release: 1.0.1

[lilypond.git] / input / twinkle.ly

diff --git a/input/twinkle.ly b/input/twinkle.ly
index afefc91a2e315a400bda64cb33f91499bfc83778..926f7abafb9d1d5a233881151a70bd1dea44bbc9 100644 (file)
--- a/input/twinkle.ly
+++ b/input/twinkle.ly
@@ -15,89 +15,82 @@ copyright =  "public domain";
 Tested Features: lyrics, interleaving lyrics and staffs
 %}
 
-\version "0.1.9";
+\version "1.0.0";
 
-melody = \melodic{
+melody = \melodic \relative c'' {
        \clef violin;
-       \octave c';
        \property Staff.instrument = "alto sax"
        
-       c4 c | g g | a a | g g |
-       f f | e e | d d8.( e16 | )c2 | % :|
+       c4 c | g' g | a a | g g |
+       f f | e e | d d8.( e16 | )c2 |
 
-       g4 g | f f | e e | d d |
+       g'4 g | f f | e e | d d |
        g g | f f | e( e8. f16 | e4 )d |
 
-       c c | g g | a a | g g |
-       f f | e e | d d8.( e16 | )c2 % :|
-       \bar ":|";
+       c c | g' g | a a | g g |
+       f f | e e | d d8.( e16 | )c2 |
 }
 
-accompany = \melodic {
+accompany = \melodic \relative c {
        \clef "bass";
-       \octave 'c;
-       \duration 4;
-       c4 c' | e' c' | f' c' | e' c' | 
-       d' b | c' a | f g | c2 | 
+       c4 c' | e c | f c | e c | 
+       d b | c a | f g | c,2 | 
 
-       e'4 g | d g | c' g | b g | 
-       e' g | d' g | c' c'8.( d'16 | c'4 )b |
+       e'4 g, | d' g, | c g | b g | 
+       e' g, | d' g, | c c8.( d16 | c4 )b |
 
-       c c' | e' c' | f' c' | e' c' | 
-       d' b | c' a | f g | c2 
-       \bar ":|";
+       c, c' | e c | f c | e c | 
+       d b | c a | f g | c,2 
 }
 
 global = \melodic {
-               \meter 2 / 4;
-               \skip 2*24;
-%              \bar "|.";
-       }
+       \time 2/4;
+       \skip 2*24;
+       \bar ":|";
+}
 
 tekst = \lyric{ 
        Al-4 tijd is Kort- jak- je ziek,2
-%      midden4 in_de week maar 's_zon- dags niet.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.
 %
-       midden8 _8 in_de8 _8 week4 maar 's_zon- dags niet.2
-       's_Zon-4 dags gaat ze naar de kerk,2
+% 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
-       midden8 _8  in_de8 _8 week4 maar 's_zon- dags niet.2
+       midden8 _8  in_de8 _8 week4 maar s,_zon- dags niet.2
 }
 
-%{
 
+%{
 Ja inderdaad. Dit is geen educatieve danwel muzikaal verantwoorde
 tekst. Mogen wij ook af en toe ergens op afgeven?
-
 %}
+
 hegedraagjetekst = \lyric{ 
        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
+       s,_Zon-4 dags gaat het door een raam,2
        Weet4 dat ik me er- voor schaam.2
        Al-4 tijd zuigt Bill Gates mijn piek,2
        "\TeX"4 is slecht- ser dan mu- ziek.2
 }
 
 texte = \lyric{ 
-        
-%      \textstyle "italic" ;
-       \textstyle "roman" ;
+       \property Lyrics . textstyle" =  "italic" 
+%      \property Lyrics . textstyle" =  "roman" 
        Ah!4 vous dir- ai_- je ma man2
        Ce4 qui cau- se mon tour- ment2
        Pa-4 pa veut que je rai- sonne2
        Comme4 un- e grand- e per- sonne2
        Moi4 je dis que les bon- bons2
        Val-4 ent mieux que la rai- son2
-       
 }
 
 texti = \lyric{
-       
-       \textstyle "roman";
+       \property "Lyrics"."textstyle" =  "roman"
        Twin-4 kle, twin- kle, lit- tle star,2
        How4 I won- der what you are.2
        Up4 a- bove the world so high,2
@@ -117,18 +110,15 @@ textii = \lyric{
 }
 
 textiii = \lyric{
-       
        Then4 the tra- veler in the dark2
        Thanks4 you for your ti- ny spark;2
        He_could4 not see which way to go,2
        If4 you did not twin- kle so.2
        Twin-4 kle, twin- kle, lit- tle star,2
        How4 I won- der what you are!2
-       
 }
 
 $top_lyrics = \type Lyrics = top <
-       \global 
        \tekst
 >
 
@@ -143,18 +133,17 @@ $bass_staff = \type Staff = bass <
 >
 
 $middle_lyrics = \type Lyrics = middle <
-       \global
        \texte
 >
 
 $bottom_lyrics = \type Lyrics = bottom <
-       \global
+%      \global
        \texti
        \textii
        \textiii
 >
 
-$grand_staff = \type Staff_group <
+$grand_staff = \type GrandStaff <
        \$treble_staff
        \$middle_lyrics
        \$bass_staff
@@ -169,8 +158,6 @@ $grand_staff = \type Staff_group <
                \$bottom_lyrics
        >
        \paper{
-               % use a lot of space, to avoid clashing syllables
-%              arithmetic_multiplier = 8.\pt;
                gourlay_maxmeasures = 14.0;
        }
        \midi{