(Composite_music): new transpose syntax,

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

diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly
index 9df29ef6de54c9d8e666d91fd451e19ad0236773..77e87b1ce96378cc10f29b0308e48630f7dd67ef 100644 (file)
--- a/input/twinkle-pop.ly
+++ b/input/twinkle-pop.ly
@@ -1,17 +1,17 @@
+\version "1.7.5"
 \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"
+xtitle =        "Ah, vous dirais-je, maman "
+description =   "twinkle twinkle in pop-song-settings"
+composer =      "traditional"
+enteredby =     "HWN, chords by Johan Vromans"
+copyright =     "public domain"
 }
 
-\version "1.2.0";
 
-melodie = \notes\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  |
@@ -19,10 +19,10 @@ melodie = \notes\relative c'' {
         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 "|.";
+        f4 f  | e e  | d d | c2 \bar "|."
 }
 
-acc = \chords {
+acc =  \chords {
        % why don't \skip, s4 work?
         c2 c f c
         f c g:7 c
@@ -33,15 +33,15 @@ acc = \chords {
         f c g:7 c
 }
 
-text = \lyrics{ 
-        \property Lyrics . textStyle =  "italic"
+text =  \lyrics{ 
+        \property Lyrics . LyricText \set #'font-style = #'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
         
 }
 
@@ -52,19 +52,19 @@ text = \lyrics{
            \context Lyrics \text
         >
        \header{
-               title = "Ah, vous dirais-je, maman ";
+               title = "Ah, vous dirais-je, maman "
        }
         \paper {  }
 }
 
 \score {
         <  
-          \chords \context ChordNames \transpose d'\acc
-          \notes \context Staff=melody \transpose d'\melodie
+          \chords \context ChordNames \transpose c d\acc
+          \notes \context Staff=melody \transpose c d\melodie
            \lyrics \context Lyrics \text
         >
        \header{
-               piece = "clarinet in B\\textflat";
+               piece = "clarinet in B$\flat$"
        }
         \paper {  }
 }