Merge branch 'cvs-head' of ssh+git://hanwen@repo.or.cz/srv/git/lilypond into master...

[lilypond.git] / python / convertrules.py

diff --git a/python/convertrules.py b/python/convertrules.py
index c4f2bb18f5e2e0b8d7bb640d7f9fa82eaaa12cdc..c992476dc1bfb4d9a7daa4068b220037d19b2712 100644 (file)
--- 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,
@@ -2832,3 +2835,40 @@ def conv (str):
 
 conversions.append (((2, 9, 13), conv, """instrument -> instrumentName, instr -> shortInstrumentName, vocNam -> shortVocalName"""))
 
+
+def conv (str):
+
+    def sub_tempo (m):
+        dur = int (m.group (1))
+        dots = len (m.group (2))
+        count = int (m.group (3))
+
+        log2 = 0
+        while dur > 1 :
+            dur /= 2
+            log2 += 1
+        
+        den = (1 << dots) * (1 << log2)
+        num = ((1 << (dots+1))  - 1)
+
+        return  """
+  \midi {
+    \context {
+      \Score
+      tempoWholesPerMinute = #(ly:make-moment %d %d)
+      }
+    }
+
+""" % (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"""))
+