(Lilypond_snippet.notice_include):

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

diff --git a/input/test/trills.ly b/input/test/trills.ly
index 33f869b6fa7175c53e3c04ef2614a5d206f439fb..fe0656c49fd4ad4937af4910b602fee3e5c399af 100644 (file)
--- a/input/test/trills.ly
+++ b/input/test/trills.ly
@@ -1,4 +1,4 @@
-\version "1.7.18"
+\version "2.1.19"
 
 \header {
   texidoc="@cindex Trills
@@ -19,44 +19,30 @@ title="Marques des agr\\'ements et leur signification"
 invisible = \property Voice.NoteHead \override #'transparent = ##t
 visible = \property Voice.NoteHead \revert #'transparent
 
-% Ugly hack to get reasonable position of the pincé and Cheute
-startHorizScript = {
-  \property Voice.scriptHorizontal = ##t
-  \property Voice.Script \override #'padding = #0.3
-  \property Voice.Script \override #'extra-offset = #'(-.6 . 0)
-  % Avoid collision with the dots of dotted notes
-  \property Voice.Dots \override #'extra-X-extent = #'(-0.7 . 0)
-}
-endHorizScript = {
-  \property Voice.scriptHorizontal \unset
-  \property Voice.Dots \revert #'padding
-  \property Voice.Script \revert #'padding
-  \property Voice.Script \revert #'extra-offset
-}
 
 
 \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}>
-       \startHorizScript
+          b_\turn}>>
 %{ FIXME  \comma does not exist
+       \startHorizScript
  
        c^\comma
        \time 3/8
@@ -64,16 +50,16 @@ endHorizScript = {
        b8 c4_\comma 
        c8 b4_\comma
        b8 c4^\comma _\comma
-%}
        \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 LyricsVoice \lyrics {
        "Tremblement"4
        "Tremblement"4.
        "Cadence"
@@ -94,7 +80,7 @@ endHorizScript = {
 %}
 
     }
-      \context Lyrics=two \lyrics {
+      \new LyricsVoice \lyrics {
        "simple"4
        "appuy\\'e"4.
 %{     \skip 1*3
@@ -104,17 +90,17 @@ endHorizScript = {
        "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  } c-]
+       d32[  \repeat unfold 3 { c d } c]
+       d8 ~  d32[\repeat unfold 3 { c32 d  } 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{ }
 }