From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 9 Apr 2004 09:32:04 +0000 (+0000)
Subject: backport of #'(markup).
X-Git-Tag: release/2.2.1~4
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=409ae351c43d908538d2a273b971b00f486ec283;p=lilypond.git

backport of #'(markup).
---

diff --git a/ChangeLog b/ChangeLog
index f57c343f32..5b52ae03ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-09  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+	* scripts/convert-ly.py: backport of #'(markup).
+
 2004-04-01  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
 	* VERSION (PACKAGE_NAME): release 2.2.0
diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 4272e0fb65..9c8f35f254 100644
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -148,7 +148,7 @@ if 1:					# need new a namespace
 		return str
 
 	conversions.append ((
-		((0,1,20), conv, 'deprecated \\textstyle, new \key syntax')))
+		((0,1,20), conv, 'deprecated \\textstyle, new \\key syntax')))
 
 
 if 1:
@@ -402,7 +402,7 @@ if 1:
 		return str
 
 	conversions.append (((1,3,4), conv,
-                '\\cadenza -> \cadenza{On|Off}'))
+                '\\cadenza -> \\cadenza{On|Off}'))
 
 if 1:
 	def conv (str):
@@ -1406,6 +1406,17 @@ if 1:
 		str = re.sub (r'@ACCENT@', '>', str)
 		return str
 
+	def text_markup (str):
+		str = re.sub (r"""([-_^]) *# *' *\( *music *(\"[^"]*\") *\)""",
+				r"\1\\markup { \\musicglyph #\2 }", str)
+		str = re.sub (r"""([-_^]) *# *' *\( *([a-z]+) *([^()]*)\)""",
+				r"\1\\markup { \\\2 \3 }", str)
+		str = re.sub (r"""\\mark *# *' *\( *music *(\"[^"]*\") *\)""",
+				r"\\mark \\markup { \\musicglyph #\1 }", str)
+		str = re.sub (r"""\\mark *# *' *\( *([a-z]+) *([^()]*)\)""",
+				r"\\mark \\markup { \\\1 \2 }", str)
+		return str	
+
 	def articulation_substitute (str):
 		str = re.sub (r"""([^-])\[ *([a-z]+[,']*[!?]?[0-9:]*\.*)""",
 			      r"\1 \2[", str)
@@ -1428,13 +1439,14 @@ if 1:
 		str =  conv_relative (str)
 		str = sub_chords (str)
 
+		str = text_markup (str)
 		str = articulation_substitute (str)
 		str = re.sub ("@SCM_EOL@", "#'()", str)
 		
 		return str
 	
 	conversions.append (((1,9,0), conv, """New relative mode,
-Postfix articulations, new chord syntax."""))
+Postfix articulations, new text markup syntax, new chord syntax."""))
 
 if 1:
 	def conv (str):