(FatalConversionError.func): handle + in

font-size. (backportme)

diff --git a/ChangeLog b/ChangeLog
index 368d51d1ff489f9c6ceae733b605d71e05901329..66c27657cb8e37e8009c3bde079ac90d7d799fea 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-10  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * scripts/convert-ly.py (FatalConversionError.func): handle + in
+       font-size. (backportme)
+
 2004-05-09  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
        * lily/paper-outputter.cc (output_stencil): dump font definitions

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index cc9bb0cd739f5c119759b9372245e71c86e56eff..934e52ea78f41bb9c25b5c7a6d57c38c29257aa2 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -1625,7 +1625,7 @@ def conv (str):
        def func(match):
                return "#'font-size = #%d" % (2*string.atoi (match.group (1))) 
                
-       str =re.sub (r"#'font-relative-size\s*=\s*#([0-9-]+)", func, str)
+       str =re.sub (r"#'font-relative-size\s*=\s*#\+?([0-9-]+)", func, str)
        str =re.sub (r"#'font-family\s*=\s*#'ancient",
                     r"#'font-family = #'music", str)