Merge commit 'origin'

[lilypond.git] / python / convertrules.py

diff --git a/python/convertrules.py b/python/convertrules.py
index 31d756f0e4cb2efd1ae737ff59290b4f6dfc95c6..66c083599ddbb675e9ebfadc370b4b388c97db59 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -3045,6 +3045,14 @@ def conv (str):
                   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"""))