Merge commit 'origin/dev/jneeman' into systems-per-page

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

diff --git a/input/regression/breathing-sign.ly b/input/regression/breathing-sign.ly
index 2d3f939fa2918c09ca89a02b2588c2bee1c7db3a..763529a44cef5020d3debee2ea509c08059a37d7 100644 (file)
--- a/input/regression/breathing-sign.ly
+++ b/input/regression/breathing-sign.ly
@@ -1,109 +1,43 @@
-#(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.12.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 {
-
-  {
-    %
-    % Modern notation:
-    %
-    \new Staff {
-      \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 =
-       %       #(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
-       \property Staff.BreathingSign \set #'text =
-               #(make-musicglyph-markup "scripts-rvarcomma")
-       <<
-         { g4 as g } \\
-         { es4 \breathe bes es }
-       >> |
-
-       % wedge
-       \property Voice.BreathingSign \set #'text =
-                #(make-musicglyph-markup "scripts-upbow")
-       es8 d es f g8 \breathe f |
-
-       % caesura
-       \property Voice.BreathingSign \set #'text =
-                #(make-musicglyph-markup "scripts-caesura")
-       es8[ d] \breathe  es[ f g f] |
-       es2 r4 \bar "||" \break
-      }
-    }
-
-    %
-    % Gregorian notation:
-    %
-    \context VaticanaStaff {
-      \notes \relative c' {
-
-       % we turn bars and bar numbers off for Gregorian stuff
-       \property Staff.BarLine \set #'transparent = ##t
-       \property Score.BarNumber \set #'transparent = ##t
-
-       % here is no \breathe
-       c g c
-
-       % \virgula applies rcomma, but in a smaller font
-       c \virgula g c
-
-       % \caesura applies rvarcomma, but in a smaller font
-       c \caesura g c
-
-       % \divisioMinima is a simple vertical stroke through the
-       % uppermost staffline, just like the original implementation
-       % of breathing signs.
-       c \divisioMinima g c
+ticks, vees and `railroad tracks' (caesura)."
+}
 
-       % \divisio{maior,maxima} and \finalis look like bars and are
-       % vertically centered on the staff; the direction property has
-       % no effect
-       c \divisioMaior g c
-       c \divisioMaxima g c
 
-       % 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 |
     }
   }
-  \paper {
-    \translator { \RemoveEmptyStaffContext }
-  }
 }