Merge branch 'master' into lilypond/translation

[lilypond.git] / python / convertrules.py

diff --git a/python/convertrules.py b/python/convertrules.py
index 3eb3e6427774cc9855a3aa57e096b77c507ee36e..6c379dae9ec203cac3745fc80f0e240991bbaf60 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2820,7 +2820,7 @@ def conv (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)
+    str = re.sub (r"([\\:])bigger", r"\1larger", str)
     return str
 
 @rule ((2, 11, 64), "systemSeparatorMarkup -> system-separator-markup,\n\
@@ -2844,21 +2844,26 @@ def conv (str):
         str = re.sub ('InnerChoirStaff', 'ChoirStaff', str)
     return str
 
+@rule ((2, 11, 66), "Syntax changes for \\addChordShape and \\chord-shape")
 def conv(str):
     if re.search(r'\\addChordShape', str):
         stderr_write ("\n")
         stderr_write (NOT_SMART % _("stringTuning must be added to \
-        addChordShape call.\n"))
+addChordShape call.\n"))
         stderr_write (UPDATE_MANUALLY)
         raise FatalConversionError ()
-    if re.search(r'\\chord-shape', str):
+    if re.search (r'\\chord-shape', str):
         stderr_write ("\n")
         stderr_write (NOT_SMART % _("stringTuning must be added to \
-        chord-shape call.\n"))
+chord-shape call.\n"))
         stderr_write (UPDATE_MANUALLY)
         raise FatalConversionError ()
     return str
 
+@rule ((2, 12, 0), _ ("bump version for release"))
+def conv (str):
+    return str
+
 # Guidelines to write rules (please keep this at the end of this file)
 #
 # - keep at most one rule per version; if several conversions should be done,