Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation

[lilypond.git] / Documentation / ly-examples / cary-layout.ily

diff --git a/Documentation/ly-examples/cary-layout.ily b/Documentation/ly-examples/cary-layout.ily
index 3075225e23f8dc836754c9122a445d95f3d396d7..66c6a7fbd326ad0de0536cfe777bccbeb204246d 100644 (file)
--- a/Documentation/ly-examples/cary-layout.ily
+++ b/Documentation/ly-examples/cary-layout.ily
@@ -1,5 +1,5 @@
 
-\version "2.17.11"
+\version "2.19.12"
 
 \layout {
   indent = #0
@@ -11,9 +11,9 @@
     \override Beam.breakable = ##t
     autoBeaming = ##f
     tupletFullLength = ##t
-    \override BarNumber.transparent = ##t
-    \override BarLine.transparent = ##t
-    \override SpanBar.transparent = ##t
+    \hide BarNumber
+    \hide BarLine
+    \hide SpanBar
     \override Beam.break-overshoot = #'(-0.5 . 1.0)
     \override TextScript.staff-padding = #6
     \override Glissando.thickness = #3
@@ -23,6 +23,13 @@
   }
 }
 
+\midi {
+  \context {
+    \Score
+    autoBeaming = ##f % synchronize lyrics the same way as \layout does
+  }
+}
+
 \paper {
   oddHeaderMarkup = \markup \fill-line { " " }
   evenHeaderMarkup = \markup \fill-line { " " }
@@ -35,7 +42,7 @@
   printfirst-page-number = ##t
   print-page-number = ##t
   ragged-last-bottom = ##t
-  markup-system-spacing #'minimum-distance = #25
+  markup-system-spacing.minimum-distance = #25
 }
 
 #(set-global-staff-size 14)