X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Ftest%2Fmensural-ligatures.ly;h=5b52f3e93bb26c4ea1c8d06d60376fd5754d2f52;hb=3ee5a5b2e566aa1638b4cb2d883e8e2b99c3fce5;hp=57f2527d35915b6940d60f69470eaf56ec7b0951;hpb=11613b92019bb42418863f43de92287a64878f14;p=lilypond.git

diff --git a/input/test/mensural-ligatures.ly b/input/test/mensural-ligatures.ly
index 57f2527d35..5b52f3e93b 100644
--- a/input/test/mensural-ligatures.ly
+++ b/input/test/mensural-ligatures.ly
@@ -1,9 +1,10 @@
-\version "1.9.2"
+\version "2.10.0"
 % TODO:
 % check with ancient- stuff.  rename, merge, something.  -gp
 
 \header { texidoc = "@cindex Ancient Mensural Ligatures
-LilyPond can print mensural ligatures."
+In mensural ligatures, notes with ancient durations are printed
+in a tight manner."
 }
 
 
@@ -12,9 +13,9 @@ LilyPond can print mensural ligatures."
 % graphical width of the ligatures rather to the musical moment in time.
 % This is intended behaviour.
 
-voice = \notes \transpose c c' {
-  \property Score.timing = ##f
-  \property Score.defaultBarType = "empty"
+voice =  \transpose c c' {
+  \set Score.timing = ##f
+  \set Score.defaultBarType = "empty"
   g\longa c\breve a\breve f\breve d'\longa^\fermata
   \bar "|"
   \[
@@ -31,52 +32,53 @@ voice = \notes \transpose c c' {
   \bar "||"
 }
 
+\paper {
+    line-thickness = \staff-space / 5.0
+}
 \score {
-    \context ChoirStaff <
-	\new MensuralStaff <
-	    \context MensuralVoice <
+    \context ChoirStaff <<
+	\new MensuralStaff <<
+	    \context MensuralVoice <<
 		\voice
-	    >
-	>
-	\new Staff <
-	    \context Voice <
+	    >>
+	>>
+	\new Staff <<
+	    \context Voice <<
 		\voice
-	    >
-	>
-    >
-    \paper {
-	stafflinethickness = \staffspace / 5.0
-	\translator {
-	    \VoiceContext
+	    >>
+	>>
+    >>
+    \layout {
+	\context {
+	    \Voice
 	    \name MensuralVoice
 	    \alias Voice
 	    \remove Ligature_bracket_engraver
 	    \consists Mensural_ligature_engraver
-	    NoteHead \set #'style = #'mensural
+	    \override NoteHead #'style = #'mensural
 	}
-	\translator {
-	    \StaffContext
+	\context {
+	    \Staff
 	    \name MensuralStaff
 	    \alias Staff
 	    \accepts MensuralVoice
 	    \consists Custos_engraver
-	    TimeSignature \set #'style = #'mensural
-	    KeySignature \set #'style = #'mensural
-	    Accidental \set #'style = #'mensural
-	    Custos \set #'style = #'mensural
-	    Custos \set #'neutral-position = #3
-	    Custos \set #'neutral-direction = #-1
-	    Custos \set #'adjust-if-on-staffline = ##t
-	    clefGlyph = #"clefs-petrucci_g"
+	    \override TimeSignature #'style = #'mensural
+	    \override KeySignature #'style = #'mensural
+	    \override Accidental #'style = #'mensural
+	    \override Custos #'style = #'mensural
+	    \override Custos #'neutral-position = #3
+	    \override Custos #'neutral-direction = #down
+	    clefGlyph = #"clefs.petrucci.g"
 	    clefPosition = #-2
 	    clefOctavation = #-0
 	}
-	\translator {
+	\context {
 	    \RemoveEmptyStaffContext
 	    \accepts MensuralVoice
         }
-	\translator {
-	    \ScoreContext
+	\context {
+	    \Score
 	    \accepts MensuralStaff
 	}
     }