X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Ftwinkle-pop.ly;h=55a7b70314720d8842a4bbdd8d4f226c9cffa5c8;hb=e9bc63b5b5a7d3ce5da1022506af16c27c9c8bfa;hp=2676202973ecb4fc43da376b1df154531e49d0f5;hpb=ee0dca4cea06f2d354cb33d935033116e88a3dba;p=lilypond.git

diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly
index 2676202973..55a7b70314 100644
--- a/input/twinkle-pop.ly
+++ b/input/twinkle-pop.ly
@@ -1,21 +1,17 @@
+\version "1.7.6"
 \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";
+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 "1.0.12";
-
-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  |
@@ -23,52 +19,52 @@ 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
-	g f c  g-7 % urg, bug!
-        g f c  g-7
+        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
+        f c g:7 c
 }
 
-text = \lyrics{ 
-        \property Lyrics . textstyle =  "italic"
+text =  \lyrics{ 
+        \property Lyrics . LyricText \set #'font-style = #'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
+        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 {
         <  
-	   \type ChordNames \acc
-	   \type Staff=melody \melodie
-           \type Lyrics \text
+	   \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 \type ChordNames \transpose bes\acc
-	   \notes \type Staff=melody \transpose bes\melodie
-           \lyrics \type Lyrics \text
+	   \chords \context ChordNames \transpose c d\acc
+	   \notes \context Staff=melody \transpose c d\melodie
+           \lyrics \context Lyrics \text
         >
 	\header{
-		piece = "clarinet in B\\textflat";
+		piece = "clarinet in B$\flat$"
 	}
         \paper {  }
 }