release: 1.3.60

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

diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly
index 41561e6a449514d17d785306f433f18e10fb5579..2483ba60940ea2f1f878e86eb36375f082c596d9 100644 (file)
--- a/input/twinkle-pop.ly
+++ b/input/twinkle-pop.ly
@@ -1,36 +1,42 @@
-%{MudelaHeader
-
- filename: twinkle.ly
- title: Ah, vous dirais-je, maman 
- description: twinkle twinkle in pop-song-settings
- composers: traditional
-
- entered-by: HWN, chords by Johan Vromans
- copyright: public domain
+\header{
+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
-EndMudelaHeader
-%}
+\version "1.3.59";
 
-\version "0.1.1";
+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";
-        Ah!4 vous dir- ai_- je ma man2
+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
         Comme4 un- e grand- e per- so- nne
@@ -40,8 +46,26 @@ texte = \lyric{
 }
 
 \score {
-        <  \melodic <  \id "Piano" "";  \melodie >
-           \lyric   < \id "Lyric" "";  \texte >
+        <  
+          \context ChordNames \acc
+          \context Staff=melody \melodie
+           \context Lyrics \text
         >
-        \paper { unitspace= 2.5\cm; }
+       \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 {  }
+}
+