release commit

[lilypond.git] / input / twinkle.ly

diff --git a/input/twinkle.ly b/input/twinkle.ly
index acfd564db390b4c1ce06abc0cf3aba5420030ded..d7b3d6baeadc719fa373c0bd2bd46e9b0f58201d 100644 (file)
--- a/input/twinkle.ly
+++ b/input/twinkle.ly
@@ -1,9 +1,10 @@
+\version "1.5.68"
 \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"
 }
 
 %{
@@ -16,15 +17,15 @@ traditional song in various languages.
 %}
 
 %{
-Tested Features: lyrics, interleaving lyrics and staffs, repeats,
+Tested Features: lyrics, interleaving lyrics and staves, repeats,
        auto beaming, adding lyrics to notes, hyphens
 %}
 
-\version "1.3.110";
 
-melody = \notes \relative c'' {
-       \clef violin;
-       \property Staff.instrument = "alto sax"
+
+melody =  \notes \relative c'' {
+       \clef violin
+       \property Staff.midiInstrument = "alto sax"
        
        c4 c | g' g | a a | g g |
        f f | e e | d d8.( e16 | )c2 |
@@ -36,8 +37,8 @@ melody = \notes \relative c'' {
        f f | e e | d d8.( e16 | )c2 |
 }
 
-accompany = \notes \relative c {
-       \clef "bass";
+accompany =  \notes \relative c {
+       \clef "bass"
        c4 c' | e c | f c | e c | 
        d b | c a | f g | c,2 | 
 
@@ -49,7 +50,7 @@ accompany = \notes \relative c {
 }
 
 
-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, " "
@@ -64,7 +65,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, " "
@@ -73,9 +74,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
@@ -84,8 +84,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, " "
@@ -94,7 +94,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, " "
@@ -103,9 +103,9 @@ 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;
+       Thanks you for your ti -- ny  " " spark
        He could not see which way to go,
        If you did not twin -- kle  " " so. " "
        Twin -- kle, twin -- kle, lit -- tle star, " "
@@ -114,11 +114,12 @@ textiii = \lyrics{
 
 \score{
        \notes <
+               \property Score.automaticMelismata = ##f
                \context Staff=i s1
                \context Lyrics=top s1
                \context GrandStaff <
                        \context Staff=ii \repeat volta 2 <
-                         \time 2/4;
+                         \time 2/4
                          \melody >
                        \context Staff=iii \repeat volta 2 <
                          \accompany >
@@ -141,11 +142,7 @@ textiii = \lyrics{
                                %}
                        >
        >
-       \paper{
-               gourlay_maxmeasures = 14.0;
-       }
-       \midi{ 
-               \tempo 4 = 120 ;
-       }
+       \paper{ }
+       \midi{ \tempo 4 = 120 }
 }