lilypond-1.5.40

diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index c99e9b34d1856ac1871da49877eb4208b347f031..91cf161cce0880166c3d5befec5df888b5d3967a 100644 (file)
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -546,16 +546,19 @@ and:
         fink install tetex
 @end example        
 
+For more information about @file{apt-get} and @file{fink}, see
+@uref{http://fink.sf.net,fink.sourceforge.net}.
+
 @c  brokenness of autoconf; don't ask
 Then, configure, patch, make and install LilyPond using these commands:
 
 @example
         CC="cc -I/sw/include" CXX="c++ -I/sw/include" LDFLAGS="-L/sw/lib" \
             ./configure --prefix=/sw
-        make -C lily out/parser.hh out/parser.cc
+        make -C lily out/parser.hh out/parser.cc out/config.h
         patch -p0 < darwin.patch
         make -C lily out/parser.o
-        make all
+        make DEPENDENCIES_OUTPUT=/dev/null all
         make install
 @end example
 
@@ -584,11 +587,6 @@ LilyPond with gcc-3.0 you may do:
 
 Note that this is fixed in Debian/unstable for flex >= 2.5.4a-13.
 
-@unnumberedsubsec Python-2.1[.1]
-
-Regular expressions are broken in Python 2.1.[.1], either upgrade or
-downgrade python.
-
 @unnumberedsubsec Linux-2.4.0, Guile-1.4 --with-threads
 
 There's a bug in certain kernels around version 2.4.0, that is

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index 8a6f012082e68574922204e45b097ea0a8e1c2d1..a1440e0e833ee55a572fa64b61c7a97271e9a691 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -1,4 +1,5 @@
 
+
 @c Note:
 @c
 @c A menu is needed before every deeper *section nesting of @node's; run
@@ -1816,7 +1817,7 @@ patterns that divide the measure length are replaced by slashes.
  \context Voice { \repeat  "percent" 4  { c'4 }
     \repeat "percent" 2 { c'2 es'2 f'4 fis'4 g'4 c''4 }
 }
-@end lilypond
+@end lilypond   
 
 The signs are represented by these grobs: @internalsref{RepeatSlash} and
 @internalsref{PercentRepeat} and @internalsref{DoublePercentRepeat}.

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 8dc047bb26b72249bf39bd8faad216465e04a3dd..0bac7a5724202f25631ed59bbaae419d72e8635f 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -477,7 +477,9 @@ re_dict = {
                  },
 
 
-       # why do we have distinction between @mbinclude and @include? 
+       # why do we have distinction between @mbinclude and @include?
+
+       
        'texi': {
                 'include':  '(?m)^[^%\n]*?(?P<match>@mbinclude[ \n\t]+(?P<filename>[^\t \n]*))',
                 'input': no_match,
@@ -486,13 +488,9 @@ re_dict = {
                 'landscape': no_match,
                 'verbatim': r"""(?s)(?P<code>@example\s.*?@end example\s)""",
                 'verb': r"""(?P<code>@code{.*?})""",
-                'lilypond-file': '(?m)^(?!@c)(?P<match>@lilypondfile(\[(?P<options>.*?)\])?{(?P<filename>[^}]+)})',
-                'lilypond' : '(?m)^(?!@c)(?P<match>@lilypond(\[(?P<options>.*?)\])?{(?P<code>.*?)})',
-# pyton2.2b2 barfs on this
-                'lilypond-block': r"""(?m)^(?!@c)(?P<match>(?s)(?P<match>@lilypond(\[(?P<options>.*?)\])?\s(?P<code>.*?)@end lilypond\s))""",
-
-# 1.5.2 barfs on this. 
-# 'lilypond-block': r"""(?m)^(?!@c)(?P<match>@lilypond(\[(?P<options>.*?)\])?\s(?P<code>.*?)@end lilypond\s)""",
+                'lilypond-file': '(?m)^(?P<match>@lilypondfile(\[(?P<options>[^]]*)\])?{(?P<filename>[^}]+)})',
+                'lilypond' : '(?m)^(?P<match>@lilypond(\[(?P<options>[^]]*)\])?{(?P<code>.*?)})',
+                'lilypond-block': r"""(?ms)^(?P<match>@lilypond(\[(?P<options>[^]]*)\])?\s(?P<code>.*?)@end lilypond)\s""",
                  'option-sep' : ',\s*',
                  'intertext': r',?\s*intertext=\".*?\"',
                  'multiline-comment': r"(?sm)^\s*(?!@c\s+)(?P<code>@ignore\s.*?@end ignore)\s",
@@ -506,7 +504,14 @@ for r in re_dict.keys ():
        olddict = re_dict[r]
        newdict = {}
        for k in olddict.keys ():
-               newdict[k] = re.compile (olddict[k])
+               try:
+                       newdict[k] = re.compile (olddict[k])
+               except:
+                       print 'invalid regexp: %s' % olddict[k]
+
+                       # we'd like to catch and reraise a more detailed  error, but
+                       # alas, the exceptions changed across the 1.5/2.1 boundary.
+                       raise "Invalid re"
        re_dict[r] = newdict