Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / python / convertrules.py

diff --git a/python/convertrules.py b/python/convertrules.py
index 1cd2d4e76660dd61beab4e3662a5a7a5db80d494..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."""))
@@ -2986,8 +2988,12 @@ def conv (str):
                          ('right', m.group (4))]:
 
             if h and float (h):
+                once = m.group(1)
+                if not once:
+                    once = ''
+                    
                 s += (r"%s \override %s #'bound-details #'%s #'text = \markup { \draw-line #'(0 . %s) }"
-                      % (m.group(1), m.group (2), var, h))
+                      % (once, m.group (2), var, h))
 
                 s += '\n'
             
@@ -2999,3 +3005,11 @@ def conv (str):
     return str
 
 conversions.append (((2, 11, 15), conv, """#'edge-height -> #'bound-details #'right/left #'text = ..."""))
+
+def conv (str):
+    str = re.sub (r"\\override\s*([a-zA-Z.]+)\s*#'break-align-symbol\s*=\s*#'([a-z-]+)",
+                  r"\\override \1 #'break-align-symbols = #'(\2)", str)
+    return str
+
+conversions.append (((2, 11, 23), conv, """#'break-align-symbol -> #'break-align-symbols"""))
+