Merge remote branch 'origin' into release/unstable

[lilypond.git] / python / convertrules.py

diff --git a/python/convertrules.py b/python/convertrules.py
index fc35924b66cdb1cc570d55db8a9aa9fccb3bc942..749e8624b6e9101e2fab5c4750139668008d2475 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -3013,6 +3013,12 @@ def conv (str):
     str = re.sub (r'\\(cresc|dim|endcresc|enddim)\b', r'\\deprecated\1', str)
     return str
 
+@rule ((2, 13, 27),
+       ("interval-translate -> coord-translate"))
+def conv (str):
+    str = re.sub ('interval-translate', 'coord-translate', str)
+    return str
+
 @rule ((2, 13, 29),
        _ ("Eliminate beamSettings, beatLength, \\setBeatGrouping, \\overrideBeamSettings and \\revertBeamSettings.\n\
 \"accordion.accEtcbase\" -> \"accordion.etcbass\""))
@@ -3207,14 +3213,6 @@ def conv(str):
 def conv (str):
     return str
 
-@rule ((2, 15, 2),
-       _ ("Change in internal property for MultiMeasureRest"))
-def conv (str):
-    if re.search (r'use-breve-rest',str):
-        stderr_write (NOT_SMART % _("use-breve-rest.  This internal property has been replaced by round-to-longer-rest and usable-duration-logs.\n"))
-        stderr_write (UPDATE_MANUALLY)
-    return str
-
 @rule ((2, 15, 7),
     _ ("Handling of non-automatic footnotes."))
 def conv(str):
@@ -3224,6 +3222,28 @@ def conv(str):
         stderr_write (UPDATE_MANUALLY)
     return str
 
+@rule ((2, 15, 9),
+       _ ("Change in internal property for MultiMeasureRest"))
+def conv (str):
+    if re.search (r'use-breve-rest',str):
+        stderr_write ("\n")
+        stderr_write (NOT_SMART % "use-breve-rest.\n")
+        stderr_write (_ ("This internal property has been replaced by round-up-to-longer-rest, round-up-exceptions and usable-duration-logs.\n"))
+        stderr_write (UPDATE_MANUALLY)
+    return str
+
+@rule ((2, 15, 10),
+       _ ("Creation of a Flag grob and moving of certain Stem properties to this grob"))
+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"(\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
+
 
 # Guidelines to write rules (please keep this at the end of this file)
 #