move ancient accidental example to regtest.

diff --git a/input/regression/ancient-accidentals.ly b/input/regression/ancient-accidentals.ly
new file mode 100644 (file)
index 0000000..879f81c
--- /dev/null
+++ b/input/regression/ancient-accidentals.ly
@@ -0,0 +1,26 @@
+
+\header {
+texidoc = "@cindex Ancient Accidentals
+Accidentals are available in different ancient styles, which all
+are collected here.
+"
+}
+
+\version "2.11.6"
+
+\relative c'' {
+      \time 3/4
+      cis^\markup { \typewriter default } c ces  
+
+      \override Staff.Accidental #'glyph-name-alist = #alteration-hufnagel-glyph-name-alist
+      cis^\markup { \typewriter hufnagel } c ces  
+
+      \override Staff.Accidental #'glyph-name-alist = #alteration-medicaea-glyph-name-alist
+      cis^\markup { \typewriter medicaea } c ces  
+
+      \override Staff.Accidental #'glyph-name-alist = #alteration-vaticana-glyph-name-alist
+      cis^\markup { \typewriter vaticana } c ces  
+
+      \override Staff.Accidental #'glyph-name-alist = #alteration-mensural-glyph-name-alist
+      cis^\markup { \typewriter mensural } c ces  
+}

diff --git a/input/test/ancient-accidentals.ly b/input/test/ancient-accidentals.ly
deleted file mode 100644 (file)
index 10c5ab7..0000000
--- a/input/test/ancient-accidentals.ly
+++ /dev/null
@@ -1,23 +0,0 @@
-
-\header {
-texidoc = "@cindex Ancient Accidentals
-Accidentals are available in different ancient styles, which all
-are collected here.
-"
-}
-
-\version "2.10.0"
-
-\relative c'' {
-      \time 5/4
-      \override Staff.Accidental  #'style = #'default
-      cisis^\markup { \typewriter default } cis c ces ceses 
-      \override Staff.Accidental  #'style = #'hufnagel
-      cisis^\markup { \typewriter hufnagel } cis c ces ceses 
-      \override Staff.Accidental  #'style = #'medicaea
-      cisis^\markup { \typewriter medicaea } cis c ces ceses 
-      \override Staff.Accidental  #'style = #'vaticana
-      cisis^\markup { \typewriter vaticana } cis c ces ceses 
-      \override Staff.Accidental  #'style = #'mensural
-      cisis^\markup { \typewriter mensural } cis c ces ceses 
-}

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index fc0b867e82754dade0f96effd64658363be008f2..063b9b44f9a708c0743031f2df59858c1d28a669 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -782,7 +782,7 @@ AncientRemoveEmptyStaffContext = \context {
 
   %% Select vaticana style font.
   \override KeySignature #'style = #'vaticana
-  \override Accidental #'style = #'vaticana
+  \override Accidental #'glyph-name-alist = #alteration-vaticana-glyph-name-alist
   \override Custos #'style = #'vaticana
   \override Custos #'neutral-position = #3
   \override Custos #'neutral-direction = #DOWN
@@ -793,7 +793,7 @@ AncientRemoveEmptyStaffContext = \context {
   \Voice
   \name "GregorianTranscriptionVoice"
   \alias "Voice"
-
+  
   %% Removing ligature bracket engraver without replacing it by some
   %% other ligature engraver would cause a "Junking event: `LigatureEvent'"
   %% warning for every "\[" and "\]".  Therefore, we make the grob
@@ -885,7 +885,7 @@ AncientRemoveEmptyStaffContext = \context {
   %% Select mensural style font.
   \override TimeSignature #'style = #'mensural
   \override KeySignature #'style = #'mensural
-  \override Accidental #'style = #'mensural
+  \override Accidental #'glyph-name-alist = #alteration-mensural-glyph-name-alist
   \override Custos #'style = #'mensural
   \override Custos #'neutral-position = #3
   \override Custos #'neutral-direction = #DOWN

diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index 42ec6932e750c1be0870da1911a8eea52b6d27d8..19f3c613459ad8f0f3aef8e5e5a00d1f1801984d 100644 (file)
--- a/scm/output-lib.scm
+++ b/scm/output-lib.scm
@@ -393,7 +393,7 @@ centered, X==1 is at the right, X == -1 is at the left."
      (0 . "accidentals.vaticana0")
      (-1/2 . "accidentals.mensural1")))
 
-(define-public alteration-medicae-glyph-name-alist
+(define-public alteration-medicaea-glyph-name-alist
    '((1/2 . "accidentals.medicaea-1")
      (0 . "accidentals.vaticana0")
      (-1/2 . "accidentals.mensural1")))