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 fb30bb04db754bdc3d1e60e631d307bd6c8e898e..66c6a7fbd326ad0de0536cfe777bccbeb204246d 100644 (file)
--- a/Documentation/ly-examples/cary-layout.ily
+++ b/Documentation/ly-examples/cary-layout.ily
@@ -1,5 +1,5 @@
 
-\version "2.17.6"
+\version "2.19.12"
 
 \layout {
   indent = #0
@@ -7,13 +7,13 @@
   \context {
     \Score
 
-    proportionalNotationDuration = #(ly:make-moment 1 64)
+    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
+    \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)
@@ -77,28 +84,28 @@ fraction = #(define-music-function (parser location music) (ly: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 #})