patch::: 1.1.27.jcn4: jcn4

[lilypond.git] / input / twinkle.ly

diff --git a/input/twinkle.ly b/input/twinkle.ly
index 5be1280c2a45d3fe0ca6d0be4071027b492234fb..82a509a8a1f3c8f1b5877c5829bb3c91499851e7 100644 (file)
--- a/input/twinkle.ly
+++ b/input/twinkle.ly
@@ -1,10 +1,9 @@
 \header{
-filename =      "twinkle.ly";
-title =         "Twinkle Twinkle Little Star";
-
-composer =      "Traditional";
-enteredby =     "HWN & JCN";
-copyright =     "public domain";
+filename =     "twinkle.ly";
+title =                "Twinkle Twinkle Little Star";
+composer =     "Traditional";
+enteredby =    "hwn and jcn";
+copyright =    "public domain";
 }
 
 %{
@@ -17,12 +16,12 @@ traditional song in various languages.
 %}
 
 %{
-Tested Features: lyrics, interleaving lyrics and staffs
+Tested Features: lyrics, interleaving lyrics and staffs, repeats
 %}
 
-\version "1.0.2";
+\version "1.0.14";
 
-melody = \melodic \relative c'' {
+melody = \notes \relative c'' {
        \clef violin;
        \property Staff.instrument = "alto sax"
        
@@ -36,7 +35,7 @@ melody = \melodic \relative c'' {
        f f | e e | d d8.( e16 | )c2 |
 }
 
-accompany = \melodic \relative c {
+accompany = \notes \relative c {
        \clef "bass";
        c4 c' | e c | f c | e c | 
        d b | c a | f g | c,2 | 
@@ -48,20 +47,13 @@ accompany = \melodic \relative c {
        d b | c a | f g | c,2 
 }
 
-global = \melodic {
+global = \notes {
        \time 2/4;
-       \skip 2*24;
-       \bar ":|";
 }
 
-tekst = \lyric{ 
+tekst = \lyrics{ 
        Al-4 tijd is Kort- jak- je ziek,2
        midden4 in_de week maar s,_zon- dags niet.2
-% ugly hack: insertion of  empty syllables creates columns on extra 
-% moments.  The net result is more spacing.
-%
-% probably not necessary anymore
-%      midden8 _8 in_de8 _8 week4 maar s,_zon- dags niet.2
        s,_Zon-4 dags gaat ze naar de kerk,2
        met4 een boek vol zil- ver werk.2
        Al-4 tijd is Kort- jak- je ziek,2
@@ -74,7 +66,7 @@ Ja inderdaad. Dit is geen educatieve danwel muzikaal verantwoorde
 tekst. Mogen wij ook af en toe ergens op afgeven?
 %}
 
-hegedraagjetekst = \lyric{ 
+hegedraagjetekst = \lyrics{ 
        Al-4 tijd zuigt Bill Gates mijn piek,2
        "\TeX"4 is slecht- ser dan mu- ziek.2
        s,_Zon-4 dags gaat het door een raam,2
@@ -83,7 +75,7 @@ hegedraagjetekst = \lyric{
        "\TeX"4 is slecht- ser dan mu- ziek.2
 }
 
-texte = \lyric{ 
+texte = \lyrics{ 
        \property Lyrics . textstyle" =  "italic" 
 %      \property Lyrics . textstyle" =  "roman" 
        Ah!4 vous dir- ai_- je ma- man2
@@ -94,7 +86,7 @@ texte = \lyric{
        Va-4 lent mieux que la rai- son2
 }
 
-texti = \lyric{
+texti = \lyrics{
        \property "Lyrics"."textstyle" =  "roman"
        Twin-4 kle, twin- kle, lit- tle star,2
        How4 I won- der what you are.2
@@ -104,7 +96,7 @@ texti = \lyric{
        How4 I won- der what you are!2
 }
 
-textii = \lyric{
+textii = \lyrics{
        When4 the bla- zing sun is gone,2
        When4 he no- thing shines up- on,2
        Then4 you show your lit- tle light,2
@@ -114,7 +106,7 @@ textii = \lyric{
        
 }
 
-textiii = \lyric{
+textiii = \lyrics{
        Then4 the tra- veler in the dark2
        Thanks4 you for your ti- ny spark;2
        He_could4 not see which way to go,2
@@ -123,44 +115,16 @@ textiii = \lyric{
        How4 I won- der what you are!2
 }
 
-$top_lyrics = \type Lyrics = top <
-       \tekst
->
-
-$treble_staff = \type Staff = treble <
-       \global
-       \melody 
->
-
-$bass_staff = \type Staff = bass <
-       \global
-       \accompany
->
-
-$middle_lyrics = \type Lyrics = middle <
-       \texte
->
-
-$bottom_lyrics = \type Lyrics = bottom <
-%      \global
-       \texti
-       \textii
-       \textiii
->
-
-$grand_staff = \type GrandStaff <
-       \$treble_staff
-       \$middle_lyrics
-       \$bass_staff
->
-
 \score{
-       < 
-               \$treble_staff
-               \$middle_lyrics
-               \$top_lyrics
-               \$grand_staff
-               \$bottom_lyrics
+       <
+               \type Staff=i \repeat 2 < \global\melody >
+               \type Lyrics=top \repeat 2 {} \alternative < \tekst \texte >
+               \type GrandStaff <
+                       \type Staff=ii \repeat 2 < \global\melody >
+                       \type Staff=iii \repeat 2 < \global\accompany >
+               >
+               \type Lyrics=bottom \repeat 3 {} 
+                       \alternative < \texti \textii \textiii >
        >
        \paper{
                gourlay_maxmeasures = 14.0;