Merge commit 'origin' into beamlets2

[lilypond.git] / input / cary-layout.ly

diff --git a/input/cary-layout.ly b/input/cary-layout.ly
index 1c8bb4cc9bc3ff0612aecfb363fbc42f7927150d..740a025086fa395377590bbfa370a68b62684b35 100644 (file)
--- a/input/cary-layout.ly
+++ b/input/cary-layout.ly
@@ -1,5 +1,5 @@
 
-\version "2.10.2"
+\version "2.12.0"
 
 \layout {
   indent = #0
@@ -8,7 +8,7 @@
     \Score
     
     proportionalNotationDuration = #(ly:make-moment 1 64)
-    allowBeamBreak = ##t
+    \override Beam #'breakable = ##t
     autoBeaming = ##f
     tupletFullLength = ##t
     \override BarNumber #'transparent = ##t
@@ -76,28 +76,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 #})