From: Jürgen Reuter <j@web.de>
Date: Wed, 9 Apr 2003 19:15:48 +0000 (+0000)
Subject: 	* scm/music-types.scm: compile fix: escape braces
X-Git-Tag: release/1.7.16~6
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1e3102d407f7101df26ef30caf577425c0d0c96e;p=lilypond.git

	* scm/music-types.scm: compile fix: escape braces

	* buildscripts/mf-to-table.py: replaced \char -> \musicglyph to
	work around font selection problem
---

diff --git a/ChangeLog b/ChangeLog
index 4f0597510e..fa4873eaa9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-04-09  Juergen Reuter  <reuter@ipd.uka.de>
+
+	* scm/music-types.scm: compile fix: escape braces
+
+	* buildscripts/mf-to-table.py: replaced \char -> \musicglyph to
+	work around font selection problem
+
 2003-04-09  Mats Bengtsson  <mats.bengtsson@s3.kth.se>
 
 	* Documentation/topdocs/AUTHORS.texi (AUTHORS): Updated contact
diff --git a/buildscripts/mf-to-table.py b/buildscripts/mf-to-table.py
index 0de6e06d59..2ebb9ab290 100644
--- a/buildscripts/mf-to-table.py
+++ b/buildscripts/mf-to-table.py
@@ -160,8 +160,9 @@ def write_fontlist (file, global_info, charmetrics):
 \score{\notes{\fatText
 """)
 	for m in charmetrics:
-		escapedname=re.sub('_','\\\\\\\\_', m['name'])
-		file.write ('  s^\\markup { \\char #%d "%s" }\n' % (m['code'], escapedname))
+		escapedname=re.sub('_','\\\\_', m['name'])
+		doubleescapedname=re.sub('_','\\\\_', escapedname)
+		file.write ('  s^\\markup { \\musicglyph #"%s" "%s" }\n' % (escapedname, doubleescapedname))
 	file.write (r"""
 }
   \paper{
diff --git a/scm/music-types.scm b/scm/music-types.scm
index 8247d6ff6e..301e5de19c 100644
--- a/scm/music-types.scm
+++ b/scm/music-types.scm
@@ -235,7 +235,7 @@ e.g. @code{\\mark \"A\"}.")
     (MultiMeasureTextEvent
      . (
 	(description . "Texts on mm rests. Syntax
-@code{R-\\markup { \\roman \"bla\"}. Note the explicit font switch.")
+@code{R-\\markup @{ \\roman \"bla\" @}}. Note the explicit font switch.")
 	(internal-class-name . "Event")
 	(types . (general-music event multi-measure-text-event))
 	))