* Documentation/user/instrument-notation.itely: Bugfix: yet some

	other "custodes.*-u0" -> "custodes.*.u0" renaming victims in
	musicglyph access.  Many small beautifications in ancient
	examples.

	* input/test/divisiones.ly: fixed indentation; small
	beautifications

	* ly/engraver-init.ly: added FIXME comment

diff --git a/Documentation/user/instrument-notation.itely b/Documentation/user/instrument-notation.itely
index 5298df173d597727e70322a6313c136bf373e465..b98a4e346a11dbee7b56385a0856668ac7123497 100644 (file)
--- a/Documentation/user/instrument-notation.itely
+++ b/Documentation/user/instrument-notation.itely
@@ -2101,7 +2101,9 @@ petrucci style mensural C clefs, for use on different staff lines
 @code{petrucci-c5}
 @tab
 @lilypond[fragment,relative=1,notime]
-  \clef "petrucci-c2" c
+  \clef "petrucci-c2"
+  \override NoteHead #'style = #'mensural
+  c
 @end lilypond
 
 @item
@@ -2110,7 +2112,9 @@ petrucci style mensural F clef
 @code{petrucci-f}
 @tab
 @lilypond[fragment,relative=1,notime]
-  \clef "petrucci-f" c
+  \clef "petrucci-f"
+  \override NoteHead #'style = #'mensural
+  c
 @end lilypond
 
 @item
@@ -2119,7 +2123,9 @@ petrucci style mensural G clef
 @code{petrucci-g}
 @tab
 @lilypond[fragment,relative=1,notime]
-  \clef "petrucci-g" c
+  \clef "petrucci-g"
+  \override NoteHead #'style = #'mensural
+  c
 @end lilypond
 
 @item
@@ -2129,7 +2135,9 @@ historic style mensural C clef
 @code{mensural-c3}, @code{mensural-c4}
 @tab
 @lilypond[fragment,relative=1,notime]
-  \clef "mensural-c2" c
+  \clef "mensural-c2"
+  \override NoteHead #'style = #'mensural
+  c
 @end lilypond
 
 @item
@@ -2138,7 +2146,9 @@ historic style mensural F clef
 @code{mensural-f}
 @tab
 @lilypond[fragment,relative=1,notime]
-  \clef "mensural-f" c
+  \clef "mensural-f"
+  \override NoteHead #'style = #'mensural
+  c
 @end lilypond
 
 @item
@@ -2147,7 +2157,9 @@ historic style mensural G clef
 @code{mensural-g}
 @tab
 @lilypond[fragment,relative=1,notime]
-  \clef "mensural-g" c
+  \clef "mensural-g"
+  \override NoteHead #'style = #'mensural
+  c
 @end lilypond
 
 @item
@@ -2158,7 +2170,12 @@ Editio Vaticana style do clef
 @tab
 @lilypond[fragment,relative=1,notime]
   \override Staff.StaffSymbol #'line-count = #4
-  \clef "vaticana-do2" c
+  \override Staff.StaffSymbol #'color = #red
+  \override Staff.LedgerLineSpanner #'color = #red
+  \override Voice.Stem #'transparent = ##t
+  \override NoteHead #'style = #'vaticana.punctum
+  \clef "vaticana-do2"
+  c
 @end lilypond
 
 @item
@@ -2168,7 +2185,12 @@ Editio Vaticana style fa clef
 @tab
 @lilypond[fragment,relative=1,notime]
   \override Staff.StaffSymbol #'line-count = #4
-  \clef "vaticana-fa2" c
+  \override Staff.StaffSymbol #'color = #red
+  \override Staff.LedgerLineSpanner #'color = #red
+  \override Voice.Stem #'transparent = ##t
+  \override NoteHead #'style = #'vaticana.punctum
+  \clef "vaticana-fa2"
+  c
 @end lilypond
 
 @item
@@ -2179,7 +2201,12 @@ Editio Medicaea style do clef
 @tab
 @lilypond[fragment,relative=1,notime]
   \override Staff.StaffSymbol #'line-count = #4
