(conv): add 2.2.0 rule.

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

diff --git a/input/regression/breathing-sign.ly b/input/regression/breathing-sign.ly
index 240e210e2c7fd7bbb084df896f790dbc54163086..21df0be4153ac1ca280e19dd42be9713082d8f9c 100644 (file)
--- a/input/regression/breathing-sign.ly
+++ b/input/regression/breathing-sign.ly
@@ -1,92 +1,58 @@
-\version "1.7.16"
+#(ly:set-option 'old-relative)
+\version "2.1.36"
 \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.
-
 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.
+ticks, vees and `railroad tracks' (caesura)."
+ }
 
-" }
-
-\include "gregorian-init.ly"
 
 \score {
-  \notes \relative c' {
-    \key es \major \time 3/4
-
-% this bar contains no \breathe
-    < \context Voice = two { \stemDown es4 bes es }
-      \context Voice = one { \stemUp g4 as g }
-    > |
-
-% by default, \breathe uses the rcomma, just as if saying:
-% \property Voice.BreathingSign \set #'text = #"scripts-rcomma"
-    < \context Voice = two { \stemDown es4 \breathe bes es }
-      \context Voice = one { \stemUp g4 as g }
-    > |
-
-% 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"
-    < \context Voice = two { \stemDown es4 \breathe bes es }
-      \context Voice = one { \stemUp g4 as g }
-    > |
-
-% 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 }
-    > |
-
-% \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 {
+      \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:
+       % \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
+      }
+    }
   }
 }