conversion rules for glyph-name-alist. Apply to ancient-font.ly

diff --git a/input/test/ancient-font.ly b/input/test/ancient-font.ly
index baaf9eb93cfdace94a02d763ec8aac22b5ba62bf..6ac44816938579f82f67ac5c4173a73b6e146252 100644 (file)
--- a/input/test/ancient-font.ly
+++ b/input/test/ancient-font.ly
@@ -1,4 +1,4 @@
-\version "2.10.0"
+\version "2.11.6"
 % TODO: split ancient-font into seperate files; possibly in
 % different locations.
 \header {
@@ -17,8 +17,8 @@ upperStaff = \new GregorianStaff =  "upperStaff" <<
     \override Staff.StaffSymbol  #'line-count = #4
 
      \transpose c c {
-       \override Staff.KeySignature  #'style = #'vaticana
-       \override Staff.Accidental  #'style = #'vaticana
+       \override Staff.KeySignature #'glyph-name-alist = #alteration-vaticana-glyph-name-alist
+       \override Staff.Accidental #'glyph-name-alist = #alteration-vaticana-glyph-name-alist
        \override NoteHead  #'style = #'vaticana.punctum
        \key es \major
        \clef "vaticana-fa2"
@@ -58,8 +58,8 @@ upperStaff = \new GregorianStaff =  "upperStaff" <<
        \override NoteHead  #'style = #'vaticana.cephalicus
        es f
 
-       \override Staff.KeySignature  #'style = #'medicaea
-       \override Staff.Accidental  #'style = #'medicaea
+       \override Staff.KeySignature #'glyph-name-alist = #alteration-medicaea-glyph-name-alist
+       \override Staff.Accidental #'glyph-name-alist = #alteration-medicaea-glyph-name-alist
        \override Staff.Custos  #'style = #'medicaea
        \override NoteHead  #'style = #'medicaea.punctum
        \clef "medicaea-fa2"
@@ -81,8 +81,8 @@ upperStaff = \new GregorianStaff =  "upperStaff" <<
        \override NoteHead  #'style = #'medicaea.rvirga
        e! des! ces!
 
-       \override Staff.KeySignature  #'style = #'hufnagel
-       \override Staff.Accidental  #'style = #'hufnagel
+       \override Staff.KeySignature #'glyph-name-alist = #alteration-hufnagel-glyph-name-alist
+       \override Staff.Accidental #'glyph-name-alist = #alteration-hufnagel-glyph-name-alist
        \override Staff.Custos  #'style = #'hufnagel
        \override NoteHead  #'style = #'hufnagel.punctum
        \clef "hufnagel-fa2"
@@ -258,8 +258,8 @@ lowerStaff = \new MensuralStaff =  "lowerStaff" <<
            \accepts MensuralVoice
            \consists Custos_engraver
            \override TimeSignature #'style = #'mensural
-           \override KeySignature #'style = #'mensural
-           \override Accidental #'style = #'mensural
+           \override KeySignature #'glyph-name-alist = #alteration-mensural-glyph-name-alist
+           \override Accidental #'glyph-name-alist = #alteration-mensural-glyph-name-alist
            \override Custos #'style = #'mensural
            \override Custos #'neutral-position = #3
            \override Custos #'neutral-direction = #down
@@ -276,8 +276,8 @@ lowerStaff = \new MensuralStaff =  "lowerStaff" <<
            \remove Time_signature_engraver
            \override StaffSymbol #'thickness = #2.0
            \override StaffSymbol #'line-count = #4
-           \override KeySignature #'style = #'vaticana
-           \override Accidental #'style = #'vaticana
+           \override KeySignature #'glyph-name-alist = #alteration-vaticana-glyph-name-alist
+           \override Accidental #'glyph-name-alist = #alteration-vaticana-glyph-name-alist
            \override Custos #'style = #'vaticana
            \override Custos #'neutral-position = #4
            \override Custos #'neutral-direction = #down

diff --git a/python/convertrules.py b/python/convertrules.py
index 5d6e8b48fbc85dcf7f390b7f492306647c50145c..d6b89e777d67c0252de6873d77f56176d4999b99 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2892,12 +2892,20 @@ def conv (str):
                    "AccidentalCautionary #'font-size = #-2", str)
     str = re.sub ("Accidental\s*#'cautionary-style\s*=\s*#'parentheses",
                    "AccidentalCautionary #'parenthesized = ##t", str)
-
     str = re.sub ("([A-Za-z]+)\s*#'cautionary-style\s*=\s*#'parentheses",
                    r"\1 #'parenthesized = ##t", str)
     str = re.sub ("([A-Za-z]+)\s*#'cautionary-style\s*=\s*#'smaller",
                    r"\1 #'font-size = #-2", str)
+    
+    return str
+
+conversions.append (((2, 11, 5), conv, """deprecate cautionary-style. Use AccidentalCautionary properties"""))
+
+                    
+
 
+def conv (str):
+    
     def sub_acc_name (m):
         idx = int (m.group (1).replace ('M','-'))
         
@@ -2913,10 +2921,9 @@ def conv (str):
 
     str = re.sub (r"accidentals[.](M?[-0-9]+)",
                   sub_acc_name, str) 
-
+    str = re.sub (r"(KeySignature|Accidental[A-Za-z]*)\s*#'style\s*=\s*#'([a-z]+)",
+                  r"\1 #'glyph-name-alist = #alteration-\2-glyph-name-alist", str)
+            
     return str
 
-conversions.append (((2, 11, 5), conv, """deprecate cautionary-style. Use AccidentalCautionary properties"""))
-
-                    
-
+conversions.append (((2, 11, 6), conv, """Rename accidental glyphs, use glyph-name-alist."""))