Merge master into nested-bookparts

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

diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly
index 3706006216d143b0854a7d49bf23e43a44ef4b00..d320f821e578bb4ffc8e15be70fece2ed0c356a6 100644 (file)
--- a/input/twinkle-pop.ly
+++ b/input/twinkle-pop.ly
@@ -1,71 +1,67 @@
-#(ly:set-option 'old-relative)
-\version "1.9.1"
+\version "2.11.61"
 \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 =  \notes\relative c'' {
-        \clef "violin"
-        \time 2/4 
+melodie = \relative c'' {
+  \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 =  \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
-       % 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 =  \lyrics{ 
-        \property Lyrics . LyricText \set #'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 "
-       }
-        \paper {  }
+  <<  
+    \acc
+    \new Staff = "melody" \melodie
+    \text
+  >>
+  \header{
+    title = "Ah, vous dirais-je, maman "
+  }
+  \layout {  }
 }
 
 \score {
-        <  
-          \chords \context ChordNames \transpose c d\acc
-          \notes \context Staff=melody \transpose c d\melodie
-           \lyrics \context Lyrics \text
-        >
-       \header{
-               piece = "clarinet in B$\flat$"
-       }
-        \paper {  }
+  <<  
+    \context ChordNames \transpose c d\acc
+    \context Staff = "melody" \transpose c d\melodie
+    \context Lyrics \text
+  >>
+  \header{
+    piece = \markup  { "clarinet in B" \flat }
+  }
+  \layout {  }
 }
-