-  \clef "medicaea-do2" c
+  \override Staff.StaffSymbol #'color = #red
+  \override Staff.LedgerLineSpanner #'color = #red
+  \override Voice.Stem #'transparent = ##t
+  \override NoteHead #'style = #'medicaea.punctum
+  \clef "medicaea-do2"
+  c
 @end lilypond
 
 @item
@@ -2189,7 +2216,12 @@ Editio Medicaea style fa clef
 @tab
 @lilypond[fragment,relative=1,notime]
   \override Staff.StaffSymbol #'line-count = #4
-  \clef "medicaea-fa2" c
+  \override Staff.StaffSymbol #'color = #red
+  \override Staff.LedgerLineSpanner #'color = #red
+  \override Voice.Stem #'transparent = ##t
+  \override NoteHead #'style = #'medicaea.punctum
+  \clef "medicaea-fa2"
+  c
 @end lilypond
 
 @item
@@ -2200,7 +2232,12 @@ historic style hufnagel do clef
 @tab
 @lilypond[fragment,relative=1,notime]
   \override Staff.StaffSymbol #'line-count = #4
-  \clef "hufnagel-do2" c
+  \override Staff.StaffSymbol #'color = #red
+  \override Staff.LedgerLineSpanner #'color = #red
+  \override Voice.Stem #'transparent = ##t
+  \override NoteHead #'style = #'hufnagel.punctum
+  \clef "hufnagel-do2"
+  c
 @end lilypond
 
 @item
@@ -2210,7 +2247,12 @@ historic style hufnagel fa clef
 @tab
 @lilypond[fragment,relative=1,notime]
   \override Staff.StaffSymbol #'line-count = #4
-  \clef "hufnagel-fa2" c
+  \override Staff.StaffSymbol #'color = #red
+  \override Staff.LedgerLineSpanner #'color = #red
+  \override Voice.Stem #'transparent = ##t
+  \override NoteHead #'style = #'hufnagel.punctum
+  \clef "hufnagel-fa2"
+  c
 @end lilypond
 
 @item
@@ -2219,7 +2261,12 @@ historic style hufnagel combined do/fa clef
 @code{hufnagel-do-fa}
 @tab
 @lilypond[fragment,relative=1,notime]
-  \clef "hufnagel-do-fa" c
+  \override Staff.StaffSymbol #'color = #red
+  \override Staff.LedgerLineSpanner #'color = #red
+  \override Voice.Stem #'transparent = ##t
+  \override NoteHead #'style = #'hufnagel.punctum
+  \clef "hufnagel-do-fa"
+  c
 @end lilypond
 @end multitable
 
