(FatalConversionError.subst_in_trans):

autobeamsettings conversion bug.

diff --git a/ChangeLog b/ChangeLog
index d8a0907ed55b36e0de88609cc0e0365f89a51fd1..ff1106ae30f838edd462473a34085471ede0f62e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-03-13  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * scripts/convert-ly.py (FatalConversionError.subst_in_trans):
+       autobeamsettings conversion bug.
+
        * lily/include/global-context.hh (Context): clean-up data hiding.
 
        * lily/include/music-iterator.hh (class Music_iterator): clean-up

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 8e2cf832500474a319703f5803e01a63945923ee..f436120e3ebe66391102a121574978eb0be8eab7 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -1884,9 +1884,9 @@ def conv (str):
                              r' \\revert \1', s)
                return s
        str = re.sub (r'\\(translator|with)\s*{[^}]+}',  subst_in_trans, str)
-
-       str = re.sub (r"""\\override\s*([a-zA-Z]+\s*\.\s*)?autoBeamSettings\s*#([^=]+)\s*=\s*#\(ly:make-moment\s+(\d+)\s+(\d)\s*\)""",
-                     r"""#(override-auto-beam-setting \1 \2 \3)""",
+       str = re.sub (r"""\\override\s*([a-zA-Z]+\s*\.\s*)?autoBeamSettings"""
+                     +r"""\s*#([^=]+)\s*=\s*#\(ly:make-moment\s+(\d+)\s+(\d)\s*\)""",
+                     r"""#(override-auto-beam-setting \2 \3 \4)""",
                      str)
        
        return str