* input/regression/breathing-sign.ly: changed ancient examples to

	be relevant (by request of Han-Wen); updated BreathingSign text
	property according to new syntax

	* ly/gregorian-init.ly: updated BreathingSign text property
	according to new syntax

diff --git a/ChangeLog b/ChangeLog
index 592137546a1440c3d37c7cb11f4ff3fb98ff28ff..5a1829afb1fdbcb4cadc71287d1f0d8305c77271 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-08-28  Juergen Reuter  <reuter@ipd.uka.de>
+
+       * input/regression/breathing-sign.ly: changed ancient examples to
+       be relevant (by request of Han-Wen); updated BreathingSign text
+       property according to new syntax
+
+       * ly/gregorian-init.ly: updated BreathingSign text property
+       according to new syntax
+
 2003-08-28  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * python/lilylib.py (system): remove errorlog files.

diff --git a/input/regression/breathing-sign.ly b/input/regression/breathing-sign.ly
index 3d130053b78cb75dcfa81bac831576b7a828bc3d..35cbe66591b728b347a9eaa646a70468846686c0 100644 (file)
--- a/input/regression/breathing-sign.ly
+++ b/input/regression/breathing-sign.ly
@@ -21,73 +21,84 @@ 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 }
-    > |
-
-% \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:
+    %
+    \context 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 off for Gregorian stuff
+       \property Staff.BarLine \override #'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
+
+       % \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
+      }
+    }
   }
 }

diff --git a/ly/gregorian-init.ly b/ly/gregorian-init.ly
index 87b7bac7ecc3b0dbc1480cbe335b29af0844afbd..f8a7395f396bdfec4c9578099ca28e2d1587abbf 100644 (file)
--- a/ly/gregorian-init.ly
+++ b/ly/gregorian-init.ly
@@ -34,7 +34,7 @@ deminutum =
 % declare divisiones shortcuts
 %
 virgula = {
-  \once \property Voice.BreathingSign \override #'text = #"scripts-rcomma"
+  \once \property Voice.BreathingSign \override #'text = #(make-musicglyph-markup "scripts-rcomma")
   \once \property Voice.BreathingSign \override #'font-relative-size = #-1
 
   % Workaround: add padding.  Correct fix would be spacing engine handle this.
@@ -43,7 +43,7 @@ virgula = {
   \breathe
 }
 caesura = {
-  \once \property Voice.BreathingSign \override #'text = #"scripts-rvarcomma"
+  \once \property Voice.BreathingSign \override #'text = #(make-musicglyph-markup "scripts-rvarcomma")
   \once \property Voice.BreathingSign \override #'font-relative-size = #-1
 
   % Workaround: add padding.  Correct fix would be spacing engine handle this.