@@ -2302,12 +2349,14 @@ following table
 @lilypond[quote,raggedright]
 \layout {
   indent = 0.0
-  \context { \Staff
+  \context {
+    \Staff
     \remove Staff_symbol_engraver
     \remove Clef_engraver
     \remove Time_signature_engraver
   }
-} {
+}
+{
   \set Score.timing = ##f
   \set Score.barAlways = ##t
   s_\markup { "\\time 4/4" }
@@ -2354,6 +2403,7 @@ The following examples show the differences in style,
 @lilypond[raggedright,fragment,relative=1,quote]
 {
   \fatText
+
   \time 2/2
   c1^\markup { \hspace #-2.0 \typewriter default }
 
@@ -2411,6 +2461,7 @@ Editio Vaticana style.
 \include "gregorian-init.ly"
 \score {
   \context VaticanaVoice {
+    \override Staff.StaffSymbol #'color = #red
     \override TextScript #'font-family = #'typewriter
     \override TextScript #'font-shape = #'upright
     \override Script #'padding = #-0.1
@@ -2483,19 +2534,19 @@ supported are @code{vaticana}, @code{medicaea}, @code{hufnagel}, and
 \new Lyrics \lyricmode {
   \markup { \column {
     \typewriter "vaticana"
-    \line { " " \musicglyph #"custodes.vaticana-u0" }
+    \line { " " \musicglyph #"custodes.vaticana.u0" }
   } }
   \markup { \column {
     \typewriter "medicaea"
-    \line { " " \musicglyph #"custodes.medicaea-u0" }
+    \line { " " \musicglyph #"custodes.medicaea.u0" }
   }}
   \markup { \column {
     \typewriter "hufnagel"
-    \line { " " \musicglyph #"custodes.hufnagel-u0" }
+    \line { " " \musicglyph #"custodes.hufnagel.u0" }
   }}
   \markup { \column {
     \typewriter "mensural"
-    \line { " " \musicglyph #"custodes.mensural-u0" }
+    \line { " " \musicglyph #"custodes.mensural.u0" }
   }}
 }
 @end lilypond
@@ -3620,6 +3671,7 @@ the following excerpt demonstrates
 \score {
   <<
     \context VaticanaVoice = "cantus" {
+      \override Staff.StaffSymbol #'color = #red
       \override Score.BarNumber #'transparent = ##t {
         \[ c'\melisma c' \flexa a \]
         \[ a \flexa \deminutum g\melismaEnd \]

diff --git a/input/test/divisiones.ly b/input/test/divisiones.ly
index 1577ab94e0bee8774b55e15ca625eb4d68da2af3..72733236654f662c2f02538e159ca7944c2973e8 100644 (file)
--- a/input/test/divisiones.ly
+++ b/input/test/divisiones.ly
@@ -2,7 +2,7 @@
 \header {
     texidoc = "@cindex Divisiones
 
-Divisiones are gregorian variants of breathing signs.
+Divisiones are ancient variants of breathing signs.
 Choices are @code{divisioMinima}, @code{divisioMaior},
 @code{divisioMaxima} and @code{finalis}, @code{virgula} and
 @code{caesura}.
@@ -14,34 +14,30 @@ Choices are @code{divisioMinima}, @code{divisioMaior},
 \include "gregorian-init.ly"
 
 \score {
- <<
-       \context Voice  \transpose c c' {
-           \set Score.timing = ##f
-           \set Score.barAlways = ##t
-           \override TextScript  #'padding = #3
-           \override Staff.BarLine  #'transparent = ##t
-           \override Stem  #'transparent = ##t
-            g4( a) g^\markup { "divisio minima" }
-           \divisioMinima
-            g4( a) g^\markup { "divisio maior" }
-           \divisioMaior
-            g4( a) g^\markup { "divisio maxima" }
-           \divisioMaxima
-            g4( a) g^\markup { "  finalis" }
-           \finalis
-            g4( a) g
-            ^\markup { "virgula" }
-           \virgula
-            g4( a) g
-            ^\markup { "caesura" }
-           \caesura
-            g4( a) g
-       }
-       \lyricsto "" \new  Lyrics \lyricmode {
-           Blah blub, blah blam.
-           Blah blub, blah blam.
-           Blah blub, blah blam.
-           Blah blub.
-       }
-    >>
+  <<
+    \context VaticanaVoice {
+      \override Staff.StaffSymbol #'color = #red
+      \override TextScript  #'padding = #3
+      g a g
+      s^\markup { "divisio minima" }
+      \divisioMinima
+      g a g
+      s^\markup { "divisio maior" }
+      \divisioMaior
+      g a g
+      s^\markup { "divisio maxima" }
+      \divisioMaxima
+      \break
+      g a g
+      s^\markup { "finalis" }
+      \finalis
+      g a g
+      s^\markup { "virgula" }
+      \virgula
+      g a g
+      s^\markup { "caesura" }
+      \caesura
+      g a g
+    }
+  >>
 }

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 9882f17e37a90780f1e759408c57f8f4622956b3..86b062ddd53c3606f3ddd183d870e65c963b1eac 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -699,6 +699,10 @@ EasyNotation = \context {  % TODO: why \context override?
   \override TextSpanner #'edge-text = #'("" . "")
 }
 
+% FIXME: need something like
+%  \remove "Bar_number_engraver" (which lives on score level)
+% for vaticana and gregorian transcription staves
+
 \context {
   \Staff
   \name "VaticanaStaff"