X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Ftwinkle-pop.ly;h=d320f821e578bb4ffc8e15be70fece2ed0c356a6;hb=4cb9638e9572650393622a78a35a308daa550dc4;hp=0f3ef80c6fa990a2f3b6859330de6ed8399d4967;hpb=c64a05795e51367c17589a9e7d60bad426305159;p=lilypond.git

diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly
index 0f3ef80c6f..d320f821e5 100644
--- a/input/twinkle-pop.ly
+++ b/input/twinkle-pop.ly
@@ -1,60 +1,67 @@
+\version "2.11.61"
 \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.10";
+melodie = \relative c'' {
+  \clef "violin"
+  \time 2/4 
 
-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  |
+  | 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?
-        @2c @c @f @c
-        @f @c @g7 @c
-	@g @f @c  @g7 % urg, bug!
-        @g @f @c  @g7
-	% copy 1-8
-        @2c @c @f @c
-        @f @c @g7 @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
+  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
-        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 {
-        <  
-	   \chords \type ChordNames \acc
-%	   \notes \type Staff=chords \acc
-	   \notes \type Staff=melody \melodie
-           \lyrics \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 {  }
 }