Merge branch 'lilypond/translation'

[lilypond.git] / python / convertrules.py

diff --git a/python/convertrules.py b/python/convertrules.py
index f1fab5c0a25b4f38cc5bf54fea62818b80439114..bbba578e48b8c7e9a3f1ec0dc0d16b817e8d1176 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -3257,6 +3257,17 @@ def conv (str):
                   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)
 #
 # - keep at most one rule per version; if several conversions should be done,