Merge commit 'origin' into beaming

[lilypond.git] / python / convertrules.py

diff --git a/python/convertrules.py b/python/convertrules.py
index 22ed07ad6072fac7c4d164ca80813fef6bc13c91..66c083599ddbb675e9ebfadc370b4b388c97db59 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -3033,3 +3033,26 @@ def conv (str):
 
 conversions.append (((2, 11, 38), conv, """\\setEasyHeads -> \\easyHeadsOn, \\fatText -> \\textLengthOn,
 \\emptyText -> \\textLengthOff"""))
+
+def conv (str):
+    str = re.sub (r"\\set\s+([a-zA-Z]+)\s*.\s*hairpinToBarline\s*=\s*##([tf]+)",
+                  r"\\override \1.Hairpin #'to-barline = ##\2", str)
+    str = re.sub (r"\\set\s+hairpinToBarline\s*=\s*##([tf]+)",
+                  r"\\override Hairpin #'to-barline = ##\1", str)
+    str = re.sub (r"\\unset\s+([a-zA-Z]+)\s*.\s*hairpinToBarline",
+                  r"\\revert \1.Hairpin #'to-barline", str)
+    str = re.sub (r"\\unset\s+hairpinToBarline",
+                  r"\\revert Hairpin #'to-barline", str)
+    str = re.sub (r"hairpinToBarline\s*=\s*##([tf]+)",
+                  r"\\override Hairpin #'to-barline = ##\1", str)
+    str = re.sub (r"\\set (de)?crescendoSpanner = #'dashed-line",
+                  r"\\set \1crescendoSpanner = #'text", str)
+    return str
+
+conversions.append (((2, 11, 46), conv, """\\set hairpinToBarline -> \\override Hairpin #'to-barline"""))
+
+def conv (str):
+    str = re.sub (r"compressMusic", r"scaleDurations", str)
+    return str
+
+conversions.append (((2, 11, 48), conv, """\\compressMusic -> \\scaleDurations"""))