X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=input%2Fregression%2Fbreathing-sign.ly;h=765aa9d7ec63102952e78f77743ba0aa2772c439;hb=32a34dcef0c0041c6d62677487a380b5c8b85712;hp=3d130053b78cb75dcfa81bac831576b7a828bc3d;hpb=11613b92019bb42418863f43de92287a64878f14;p=lilypond.git

diff --git a/input/regression/breathing-sign.ly b/input/regression/breathing-sign.ly
index 3d130053b7..765aa9d7ec 100644
--- a/input/regression/breathing-sign.ly
+++ b/input/regression/breathing-sign.ly
@@ -1,93 +1,43 @@
-#(ly:set-option 'old-relative)
-\version "1.9.2"
+\version "2.16.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).
-
-Gregorian chant notation sometimes also uses commas and ticks, but in
-smaller font size (we call it 'virgula' and 'caesura').  However, the
-most common breathing signs are divisio minima/maior/maxima and
-finalis, the latter three looking similar to bar glyphs.
-
-" }
-
-\include "gregorian-init.ly"
-
-\score {
-  \notes \relative c' {
-    \key es \major \time 3/4
-
-% this bar contains no \breathe
-    <         {  g4 as g }
-\\{  es4 bes es }
-    > |
-
-% by default, \breathe uses the rcomma, just as if saying:
-% \property Voice.BreathingSign \set #'text = #"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
-    \property Staff.BreathingSign \override #'text = #"scripts-rvarcomma"
-    <       { g4 as g }\\
-	    { es4 \breathe bes es }
-    > |
-
-% wedge
-    \property Voice.BreathingSign \override #'text = #"scripts-upbow"
-    es8 d es f g8 \breathe f |
-
-% caesura
-    \property Voice.BreathingSign \set #'text = #"scripts-caesura"
-     es8[ d] \breathe  es[ f g f] |
-    es2 r4 \bar "||" \break
-
-%
-% Gregorian stuff:
-%
-
-% we turn bars off for Gregorian stuff
-    \property Staff.BarLine \override #'transparent = ##t
-
-% this bar contains no \breathe
-    < \context Voice = two { \stemDown es4 bes es }
-      \context Voice = one { \stemUp g4 as g }
-    > |
-
-% \virgula applies rcomma, but in a smaller font
-    < \context Voice = two { \stemDown es4 \virgula bes es }
-      \context Voice = one { \stemUp g4 as g }
-    > |
-
-% \caesura applies rvarcomma, but in a smaller font
-    < \context Voice = two { \stemDown es4 \caesura bes es }
-      \context Voice = one { \stemUp g4 as g }
-    > |
+ticks, vees and `railroad tracks' (caesura)."
+}
 
-% \divisioMinima is a simple vertical stroke through the uppermost
-% staffline, just like the original implementation of breathing signs.
-    < \context Voice = two { \stemDown es4 \divisioMinima bes es }
-      \context Voice = one { \stemUp g4 as g }
-    > |
-% \divisio{maior,maxima} and \finalis look like bars and are vertically
-% centered on the staff; the direction property has no effect
-    < \context Voice = two { \stemDown es4 \divisioMaior bes es }
-      \context Voice = one { \stemUp g4 as g }
-    > |
-    < \context Voice = two { \stemDown es4 \divisioMaxima bes es }
-      \context Voice = one { \stemUp g4 as g }
-    > |
 
-% this one looks almost like a "||" type bar
-    \finalis
+{
+  %% Modern notation:
+  \new Staff {
+    \relative c'' {
+      %% by default, \breathe uses the rcomma, just as if saying:
+      %% \override BreathingSign #'text =
+      %%   #(make-musicglyph-markup "scripts.rcomma")
+      %%
+      c4 c \breathe c c |
+
+      %% rvarcomma and lvarcomma are variations of the default rcomma
+      %% and lcomma
+      %%
+      \override Staff.BreathingSign #'text =
+        #(make-musicglyph-markup "scripts.rvarcomma")
+      c4 c \breathe c c |
+
+      %% wedge
+      %%
+      \override BreathingSign #'text =
+        #(make-musicglyph-markup "scripts.upbow")
+      c4 c \breathe c c |
+
+      %% caesurae
+      %%
+      \override BreathingSign #'text =
+        #(make-musicglyph-markup "scripts.caesura.curved")
+      c4 c \breathe c c |
+
+      \override BreathingSign #'text =
+        #(make-musicglyph-markup "scripts.caesura.straight")
+      c4 c \breathe c c |
+    }
   }
 }