Merge branch 'stable'

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

diff --git a/input/regression/mensural-ligatures.ly b/input/regression/mensural-ligatures.ly
index fe41d9c3500f7f1fa5ac174439e37f340ac19137..787cde444b80026db9ad4f5250a742670991608d 100644 (file)
--- a/input/regression/mensural-ligatures.ly
+++ b/input/regression/mensural-ligatures.ly
@@ -1,4 +1,4 @@
-\version "2.6.0"
+\version "2.12.0"
 
 \header {
   texidoc = "Mensural ligatures show different shapes, depending on the
@@ -6,11 +6,26 @@
 }
 
 
-\context Voice{
+\layout {
+  ragged-right = ##t
+  indent = 0.0
+  \context {
+    \Voice
+    \remove "Ligature_bracket_engraver"
+    \consists "Mensural_ligature_engraver"
+  }
+  \context {
+    \Score
+    \override SpacingSpanner #'packed-spacing = ##t
+  }
+}
+
+\context Voice {
   \clef "petrucci-c4"
   \set Staff.printKeyCancellation = ##f
   \cadenzaOn % turn off bar lines
   #(set-accidental-style 'forget)
+  \textLengthOn
 
                                % ligaturae binaria
 
@@ -314,17 +329,6 @@
                                %  \]
 }
 
-\layout {
-  raggedright = ##t
-  packed = ##t
-  indent = 0.0
-  \context {
-    \Voice
-    \remove Ligature_bracket_engraver
-    \consists Mensural_ligature_engraver
-  }
-}
-
 
 % Litterae:
 %