re fixes

diff --git a/ChangeLog b/ChangeLog
index 472c267977b9388e0ab09cc22a6a07c6f8f0eb4a..f99147987eed390f791b9a9ec0e23150f64033a5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-17  Han-Wen  <hanwen@cs.uu.nl>
+
+       * scripts/lilypond-book.py (re_dict): fix regexps; don't combine ?
+       and * (as in "([^>]*)?")
+
 2002-05-17  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * Documentation/topdocs/INSTALL.texi: Update GCC, Flex and GUILE info.

diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index 022db91c0033ede616e5e5514dc048db4c9c7ddb..dd20f21d820e0d75c8c3f7ee11a57d31afc12a95 100644 (file)
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -27,11 +27,11 @@ More information on this topic can be found at the
 
 @section Downloading
 
-Even numbered versions are `stable'. The webpages for the stable
-version (1.4) reside @uref{http://www.lilypond.org/stable,the lilypond
-users site}. Big enhancements go into the latest odd numbered
-version (1.5), whose webpages are on
-@uref{http://www.lilypond.org/development, the lilypond development site}.
+Even numbered versions are `stable'. The webpages for the stable version
+(1.4) reside @uref{http://www.gnu.org/software/lilypond, on the GNU
+servers}. Big enhancements go into the latest odd numbered version
+(1.5), whose webpages are on @uref{http://www.lilypond.org/,the lilypond
+site}.
 
 @subsection Source code
 
@@ -338,7 +338,9 @@ file.
 @subsection Red Hat Linux
 
 Red Hat 7.x i386 RPMS are available from
-@uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/binaries/}.
+@uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/binaries/}.  For running on
+a Red Hat system you need these packages: guile, tetex, tetex-latex,
+tetex-dvips, libstdc++, python, ghostscript.
 
 You can also compile them yourself.  A spec file is in
 @file{make/out/lilypond.redhat.spec}. This file is distributed along
@@ -351,9 +353,6 @@ with the sources.  You can make the rpm by issuing
 
 @end example 
 
-For running on a Red Hat system you need these packages: guile, tetex,
-tetex-latex, tetex-dvips, libstdc++, python, ghostscript.
-
 For compilation on a Red Hat system you need these packages, in
 addition to the those needed for running: glibc-devel, gcc-c++,
 libstdc++-devel, guile-devel, flex, bison, texinfo, groff, pktrace,

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 7689f6d2ada77fd034c86ee8bda9c6752d0fc752..b7c5fecf231f2e1bf0c7644667edda77b57979a1 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -567,9 +567,11 @@ def output_verbatim (body):
 
 #warning: this uses extended regular expressions. Tread with care.
 
-# legenda (?P  name parameter
-# *? match non-greedily.
+# legenda
 
+# (?P  -- name parameter
+# *? -- match non-greedily.
+# (?m)  -- ?  
 re_dict = {
        'html': {
                 'include':  no_match,
@@ -579,9 +581,9 @@ re_dict = {
                 'landscape': no_match,
                 'verbatim': r'''(?s)(?P<code><pre>\s.*?</pre>\s)''',
                 'verb': r'''(?P<code><pre>.*?</pre>)''',
-                'lilypond-file': '(?m)(?P<match><lilypondfile(?P<options>[^>]*)?>\s*(?P<filename>.*?)\s*</lilypondfile>)',
+                'lilypond-file': r'(?m)(?P<match><lilypondfile(?P<options>[^>]+)?>\s*(?P<filename>[^<]+)\s*</lilypondfile>)',
                 'lilypond' : '(?m)(?P<match><lilypond((?P<options>[^:]*):)(?P<code>.*?)/>)',
-                'lilypond-block': r'''(?ms)(?P<match><lilypond(?P<options>[^>]*)?>(?P<code>.*?)</lilypond>)''',
+                'lilypond-block': r'''(?ms)(?P<match><lilypond(?P<options>[^>]+)?>(?P<code>.*?)</lilypond>)''',
                  'option-sep' : '\s*',
                  'intertext': r',?\s*intertext=\".*?\"',
                  'multiline-comment': r"(?sm)\s*(?!@c\s+)(?P<code><!--\s.*?!-->)\s",