lilypond-0.0.31

diff --git a/Sources.make b/Sources.make
index e7e7a22782eeceeae3f1822b72da4cc243b5bebf..dad8bf273410848c8d25ce7d94d9e902d612b77c 100644 (file)
--- a/Sources.make
+++ b/Sources.make
@@ -12,7 +12,7 @@ hdr=   bar.hh beam.hh boxes.hh break.hh clef.hh clefitem.hh\
        localkeyitem.hh localkeyreg.hh lookup.hh \
        lyriccolumn.hh  lyricitem.hh lyricstaff.hh lyricwalker.hh\
        main.hh  meter.hh misc.hh\
-       molecule.hh moment.hh notehead.hh notename.hh offset.hh paper.hh\
+       molecule.hh moment.hh notehead.hh notename.hh offset.hh paperdef.hh\
        parseconstruct.hh pcol.hh proto.hh pscore.hh pstaff.hh qlp.hh\
        qlpsolve.hh register.hh request.hh rest.hh \
        sccol.hh score.hh\
@@ -40,7 +40,7 @@ mycc=bar.cc beam.cc boxes.cc break.cc calcideal.cc clef.cc\
        lyriccolumn.cc lyricitem.cc lyricstaff.cc lyricwalker.cc\
        main.cc  meter.cc\
        misc.cc molecule.cc mylexer.cc note.cc notehead.cc  notename.cc\
-       paper.cc pcol.cc pscore.cc pstaff.cc qlp.cc qlpsolve.cc\
+       paperdef.cc pcol.cc pscore.cc pstaff.cc qlp.cc qlpsolve.cc\
        register.cc request.cc rest.cc  sccol.cc score.cc\
        scoreline.cc scores.cc script.cc scriptdef.cc scriptreg.cc \
         slur.cc\
@@ -60,7 +60,7 @@ mycc=bar.cc beam.cc boxes.cc break.cc calcideal.cc clef.cc\
 stablecc=request.cc bar.cc boxes.cc break.cc  clef.cc getcommands.cc grouping.cc\
        item.cc keyword.cc leastsquares.cc \
        linepstaff.cc linespace.cc lookup.cc molecule.cc meter.cc\
-       paper.cc parser.cc lexer.cc pstaff.cc qlp.cc qlpsolve.cc\
+       paperdef.cc parser.cc lexer.cc pstaff.cc qlp.cc qlpsolve.cc\
        template1.cc template2.cc template3.cc template4.cc\
        template5.cc template6.cc version.cc tstream.cc  tex.cc\
        voice.cc wordwrap.cc spanner.cc 

diff --git a/input/coriolan-alto.ly b/input/coriolan-alto.ly
new file mode 100644 (file)
index 0000000..959c4d7
--- /dev/null
+++ b/input/coriolan-alto.ly
@@ -0,0 +1,85 @@
+% Ludwig van Beethoven (1770-1792)
+%
+% Opus 62
+% Ouverture zu Collins Trauerspiel "Coriolan"
+%
+% a 5 bar fragment of the alto part
+%
+% Copyright (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+%
+% when lily can handle this, i-ll type the other 304 bars 
+% (maybe even sooner :-)
+%
+
+alto = music { 
+       $
+       \duration{ 8 }
+
+       % these are chords (i.e. non-divisi)
+       % that-s why i-d rather type chords, 
+       % but how to type slurs?
+%30     
+               {       
+               \music{ 
+                       [ c c-. ] c2.( | 
+%31
+                       [ ) c c-. ] c2.( | 
+%32
+                       [ ) c c-. ] c4. c-. c4( |
+%33
+                       [ ) c c-. ] c4. c-. c4 
+               }
+%30:2
+               \music{ 
+                       \octave{ ` }
+                       \textstyle "italic"
+                       % this should be a dynamic, rather than text
+                       [ c c_"cresc. \ \ - \ \ \ \ - \ \ \ \ - \ \ \ \
+                               - \ \ \ \ - \ \ \ \ - \ \ \ \ - \ \ \ \
+                               - \ \ \ \ - \ \ \ \ - \ \ \ \ - \ \ \ \
+                               - \ \ \ \ - \ \ \ \ -" ] c2.( |  
+                       \textstyle "roman"
+%31:2
+                       [ ) c c-. ] c2.( | 
+%32:2
+                       [ ) c c-. ] c4. c-. c4( | 
+%33:2
+                       [ ) c c-. ] c4. c-. c4 |
+                       \octave{ }
+               }
+       }
+%34
+       % these are two voices (i.e. divisi)
+       % the c4 and c2, however are really 16th...
+       % e.g.: c16*4 and c16*8  or
+       %       [ c4 c2 ]*16 ?
+       % we-ll say "simile" for now...
+       % 
+               { \multivoice
+               \music{ \stem{ 1 }[ c16^"div." c16 c16 c16 ] c4 c2 }
+               \music  { 
+                       \octave{ ` }
+                       \textstyle "italic"
+                       \stem{ -1 } [ as16_"\ff" as16 as16 as16 ] as4_"simile" as2
+                       \textstyle "roman"
+               }
+       }
+       $
+}
+
+score {
+       staff { melodic music { alto }
+               commands {
+                       clef "alto"
+                       key $c es as$ % c ??? 
+               }
+       }
+       commands { 
+               meter 4*4
+               skip 5:0
+       }
+       paper { 
+               unitspace 14mm
+               geometric 1.4
+       }
+}

diff --git a/input/wohltemperirt.ly b/input/wohltemperirt.ly
index aa8120ade856641fcd066b2dbc64ba76a5bb0626..53187772f919370846ad21f6a031d98d1d9f561e 100644 (file)
--- a/input/wohltemperirt.ly
+++ b/input/wohltemperirt.ly
@@ -2,7 +2,7 @@
 %
 % a 7 bar fragment
 %
-%      Public Domain -- by HWN
+%      Public Domain -- typed by by HWN
 %
 
 dux = music { $
@@ -31,7 +31,7 @@ comes = music { $
 $}
 
 bassdux = music { $
-       r1 r1 r1 r1 r1 r1
+       r1 r r r r r
        \octave { }
        r8 [c16 B] [c8 G] [As c16 B] [c8 d] |
        [G c16 B] [c8 d] [F16 G] As4 [G16 F] | $
@@ -65,4 +65,5 @@ score {
        paper { %unitspace 2.5cm
                %geometric 1.4
        }
-}
\ No newline at end of file
+}
+