* scm/output-tex.scm (named-glyph): new function. This fixes TeX output.

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

diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly
index e5073265d0e7d8e1376f4469b73fe05ba4ec62da..1c90375b47019fc8599aa6077bc49b066703f477 100644 (file)
--- a/input/twinkle-pop.ly
+++ b/input/twinkle-pop.ly
@@ -1,15 +1,15 @@
-\version "1.3.146"
+#(ly:set-option 'old-relative)
+\version "2.4.0"
 \header{
 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"
 }
 
 
-melodie =  \notes\relative c'' {
+melodie = \relative c'' {
         \clef "violin"
         \time 2/4 
 
@@ -22,7 +22,7 @@ melodie =  \notes\relative c'' {
         f4 f  | e e  | d d | c2 \bar "|."
 }
 
-acc =  \chords {
+acc = \chordmode {
        % why don't \skip, s4 work?
         c2 c f c
         f c g:7 c
@@ -33,8 +33,8 @@ acc =  \chords {
         f c g:7 c
 }
 
-text =  \lyrics{ 
-        \property Lyrics . LyricText \set #'font-style = #'italic
+text = \lyricmode{ 
+        \override LyricText  #'font-shape = #'italic
 
         Ah!4 vous dir -- ai -- je ma man2
         Ce4 qui cau -- se mon tour -- ment2
@@ -46,26 +46,26 @@ text =  \lyrics{
 }
 
 \score {
-        <  
+        <<  
           \context ChordNames \acc
-          \context Staff=melody \melodie
+          \context Staff = "melody" \melodie
            \context Lyrics \text
-        >
+        >>
        \header{
                title = "Ah, vous dirais-je, maman "
        }
-        \paper {  }
+        \layout {  }
 }
 
 \score {
-        <  
-          \chords \context ChordNames \transpose d'\acc
-          \notes \context Staff=melody \transpose d'\melodie
-           \lyrics \context Lyrics \text
-        >
+        <<  
+          \context ChordNames \transpose c d\acc
+          \context Staff = "melody" \transpose c d\melodie
+           \context Lyrics \text
+        >>
        \header{
                piece = "clarinet in B$\flat$"
        }
-        \paper {  }
+        \layout {  }
 }