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

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

diff --git a/ChangeLog b/ChangeLog
index 7f92f870d33c7ef3ccb8eacdcfd21c9c463e2abf..5155c3a26ea6e3ceafdaf2eedfecd9a3ae82ef55 100644 (file)
--- 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 0738aa10bb09c1673e498dbb79ae86f65d51b683..ce7545b368226ffaf5572f6fbd4b9d62975444ca 100644 (file)
--- 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 20a2d12498bbd092a7f9fdceff62c31c57ab7d21..8e2c87b42c422d72fd7be0862c0ee43380bd783d 100644 (file)
--- 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 c518496f865473062218dd7cef2053db25b37a1b..da605d14bfdf59dc1960e179c40130b6d053b53b 100644 (file)
--- 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 b9ca1f589190830aab295600bcafb9876735ece3..526ae17dc0f6bdd3d8e0ff612ce6ae3184c6ba7b 100644 (file)
--- 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 7bbe8e817af0e57bc6061107411d3dd19076f2c0..a314952c13f03949b001d408ba73b3a01e9dc665 100644 (file)
--- 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 0a2dfa969ae449415770ed510eaa9329d5e652fa..7ba205c49891dcfe3826c11a1948f11e8c420734 100644 (file)
--- 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")