lilypond-0.0.34

diff --git a/input/maartje.ly b/input/maartje.ly
index 9a79cf47c3abecd803ea6495a0cc159d28f24444..7f35583ae2b2aea8212653b56b861cbed03eaeba 100644 (file)
--- a/input/maartje.ly
+++ b/input/maartje.ly
@@ -57,14 +57,15 @@ score {
                geometric 1.4
                unitspace 3.0 cm
        }
-%      staff { ritme }%broken for now
+%      staff { ritme } % broken for now
        staff { melody }
        commands {
                meter {4* 4}
-               partial 8
-               skip 3*2
+               partial {8}
+               skip {1*8}
+               skip {3*2 }
                bar ":|:"
-               skip 2*1
+               skip {1*2}
                meter {2*4}
 
        }

diff --git a/input/standchen.ly b/input/standchen.ly
index 219cb50765f098b9863acce7fd6dac9f9eff4ccb..4d104f84ee7c378d64a6c79b8da1c5374496f6fb 100644 (file)
--- a/input/standchen.ly
+++ b/input/standchen.ly
@@ -216,9 +216,6 @@ begeleiding = music { $
 %%6
        { \multivoice \music{ \stem{ 1 } [ `d `e `g `e `g `e ] } \music { \stem{ -1 } ``bes2 r4 } } |
 %%7 
-% this (one note missing) fails with assertion:
-% lilypond: src/beam.cc:144: void Beam::set_grouping(struct Rhythmic_grouping, struct Rhythmic_grouping): Assertion `cur.children.size() == stems.size()' failed.
-%      { \multivoice \music{ \stem{ 1 } [ `cis `e `g `e `g ] } \music { \stem{ -1 } ``a2 r4 } } |
        { \multivoice \music{ \stem{ 1 } [ `cis `e `g `e `g e ] } \music { \stem{ -1 } ``a2 r4 } } |
 %%8
        { \multivoice \music{ \stem{ 1 } [ `d `a d `a d `a ] } \music { \stem{ -1 } `d2 r4 } } |
@@ -464,19 +461,19 @@ tekst2 = music {
 }
 
 score {
-%      staff { 
-%              lyric 
-       %       music { tekst1 }
-       %       music { tekst2 }
-%      }
-%      staff { 
-%              melodic 
-%              music { melodie }
-%      }
-%      staff { 
-%              melodic 
-%              music { begeleiding }
-%      }
+       staff { 
+               lyric 
+       music { tekst1 }
+       music { tekst2 }
+       }
+       staff { 
+               melodic 
+               music { melodie }
+       }
+       staff { 
+               melodic 
+               music { begeleiding }
+       }
        commands { 
                meter {3*4}
        }
@@ -485,14 +482,10 @@ score {
                width 195mm
 
                % on two pages...
-%              unitspace 10mm
-%              geometric 1.2
                unitspace 9mm
                geometric 1.2
                output "standchen.out"
        }
-       staff { midi music { melodie } }
-       staff { midi music { begeleiding } }
        midi {
                tempo 4:50
        }