X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=python%2Fconvertrules.py;h=c992476dc1bfb4d9a7daa4068b220037d19b2712;hb=3f064aed93e63be2f8cb3eabe74f2c998edda380;hp=3f10e386fb1f973ee98d368882bc946b40546efd;hpb=715153c6137c0a16a1e08ffe03e6937f03c1bf3f;p=lilypond.git

diff --git a/python/convertrules.py b/python/convertrules.py
index 3f10e386fb..c992476dc1 100644
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2632,7 +2632,10 @@ def conv (str):
     str = re.sub (r"minimumVerticalExtent",
 		  r"\\override VerticalAxisGroup #'minimum-Y-extent",
 		  str)
-
+    str = re.sub (r"\\set ([a-zA-Z]*\.?)extraVerticalExtent",
+		  r"\\override \1VerticalAxisGroup #'extra-Y-extent")
+    str = re.sub (r"\\set ([a-zA-Z]*\.?)verticalExtent",
+		  r"\\override \1VerticalAxisGroup #'Y-extent")
     return str
 
 conversions.append (((2, 7, 14), conv,
@@ -2834,8 +2837,8 @@ conversions.append (((2, 9, 13), conv, """instrument -> instrumentName, instr ->
 
 
 def conv (str):
-    m = re.search (r'\\tempo ([0-9]+)\s*([.]*)\s*=\s*([0-9]+)', str)
-    if m and re.search (r'\\midi', str):
+
+    def sub_tempo (m):
         dur = int (m.group (1))
         dots = len (m.group (2))
         count = int (m.group (3))
@@ -2848,10 +2851,7 @@ def conv (str):
         den = (1 << dots) * (1 << log2)
         num = ((1 << (dots+1))  - 1)
 
-        error_file.write (r"""
-
-\tempo in \midi is no longer supported. Use
-
+        return  """
   \midi {
     \context {
       \Score
@@ -2859,9 +2859,16 @@ def conv (str):
       }
     }
 
-""" % (num*count, den))
-        
+""" % (num*count, den)
+    
+    str = re.sub (r'\\midi\s*{\s*\\tempo ([0-9]+)\s*([.]*)\s*=\s*([0-9]+)\s*}', sub_tempo, str)
     return str
 
 conversions.append (((2, 9, 16), conv, """deprecate \\tempo in \\midi"""))
 
+def conv (str):
+    str = re.sub ('printfirst-page-number', 'print-first-page-number', str)
+    return str
+
+conversions.append (((2, 9, 19), conv, """printfirst-page-number -> print-first-page-number"""))
+