* 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 f04577e8a49052af9a2b5d81864956c13a14dba2..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)
@@ -2249,8 +2253,8 @@ def conv (str):
        return str
 
 conversions.append (((2, 3, 16), conv,
-                    '''\foo -> \foomode (for chords, notes, etc.)
-fold \new FooContext \foomode into \foo.'''))
+                    '''\\foo -> \\foomode (for chords, notes, etc.)
+fold \\new FooContext \\foomode into \\foo.'''))
 
 def conv (str):
        str = re.sub (r'(slur|stem|phrasingSlur|tie|dynamic|dots|tuplet|arpeggio|)Both', r'\1Neutral', str)
@@ -2259,8 +2263,8 @@ def conv (str):
        return str
 
 conversions.append (((2, 3, 17), conv,
-                    '''\foo -> \foomode (for chords, notes, etc.)
-fold \new FooContext \foomode into \foo.'''))
+                    '''\\foo -> \\foomode (for chords, notes, etc.)
+fold \\new FooContext \\foomode into \\foo.'''))
 
 
 def conv (str):
@@ -2566,3 +2570,84 @@ def conv (str):
 
 conversions.append (((2, 7, 10), conv,
                     '''\\applyxxx -> \\applyXxx'''))
+
+
+
+def conv (str):
+       str = re.sub(r'\"tabloid\"', '"11x17"', str)
+       return str
+
+conversions.append (((2, 7, 11), conv,
+                    '''\"tabloid\" -> \"11x17\"'''))
+
+def conv (str):
+       str = re.sub(r'outputProperty' , 'overrideProperty', str)
+       return str
+
+conversions.append (((2, 7, 12), conv,
+                    '''outputProperty -> overrideProperty'''))
+
+
+def conv (str):
+       def subber (match):
+               newkey = {'spacing-procedure': 'springs-and-rods',
+                         'after-line-breaking-callback' : 'after-line-breaking',
+                         'before-line-breaking-callback' : 'before-line-breaking',
+                         'print-function' : 'stencil'} [match.group(3)]
+               what = match.group (1)
+               grob = match.group (2)
+
+               if what == 'revert':
+                       return "revert %s #'callbacks %% %s\n" % (grob, newkey)
+               elif what == 'override':
+                       return "override %s #'callbacks #'%s" % (grob, newkey)
+               else:
+                       raise 'urg'
+                       return ''
+               
+       str = re.sub(r"(override|revert)\s*([a-zA-Z.]+)\s*#'(spacing-procedure|after-line-breaking-callback"
+                   + r"|before-line-breaking-callback|print-function)",
+                   subber, str)
+
+       if re.search ('bar-size-procedure', str):
+               error_file.write (NOT_SMART % "bar-size-procedure")
+       if re.search ('space-function', str):
+               error_file.write (NOT_SMART % "space-function")
+       if re.search ('verticalAlignmentChildCallback', str):
+               error_file.write ('verticalAlignmentChildCallback has been deprecated') 
+       return str
+
+conversions.append (((2, 7, 13), conv,
+                    '''layout engine refactoring. [FIXME] '''))
+
+
+
+def conv (str):
+       str = re.sub (r"\\override +([A-Z.a-z]+) #'callbacks",
+                     r"\\override \1", str)
+       str = re.sub (r"\\revert ([A-Z.a-z]+) #'callbacks % ([a-zA-Z]+)",
+                     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",
+                     r"\\override \1VerticalAxisGroup #'minimum-Y-extent",
+                     str)
+       str = re.sub (r"minimumVerticalExtent",
+                     r"\\override VerticalAxisGroup #'minimum-Y-extent",
+                     str)
+       
+       return 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.'''))