X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=python%2Fconvertrules.py;h=60fb1740fd58826582b775ea6b8280b50e2791b8;hb=446dc1f3ac9bfff6bfee31de929698b0425da6fe;hp=acabe0237e452869b4648caf98180af7c8ace815;hpb=c924aab690820bb69bec043608b4a7b46023bafb;p=lilypond.git

diff --git a/python/convertrules.py b/python/convertrules.py
index acabe0237e..60fb1740fd 100644
--- 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,15 +3355,17 @@ 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
 
 # Guidelines to write rules (please keep this at the end of this file)