X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fly-examples%2Fcary-layout.ily;h=66c6a7fbd326ad0de0536cfe777bccbeb204246d;hb=62b428826f37228ab4644dbaabac7935c17ecdcd;hp=67bc65936d9af8926fd6e9f459ce8f860217b123;hpb=2dda907e2e8cec814e5cbe7cc5e77cb186b15a28;p=lilypond.git

diff --git a/Documentation/ly-examples/cary-layout.ily b/Documentation/ly-examples/cary-layout.ily
index 67bc65936d..66c6a7fbd3 100644
--- a/Documentation/ly-examples/cary-layout.ily
+++ b/Documentation/ly-examples/cary-layout.ily
@@ -1,5 +1,5 @@
 
-\version "2.14.0"
+\version "2.19.12"
 
 \layout {
   indent = #0
@@ -7,19 +7,26 @@
   \context {
     \Score
 
-    proportionalNotationDuration = #(ly:make-moment 1 64)
-    \override Beam #'breakable = ##t
+    proportionalNotationDuration = #(ly:make-moment 1/64)
+    \override Beam.breakable = ##t
     autoBeaming = ##f
     tupletFullLength = ##t
-    \override BarNumber #'transparent = ##t
-    \override BarLine #'transparent = ##t
-    \override SpanBar #'transparent = ##t
-    \override Beam #'break-overshoot = #'(-0.5 . 1.0)
-    \override TextScript #'staff-padding = #6
-    \override Glissando #'thickness = #3
-    \override SpacingSpanner #'strict-grace-spacing = ##t
-    \override TupletBracket #'bracket-visibility = ##t
-    \override NoteColumn #'ignore-collision = ##t
+    \hide BarNumber
+    \hide BarLine
+    \hide SpanBar
+    \override Beam.break-overshoot = #'(-0.5 . 1.0)
+    \override TextScript.staff-padding = #6
+    \override Glissando.thickness = #3
+    \override SpacingSpanner.strict-grace-spacing = ##t
+    \override TupletBracket.bracket-visibility = ##t
+    \override NoteColumn.ignore-collision = ##t
+  }
+}
+
+\midi {
+  \context {
+    \Score
+    autoBeaming = ##f % synchronize lyrics the same way as \layout does
   }
 }
 
@@ -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)
@@ -57,48 +64,48 @@ sffpp = #(make-dynamic-script "sffpp")
 beam = #(define-music-function (parser location left right) (number? number?)
 	(cond ((and (= left 0) (> right 0))
 			#{
-				\set stemRightBeamCount = #$right
+				\set stemRightBeamCount = #right
 			#})
 
 			((and (> left 0) (= right 0))
 			#{
-				\set stemLeftBeamCount = #$left
+				\set stemLeftBeamCount = #left
 			#})
 
 			(else
 			#{
-				\set stemLeftBeamCount = #$left
-				\set stemRightBeamCount = #$right
+				\set stemLeftBeamCount = #left
+				\set stemRightBeamCount = #right
 			#})
 	)
 )
 
 fraction = #(define-music-function (parser location music) (ly:music?)
-	#{ \tweak #'text #tuplet-number::calc-fraction-text $music #})
+	#{ \tweak text #tuplet-number::calc-fraction-text #music #})
 
 triangle = #(define-music-function (parser location music) (ly:music?)
-	#{ \once \set shapeNoteStyles = #'#(do do do do do do do) $music #})
+	#{ \once \set shapeNoteStyles = ##(do do do do do do do) #music #})
 
 semicircle = #(define-music-function (parser location music) (ly:music?)
-	#{ \once \set shapeNoteStyles = #'#(re re re re re re re) $music #})
+	#{ \once \set shapeNoteStyles = ##(re re re re re re re) #music #})
 
 blackdiamond = #(define-music-function (parser location music) (ly:music?)
-	#{ \once \set shapeNoteStyles = #'#(mi mi mi mi mi mi mi) $music #})
+	#{ \once \set shapeNoteStyles = ##(mi mi mi mi mi mi mi) #music #})
 
 tiltedtriangle = #(define-music-function (parser location music) (ly:music?)
-	#{ \once \set shapeNoteStyles = #'#(fa fa fa fa fa fa fa) $music #})
+	#{ \once \set shapeNoteStyles = ##(fa fa fa fa fa fa fa) #music #})
 
 square = #(define-music-function (parser location music) (ly:music?)
-	#{ \once \set shapeNoteStyles = #'#(la la la la la la la) $music #})
+	#{ \once \set shapeNoteStyles = ##(la la la la la la la) #music #})
 
 wedge = #(define-music-function (parser location music) (ly:music?)
-	#{ \once \set shapeNoteStyles = #'#(ti ti ti ti ti ti ti) $music #})
+	#{ \once \set shapeNoteStyles = ##(ti ti ti ti ti ti ti) #music #})
 
 harmonic = #(define-music-function (parser location music) (ly:music?)
-	#{ \once \set shapeNoteStyles = #'#(harmonic harmonic harmonic harmonic harmonic harmonic harmonic) $music #})
+	#{ \once \set shapeNoteStyles = ##(harmonic harmonic harmonic harmonic harmonic harmonic harmonic) #music #})
 
 cross = #(define-music-function (parser location music) (ly:music?)
-	#{ \once \set shapeNoteStyles = #'#(cross cross cross cross cross cross cross) $music #})
+	#{ \once \set shapeNoteStyles = ##(cross cross cross cross cross cross cross) #music #})
 
 white = #(define-music-function (parser location music) (ly:music?)
-	#{ \once \override NoteHead #'duration-log = #1 $music #})
+	#{ \once \override NoteHead.duration-log = #1 #music #})