* mf/feta-bolletjes.mf (solfa_quarter_width): use

[lilypond.git] / python / convertrules.py

diff --git a/python/convertrules.py b/python/convertrules.py
index 3f10e386fb1f973ee98d368882bc946b40546efd..40a8300e730d252f19c75d14533443346581145e 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2834,8 +2834,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 +2848,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 +2856,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"""))
+