Mats' fix. Try to import pre if available.

diff --git a/ChangeLog b/ChangeLog
index 0e86f0941eb93cedd35fd52bd1df86ce50f61520..9d1af6946c4b328beeafbe5a1b5ca6e1e7094b79 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2002-04-25  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * scripts/ly2dvi.py: Mats' fix.  Try to import pre if available.
+
        * scripts/lilypond-book.py: %Newline, rather than glue macros
        after \end{verbatim}.
 

diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py
index bb3206df7526b27e7902e7159fb81f5762e79a6e..3c454789f88209785748c5a609879485d22c1103 100644 (file)
--- a/scripts/ly2dvi.py
+++ b/scripts/ly2dvi.py
@@ -66,6 +66,20 @@ import tempfile
 import traceback
 
 
+# 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.
+
+# todo: should check Python version first.
+try:
+       import pre
+       re = pre
+       del pre
+except ImportError:
+       import re
+
+
 ################################################################
 # lilylib.py -- options and stuff
 # 
@@ -719,6 +733,7 @@ for opt in options:
                sys.exit (0)
        elif o == '--find-pfa' or o == '-f':
                fonts = map (lambda x: x + '.pfa', find_pfa_fonts (a))
+               print `fonts`
                files = map (lambda x:
                             find_file_in_path (os.environ['GS_FONTPATH'], x),
                             fonts)