Merge with git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond.git

[lilypond.git] / input / test / mensural-ligatures.ly

diff --git a/input/test/mensural-ligatures.ly b/input/test/mensural-ligatures.ly
index 3dcccbfdbd3dd652698ef144bbfc332255336a35..5b52f3e93bb26c4ea1c8d06d60376fd5754d2f52 100644 (file)
--- a/input/test/mensural-ligatures.ly
+++ b/input/test/mensural-ligatures.ly
@@ -1,9 +1,10 @@
-\version "2.1.22"
+\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' {
-  \set Score.timing =  ##f
-  \set 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,6 +32,9 @@ voice = \notes \transpose c c' {
   \bar "||"
 }
 
+\paper {
+    line-thickness = \staff-space / 5.0
+}
 \score {
     \context ChoirStaff <<
        \new MensuralStaff <<
@@ -44,39 +48,37 @@ voice = \notes \transpose c c' {
            >>
        >>
     >>
-    \paper {
-       linethickness = \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
        }
     }