Merge commit 'origin' into beamlets2

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

diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly
index 599749f93418b6064687f41675cbb544f4910a62..6e261127ba799788addf0d3e6512dd9280188103 100644 (file)
--- a/input/twinkle-pop.ly
+++ b/input/twinkle-pop.ly
@@ -1,46 +1,67 @@
+\version "2.12.0"
 \header{
-filename =      "twinkle.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 "0.1.15";
+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 {
+  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
+}
 
-melodie = \melodic {
-        \clef"violin";
-        \meter 2/4 ;
-        \octave  c';
+text = \lyrics { 
+  \override LyricText  #'font-shape = #'italic
 
-        c4^"C" c |      g     g |       a^"F"  a |      g2^"C"   |
-        f4^"F" f |      e^"C" e |       d^"G7" d |      c2^"C"   |
-        g4^"G" g |      f^"F" f |       e^"C"  e |      d^"G7" d |
-        g^"G"  g |      f^"F" f |       e^"C"  e |      d^"G7" d |
-        c4^"C" c |      g     g |       a^"F"  a |      g2^"C"   |
-        f4^"F" f |      e^"C" e |       d^"G7" d |      c2^"C"   |
+  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
+  
 }
 
-text = \lyric{ 
-        \textstyle "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
-        
+\score {
+  <<  
+    \acc
+    \new Staff = "melody" \melodie
+    \text
+  >>
+  \header{
+    title = "Ah, vous dirais-je, maman "
+  }
+  \layout {  }
 }
 
 \score {
-        <  \melodic \type Staff \melodie
-           \lyric   \type Lyrics \text
-        >
-        \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 {  }
 }