*** empty log message ***

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

diff --git a/input/test/trills.ly b/input/test/trills.ly
index 51f60bda8ec43bc6c2a3929ad2c6f422aa03555c..cb9fe4527f9481137ae0e901ff297f563988c606 100644 (file)
--- a/input/test/trills.ly
+++ b/input/test/trills.ly
@@ -1,9 +1,9 @@
-#(ly:set-option 'old-relative)
-\version "2.1.7"
+\version "2.1.28"
 
 \header {
   texidoc="@cindex Trills
-Document trills, pralls and turns."
+Trills, pralls and turns may also be written out in full. Here the
+D'Anglebert system (1689) is shown."
   
 }
 
@@ -17,23 +17,9 @@ title="Marques des agr\\'ements et leur signification"
 
 %}
 
-invisible = \property Voice.NoteHead \override #'transparent = ##t
-visible = \property Voice.NoteHead \revert #'transparent
+invisible = \override NoteHead  #'transparent = ##t
+visible = \revert NoteHead #'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 {
@@ -54,10 +40,10 @@ endHorizScript = {
        \time 1/4
        <<{ d4}\\
        { 
-          \property Voice.Script \override #'extra-offset = #'(-0.8 . 2.0)
+          \override Script  #'extra-offset = #'(-0.8 . 2.0)
           b_\turn}>>
-       \startHorizScript
 %{ FIXME  \comma does not exist
+       \startHorizScript
  
        c^\comma
        \time 3/8
@@ -65,8 +51,8 @@ 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)
@@ -108,7 +94,7 @@ endHorizScript = {
       \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]
+       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)]