* make/stepmake.make: include toplevel-version.make after config.make.

[lilypond.git] / python / convertrules.py

diff --git a/python/convertrules.py b/python/convertrules.py
index 4d5fdf06e5655f44547fef26c10106404c0af2a8..bf0e4d1aa8435c2bbfe5f59cd646a348b9803b3c 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -1818,7 +1818,11 @@ conversions.append (((2,1,18), conv, """\\newpartcombine -> \\partcombine,
 
 
 def conv (str):
+       if re.search ('include "drumpitch', str):
+               error_file.write ("Drums found. Enclose drum notes in \\drummode")
+               
        str = re.sub (r'\\include "drumpitch-init.ly"','', str)
+       
        str = re.sub (r'\\pitchnames ','pitchnames = ', str)
        str = re.sub (r'\\chordmodifiers ','chordmodifiers = ', str)
        str = re.sub (r'\bdrums\b\s*=','drumContents = ', str)
@@ -2625,7 +2629,7 @@ def conv (str):
                      r"\\revert \1 #'\2", str)
        str = re.sub (r"([XY]-extent)-callback", r'\1', str)
        str = re.sub (r"RemoveEmptyVerticalGroup", "VerticalAxisGroup", str)
-       str = re.sub (r"\\set ([a-zA-Z]+\.)?minimumVerticalExtent",
+       str = re.sub (r"\\set ([a-zA-Z]*\.?)minimumVerticalExtent",
                      r"\\override \1VerticalAxisGroup #'minimum-Y-extent",
                      str)
        str = re.sub (r"minimumVerticalExtent",
@@ -2636,3 +2640,14 @@ def conv (str):
 
 conversions.append (((2, 7, 14), conv,
                     '''Remove callbacks property, deprecate XY-extent-callback. '''))
+
+
+def conv (str):
+       if re.search ('[XY]-offset-callbacks', str):
+               error_file.write (NOT_SMART % "[XY]-offset-callbacks")
+       if re.search ('position-callbacks', str):
+               error_file.write (NOT_SMART % "position-callbacks")
+       return str
+
+conversions.append (((2, 7, 15), conv,
+                    '''Use grob closures iso. XY-offset-callbacks.'''))