* lily/tab-note-heads-engraver.cc: listen to string number events

[lilypond.git] / input / test / trills.ly

diff --git a/input/test/trills.ly b/input/test/trills.ly
index 8b0ac8431bfc3c254ddc8f9c746fa28b2ad6c3e9..51f60bda8ec43bc6c2a3929ad2c6f422aa03555c 100644 (file)
--- a/input/test/trills.ly
+++ b/input/test/trills.ly
@@ -1,15 +1,22 @@
-\version "1.7.18"
+#(ly:set-option 'old-relative)
+\version "2.1.7"
 
 \header {
   texidoc="@cindex Trills
 Document trills, pralls and turns."
   
-% TODO:  these don't get built, right?  check it, then delete.
-%  title="Marques des agr\\'ements et leur signification"
-%  composer="D'Anglebert"
-%  year="1689"
 }
 
+%{
+
+taken from :
+
+title="Marques des agr\\'ements et leur signification"
+  composer="D'Anglebert"
+  year="1689"
+
+%}
+
 invisible = \property Voice.NoteHead \override #'transparent = ##t
 visible = \property Voice.NoteHead \revert #'transparent
 
@@ -30,25 +37,25 @@ endHorizScript = {
 
 
 \score {
-  <
-    \context GrandStaff <
-      \context Staff=upper \notes\relative c'' {
+  <<
+    \context GrandStaff <<
+      \new Staff \notes\relative c'' {
        \time 1/4
-       c4-\prall
+       c4\prall
        \time 3/8
        c4.^\lineprall
-       c4.-\downprall
-       c4.-\upprall
+       c4.\downprall
+       c4.\upprall
        \time 5/8
-       c4-\turn c4.-\upprall
-       d4-\turn b4.-\downprall
+       c4\turn c4.\upprall
+       d4\turn b4.\downprall
        \time 3/4
        b4 c^\turn d 
        \time 1/4
-       <\context Voice=upper{\voiceOne d4}
-        \context Voice=lower{\voiceTwo 
+       <<{ d4}\\
+       { 
           \property Voice.Script \override #'extra-offset = #'(-0.8 . 2.0)
-          b_\turn}>
+          b_\turn}>>
        \startHorizScript
 %{ FIXME  \comma does not exist
  
@@ -61,19 +68,19 @@ endHorizScript = {
 %}
        \endHorizScript
         \time  2/2 \slurDown
-       <{c2}{s4 \invisible d1*1/4 ( \visible }>  e2-)
-       <{a,2}{s4 \invisible b1*1/4 ( \visible }>  d2-)
-       <{a2}{s4 \invisible b1*1/4 ( \visible }>  d2-)
+       <<{c2}{s4 \invisible d1*1/4 ( \visible }>>  e2)
+       <<{a,2}{s4 \invisible b1*1/4 ( \visible }>>  d2)
+       <<{a2}{s4 \invisible b1*1/4 ( \visible }>>  d2)
        \time 3/4
        d2^\prallup e4
       }
-      \context Lyrics=one \lyrics {
+      \new Lyrics \lyrics {
        "Tremblement"4
        "Tremblement"4.
        "Cadence"
        "autre"
        "Double"4 "cadence"4.
-       "autre"4 _4.
+%{     "autre"4 _4.
        _4 "sans tremblement"2
        "sur une tierce"4
        "Pinc\\'e"4
@@ -85,27 +92,30 @@ endHorizScript = {
        "autre"
        "autre"
        "Double cadence"2.
-      }
-      \context Lyrics=two \lyrics {
+%}
+
+    }
+      \new Lyrics \lyrics {
        "simple"4
-       "appuy\'e"4.
-       \skip 1*3
+       "appuy\\'e"4.
+%{     \skip 1*3
        \skip 4 \skip 4.
        "voix et montant"
        \skip 2.
        "de suite"1
+%}
       }
-      \context Staff=lower \notes\relative c'' {
+      \new Staff \notes\relative c'' {
         % autobeamer has som problems here
-       d32-[  \repeat unfold 3 { c d } c-]
-       d8 ~  d32-[\repeat unfold 3 { d32  } c-]
+       d32[  \repeat unfold 3 { c d } c]
+       d8 ~  d32[\repeat unfold 3 { d32 c  } c]
        d32 c b c \repeat unfold 4 { d32 c }
        b32 c d c \repeat unfold 4 { d32 c }
-       c32-[-( b a16 b  c-)-]
-       b32-[ \repeat unfold 5 { c d32 } c-]
+       c32[( b a16 b  c)]
+       b32[ \repeat unfold 5 { c d32 } c]
       }
-    >
-  >
+    >>
+  >>
        \paper{ }
 }
-%% new-chords-done %%
+