Release: update news.

[lilypond.git] / python / convertrules.py

diff --git a/python/convertrules.py b/python/convertrules.py
index acabe0237e452869b4648caf98180af7c8ace815..78512310c30c35d6bd9513852423a3f14858fc18 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -3346,7 +3346,7 @@ def conv (str):
                   sub_tempo, str)
     return str
 
-@rule((2, 15, 39), r"\footnote -> <>\footnote, -\footnote -> \footnote")
+@rule((2, 15, 39), r"\footnote ... -> \footnote ... \default")
 def conv (str):
     def not_first (s):
         def match_fun (m):
@@ -3355,17 +3355,37 @@ def conv (str):
             return m.expand (s)
         return match_fun
     str = re.sub ("(" + matchmarkup + ")|"
-                  + r"(?<![-_^])((?:[-_^][-_^])*)(\\footnote(?:\s*"
+                  + r"(\\footnote(?:\s*"
                   + matchmarkup + ")?" + matcharg + "(?:" + matcharg
                   + ")?\s+" + matchmarkup + ")",
-                  not_first (r"\2<>\3"), str)
-    str = re.sub ("(" + matchmarkup + ")|"
-                  + r"(?<![-_^])((?:[-_^][-_^])*)-(\\footnote(?:\s*"
-                  + matchmarkup + ")?" + matcharg + "(?:" + matcharg
-                  + ")?\s+" + matchmarkup + ")",
-                  not_first (r"\2\3"), str)
+                  not_first (r"\2 \\default"), str)
+    return str
+
+@rule ((2, 15, 40), r"Remove beamWholeMeasure")
+def conv (str):
+    if re.search (r"\bbeamWholeMeasure\b", str):
+        stderr_write (NOT_SMART % "beamWholeMeasure")
+        stderr_write (_ ("beamExceptions controls whole-measure beaming.") + "\n")
+    return str
+
+@rule ((2, 15, 42), r"\set stringTuning -> \set Staff.stringTuning")
+def conv (str):
+    str = re.sub (r"(\\set\s+)stringTuning", r"\1Staff.stringTuning", str)
     return str
 
+wordsyntax = r"[a-zA-Z\200-\377](?:[-_]?[a-zA-Z\200-\377])*"
+
+@rule ((2, 15, 43), r'"custom-tuning" = -> custom-tuning =')
+def conv (str):
+    str = re.sub ('\n"(' + wordsyntax + r')"(\s*=\s*\\stringTuning)', "\n\\1\\2", str)
+    return str
+
+@rule ((2, 16, 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,