Merge branch 'master' into nested-bookparts

[lilypond.git] / input / lsr / breathing-signs.ly

diff --git a/input/lsr/breathing-signs.ly b/input/lsr/breathing-signs.ly
index f4705ef651d53bd89ab787b093a40c844e904cb4..0423e77cea873721ddf677451d441cf06c644668 100644 (file)
--- a/input/lsr/breathing-signs.ly
+++ b/input/lsr/breathing-signs.ly
@@ -12,6 +12,7 @@ ticks, vees and \"railroad tracks\" (caesura).
 "
   doctitle = "Breathing signs"
 } % begin verbatim
+
 \new Staff \relative c'' {
   \key es \major
   \time 3/4
@@ -19,20 +20,20 @@ ticks, vees and \"railroad tracks\" (caesura).
   << { g4 as g } \\ { es4 bes es } >> |
   % Modern notation:
   % by default, \breathe uses the rcomma, just as if saying:
-  % \override BreathingSign  #'text = #(make-musicglyph-markup "scripts.rcomma")
+  % \override BreathingSign #'text = #(make-musicglyph-markup "scripts.rcomma")
   << { g4 as g } \\ { es4 \breathe bes es } >> |
   
   % rvarcomma and lvarcomma are variations of the default rcomma and lcomma
   % N.B.: must use Staff context here, since we start a Voice below
-  \override Staff.BreathingSign  #'text = #(make-musicglyph-markup "scripts.rvarcomma")
+  \override Staff.BreathingSign #'text = \markup { \musicglyph #"scripts.rvarcomma" }
   << { g4 as g } \\ { es4 \breathe bes es } >> |
   
   % vee
-  \override BreathingSign  #'text = #(make-musicglyph-markup "scripts.upbow")
+  \override BreathingSign #'text = \markup { \musicglyph #"scripts.upbow" }
   es8[ d es f g] \breathe f |
   
   % caesura
-  \override BreathingSign  #'text = #(make-musicglyph-markup "scripts.caesura.curved")
-  es8[ d] \breathe  es[ f g f] |
+  \override BreathingSign #'text = \markup { \musicglyph #"scripts.caesura.curved" }
+  es8[ d] \breathe es[ f g f] |
   es2 r4 \bar "||"
 }