From: John Mandereau <john.mandereau@gmail.com>
Date: Sun, 28 Dec 2008 15:05:59 +0000 (+0100)
Subject: Merge 2.11.66 conversion rule into 2.12.0
X-Git-Tag: release/2.12.1-1~22
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1dbeded5626ac18a0e3ca98c0ed9aaeef4e5c4d0;p=lilypond.git

Merge 2.11.66 conversion rule into 2.12.0
---

diff --git a/python/convertrules.py b/python/convertrules.py
index 6c379dae9e..8aa8d29553 100644
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2844,7 +2844,9 @@ def conv (str):
         str = re.sub ('InnerChoirStaff', 'ChoirStaff', str)
     return str
 
-@rule ((2, 11, 66), "Syntax changes for \\addChordShape and \\chord-shape")
+@rule ((2, 12, 0),
+       _ ("Syntax changes for \\addChordShape and \\chord-shape") + "\n" + \
+       _ ("bump version for release"))
 def conv(str):
     if re.search(r'\\addChordShape', str):
         stderr_write ("\n")
@@ -2860,10 +2862,6 @@ chord-shape call.\n"))
         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,