*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 7cbdc3b67e4326a987dae6f9afdf24b67fd3563d..ee5560aad5c5e21164e64747db6e68636106948e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-08  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * scripts/convert-ly.py (lilypond_version_re_str): Move from
+       convertrules.  Add explicit grouping, needed for python2.2.
+
 2006-02-07  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * Documentation/topdocs/NEWS.tely (Top): Mention code cleanup.

diff --git a/python/convertrules.py b/python/convertrules.py
index f35a782ed935b4a3bb167e66154ad85eca25dd08..289cd92681ac1f6202d00788de749188ba1d0691 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -15,13 +15,7 @@ class FatalConversionError:
        pass
 
 conversions = []
-
 error_file = sys.stderr 
-lilypond_version_re_str = '\\\\version *\"[0-9.]+"'
-lilypond_version_re = re.compile (lilypond_version_re_str)
-
-
-
 
 def conv(str):
        if re.search ('\\\\multi', str):

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 63814ac985e363b9deb3ce0e263b890391990e38..b9cac64f59b6140baae5866c94f323f42561da29 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -36,6 +36,9 @@ global re;re = ly.re
 
 from convertrules import *
 
+lilypond_version_re_str = '\\\\version *\"([0-9.]+)"'
+lilypond_version_re = re.compile (lilypond_version_re_str)
+
 
 help_summary = _ (
 '''Update LilyPond input to newer version.  By default, update from the