Convert accidental alteration #'default to standard-alteration-glyph-name-alist

(WAS: alteration-default-glyph-name-alist).  Also define alteration-default-glyph-name-alist as an alias for standard-alteration-glyph-name-alist.

diff --git a/input/regression/accidental-ancient.ly b/input/regression/accidental-ancient.ly
index 879f81c2b6d85f834535e1a3b10a2b07f4d5ad10..bfaa268fa61421a1566e6c1ddaa35a36cddb029c 100644 (file)
--- a/input/regression/accidental-ancient.ly
+++ b/input/regression/accidental-ancient.ly
@@ -10,6 +10,8 @@ are collected here.
 
 \relative c'' {
       \time 3/4
+      % FIXME: standard vs default, alteration-FOO vs FOO-alteration
+      \override Staff.Accidental #'glyph-name-alist = #standard-alteration-glyph-name-alist
       cis^\markup { \typewriter default } c ces  
 
       \override Staff.Accidental #'glyph-name-alist = #alteration-hufnagel-glyph-name-alist

diff --git a/python/convertrules.py b/python/convertrules.py
index 147813ef195087359bb1112e4c27e3e8f87c4a9e..54db434b49d8e86682f69e5eb702593240502adb 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2933,7 +2933,9 @@ def conv (str):
                   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)
-            
+    ## FIXME: standard vs default, alteration-FOO vs FOO-alteration
+    str = str.replace ('alteration-default-glyph-name-alist',
+                       'standard-alteration-glyph-name-alist')
     return str
 
 conversions.append (((2, 11, 6), conv, """Rename accidental glyphs, use glyph-name-alist."""))

diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index 77e69b0759f45e517a857c90aba735d83de5d491..745c231c48256610251b1c30ca175b1a9ac89c7d 100644 (file)
--- a/scm/output-lib.scm
+++ b/scm/output-lib.scm
@@ -383,6 +383,9 @@ centered, X==1 is at the right, X == -1 is at the left."
        (-3/4 . "accidentals.mirroredflat.flat")
        ))
 
+;; FIXME: standard vs default, alteration-FOO vs FOO-alteration
+(define-public alteration-default-glyph-name-alist standard-alteration-glyph-name-alist)
+
 (define-public makam-alteration-glyph-name-alist
      '((1 . "accidentals.doublesharp")
        (8/9 . "accidentals.sharp.slashslashslash.stemstem")