* 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 4f0597510e63672569eb4b6fb5fcc85a60dac099..fa4873eaa9543a20a04a582b1ea94f2dbbc77026 100644 (file)
--- 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 0de6e06d59225795a34327b56c611e674ac66ff6..2ebb9ab290e22358a7b323500f70a927c4839181 100644 (file)
--- 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 8247d6ff6e3a770b481d177665e97f5f6a667ec3..301e5de19c5509cd9337bd373c127af986e4eab4 100644 (file)
--- 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))
        ))