X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Ftwinkle-pop.ly;h=6e261127ba799788addf0d3e6512dd9280188103;hb=bbaf60edda2d5dd759050c1046cbd9865f3affbd;hp=1c90375b47019fc8599aa6077bc49b066703f477;hpb=641486a1a5522a9e66b470d8c762a1f789219573;p=lilypond.git

diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly
index 1c90375b47..6e261127ba 100644
--- a/input/twinkle-pop.ly
+++ b/input/twinkle-pop.ly
@@ -1,71 +1,67 @@
-#(ly:set-option 'old-relative)
-\version "2.4.0"
+\version "2.12.0"
 \header{
-filename = 	 "twinkle-pop.ly"
-xtitle = 	 "Ah, vous dirais-je, maman "
-composer = 	 "traditional"
-enteredby = 	 "HWN, chords by Johan Vromans"
-copyright = 	 "public domain"
+  filename = "twinkle-pop.ly"
+  composer = "traditional"
+  enteredby = "HWN, chords by Johan Vromans"
+  copyright = "public domain"
 }
 
 
 melodie = \relative c'' {
-        \clef "violin"
-        \time 2/4 
+  \clef "violin"
+  \time 2/4 
 
-        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  | 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 "|."
 }
 
-acc = \chordmode {
-	% 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
+acc = \chords {
+  c2 c f c
+  f c g:7 c
+  g f c  g:7
+  g f c  g:7
+  %% copy 1-8
+  c2 c f c
+  f c g:7 c
 }
 
-text = \lyricmode{ 
-        \override LyricText  #'font-shape = #'italic
+text = \lyrics { 
+  \override LyricText  #'font-shape = #'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
-        
+  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 {
-        <<  
-	   \context ChordNames \acc
-	   \context Staff = "melody" \melodie
-           \context Lyrics \text
-        >>
-	\header{
-		title = "Ah, vous dirais-je, maman "
-	}
-        \layout {  }
+  <<  
+    \acc
+    \new Staff = "melody" \melodie
+    \text
+  >>
+  \header{
+    title = "Ah, vous dirais-je, maman "
+  }
+  \layout {  }
 }
 
 \score {
-        <<  
-	   \context ChordNames \transpose c d\acc
-	   \context Staff = "melody" \transpose c d\melodie
-           \context Lyrics \text
-        >>
-	\header{
-		piece = "clarinet in B$\flat$"
-	}
-        \layout {  }
+  <<  
+    \context ChordNames \transpose c d\acc
+    \context Staff = "melody" \transpose c d\melodie
+    \context Lyrics \text
+  >>
+  \header{
+    piece = \markup  { "clarinet in B" \flat }
+  }
+  \layout {  }
 }
-