X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Ftwinkle-pop.ly;h=0511c64448fca4bec3ec4d2f2534145b0b6267da;hb=16f86be3db31bcf062a33fdd79c37c168e4883d4;hp=599749f93418b6064687f41675cbb544f4910a62;hpb=6bc0a8a090e82c4bce57df8e980b48cc78cb422b;p=lilypond.git

diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly
index 599749f934..0511c64448 100644
--- a/input/twinkle-pop.ly
+++ b/input/twinkle-pop.ly
@@ -1,46 +1,71 @@
+\version "1.5.49"
 \header{
-filename =	 "twinkle.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";
+filename = 	 "twinkle-pop.ly"
+xtitle = 	 "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.15";
+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
 }
 
-text = \lyric{ 
-        \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
-        Moi4 je dis que les bon- bons2
-        Val-4 ent mieux que la rai- son2
+text =  \lyrics{ 
+        \property Lyrics . LyricText \set #'font-style = #'italic
+
+        Ah!4 vous dir -- ai -- je ma man2
+        Ce4 qui cau -- se mon tour -- ment2
+        Pa4 --  pa veut que je rai -- so -- nne
+        Comme4 un -- e grand -- e per -- so -- nne
+        Moi4 je dis que les bon -- bons2
+        Val4 -- ent mieux que la rai -- son2
         
 }
 
 \score {
-        <  \melodic \type Staff \melodie
-           \lyric   \type Lyrics \text
+        <  
+	   \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$\flat$"
+	}
+        \paper {  }
+}
+