Merge master into nested-bookparts

[lilypond.git] / python / convertrules.py

diff --git a/python/convertrules.py b/python/convertrules.py
index 5e6dfc23b932d5d6ea8bf5c26dc980eedeba7e3d..e94bf30e7625c5c5d6cd0863d46607805d9b13e0 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2785,12 +2785,42 @@ def conv (str):
     str = str.replace ("setHairpinDim", "dimHairpin")
     return str
 
-@rule ((2, 11, 53), "infinite-spacing-height -> extra-spacing-height, \
-#(set-octavation oct) -> \\ottava #oct")
+@rule ((2, 11, 53), "infinite-spacing-height -> extra-spacing-height")
 def conv (str):
     str = re.sub (r"infinite-spacing-height\s+=\s+##t", r"extra-spacing-height = #'(-inf.0 . +inf.0)", str)
     str = re.sub (r"infinite-spacing-height\s+=\s+##f", r"extra-spacing-height = #'(0 . 0)", str)
+    return str
+
+@rule ((2, 11, 55), "#(set-octavation oct) -> \\ottava #oct,\n\
+\\put-adjacent markup axis dir markup -> \\put-adjacent axis dir markup markup")
+def conv (str):    
     str = re.sub (r"#\(set-octavation (-*[0-9]+)\)", r"\\ottava #\1", str)
+    if re.search ('put-adjacent', str):
+       stderr_write (NOT_SMART % _ ("\\put-adjacent argument order.\n"))
+       stderr_write (_ ("Axis and direction now come before markups:\n"))
+       stderr_write (_ ("\\put-adjacent axis dir markup markup."))
+    return str
+
+@rule ((2, 11, 57), "\\center-align -> \\center-column, \\hcenter -> \\center-align")
+def conv (str):
+    str = re.sub (r"([\\:]+)center-align", r"\1center-column", str)
+    str = re.sub (r"hcenter(\s+)", r"center-align\1", str)
+    return str
+
+@rule ((2, 11, 60), "printallheaders -> print-all-headers")
+def conv (str):
+    str = re.sub (r"printallheaders", r"print-all-headers", str)
+    return str
+
+@rule ((2, 11, 61), "gregorian-init.ly -> gregorian.ly")
+def conv (str):
+    str = re.sub (r'\\include(\s+)"gregorian-init.ly"', r'\\include\1"gregorian.ly"', str)
+    return str
+
+@rule ((2, 11, 62), "makam-init.ly -> makam.ly, \\bigger -> \\larger")
+def conv (str):
+    str = re.sub (r'\\include(\s+)"makam-init.ly"', r'\\include\1"makam.ly"', str)
+    str = re.sub (r"\\bigger", r"\\larger", str)
     return str
 
 # Guidelines to write rules (please keep this at the end of this file)