Merge branch 'master' into translation

[lilypond.git] / python / convertrules.py

diff --git a/python/convertrules.py b/python/convertrules.py
index 8ecce6f877478a88ce2cff8c26f465af6b6b73c4..0df4b09b1d735a863bd8d4bdd76a66e6a35bfc66 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -3723,9 +3723,12 @@ def conv(str):
     str = re.sub (r'\bthin-kern\b', 'segno-kern', str)
     return str
 
-@rule ((2, 19, 16), "implicitTimeSignatureVisibility -> initialTimeSignatureVisibility")
+@rule ((2, 19, 16), """implicitTimeSignatureVisibility -> initialTimeSignatureVisibility
+csharp -> c-sharp""")
 def conv(str):
     str = re.sub (r'\bimplicitTimeSignatureVisibility\b', 'initialTimeSignatureVisibility', str)
+    str = re.sub (r'\b([a-g])((?:sharp){1,2}|(?:flat){1,2})\b',r'\1-\2', str)
+    str = re.sub (r'\\shiftOff\b', r'\\undo\\shiftOn', str)
     return str
 
 # Guidelines to write rules (please keep this at the end of this file)