release: 1.1.43

[lilypond.git] / input / twinkle-pop.ly

diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly
index 1feeeb2eec6f9d528ae2d4aaa43e11bd86928b24..802246a3e6515e126c8241e1ad42ae3232e81920 100644 (file)
--- a/input/twinkle-pop.ly
+++ b/input/twinkle-pop.ly
@@ -1,35 +1,45 @@
 \header{
-filename               twinkle.ly
-title          Ah, vous dirais-je, maman 
-description            twinkle twinkle in pop-song-settings
-composers              traditional
-
-enteredby              HWN, chords by Johan Vromans
-copyright              public domain
+filename =      "twinkle-pop.ly";
+%title =        "Ah, vous dirais-je, maman ";
+description =   "twinkle twinkle in pop-song-settings";
+composer =      "traditional";
+enteredby =     "HWN, chords by Johan Vromans";
+copyright =     "public domain";
 }
 
 %{
 Tested Features                lyrics and chords
 %}
 
-\version "0.1.1";
+\version "1.0.19";
+
+melodie = \notes\relative c'' {
+        \clef "violin";
+        \time 2/4 ;
 
-melodie = \melodic {
-        \clef"violin";
-        \meter 2/4 ;
-        \octave  c';
+        c4 c  | g' g | a a | g2  |
+        f4 f  | e e  | d d | c2  |
+        g'4 g | f f  | e e | d d |
+        g  g  | f f  | e e | d d |
+       % copy 1-8
+        c4 c  | g' g | a a | g2  |
+        f4 f  | e e  | d d | c2 \bar "|.";
+}
 
-        c4^"C" c |      g     g |       a^"F"  a |      g2^"C"   |
-        f4^"F" f |      e^"C" e |       d^"G7" d |      c2^"C"   |
-        g4^"G" g |      f^"F" f |       e^"C"  e |      d^"G7" d |
-        g^"G"  g |      f^"F" f |       e^"C"  e |      d^"G7" d |
-        c4^"C" c |      g     g |       a^"F"  a |      g2^"C"   |
-        f4^"F" f |      e^"C" e |       d^"G7" d |      c2^"C"   |
+acc = \chords {
+       % why don't \skip, s4 work?
+        c2 c f c
+        f c g-7 c
+       g f c  g-7 % urg, bug!
+        g f c  g-7
+       % copy 1-8
+        c2 c f c
+        f c g-7 c
 }
 
-texte = \lyric{ 
-         
-        \textstyle "italic";
+text = \lyrics{ 
+        \property Lyrics . textstyle =  "italic"
+
         Ah!4 vous dir- ai_- je ma man2
         Ce4 qui cau- se mon tour- ment2
         Pa-4 pa veut que je rai- so- nne
@@ -40,8 +50,26 @@ texte = \lyric{
 }
 
 \score {
-        <  \melodic <  \id "Piano" "";  \melodie >
-           \lyric   < \id "Lyric" "";  \texte >
+        <  
+          \context ChordNames \acc
+          \context Staff=melody \melodie
+           \context Lyrics \text
+        >
+       \header{
+               title = "Ah, vous dirais-je, maman ";
+       }
+        \paper {  }
+}
+
+\score {
+        <  
+          \chords \context ChordNames \transpose d'\acc
+          \notes \context Staff=melody \transpose d'\melodie
+           \lyrics \context Lyrics \text
         >
+       \header{
+               piece = "clarinet in B\\textflat";
+       }
         \paper {  }
 }
+