From 260fc5333d7386daf6ebd93821c9fcbbd9a0d3fa Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sat, 22 Mar 2003 00:34:28 +0000
Subject: [PATCH] (make_lilypond_file): convert lilypond-file to lilypond block
 directly, without going through begin/end lilypond text.

---
 ChangeLog                   |  6 ++++++
 buildscripts/mf-to-table.py |  2 +-
 scripts/lilypond-book.py    | 24 +++++++-----------------
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7aa98f67d9..4206a6986f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-03-22  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+	* scripts/lilypond-book.py (make_lilypond_file): convert
+	lilypond-file to lilypond block directly, without going through
+	begin/end lilypond text.
+	
 
 2003-03-21  Juergen Reuter  <reuter@ipd.uka.de>
 
diff --git a/buildscripts/mf-to-table.py b/buildscripts/mf-to-table.py
index d11bb5ce90..0de6e06d59 100644
--- a/buildscripts/mf-to-table.py
+++ b/buildscripts/mf-to-table.py
@@ -161,7 +161,7 @@ def write_fontlist (file, global_info, charmetrics):
 """)
 	for m in charmetrics:
 		escapedname=re.sub('_','\\\\\\\\_', m['name'])
-		file.write ('s^\\markup { \\musicglyph #"%s" "%s" }\n' % (m['name'], escapedname))
+		file.write ('  s^\\markup { \\char #%d "%s" }\n' % (m['code'], escapedname))
 	file.write (r"""
 }
   \paper{
diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 3cc1fe3495..362df5df45 100644
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -341,9 +341,6 @@ output_dict= {
 
 	'html' : {
 
-		'output-lilypond': '''<lilypond%s>
-%s
-</lilypond>''',
 		'output-filename' : r'''
 <!-- %s >
 <a href="%s">
@@ -388,10 +385,7 @@ output_dict= {
 %% %s
 %% %s
 ''',
-		'output-lilypond': r'''\begin[%s]{lilypond}
-%s
-\end{lilypond}
-''',
+
 		# verbatim text is always finished with \n
 		'output-verbatim': r'''\begin{verbatim}
 %s\end{verbatim}
@@ -420,10 +414,7 @@ output_dict= {
 
 	'texi' : {
 
-		'output-lilypond': '''@lilypond[%s]
-%s
-@end lilypond
-''',
+
 		'output-filename' : r'''@ifnothtml
 @file{%s}:@*
 @end ifnothtml
@@ -567,7 +558,7 @@ re_dict = {
 		'verb': r'''(?P<code>@code{.*?})''',
 		'lilypond-file': '(?m)^(?P<match>@lilypondfile(\[(?P<options>[^]]*)\])?{(?P<filename>[^}]+)})',
 		'lilypond' : '(?m)^(?P<match>@lilypond(\[(?P<options>[^]]*)\])?{(?P<code>.*?)})',
-		'lilypond-block': r'''(?ms)^(?P<match>@lilypond(\[(?P<options>[^]]*)\])?\s(?P<code>.*?)@end +lilypond)\s''',
+		'lilypond-block': r'''(?ms)^(?P<match>@lilypond(\[(?P<options>[^]]*)\])?\s(?P<code>.*?)@end lilypond)\s''',
 		'option-sep' : ',\s*',
 		'intertext': r',?\s*intertext=\".*?\"',
 		'multiline-comment': r"(?sm)^\s*(?!@c\s+)(?P<code>@ignore\s.*?@end ignore)\s",
@@ -897,14 +888,13 @@ def make_lilypond_file (m):
 	'''
 
 	if m.group ('options'):
-		options = m.group ('options')
+		options = get_re ('option-sep').split (m.group ('options'))
 	else:
-		options = ''
+		options = []
 	(content, nm) = find_file (m.group ('filename'))
-	options = "filename=%s," % nm + options
+	options.append ("filename=%s" % nm)
 
-	return [('input', get_output ('output-lilypond') %
-			(options, content))]
+	return [('lilypond', content, options)]
 
 def make_ly2dvi_block (m):
 	'''
-- 
2.39.5