(re_dict): Fix for python 2.x.

diff --git a/ChangeLog b/ChangeLog
index fd87d0d6adf6651ed03c8befbfc0ac604b32e06e..8ea5954ecbb9b859be4c8b9d9fdfd8725710753d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2002-04-22  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * scripts/lilypond-book.py (re_dict): Fix for python 2.x.
+
        * lilypond-mode.el (LilyPond-xdvi-command): Default to plain xdvi.
 
        * input/mozart-hrn3-allegro.ly: Bugfix: include defs.

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 4ef74eaab8f46005819f74d26ea02dea1352f8ef..413060a70a1132d6be365c8d32e8c803f6b57d14 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -476,7 +476,7 @@ re_dict = {
                  'preamble-end': r'(?P<code>\\begin{document})',
                  'verbatim': r"(?s)(?P<code>\\begin{verbatim}.*?\\end{verbatim})",
                  'verb': r"(?P<code>\\verb(?P<del>.).*?(?P=del))",
-                 'lilypond-file': r'(?m)^[^%\n]*?(?P<match>\\lilypondfile\s*(\[(?P<options>.*?)\])?\s*\{(?P<filename>.+)})',
+                 'lilypond-file': r'(?m)^[^%\n]*?(?P<match>\\lilypondfile\s*(\[(?P<options>.*?)\])?\s*{(P<filename>[^}]+)})',
                  'lilypond' : r'(?m)^[^%\n]*?(?P<match>\\lilypond\s*(\[(?P<options>.*?)\])?\s*{(?P<code>.*?)})',
                  'lilypond-block': r"(?sm)^[^%\n]*?(?P<match>\\begin\s*(\[(?P<options>.*?)\])?\s*{lilypond}(?P<code>.*?)\\end{lilypond})",
                  'def-post-re': r"\\def\\postLilypondExample",