X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Ftest%2Ftrills.ly;h=fe0656c49fd4ad4937af4910b602fee3e5c399af;hb=84a8f6b00b0ce11f2c394ed57e03634998187730;hp=ab7cc17555278c42a3cfd6e6c4d0e092c51c87f0;hpb=4995fea559cd5399b4f462de546a15195d76f4c3;p=lilypond.git

diff --git a/input/test/trills.ly b/input/test/trills.ly
index ab7cc17555..fe0656c49f 100644
--- a/input/test/trills.ly
+++ b/input/test/trills.ly
@@ -1,42 +1,106 @@
+\version "2.1.19"
+
 \header {
-  texidoc="Document trills, pralls and turns"
-  title="Marques des agr\'ements et leur signification"
-  copyright="(1689)"
+  texidoc="@cindex Trills
+Document trills, pralls and turns."
+  
 }
 
+%{
+
+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
+
+
+
 \score {
-  <
-    \property Score.TimeSignature = \turnOff
-    \context GrandStaff <
-      \context Staff=upper \notes\relative c'' {
+  <<
+    \context GrandStaff <<
+      \new Staff \notes\relative c'' {
 	\time 1/4
-	c4-\prallprall
+	c4\prall
 	\time 3/8
-	c4.^"TODO"
-	c4.-\downprall
-	c4.-\upprall
+	c4.^\lineprall
+	c4.\downprall
+	c4.\upprall
 	\time 5/8
-	c4-\turn c4.-\upprall
+	c4\turn c4.\upprall
+	d4\turn b4.\downprall
+	\time 3/4
+	b4 c^\turn d 
+	\time 1/4
+	<<{ d4}\\
+	{ 
+	   \property Voice.Script \override #'extra-offset = #'(-0.8 . 2.0)
+	   b_\turn}>>
+%{ FIXME  \comma does not exist
+	\startHorizScript
+ 
+	c^\comma
+	\time 3/8
+	c4.^\comma
+	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)
+	\time 3/4
+	d2^\prallup e4
       }
-      \context Lyrics=one \lyrics {
+      \new LyricsVoice \lyrics {
 	"Tremblement"4
 	"Tremblement"4.
 	"Cadence"
 	"autre"
 	"Double"4 "cadence"4.
-      }
-      \context Lyrics=two \lyrics {
+%{	"autre"4 _4.
+	_4 "sans tremblement"2
+	"sur une tierce"4
+	"Pinc\\'e"4
+	"autre"4.
+	"Cheute ou Port de"
+	"en descendant"
+	"Cheute et pinc\\'e"
+	"Coul\\'e Sur 2 notes"1
+	"autre"
+	"autre"
+	"Double cadence"2.
+%}
+
+    }
+      \new LyricsVoice \lyrics {
 	"simple"4
-	"appuy\'e"4.
+	"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]
       }
-    >
-  >
-}
\ No newline at end of file
+    >>
+  >>
+	\paper{ }
+}
+