X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=python%2Fbook_html.py;h=ac70b743a0e3a91727f3ee099b5026056b028bbb;hb=ad8cfeebea0960375c9c30f1babd69f0bed1f3cf;hp=d5eb6dfede52aa48a558a150cfa7a7c9bbe7f496;hpb=d4a36739fbf2b85e3a6c85fdf76b482b8c07b656;p=lilypond.git
diff --git a/python/book_html.py b/python/book_html.py
index d5eb6dfede..ac70b743a0 100644
--- a/python/book_html.py
+++ b/python/book_html.py
@@ -40,6 +40,13 @@ HTML_snippet_res = {
'multiline_comment':
r'''(?smx)(?P)\s)''',
+ 'musicxml_file':
+ r'''(?mx)
+ (?P
.*?
))''',
@@ -62,7 +69,7 @@ HTML_output = {
- ''',
+ ''',
OUTPUT: r'''
''',
- PRINTFILENAME: '',
+ PRINTFILENAME: '',
QUOTE: r'''
%(str)s
@@ -101,7 +108,7 @@ class BookHTMLOutputFormat (BookBase.BookOutputFormat):
def split_snippet_options (self, option_string):
if option_string:
- options = re.findall('[\w\.-:]+(?:\s*=\s*(?:"[^"]*"|\'[^\']*\'|\S+))?',
+ options = re.findall('[-\w\.-:]+(?:\s*=\s*(?:"[^"]*"|\'[^\']*\'|\S+))?',
option_string)
options = [re.sub('^([^=]+=\s*)(?P
["\'])(.*)(?P=q)', '\g<1>\g<3>', opt)
for opt in options]
@@ -118,12 +125,14 @@ class BookHTMLOutputFormat (BookBase.BookOutputFormat):
str = ''
rep = snippet.get_replacements ();
rep['base'] = basename
+ rep['filename'] = os.path.basename (snippet.filename)
+ rep['ext'] = snippet.ext
str += self.output_print_filename (basename, snippet)
if VERBATIM in snippet.option_dict:
rep['verb'] = BookBase.verbatim_html (snippet.verb_ly ())
str += self.output[VERBATIM] % rep
if QUOTE in snippet.option_dict:
- str = self.output[QUOTE] % rep
+ str = self.output[QUOTE] % {'str': str}
str += self.output[BEFORE] % rep
for image in snippet.get_images ():