Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / python / convertrules.py

diff --git a/python/convertrules.py b/python/convertrules.py
index f034d1aa6b1e179df26d4ad0030c4ac372e4ae7c..d535ae8ce96dda13cfe17e895b6e5e460b35ce81 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -623,13 +623,13 @@ def conv (str):
            lastx = x
        return s
 
-    def regularize_dollar_reference (match):
-       return regularize_id (match.group (1))
-    def regularize_assignment (match):
-       return '\n' + regularize_id (match.group (1)) + ' = '
-    str = re.sub ('\$([^\t\n ]+)', regularize_dollar_reference, str)
-    str = re.sub ('\n([^ \t\n]+)[ \t]*= *', regularize_assignment, str)
-    return str
+       def regularize_dollar_reference (match):
+           return regularize_id (match.group (1))
+       def regularize_assignment (match):
+           return '\n' + regularize_id (match.group (1)) + ' = '
+       str = re.sub ('\$([^\t\n ]+)', regularize_dollar_reference, str)
+       str = re.sub ('\n([^ \t\n]+)[ \t]*= *', regularize_assignment, str)
+       return str
 
 conversions.append (((1,3,117), conv, 'identifier names: $!foo_bar_123 -> xfooBarABC'))
 
@@ -2680,7 +2680,6 @@ conversions.append (((2, 7, 28), conv,
 
 def conv (str):
     for a in ['beamed-lengths', 'beamed-minimum-free-lengths',
-              'lengths',
              'beamed-extreme-minimum-free-lengths']:
        str = re.sub (r"\\override\s+Stem\s+#'%s" % a,
                      r"\\override Stem #'details #'%s" % a,
@@ -2691,7 +2690,7 @@ conversions.append (((2, 7, 29), conv,
                     """override Stem #'beamed-* -> #'details #'beamed-*"""))
 
 def conv (str):
-    str = re.sub (r'\\epsfile *#"', r'\\epsfile #X #10 #"', str)
+    str = re.sub (r'\epsfile *#"', r'\epsfile #X #10 #"', str)
     return str
 
 conversions.append (((2, 7, 30), conv,
@@ -2796,39 +2795,3 @@ def conv (str):
     return str
 
 conversions.append (((2, 9, 6), conv, """\context Foo \applyOutput #bla -> \applyOutput #'Foo #bla """))
-
-
-def conv (str):
-    str = re.sub ('annotatepage', 'annotate-page', str)
-    str = re.sub ('annotateheaders', 'annotate-headers', str)
-    str = re.sub ('annotatesystems', 'annotate-systems', str)
-    return str
-
-conversions.append (((2, 9, 9), conv, """annotatefoo -> annotate-foo"""))
-
-
-def conv (str):
-    str = re.sub (r"""(\\set\s)?(?P<context>[a-zA-Z]*.?)tupletNumberFormatFunction\s*=\s*#denominator-tuplet-formatter""",
-                  r"""\\override \g<context>TupletNumber #'text = #tuplet-number::calc-denominator-text""", str)
-
-    str = re.sub (r"""(\\set\s+)?(?P<context>[a-zA-Z]*.?)tupletNumberFormatFunction\s*=\s*#fraction-tuplet-formatter""",
-                  r"""\\override \g<context>TupletNumber #'text = #tuplet-number::calc-fraction-text""", str)
-
-    if re.search ('tupletNumberFormatFunction', str):
-        error_file.write ("\n")
-       error_file.write ("tupletNumberFormatFunction has been removed. Use #'text property on TupletNumber")
-        error_file.write ("\n")
-        
-    return str
-
-conversions.append (((2, 9, 11), conv, """\\set tupletNumberFormatFunction -> \\override #'text = """))
-
-
-def conv (str):
-    str = re.sub ('vocNam', 'shortVocalName', str)
-    str = re.sub (r'([^a-z])instr\s*=', r'\1shortInstrumentName =', str)
-    str = re.sub (r'([^a-z])instrument\s*=', r'\1instrumentName =', str)
-    return str
-
-conversions.append (((2, 9, 13), conv, """instrument -> instrumentName, instr -> shortInstrumentName, vocNam -> shortVocalName"""))
-