X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=python%2Fconvertrules.py;h=7ba205c49891dcfe3826c11a1948f11e8c420734;hb=1bcba0490ef7ad8671d221844b16b95da22ce9a0;hp=3bc19ef5f8d8eaa1be93e404c77e04dd89497e90;hpb=b75e9d10bb64ae5d0206680275aaa9c7637abfc3;p=lilypond.git

diff --git a/python/convertrules.py b/python/convertrules.py
index 3bc19ef5f8..7ba205c498 100644
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2680,6 +2680,7 @@ conversions.append (((2, 7, 28), conv,
 
 def conv (str):
     for a in ['beamed-lengths', 'beamed-minimum-free-lengths',
+              'lengths',
 	      'beamed-extreme-minimum-free-lengths']:
 	str = re.sub (r"\\override\s+Stem\s+#'%s" % a,
 		      r"\\override Stem #'details #'%s" % a,
@@ -2789,3 +2790,37 @@ def conv (str):
     return str
 
 conversions.append (((2, 9, 4), conv, """(page-)penalty -> (page-)break-penalty"""))
+
+def conv (str):
+    str = re.sub (r'\\context\s+\"?([a-zA-Z]+)\"?\s*\\applyOutput', r"\\applyOutput #'\1", str)
+    return str
+
+conversions.append (((2, 9, 6), conv, """\context Foo \applyOutput #bla -> \applyOutput #'Foo #bla """))
+
+
+def conv (str):
+    str = re.sub ('annotatepage', 'annotate-page', str)
+    str = re.sub ('annotateheaders', 'annotate-headers', str)
+    str = re.sub ('annotatesystems', 'annotate-systems', str)
+    return str
+
+conversions.append (((2, 9, 9), conv, """annotatefoo -> annotate-foo"""))
+
+
+def conv (str):
+    str = re.sub (r"""(\\set\s)?(?P<context>[a-zA-Z]*.?)tupletNumberFormatFunction\s*=\s*#denominator-tuplet-formatter""",
+                  r"""\\override \g<context>TupletNumber #'text = #tuplet-number::calc-denominator-text""", str)
+
+    str = re.sub (r"""(\\set\s+)?(?P<context>[a-zA-Z]*.?)tupletNumberFormatFunction\s*=\s*#fraction-tuplet-formatter""",
+                  r"""\\override \g<context>TupletNumber #'text = #tuplet-number::calc-fraction-text""", str)
+
+    if re.search ('tupletNumberFormatFunction', str):
+        error_file.write ("\n")
+	error_file.write ("tupletNumberFormatFunction has been removed. Use #'text property on TupletNumber")
+        error_file.write ("\n")
+        
+    return str
+
+conversions.append (((2, 9, 11), conv, """\\set tupletNumberFormatFunction -> \\override #'text = """))
+
+