Merge commit 'origin' into beamlets2

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

diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly
index b18d69be773b734cea3abbb73af166f6b0517532..6e261127ba799788addf0d3e6512dd9280188103 100644 (file)
--- a/input/twinkle-pop.ly
+++ b/input/twinkle-pop.ly
@@ -1,75 +1,67 @@
+\version "2.12.0"
 \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"
+  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 ;
-  
-        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 "|.";
+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 "|."
 }
 
 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
-  }
-  
+  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 . textstyle =  "italic"
+text = \lyrics { 
+  \override LyricText  #'font-shape = #'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
-          >
-      \header{
-              title = "Ah, vous dirais-je, maman ";
-      }
-          \paper {  }
+  <<  
+    \acc
+    \new Staff = "melody" \melodie
+    \text
+  >>
+  \header{
+    title = "Ah, vous dirais-je, maman "
   }
+  \layout {  }
+}
 
 \score {
-        <  
-         \chords \type ChordNames \transpose bes\acc
-         \notes \type Staff=melody \transpose bes\melodie
-           \lyrics \type Lyrics \text
-        >
-      \header{
-              piece = "clarinet in B\\textflat";
-      }
-        \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 {  }
 }