From: hanwen <hanwen>
Date: Tue, 30 Aug 2005 19:33:32 +0000 (+0000)
Subject: (get_latex_textwidth): bugfix for splitext().
X-Git-Tag: release/2.6.4~11
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4c74ff950afc980cba9d7a0c473b517c02e482bd;p=lilypond.git

(get_latex_textwidth): bugfix for splitext().
---

diff --git a/ChangeLog b/ChangeLog
index 53b16f6bc4..0ab62d987b 100644
--- 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 da074b0284..8fb5e4cba7 100644
--- 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 4eae569365..e8cebdd43a 100644
--- 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()