Merge branch 'lilypond/translation'

[lilypond.git] / python / convertrules.py

diff --git a/python/convertrules.py b/python/convertrules.py
index 06e900b5844d12653d77d76aa91f335625457f11..bbba578e48b8c7e9a3f1ec0dc0d16b817e8d1176 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -3238,12 +3238,35 @@ def conv (str):
     str = re.sub (r"Stem\s+#'flag-style", r"Flag #'style", str)
     str = re.sub (r"Stem\s+#'stroke-style", r"Flag #'stroke-style", str)
     str = re.sub (r"Stem\s+#'flag", r"Flag #'print", str)
-    str = re.sub (r"((?:\\once)?\s*)\\override\s+Stem\s+#'transparent\s*=\s*##t", r"\g<1>\\override Stem #'transparent = ##t \g<1>\\override Flag #'transparent = ##t", str)
-    str = re.sub (r"((?:\\once)?\s*)\\revert\s*Stem\s+#'transparent", r"\g<1>\\revert Stem #'transparent \g<1>\\revert Flag #'transparent", str)
-    str = re.sub (r"((?:\\once)?\s*)\\override\s+Stem\s+#'stencil\s*=\s*##f", r"\g<1>\\override Stem #'stencil = ##f \g<1>\\override Flag #'stencil = ##f", str)
-    str = re.sub (r"((?:\\once)?\s*)\\revert\s*Stem\s+#'stencil", r"\g<1>\\revert Stem #'stencil \g<1>\\revert Flag #'stencil", str)
+    str = re.sub (r"(\s+(?:\\once\s*)?)\\override\s+Stem\s+#'transparent\s*=\s*##t", r"\g<1>\\override Stem #'transparent = ##t\g<1>\\override Flag #'transparent = ##t", str)
+    str = re.sub (r"(\s+(?:\\once\s*)?)\\revert\s*Stem\s+#'transparent", r"\g<1>\\revert Stem #'transparent\g<1>\\revert Flag #'transparent", str)
+    str = re.sub (r"(\s+(?:\\once\s*)?)\\override\s+Stem\s+#'stencil\s*=\s*##f", r"\g<1>\\override Stem #'stencil = ##f\g<1>\\override Flag #'stencil = ##f", str)
+    str = re.sub (r"(\s+(?:\\once\s*)?)\\revert\s*Stem\s+#'stencil", r"\g<1>\\revert Stem #'stencil\g<1>\\revert Flag #'stencil", str)
     return str
 
+@rule ((2, 15, 16), r"\makeStringTuning, \contextStringTuning -> \stringTuning")
+def conv (str):
+    str = re.sub (r"(\s+)\\contextStringTuning(\s+)#'([-a-zA-Z]+)(\s+<[^<>]+>)",
+                  r"""\g<1>#(define \g<3> #{ \\stringTuning\g<4> #})\g<1>\\set stringTunings = #\g<3>""",
+                  str)
+    str = re.sub (r"""
+\\makeStringTuning(\s+)#'([-a-zA-Z]+)""",
+                  r"""
+"\g<2>" = \\stringTuning""", str)
+    str = re.sub (r"\\makeStringTuning(\s+)#'([-a-zA-Z]+)(\s+<[^<>]+>)",
+                  r"#(define \g<2> #{ \\stringTuning\g<3> #})", str)
+    return str
+
+@rule ((2, 15, 17), "\\markuplines -> \\markuplist")
+def conv (str):
+    str = re.sub (r"""
+\\markuplines( +)([^ ].*)
+            \1([^ ])""", r"""
+\\markuplist\g<1>\g<2>
+           \g<1>\g<3>""", str)
+    str = re.sub (r"\\markuplines", r"\\markuplist", str)
+    str = re.sub (r"@funindex markuplines", r"@funindex markuplist", str)
+    return str
 
 # Guidelines to write rules (please keep this at the end of this file)
 #