* input/regression/stanza-number.ly:

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

diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly
index 0ffda2e1cfc34a39cb62818d85f68d2bdd8dffb2..ef8c568b465d5dcfdba84cc054db810b23147677 100644 (file)
--- a/input/twinkle-pop.ly
+++ b/input/twinkle-pop.ly
@@ -1,5 +1,4 @@
-#(ly:set-option 'old-relative)
-\version "1.9.4"
+\version "2.4.0"
 \header{
 filename =      "twinkle-pop.ly"
 xtitle =        "Ah, vous dirais-je, maman "
@@ -9,7 +8,7 @@ copyright =      "public domain"
 }
 
 
-melodie =  \notes\relative c'' {
+melodie = \relative c'' {
         \clef "violin"
         \time 2/4 
 
@@ -22,7 +21,7 @@ melodie =  \notes\relative c'' {
         f4 f  | e e  | d d | c2 \bar "|."
 }
 
-acc =  \chords {
+acc = \chordmode {
        % why don't \skip, s4 work?
         c2 c f c
         f c g:7 c
@@ -33,8 +32,8 @@ acc =  \chords {
         f c g:7 c
 }
 
-text =  \lyrics{ 
-        \property Lyrics . LyricText \set #'font-shape = #'italic
+text = \lyricmode{ 
+        \override LyricText  #'font-shape = #'italic
 
         Ah!4 vous dir -- ai -- je ma man2
         Ce4 qui cau -- se mon tour -- ment2
@@ -48,24 +47,24 @@ text =  \lyrics{
 \score {
         <<  
           \context ChordNames \acc
-          \context Staff=melody \melodie
+          \context Staff = "melody" \melodie
            \context Lyrics \text
         >>
        \header{
                title = "Ah, vous dirais-je, maman "
        }
-        \paper {  }
+        \layout {  }
 }
 
 \score {
         <<  
-          \chords \context ChordNames \transpose c d\acc
-          \notes \context Staff=melody \transpose c 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$\flat$"
+         piece = \markup  { "clarinet in B" \flat }
        }
-        \paper {  }
+        \layout {  }
 }