Merge branch 'stable/2.16' into staging

[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 67bc65936d9af8926fd6e9f459ce8f860217b123..4d2faf4c1e1583d0fdd87858c2f24fb4cbd55da7 100644 (file)
--- a/Documentation/ly-examples/cary-layout.ily
+++ b/Documentation/ly-examples/cary-layout.ily
@@ -1,5 +1,5 @@
 
-\version "2.14.0"
+\version "2.16.0"
 
 \layout {
   indent = #0
@@ -57,48 +57,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 #})