diff options
| author | Jan Nieuwenhuizen <janneke@gnu.org> | 2007-08-15 14:10:30 +0200 |
|---|---|---|
| committer | Jan Nieuwenhuizen <janneke@gnu.org> | 2007-08-15 14:10:30 +0200 |
| commit | 09a5e371b211575eb17fb43bdd4e6c6ccc135cff (patch) | |
| tree | e202c1e92e20eb1afc6e85f895a5b1d849bcddbe | |
| parent | 7564df5cf1888ed3ec21b49a9067347a37ebeab7 (diff) | |
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.
| -rw-r--r-- | input/regression/accidental-ancient.ly | 2 | ||||
| -rw-r--r-- | python/convertrules.py | 4 | ||||
| -rw-r--r-- | scm/output-lib.scm | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/input/regression/accidental-ancient.ly b/input/regression/accidental-ancient.ly index 879f81c2b6..bfaa268fa6 100644 --- 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 147813ef19..54db434b49 100644 --- 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 77e69b0759..745c231c48 100644 --- 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") |