Imported Upstream version 2.18.0

[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 4d2faf4c1e1583d0fdd87858c2f24fb4cbd55da7..c002e111d02c1e00396098f37dcf783fc823c3ef 100644 (file)
--- a/Documentation/ly-examples/cary-layout.ily
+++ b/Documentation/ly-examples/cary-layout.ily
@@ -1,5 +1,5 @@
 
-\version "2.16.0"
+\version "2.17.30"
 
 \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
   }
 }
 
@@ -74,31 +81,31 @@ beam = #(define-music-function (parser location left right) (number? number?)
 )
 
 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 #})