From: Han-Wen Nienhuys Date: Thu, 28 Aug 2003 11:22:26 +0000 (+0000) Subject: * scm/document-markup.scm (markup-doc-node): sort markup function X-Git-Tag: release/1.9.2~1 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=09a34bd669e9fae9fe7162d5436fb5aec2c76335;p=lilypond.git * scm/document-markup.scm (markup-doc-node): sort markup function list. * scm/new-markup.scm (fraction-markup): \fraction command. * Documentation/user/refman.itely: revise section explaining grace notes. --- diff --git a/ChangeLog b/ChangeLog index 0affdee979..bfc661d325 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2003-08-28 Han-Wen Nienhuys + * scm/document-markup.scm (markup-doc-node): sort markup function + list. + * lily/paper-outputter.cc (output_version): change "Lily was here" into "Engraved by LilyPond" diff --git a/GNUmakefile.in b/GNUmakefile.in index 4f8d9b775e..d26828ddd0 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -20,7 +20,7 @@ SCRIPTS = configure aclocal.m4 autogen.sh README_FILES = ChangeLog COPYING DEDICATION README.mandrake ROADMAP THANKS README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt NEWS.txt IN_FILES := $(wildcard *.in) -EXTRA_DIST_FILES = $(wildcard *.el) vimrc VERSION $(README_FILES) $(SCRIPTS) $(IN_FILES) emacsclient.patch server.el.patch darwin.patch .cvsignore lexer-gcc-3.1.sh lilypond.words +EXTRA_DIST_FILES = $(wildcard *.el) lilypond.vim vimrc VERSION $(README_FILES) $(SCRIPTS) $(IN_FILES) emacsclient.patch server.el.patch darwin.patch .cvsignore lexer-gcc-3.1.sh lilypond.words NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES) INSTALLATION_DIR=$(local_lilypond_datadir) INSTALLATION_FILES=$(config_make) VERSION diff --git a/input/bugs/+.ly b/input/bugs/+.ly deleted file mode 100644 index 6c5ad2297e..0000000000 --- a/input/bugs/+.ly +++ /dev/null @@ -1,26 +0,0 @@ -\version "1.9.1" -%% +.ly: Be the first .ly file for lys-to-tely.py. -%% Better to make lys-to-tely.py include "introduction.texi" or -%% other .texi documents too? - - -\header{ -texidoc = " -@section Introduction - -This document presents brief overview of all simple bugs known to -exist in LilyPond. Things that don't look like bugs, have hopefully -been fixed. Note that this page only shows notational bugs, input -that does not result in any notation (ie, crashes lilypond) should go -in @file{input/no-notation/}. - -" - -foollilypondbook = " -\score -" -} - -\score{ -\context Lyrics \lyrics { "." } -} diff --git a/input/bugs/GNUmakefile b/input/bugs/GNUmakefile deleted file mode 100644 index 8157e1c8ef..0000000000 --- a/input/bugs/GNUmakefile +++ /dev/null @@ -1,10 +0,0 @@ -depth = ../.. - -STEPMAKE_TEMPLATES=documentation texinfo tex -LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc -EXTRA_DIST_FILES=README - -include $(depth)/make/stepmake.make - -TITLE=LilyPond Assorted Possible Bugs - diff --git a/input/bugs/README b/input/bugs/README deleted file mode 100644 index 2865bdf333..0000000000 --- a/input/bugs/README +++ /dev/null @@ -1,7 +0,0 @@ -This directory holds a collection of examples that show all simple -notation bugs known to exist in LilyPond. - -Bugs that make lilypond crash, or don't generate notation should go in - - input/no-notation - diff --git a/input/bugs/dynamic-switch.ly b/input/bugs/dynamic-switch.ly deleted file mode 100644 index 31517433f1..0000000000 --- a/input/bugs/dynamic-switch.ly +++ /dev/null @@ -1,31 +0,0 @@ -#(ly:set-option 'old-relative) -\header{ -% what's the problem? -% well, that's elementary my dear watson -texidoc="The decrescendo disappears when the part combiner decides that -the a2 and c2 should be a chord in one voice. Using the commented -version, with a c2 instead of a2, the decrescendo reappears." -} -\version "1.9.1" - -\score{ - \context Staff < - \context Voice=one \skip 1 - \context Voice=two \skip 1 - \context Voice=one \partcombine Voice - \context Thread=one \notes\relative c'' { - c2 \clef bass c2 - c2 c2 - } - \context Thread=two \notes\relative c'' { - b2 \< a4 () \! a - %c2 \> a4 () \! a - a2 \> a4 () \! a - } - > - \paper{ - linewidth=140.\mm - } -} - - diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.midi b/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.midi deleted file mode 100644 index dc1c0aa073..0000000000 --- a/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.midi +++ /dev/null @@ -1 +0,0 @@ -MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM \ No newline at end of file diff --git a/mutopia/GNUmakefile b/mutopia/GNUmakefile deleted file mode 100644 index 63bda70283..0000000000 --- a/mutopia/GNUmakefile +++ /dev/null @@ -1,11 +0,0 @@ -# mutopia/Makefile - -depth = .. - -SUBDIRS = J.S.Bach F.Schubert E.Satie -EXTRA_DIST_FILES += claop.py - -LOCALSTEPMAKE_TEMPLATES=ly mutopia - -include $(depth)/make/stepmake.make - diff --git a/mutopia/claop.py b/mutopia/claop.py deleted file mode 100644 index efef518631..0000000000 --- a/mutopia/claop.py +++ /dev/null @@ -1,306 +0,0 @@ -import sys - - -copyright = """copyright 1992. Peter Wallin. Verbatim redistribution -permitted """ - - - -""" - -This file produces the Score for CLA(O)P II -- a piece by -Peter Wallin (pwallin@post8.tele.dk). - -The score produced by this file is -copyright 1992. Peter -Wallin. Verbatim redistribution permitted - - - - -From: Rune Zedeler -Sender: lilypond-devel-admin@gnu.org -To: LilyPond Devel -Subject: CLA(O)P II -Date: Wed, 12 Jun 2002 02:14:05 +0200 - -The concert went well. -I talked to the composer and he agreed to include the score in lilypond -as long as his name was maintained and as long as he kept the copyrights -- that is people are not allowed to make changes to the score. - -I think including CLA(O)P II is a Good Thing because it stress tests -lilypond very well. This is also why I think that including only an -excerpt from it is stupid. -I am not sure how the inclusion should be. -The raw lilypond file is 750k; gzip'ed 40k. -Alternatively one could include the generating c-file into lilypond. -Or perhaps we should just wait till I manage to redo it in scheme... :-) - --Rune - -""" - - - -#//set to 1, 385 to typeset the whole score -start_measure =1 -no_measures = 385 -voices = 48 - -durs = ["16","8","8.","4"] -grund = [ - "x x x x xx x", - "x x xx xx x xx x", - "xx xx x xx xx x xx xx x ", - - "x x x xx xx ", - "x xx xx x xx xx ", - "x xx x xx xx x xx xx x x", - - "x x xx xx x ", - "xx xx x xx xx x ", - "xx x xx xx x xx xx x xx ", - - "x xx xx x x ", - "x xx x xx xx x x", - "x x xx xx x xx xx x xx x", - - "xx xx x x x ", - "xx x xx xx x xx ", - "x xx xx x xx xx x xx xx ", - - "x xx x x x x", - "x x xx xx x xx x", - "xx xx x xx xx x xx xx x ", - - "xx x x x xx ", - "x xx xx x xx xx ", - "x xx x xx xx x xx xx x x", - - - "x x x x xx x", - "xx xx x xx xx x ", - "xx x xx xx x xx xx x xx ", - - "x x x xx xx ", - "x xx x xx xx x x", - "x x xx xx x xx xx x xx x", - - "x x xx xx x ", - "xx x xx xx x xx ", - "x xx xx x xx xx x xx xx ", - - "x xx xx x x ", - "x x xx xx x xx x", - "xx xx x xx xx x xx xx x ", - - "xx xx x x x ", - "x xx xx x xx xx ", - "x xx x xx xx x xx xx x x", - - "x xx x x x x", - "xx xx x xx xx x ", - "xx x xx xx x xx xx x xx ", - - "xx x x x xx ", - "x xx x xx xx x x", - "x x xx xx x xx xx x xx x", - - "x x x x xx x", - "xx x xx xx x xx ", - "x xx xx x xx xx x xx xx ", - - "x x x xx xx ", - "x x xx xx x xx x", - "xx xx x xx xx x xx xx x " -] - -accents = '' -accstr = '' - - -def stemme(st) : - adr = [0] * (385*16) - pos = st*48+44 - - for i in range(0,100): - adr[384*16-i*28] = ord ('X') - - for k in range(0,48): - if k: - for j in range(0,8): - adr[pos] = 0 - pos += 1 - - for j in range(0,4): - for c in grund[k]: - if c ==' ' : - adr[pos] = 0 - else: - adr[pos] = 3-j+ord ('a') - pos += 1 - - for i in range(0,385*16): - ac = accents[48*4+i-((48+24-st)%48)*4] - if ac: - adr[i]=ac - - return adr - - -def print1(ch) : - accstr="" - if ch >= ord('A') and ch <=ord('D'): - ch += ord('a')-ord('A') - accstr="->" - - namestr = '' - cr = chr (ch) - - if cr=='a': - namestr="a" - elif cr=='b': - namestr="b" - elif cr=='c': - namestr="d'" - elif cr=='d': - namestr="e'" - elif cr=='X': - namestr="\\property Staff.NoteHead \\override #'style = #'cross c'" - accstr="-^ \\property Staff.NoteHead \\revert #'style" - else: - print 'foo', cr, chr(ch), ch == 'd', "A%sA" % cr - raise 'foo' - - return (namestr,accstr) - - -namestr = '' -accstr = '' - -def print4(ptr): - val = reduce (lambda x,y : x|y, ptr) -# sys.stderr.write ('%d ' % val) - if not val: - sys.stdout.write ("r4 ") - else: - dur=-1 - - global namestr - global accstr - if ptr[0]==0: - sys.stdout.write ("~") - (namestr, accstr) = print1(val) - - for c in ptr: - if c==0: - dur += 1 - else: - if dur>=0: - sys.stdout.write( "%s%s%s " % (namestr,durs[dur],accstr)) - (namestr, accstr) = print1(c) - dur=0 - - sys.stdout.write( "%s%s%s "% (namestr,durs[dur],accstr)) - - - -def print8(ptr) : - val = reduce (lambda x,y : x|y, ptr) - if val: - print4(ptr[0:4]) - print4(ptr[4:8]) - else: - sys.stdout.write ("r2 ") - - -def print16(ptr): - val = reduce (lambda x,y : x|y, ptr) - if val: - print8(ptr[0:8]) - print8(ptr[8:16]) - else: - sys.stdout.write("R1 ") - -accents = [0] *(500*16) -for i in range(0,32): - pos=i*12*16+4*48 - accents[pos]=ord('D') - if(i<31) : - if(i>0): - accents[pos+4*12]=ord('A') - accents[pos+4*23]=ord('C') - accents[pos+4*35]=ord('B' ) - - -sys.stdout.write ('%%{\n %s \n %%}' % copyright) -sys.stdout.write (r""" -\include "paper11.ly" - -\header { - title = "CLA(O)P II" - composer = "Peter Wallin (1992-93)" - copyright = "Copyright (1992-93) Peter Wallin, verbatim redistribution permitted" -} - - -""") - - - - - -for st in range(1,voices+1): - str=stemme(st) - ststr=chr((st-1)/24+ord('A')) + chr ((st-1)%24+ord('A')) - sys.stdout.write( """ - -stemme%s = \\notes {\n\\clef percussion -\\property Staff.instrument = \"%d\"\n -\\property Staff.instr = \"%d\"\n -\\property Score.currentBarNumber = #%d\n""" % (ststr,st,st,start_measure)) - - for i in range(start_measure-1, start_measure-1+no_measures): - print16(str[i*16:i*16+16]) - sys.stdout.write (" |\n") - - sys.stdout.write ("\\bar\"|.\" }\n") - - -sys.stdout.write (r""" -\score { - \notes < - \property Score.BarNumber \override #'padding = #2.5 - \property Score.autoBeamSettings \override - #'(end * * * *) = #(ly:make-moment 1 4) - \property Score.skipBars = ##t - \context StaffGroup < - \property StaffGroup.Stem \override #'direction = #1 -""") - - -for st in range(1,voices+1): - ststr=chr((st-1)/24+ord('A')) + chr ((st-1)%24+ord('A')) - ststr = 'stemme' + ststr - sys.stdout.write (r"""\context Staff="%s" \%s -""" % (ststr,ststr)) - -sys.stdout.write (r"""> - > - \paper { - linewidth = 26.0\cm - indent = 0 - textheight = 38.0\cm - %hsize = 30.0 \cm - %vsize = 42.0 \cm - - \translator { - \StaffContext - StaffSymbol \override #'line-count = #3 - minimumVerticalExtent = #'(-3 . 3) - } - } - -} -""") diff --git a/scm/document-markup.scm b/scm/document-markup.scm index 1db87f01b0..85c2659adf 100644 --- a/scm/document-markup.scm +++ b/scm/document-markup.scm @@ -24,13 +24,16 @@ ))) +(define (markup-functionstring (procedure-name a)) (symbol->string (procedure-name b)))) (define (markup-doc-node) (make #:name "Markup functions" #:desc "Definitions of the markup functions" #:text (apply string-append - (map doc-markup-function markup-function-list) ) + (map doc-markup-function + (sort markup-function-list markup-function