Silly me, this problem was easy to fix once I found a 
stupid typo in an earlier solution attempt. The attached 
patch should solve the problem (which only occured in 
Python 2.2 and newer).

Regards

  /Mats


> Thomas Willhalm <[EMAIL PROTECTED]> writes:
> 
> Hi,
> 
> > is the lilypond-book in the cvs supposed to work?
> 
> It had a bug wrt determining latex input.  Now fixed in CVS.
> 
> > When I run it on the
> > file input/lilbook.tex I get:
> >
> > invalid regexp:
> > (?ms)(?P<match><lilypond(?P<options>[^>]*)?>(?P<code>.*?)</lilypond>)
> > Traceback (most recent call last):
> >   File "/usr/local/bin/lilypond-book", line 645, in ?
> >     raise "Invalid re"
> > Invalid re
> 
> Strange.  It works fine here with python 2.1.3.
> 
> > By the way, is there a standard test file for lilypond-book that covers all 
> > or most of its features?
> 
> No, not really.  There is the somewhat messy
> 
>     
>http://lilypond.org/development/Documentation/user/out-www/lilypond/lilypond-book.html#lilypond-book
> 
> 
> Also, I started a little nothing about lilypond-book at:
> 
>     http://lilypond.org/~jan/jeremie
> 
> I'm afraid that's all there is at this time.
>     
> Jan.    
> 
> -- 
> Jan Nieuwenhuizen <[EMAIL PROTECTED]> | GNU LilyPond - The music typesetter
> http://www.xs4all.nl/~jantien       | http://www.lilypond.org
> 
> 
> _______________________________________________
> Lilypond-devel mailing list
> [EMAIL PROTECTED]
> http://mail.gnu.org/mailman/listinfo/lilypond-devel

Generated by (address unknown),
From = lilypond-1.5.55, To = lilypond-1.5.55.mb1

usage 

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.5.55.mb1.diff

Patches do not contain automatically generated files 
or (urg) empty directories, 
i.e., you should rerun autoconf, configure

diff -purN ../lilypond-1.5.55/ChangeLog ./ChangeLog
--- ../lilypond-1.5.55/ChangeLog        Sat May  4 15:20:45 2002
+++ ./ChangeLog Thu May 16 18:44:50 2002
@@ -1,3 +1,7 @@
+2002-05-16  Mats Bengtsson  <[EMAIL PROTECTED]>
+
+       * scripts/lilypond-book.py: Don't import pre for Python >= 2.2
+
 2002-05-04  Han-Wen  <[EMAIL PROTECTED]>
 
        * VERSION: 1.5.55 released
diff -purN ../lilypond-1.5.55/VERSION ./VERSION
--- ../lilypond-1.5.55/VERSION  Sat May  4 15:14:13 2002
+++ ./VERSION   Thu May 16 18:45:01 2002
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=55
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=mb1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
diff -purN ../lilypond-1.5.55/scripts/lilypond-book.py ./scripts/lilypond-book.py
--- ../lilypond-1.5.55/scripts/lilypond-book.py Thu Apr 25 15:03:00 2002
+++ ./scripts/lilypond-book.py  Thu May 16 18:44:10 2002
@@ -50,14 +50,16 @@ import operator
 # Handle bug in Python 1.6-2.1
 #
 # there are recursion limits for some patterns in Python 1.6 til 2.1. 
-# fix this by importing pre instead. Fix by Mats.
+# fix this by importing the 1.5.2 implementation pre instead. Fix by Mats.
 
-# todo: should check Python version first.
-try:
-       import pre
-       re = pre
-       del pre
-except ImportError:
+if float (sys.version[0:3]) < 2.2:
+       try:
+               import pre
+               re = pre
+               del pre
+       except ImportError:
+               import re
+else:
        import re
 
 program_version = '@TOPLEVEL_VERSION@'

Reply via email to