From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Mon, 22 Apr 2002 15:12:16 +0000 (+0000)
Subject: (re_dict): Fix for python 2.x.
X-Git-Tag: release/1.5.54~10
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=70f2aeeccaed64592b9b87686261351a5e4ebebd;p=lilypond.git

(re_dict): Fix for python 2.x.
---

diff --git a/ChangeLog b/ChangeLog
index fd87d0d6ad..8ea5954ecb 100644
--- 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 4ef74eaab8..413060a70a 100644
--- 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",