*** empty log message ***

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

diff --git a/input/test/trills.ly b/input/test/trills.ly
index 55ac7864fa3b7fdd59c0f81ff89c37b2572fffbe..df02e1cb2583a32b0998e3740a66234adafbbb43 100644 (file)
--- a/input/test/trills.ly
+++ b/input/test/trills.ly
@@ -1,61 +1,49 @@
+\version "2.2.0"
 
-% Generated automatically by: lilypond-book.py
-% options are filename=/var/fred/cvs/savannah/lilypond/input/test/trills.ly printfilename  
-\include "paper16.ly"
-\paper  {
-  linewidth = 433.619940\pt
-  
-} 
-\version "1.7.16"
 \header {
-  texidoc="Document trills, pralls and turns"
-  title="Marques des agr\\'ements et leur signification"
-  composer="D'Anglebert"
-  copyright="(1689)"
+  texidoc="@cindex Trills
+Trills, pralls and turns may also be written out in full. Here the
+D'Anglebert system (1689) is shown."
+  
 }
 
-invisible = \property Voice.NoteHead \override #'transparent = ##t
-visible = \property Voice.NoteHead \revert #'transparent
+%{
+
+taken from :
+
+title="Marques des agr\\'ements et leur signification"
+  composer="D'Anglebert"
+  year="1689"
+
+%}
+
+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 {
-  <
-    \property Score.TimeSignature = \turnOff
-    \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 
-          \property Voice.Script \override #'extra-offset = #'(-0.8 . 2.0)
-          b_\turn}>
-       \startHorizScript
+       <<{ d4}\\
+       { 
+          \override Script  #'extra-offset = #'(-0.8 . 2.0)
+          b_\turn}>>
 %{ FIXME  \comma does not exist
+       \startHorizScript
  
        c^\comma
        \time 3/8
@@ -63,22 +51,22 @@ 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 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
@@ -90,25 +78,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
-       [\repeat unfold 4 { d32 c }]
-       d8~[\repeat unfold 4 { d32 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-[ c d c \repeat unfold 4 { d32 c }]
+       c32[( b a16 b  c)]
+       b32[ \repeat unfold 5 { c d32 } c]
       }
-    >
-  >
+    >>
+  >>
+       \paper{ }
 }
-%% new-chords-done %%
+