Merge branch 'master' of ssh+git://git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / input / regression / breathing-sign.ly

diff --git a/input/regression/breathing-sign.ly b/input/regression/breathing-sign.ly
index 4db808789dacbfe19404eeb8012b63977bf90e23..9a0fa00e553e2214610c656a172515c4e74d8070 100644 (file)
--- a/input/regression/breathing-sign.ly
+++ b/input/regression/breathing-sign.ly
@@ -1,32 +1,52 @@
-\version "1.5.68"
+\version "2.10.0"
 \header{
-texidoc="
-Breathing signs, also used for phrasing, do normally not influence
-global spacing -- only if space gets tight, notes are shifted to make
-room for the breathing sign. Breathing signs break beams running
-through their voice. In the following example, the notes in the first
-two measures all have the same distance from each other:
-"
+  texidoc="
+Breathing signs are available in different tastes: commas (default),
+ticks, vees and `railroad tracks' (caesura)."
 }
 
 
+{
+  %% Modern notation:
+  \new Staff {
+    \relative c'' {
+      \key es \major \time 3/4
 
+      %% this bar contains no \breathe
+      <<
+       { g4 as g } \\
+       { es4 bes es }
+      >> |
 
-\score {
-  \notes \relative c' {
-    \key es \major \time 3/4
-    < \context Voice = two { \stemDown es4 bes es }
-      \context Voice = one { \stemUp g4 as g }
-    > |
-    < \context Voice = two { \stemDown es4 \breathe bes es }
-      \context Voice = one { \stemUp g4 as g }
-    > |
-% Change to wedge:
-    \property Voice.BreathingSign \override #'text = #"scripts-upbow"
-    es8 d es f g8 \breathe f |
-% Revert to old layout:
-    \property Voice.BreathingSign \override #'molecule-callback = #Breathing_sign::brew_molecule
-    es8 d \breathe es f g f |
-    es2 r4 \bar "||"
+      %% by default, \breathe uses the rcomma, just as if saying:
+      %% \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")
+      <<
+       { g4 as g } \\
+       { es4 \breathe bes es }
+      >> |
+
+      %% wedge
+      \override BreathingSign  #'text =
+      #(make-musicglyph-markup "scripts.upbow")
+      es8 d es f g8 \breathe f |
+
+      %% caesura
+      \override BreathingSign  #'text =
+      #(make-musicglyph-markup "scripts.caesura")
+      es8[ d] \breathe  es[ f g f] |
+      es2 r4 \bar "||" \break
+    }
   }
 }