Merge commit 'origin' into beamlets2

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

diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly
index 3d6ce030de0e18bbfd926f5aff1247ac50d2dbc0..6e261127ba799788addf0d3e6512dd9280188103 100644 (file)
--- a/input/twinkle-pop.ly
+++ b/input/twinkle-pop.ly
@@ -1,4 +1,4 @@
-\version "2.6.0"
+\version "2.12.0"
 \header{
   filename = "twinkle-pop.ly"
   composer = "traditional"
@@ -20,7 +20,7 @@ melodie = \relative c'' {
   | f4 f  | e e  | d d | c2 \bar "|."
 }
 
-acc = \chordmode {
+acc = \chords {
   c2 c f c
   f c g:7 c
   g f c  g:7
@@ -30,7 +30,7 @@ acc = \chordmode {
   f c g:7 c
 }
 
-text = \lyricmode{ 
+text = \lyrics { 
   \override LyricText  #'font-shape = #'italic
 
   Ah!4 vous dir -- ai -- je ma man2
@@ -44,9 +44,9 @@ text = \lyricmode{
 
 \score {
   <<  
-    \context ChordNames \acc
-    \context Staff = "melody" \melodie
-    \context Lyrics \text
+    \acc
+    \new Staff = "melody" \melodie
+    \text
   >>
   \header{
     title = "Ah, vous dirais-je, maman "