From c6a964d9442d0f81b2a25a341d57ba0285ee918d Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=BCrgen=20Reuter?= <j@web.de>
Date: Tue, 6 Jun 2006 21:19:16 +0000
Subject: [PATCH] * Documentation/user/instrument-notation.itely,
input/regression/breathing-sign-ancient.ly, input/test/divisiones.ly:
Removed redundant property settings for vaticana contexts.
* ly/gregorian-init.ly: Minor edit of comments.
---
ChangeLog | 8 +++++-
Documentation/user/instrument-notation.itely | 20 +++++---------
input/regression/breathing-sign-ancient.ly | 29 +++++++-------------
input/test/divisiones.ly | 1 -
ly/gregorian-init.ly | 15 +++++++---
5 files changed, 35 insertions(+), 38 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 20ef8842a5..899f05535f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,10 +56,16 @@
2006-06-06 Jürgen Reuter <reuter@ipd.uka.de>
+ * Documentation/user/instrument-notation.itely,
+ input/regression/breathing-sign-ancient.ly,
+ input/test/divisiones.ly: Removed redundant property settings for
+ vaticana contexts.
+
* ly/gregorian-init.ly: Rewrote \versus and \responsum in order to
fix lyrics alignment problems. They are implemented now as scheme
functions that add the appropriate unicode char to the first lyric
- event rather than adding a separate lyric event.
+ event rather than adding a separate lyric event. Minor edit of
+ comments.
2006-06-06 Han-Wen Nienhuys <hanwen@lilypond.org>
diff --git a/Documentation/user/instrument-notation.itely b/Documentation/user/instrument-notation.itely
index 30f112dcc4..fb1efda26d 100644
--- a/Documentation/user/instrument-notation.itely
+++ b/Documentation/user/instrument-notation.itely
@@ -2909,8 +2909,6 @@ Editio Vaticana style.
\include "gregorian-init.ly"
\score {
\new VaticanaVoice {
- \override Staff.StaffSymbol #'color = #red
- \override Staff.LedgerLineSpanner #'color = #red
\override TextScript #'font-family = #'typewriter
\override TextScript #'font-shape = #'upright
\override Script #'padding = #-0.1
@@ -4159,17 +4157,13 @@ the following excerpt demonstrates
\score {
<<
\new VaticanaVoice = "cantus" {
- \override Staff.StaffSymbol #'color = #red
- \override Staff.LedgerLineSpanner #'color = #red
- \override Score.BarNumber #'transparent = ##t {
- \[ c'\melisma c' \flexa a \]
- \[ a \flexa \deminutum g\melismaEnd \]
- f \divisioMinima
- \[ f\melisma \pes a c' c' \pes d'\melismaEnd \]
- c' \divisioMinima \break
- \[ c'\melisma c' \flexa a \]
- \[ a \flexa \deminutum g\melismaEnd \] f \divisioMinima
- }
+ \[ c'\melisma c' \flexa a \]
+ \[ a \flexa \deminutum g\melismaEnd \]
+ f \divisioMinima
+ \[ f\melisma \pes a c' c' \pes d'\melismaEnd \]
+ c' \divisioMinima \break
+ \[ c'\melisma c' \flexa a \]
+ \[ a \flexa \deminutum g\melismaEnd \] f \divisioMinima
}
\new Lyrics \lyricsto "cantus" {
San- ctus, San- ctus, San- ctus
diff --git a/input/regression/breathing-sign-ancient.ly b/input/regression/breathing-sign-ancient.ly
index 5e4de07dfc..7c9d1961fb 100644
--- a/input/regression/breathing-sign-ancient.ly
+++ b/input/regression/breathing-sign-ancient.ly
@@ -11,38 +11,29 @@ finalis, the latter three looking similar to bar glyphs.
\include "gregorian-init.ly"
-
-%%
-%% Gregorian notation:
-%%
\context VaticanaStaff {
\relative c' {
-
- %% we turn bars and bar numbers off for Gregorian stuff
- \override Staff.BarLine #'transparent = ##t
- \override Score.BarNumber #'transparent = ##t
-
- %% here is no \breathe
+ % here is no \breathe
c g c
- %% \virgula applies rcomma, but in a smaller font
+ % \virgula applies rcomma, but in a smaller font
c \virgula g c
- %% \caesura applies rvarcomma, but in a smaller font
+ % \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.
+ % \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
+ % \divisioMaior, \divisioMaxima 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
+ % this one looks almost like a "||" type bar
\finalis
}
}
diff --git a/input/test/divisiones.ly b/input/test/divisiones.ly
index b98091432e..d3054f99b6 100644
--- a/input/test/divisiones.ly
+++ b/input/test/divisiones.ly
@@ -16,7 +16,6 @@ Choices are @code{divisioMinima}, @code{divisioMaior},
\score {
<<
\context VaticanaVoice {
- \override Staff.StaffSymbol #'color = #red
\override TextScript #'padding = #3
g a g
s^\markup { "divisio minima" }
diff --git a/ly/gregorian-init.ly b/ly/gregorian-init.ly
index 008cb6e118..2247081083 100644
--- a/ly/gregorian-init.ly
+++ b/ly/gregorian-init.ly
@@ -1,8 +1,9 @@
-\version "2.7.39"
+%{
+ Shortcuts common for all styles of gregorian chant notation.
+ $Id: gregorian-init.ly,v 1.46 2006/06/06 21:19:17 reuter Exp $
+%}
-%%%%%%%%
-%%%%%%%% shortcuts common for all styles of gregorian chant notation
-%%%%%%%%
+\version "2.7.39"
%
% Declare memorable shortcuts for special unicode characters
@@ -17,8 +18,14 @@ IIJ = \lyricmode { IIJ }
ij = \lyricmode { ij }
iij = \lyricmode { iij }
+%
% Given some music that represents lyrics, add a prefix to the first
% lyric event.
+%
+% TODO: Robustify this function. For example, this function works
+% correctly for "\versus { some lyrics }", but it barfs with a wrong type
+% argument error for e.g. "\versus some lyrics".
+%
#(define (add-prefix-to-lyrics prefix music)
(make-music
'SequentialMusic
--
2.39.5