From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 10 May 2004 19:00:20 +0000 (+0000)
Subject: (FatalConversionError.func): handle + in
X-Git-Tag: release/2.3.2~21
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4d9ecc057e42df13d78c7b0e4bb5f8a23c16f9f2;p=lilypond.git

(FatalConversionError.func): handle + in
font-size. (backportme)
---

diff --git a/ChangeLog b/ChangeLog
index 368d51d1ff..66c27657cb 100644
--- 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 cc9bb0cd73..934e52ea78 100644
--- 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)