* lily/instrument-name-engraver.cc (start_spanner): new

[lilypond.git] / python / convertrules.py

diff --git a/python/convertrules.py b/python/convertrules.py
index 7ba205c49891dcfe3826c11a1948f11e8c420734..d670696b765c7b5a92d18f9cccaf3140aa7d28d5 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2691,7 +2691,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,
@@ -2824,3 +2824,11 @@ def conv (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"""))
+