Merge commit 'origin' into includes

[lilypond.git] / input / regression / custos.ly

diff --git a/input/regression/custos.ly b/input/regression/custos.ly
index 8c9bcfdaa389798c020bbabe247dd87a6e3a9acf..852026073957198ae318feea783148987023eac6 100644 (file)
--- a/input/regression/custos.ly
+++ b/input/regression/custos.ly
@@ -1,34 +1,34 @@
-\version "2.1.23"
+\version "2.12.0"
 \header {
-    texidoc = "Custodes in various styles."
+    texidoc = "Custodes may be engraved in various styles."
 }
 
-\score {
-    \notes {
-       \override Staff.Custos  #'neutral-position = #4
-
-       \override Staff.Custos  #'style = #'hufnagel
-       c'1^"hufnagel"
-       \break < d' a' f''>1
-
-       \override Staff.Custos  #'style = #'medicaea
-       c'1^"medicaea"
-       \break < d' a' f''>1
-
-       \override Staff.Custos  #'style = #'vaticana
-       c'1^"vaticana"
-       \break < d' a' f''>1
-
-       \override Staff.Custos  #'style = #'mensural
-       c'1^"mensural"
-       \break < d' a' f''>1
-    }
-    \paper {
-       \translator {
-           \StaffContext
-           \consists Custos_engraver
-       }
-       raggedright = ##t
-    }
+\layout {
+  \context {
+    \Staff
+    \consists Custos_engraver
+  }
+  ragged-right = ##t
 }
 
+
+
+{
+  \override Staff.Custos  #'neutral-position = #4
+
+  \override Staff.Custos  #'style = #'hufnagel
+  c'1^"hufnagel"
+  \break < d' a' f''>1
+
+  \override Staff.Custos  #'style = #'medicaea
+  c'1^"medicaea"
+  \break < d' a' f''>1
+
+  \override Staff.Custos  #'style = #'vaticana
+  c'1^"vaticana"
+  \break < d' a' f''>1
+
+  \override Staff.Custos  #'style = #'mensural
+  c'1^"mensural"
+  \break < d' a' f''>1
+}