(get_latex_textwidth): bugfix for splitext().

diff --git a/ChangeLog b/ChangeLog
index 53b16f6bc4971320fa1ba92c79a6a793fdd65f39..0ab62d987bb01a328a4d8e0733999446c78ef27c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-30  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * scripts/lilypond-book.py (get_latex_textwidth): bugfix for splitext().
+
 2005-08-30  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * stepmake/aclocal.m4: Include MY_PATCH_LEVEL in config.make's

diff --git a/VERSION b/VERSION
index da074b02842695ba7de5112d6e6161c1d06defcf..8fb5e4cba73435d7d7cd9fa3cf7d5001bab1c41e 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=6
-PATCH_LEVEL=3
-MY_PATCH_LEVEL=1
+PATCH_LEVEL=4
+MY_PATCH_LEVEL=
 

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 4eae5693657afbfb7da3206b529151735f7b4335..e8cebdd43adeb6e6f90b8fda9a5e369a643f9cbb 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -1280,7 +1280,7 @@ def get_latex_textwidth (source):
        # Workaround problems with unusable $TMP on Cygwin:
        tempfile.tempdir = ''
        tmpfile = tempfile.mktemp('.tex')
-       logfile = os.path.splitext (tmpfile) + '.log'
+       logfile = os.path.splitext (tmpfile)[0] + '.log'
        open (tmpfile,'w').write (latex_document)
        ly.system ('latex %s' % tmpfile)
        parameter_string = open (logfile).read()