Merge branch 'master' into lilypond/translation

[lilypond.git] / python / book_texinfo.py

diff --git a/python/book_texinfo.py b/python/book_texinfo.py
index 03f723754a43619cf055d82d9f89601ffeda3356..6bda07a3f8f890603df077ae905fe055ef436a80 100644 (file)
--- a/python/book_texinfo.py
+++ b/python/book_texinfo.py
@@ -58,6 +58,15 @@ TexInfo_snippet_res = {
             .*?
            @end\s+ignore))\s''',
 
+    'musicxml_file': r'''(?mx)
+          ^(?P<match>
+          @musicxmlfile\s*(
+          \[
+           \s*(?P<options>.*?)\s*
+          \])?\s*{
+           (?P<filename>\S+)
+          })''',
+
     'singleline_comment': r'''(?mx)
           ^.*
           (?P<match>
@@ -103,7 +112,7 @@ TexInfo_output = {
 @end ifinfo
 @html
 <p>
- <a href="%(base)s.ly">
+ <a href="%(base)s%(ext)s">
   <img align="middle"
        border="0"
        src="%(image)s"
@@ -115,7 +124,7 @@ TexInfo_output = {
 
     PRINTFILENAME: '''
 @html
-<a href="%(base)s.ly">
+<a href="%(base)s%(ext)s">
 @end html
 @file{%(filename)s}
 @html
@@ -125,10 +134,6 @@ TexInfo_output = {
 
     QUOTE: r'''@quotation
 %(str)s@end quotation
-''',
-
-    NOQUOTE: r'''@format
-%(str)s@end format
 ''',
 
     VERBATIM: r'''@exampleindent 0