Merge branch 'translation' into 'master'

[lilypond.git] / python / convertrules.py

diff --git a/python/convertrules.py b/python/convertrules.py
index d00a411c6eb7d2b97bb8d54213f2eaccb912a619..8c472a63e03d487775fc8f6673b9e60a5e43c64f 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -3667,7 +3667,7 @@ def conv(str):
 def conv(str):
     str = re.sub (r"\\stringTuning\s*\\notemode(\s*)@?\{\s*(.*?)\s*@?}",
                   r"\\stringTuning\1\2", str)
-    if re.search (r'\bstaff-padding\b', str):
+    if re.search (r'[^-\w]staff-padding[^-\w]', str):
         stderr_write (NOT_SMART % "staff-padding")
         stderr_write (_ ("Staff-padding now controls the distance to the baseline, not the nearest point."))
     return str
@@ -3683,40 +3683,17 @@ def conv(str):
     str = re.sub ("New_dynamic_engraver", "Dynamic_engraver", str)
     return str
 
-@rule((2, 17, 30), r'''\override/\tweak transparent -> \hide
-\override/\tweak stencil -> \omit''')
-def conv(str):
-# Only use \undo \hide for properties that also use \hide in the same
-# file.  The same is later done for \undo \omit.
-    matches = {}
-    def subst(m):
-        matches [m.group (2)]=True
-        return r"\hide" + m.group (1)
-    str = re.sub (r"\\override(\s*([A-Za-z.]*))\.transparent\s*=\s*##t",
-                  subst, str)
-    def subst(m):
-        if m.group (2) in matches:
-            return r"\undo \hide" + m.group (1)
-        return m.group ()        
-    str = re.sub (r"\\revert(\s*([A-Za-z.]*))\.transparent",
-                  subst, str)
-    matches = {}
-    def subst(m):
-        matches [m.group (2)]=True
-        return r"\omit" + m.group (1)
-    str = re.sub (r"\\override(\s*([A-Za-z.]*))\.stencil\s*=\s*##f",
-                  subst, str)
-    def subst(m):
-        if m.group (2) in matches:
-            return r"\undo \omit" + m.group (1)
-        return m.group ()        
-    str = re.sub (r"\\revert(\s*([A-Za-z.]*))\.stencil",
-                  subst, str)
-
-    str = re.sub (r"\\tweak(\s+|\s*#')transparent\s*##t",r"\\hide", str)
-    str = re.sub (r"\\tweak(\s+|\s*#')stencil\s*##f",r"\\omit", str)
+@rule ((2, 19, 0), r'''(make-relative (a b) b ...) -> make-relative (a b) #{ a b #}...''')
+def conv (str):
+    str = re.sub (r"(\(make-relative\s+\(\s*(([A-Za-z][-_A-Za-z0-9]*)" +
+                  r"(?:\s+[A-Za-z][-_A-Za-z0-9]*)*)\s*\)\s*)\3(?=\s)",
+                  r"\1(make-event-chord (list \2))", str)
+    str = re.sub (r"(\(make-relative\s+\(\s*([A-Za-z][-_A-Za-z0-9]*" +
+                  r"(?:\s+([A-Za-z][-_A-Za-z0-9]*))+)\s*\)\s*)\3(?=\s)",
+                  r"\1(make-sequential-music (list \2))", 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,