* python/convertrules.py (conv): tweaks.

* python/convertrules.py (conv): add rule for tupletNumberFormatFunction.

7 files changed, 15 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 7f92f870d3..5155c3a26e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-07-11  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+	* python/convertrules.py (conv): tweaks. 
+
 	* VERSION (PATCH_LEVEL): bump version.
 
 	* python/convertrules.py (conv): add rule for tupletNumberFormatFunction.
diff --git a/input/proportional.ly b/input/proportional.ly
index 0738aa10bb..ce7545b368 100644
--- a/input/proportional.ly
+++ b/input/proportional.ly
@@ -1,4 +1,4 @@
-\version "2.7.39"
+\version "2.9.11"
 
 \header
 {
@@ -12,7 +12,7 @@
  \context {
    \Voice
    \remove "Forbid_line_break_engraver"
-   tupletNumberFormatFunction = #fraction-tuplet-formatter
+  \override  TupletNumber #'text = #tuplet-number::calc-fraction-text
    tupletFullLength = ##t
    allowBeamBreak = ##t
  }
diff --git a/input/regression/tuplet-beam.ly b/input/regression/tuplet-beam.ly
index 20a2d12498..8e2c87b42c 100644
--- a/input/regression/tuplet-beam.ly
+++ b/input/regression/tuplet-beam.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.39"
+\version "2.9.11"
 \header {
 
   texidoc = "In combination with a beam, the bracket of the tuplet
diff --git a/input/regression/tuplet-broken.ly b/input/regression/tuplet-broken.ly
index c518496f86..da605d14bf 100644
--- a/input/regression/tuplet-broken.ly
+++ b/input/regression/tuplet-broken.ly
@@ -8,7 +8,7 @@
 
 }
 
-\version "2.7.39"
+\version "2.9.11"
 
 \paper {
   ragged-right = ##t  
@@ -17,7 +17,7 @@
 
 
 \relative c'' {
-  \set tupletNumberFormatFunction = #fraction-tuplet-formatter
+  \override TupletNumber #'text = #tuplet-number::calc-fraction-text
 
   \override TupletBracket #'edge-text = #(cons
 					  (markup #:fontsize 6
diff --git a/input/regression/tuplet-gap.ly b/input/regression/tuplet-gap.ly
index b9ca1f5891..526ae17dc0 100644
--- a/input/regression/tuplet-gap.ly
+++ b/input/regression/tuplet-gap.ly
@@ -5,7 +5,7 @@
 
 }
 
-\version "2.7.39"
+\version "2.9.11"
 
 \layout {
   indent = 0.0\mm
@@ -14,7 +14,7 @@
 
 
 \relative c'' {
-  \set tupletNumberFormatFunction = #fraction-tuplet-formatter
+  \override TupletNumber #'text = #tuplet-number::calc-fraction-text
   \times  17/12  { c8 c4 c8 c8}
 }
 
diff --git a/input/regression/tuplet-nest.ly b/input/regression/tuplet-nest.ly
index 7bbe8e817a..a314952c13 100644
--- a/input/regression/tuplet-nest.ly
+++ b/input/regression/tuplet-nest.ly
@@ -1,5 +1,5 @@
 
-\version "2.7.39"
+\version "2.9.11"
 
 \header {
     texidoc=" Tuplets may be nested."
@@ -11,7 +11,7 @@
 }
 
 \relative c'' {
-  \set tupletNumberFormatFunction = #fraction-tuplet-formatter
+  \override TupletNumber #'text = #tuplet-number::calc-fraction-text
   \times 4/6 {
     \times 2/3 {
       a a a
diff --git a/python/convertrules.py b/python/convertrules.py
index 0a2dfa969a..7ba205c498 100644
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2808,11 +2808,11 @@ conversions.append (((2, 9, 9), conv, """annotatefoo -> annotate-foo"""))
 
 
 def conv (str):
-    str = re.sub (r"""\\set ([a-zA-Z]+.?)tupletNumberFormatFunction *= *#denominator-tuplet-formatter""",
-                  r"""\\override \1TupletNumber #'text = #tuplet-number::calc-denominator-text""", str)
+    str = re.sub (r"""(\\set\s)?(?P<context>[a-zA-Z]*.?)tupletNumberFormatFunction\s*=\s*#denominator-tuplet-formatter""",
+                  r"""\\override \g<context>TupletNumber #'text = #tuplet-number::calc-denominator-text""", str)
 
-    str = re.sub (r"""\\set ([a-zA-Z]+.?)tupletNumberFormatFunction *= *#fraction-tuplet-formatter""",
-                  r"""\\override \1TupletNumber #'text = #tuplet-number::calc-fraction-text""", str)
+    str = re.sub (r"""(\\set\s+)?(?P<context>[a-zA-Z]*.?)tupletNumberFormatFunction\s*=\s*#fraction-tuplet-formatter""",
+                  r"""\\override \g<context>TupletNumber #'text = #tuplet-number::calc-fraction-text""", str)
 
     if re.search ('tupletNumberFormatFunction', str):
         error_file.write ("\n")