release: 1.3.134

[lilypond.git] / input / twinkle.ly

diff --git a/input/twinkle.ly b/input/twinkle.ly
index 78a40f1a15e93452f36143819093eb9f1d771a22..0407456491f7468d163bc9b104cb9597931563f8 100644 (file)
--- a/input/twinkle.ly
+++ b/input/twinkle.ly
@@ -1,9 +1,9 @@
 \header{
-filename =     "twinkle.ly";
-title =                "Twinkle Twinkle Little Star";
-composer =     "Traditional";
-enteredby =    "hwn and jcn";
-copyright =    "public domain";
+filename =     "twinkle.ly";
+title =                "Twinkle Twinkle Little Star";
+composer =     "Traditional";
+enteredby =    "hwn and jcn";
+copyright =    "public domain";
 }
 
 %{
@@ -17,12 +17,12 @@ traditional song in various languages.
 
 %{
 Tested Features: lyrics, interleaving lyrics and staffs, repeats,
-       auto beaming, applying new rhythm on lyrics, hyphens
+       auto beaming, adding lyrics to notes, hyphens
 %}
 
-\version "1.1.52";
+\version "1.3.117";
 
-melody = \notes \relative c'' {
+melody =  \notes \relative c'' {
        \clef violin;
        \property Staff.instrument = "alto sax"
        
@@ -36,7 +36,7 @@ melody = \notes \relative c'' {
        f f | e e | d d8.( e16 | )c2 |
 }
 
-accompany = \notes \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,11 +48,8 @@ accompany = \notes \relative c {
        d b | c a | f g | c,2 
 }
 
-global = \notes {
-       \time 2/4;
-}
 
-tekst = \lyrics{ 
+tekst =  \lyrics{ 
        Al -- tijd is Kort -- jak -- je ziek, " "
        midden "in de" week maar "'s zon" -- dags  " " niet.
        "'s Zon" -- dags gaat ze naar de kerk, " "
@@ -67,7 +64,7 @@ Ja inderdaad. Dit is geen educatieve danwel muzikaal verantwoorde
 tekst. Mogen wij ook af en toe ergens op afgeven?
 %}
 
-hegedraagjetekst = \lyrics{ 
+hegedraagjetekst =  \lyrics{ 
        Al -- tijd zuigt Bill Gates mijn piek, " "
        "\TeX" is slecht -- ser dan mu --  " " ziek.
        "'s Zon" -- dags gaat het door een raam, " "
@@ -76,9 +73,8 @@ hegedraagjetekst = \lyrics{
        "\TeX" is slecht -- ser dan mu --  " " ziek.
 }
 
-texte = \lyrics{ 
-       \property Lyrics . textStyle" =  "italic" 
-%      \property Lyrics . textStyle" =  "roman" 
+texte =  \lyrics{ 
+       \property Lyrics . LyricText \set #'font-shape = #'italic
        Ah! vous dir -- ai -- je ma -- man " "
        Ce qui cau -- se mon tour --  " " ment
        Pa -- pa veut que je rai -- son -- ne
@@ -87,8 +83,8 @@ texte = \lyrics{
        Va -- lent mieux que la rai --  " " son
 }
 
-texti = \lyrics{
-       \property "Lyrics"."textStyle" =  "roman"
+texti =  \lyrics{
+
        Twin -- kle, twin -- kle, lit -- tle star, " "
        How I won -- der what you  " " are.
        Up a -- bove the world so high, " "
@@ -97,7 +93,7 @@ texti = \lyrics{
        How I won -- der what you  " " are!
 }
 
-textii = \lyrics{
+textii =  \lyrics{
        When the bla -- zing sun is gone, " "
        When he no -- thing shines up --  " " on,
        Then you show your lit -- tle light, " "
@@ -106,7 +102,7 @@ textii = \lyrics{
        How I won -- der what you  " " are!
 }
 
-textiii = \lyrics{
+textiii =  \lyrics{
        Then the tra -- veler in the dark " "
        Thanks you for your ti -- ny  " " spark;
        He could not see which way to go,
@@ -116,25 +112,33 @@ textiii = \lyrics{
 }
 
 \score{
-       <
-               \context Staff=i \repeat semi 2 < \global\melody >
-               \context Lyrics=top \context LyricVoice 
-                       \repeat fold 2 {} 
-                       \alternative { 
-                               \rhythm \melody \tekst 
-                               \rhythm \melody \texte 
-                       }
+       \notes <
+               \context Staff=i s1
+               \context Lyrics=top s1
                \context GrandStaff <
-                       \context Staff=ii \repeat semi 2 < \global\melody >
-                       \context Staff=iii \repeat semi 2 < \global\accompany >
+                       \context Staff=ii \repeat volta 2 <
+                         \time 2/4;
+                         \melody >
+                       \context Staff=iii \repeat volta 2 <
+                         \accompany >
                >
-               \context Lyrics =bottom \context LyricVoice 
-                       \repeat fold 3 {} 
-                       \alternative { 
-                               \rhythm \melody \texti 
-                               \rhythm \melody \textii 
-                               \rhythm \melody \textiii 
-                       }
+               \context Lyrics=bottom s1
+               % ugh, \repeat in \addlyrics dumps core
+               \addlyrics
+                       \context Staff = i < \melody>
+                       < 
+                               %\repeat fold 2 {} 
+                               %\alternative { 
+                                       \context Lyrics = top \tekst
+                                       \context Lyrics = top \texte
+                               %}
+                               %\repeat fold 3 {} 
+                               %\alternative { 
+                                       \context Lyrics = bottom \texti
+                                       \context Lyrics = bottom \textii
+                                       \context Lyrics = bottom \textiii
+                               %}
+                       >
        >
        \paper{
                gourlay_maxmeasures = 14.0;