X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Ftwinkle-pop.ly;h=476d699c016e79fc0da216be47bacfcbb2e824a5;hb=5f7bad2f8c6b46083405261f2912a91426482d26;hp=f95be9930cda10fc843a819b91b0fc35f115104e;hpb=8b88bf025331c789167734067001a3d79501b433;p=lilypond.git

diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly
index f95be9930c..476d699c01 100644
--- a/input/twinkle-pop.ly
+++ b/input/twinkle-pop.ly
@@ -1,16 +1,17 @@
+#(ly:set-option 'old-relative)
+\version "2.2.0"
 \header{
-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";
+filename = 	 "twinkle-pop.ly"
+xtitle = 	 "Ah, vous dirais-je, maman "
+composer = 	 "traditional"
+enteredby = 	 "HWN, chords by Johan Vromans"
+copyright = 	 "public domain"
 }
 
 
-melodie =  \notes\relative c'' {
-        \clef "violin";
-        \time 2/4 ;
+melodie = \notes\relative c'' {
+        \clef "violin"
+        \time 2/4 
 
         c4 c  | g' g | a a | g2  |
         f4 f  | e e  | d d | c2  |
@@ -18,10 +19,10 @@ melodie =  \notes\relative c'' {
         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 "|.";
+        f4 f  | e e  | d d | c2 \bar "|."
 }
 
-acc =  \chords {
+acc = \chords {
 	% why don't \skip, s4 work?
         c2 c f c
         f c g:7 c
@@ -32,8 +33,8 @@ acc =  \chords {
         f c g:7 c
 }
 
-text =  \lyrics{ 
-        \property Lyrics.LyricText \set #'font-style = #'italic
+text = \lyrics{ 
+        \override LyricText  #'font-shape = #'italic
 
         Ah!4 vous dir -- ai -- je ma man2
         Ce4 qui cau -- se mon tour -- ment2
@@ -45,25 +46,25 @@ text =  \lyrics{
 }
 
 \score {
-        <  
+        <<  
 	   \context ChordNames \acc
 	   \context Staff=melody \melodie
            \context Lyrics \text
-        >
+        >>
 	\header{
-		title = "Ah, vous dirais-je, maman ";
+		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
-        >
+        <<  
+	   \context ChordNames \transpose c d\acc
+	   \context Staff=melody \transpose c d\melodie
+           \context Lyrics \text
+        >>
 	\header{
-		piece = "clarinet in B\\textflat";
+		piece = "clarinet in B$\flat$"
 	}
         \paper {  }
 }