patch::: 1.1.27.jcn4: jcn4

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

diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly
index 46c35973e34c959fbfb21dbd7a077de823134328..80c38ee46ce706fa7624ed130ac686ce5d0ddac5 100644 (file)
--- a/input/twinkle-pop.ly
+++ b/input/twinkle-pop.ly
@@ -1,9 +1,8 @@
 \header{
-filename =      "twinkle.ly";
-title =         "Ah, vous dirais-je, maman ";
+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";
 }
@@ -12,18 +11,30 @@ copyright =  "public domain";
 Tested Features                lyrics and chords
 %}
 
-\version "1.0.7";
+\version "1.0.14";
 
-melodie = \notes\relative c {
-        \clef"violin";
+melodie = \notes\relative c'' {
+        \clef "violin";
         \time 2/4 ;
 
-        c''4^"C" c |    g'    g |       a^"F"  a |      g2^"C"   |
-        f4^"F" f |      e^"C" e |       d^"G7" d |      c2^"C"   |
-        g'4^"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"   |
+        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
 }
 
 text = \lyrics{ 
@@ -39,8 +50,26 @@ text = \lyrics{
 }
 
 \score {
-        <  \notes \type Staff \melodie
-           \lyrics   \type Lyrics \text
+        <  
+          \type ChordNames \acc
+          \type Staff=melody \melodie
+           \type Lyrics \text
         >
+       \header{
+               title = "Ah, vous dirais-je, maman ";
+       }
         \paper {  }
 }
+
+\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 {  }
+}
+