From 5b551a0b1d6a26b33a673270d2fc99625e07c1ca Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Fri, 26 Aug 2005 07:16:50 +0000
Subject: [PATCH] (get_latex_textwidth): remove unixisms

---
 ChangeLog                |  4 ++++
 scripts/lilypond-book.py | 14 +++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index da9a67e11a..7d90151fda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-26  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+	* scripts/lilypond-book.py (get_latex_textwidth): remove unixisms
+
 2005-08-25  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
 	* scm/define-markup-commands.scm (null): add  null markup.
diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 01978dbbaa..4eae569365 100644
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -117,7 +117,6 @@ psfonts_p = 0
 use_hash_p = 1
 format = 0
 output_name = ''
-latex_filter_cmd = 'cat > %(tmpfile)s && latex "\\nonstopmode \input %(tmpfile)s" && rm %(tmpfile)s'
 filter_cmd = 0
 process_cmd = ''
 default_ly_options = { 'alt': "[image of music]" }
@@ -1263,7 +1262,8 @@ def process_snippets (cmd, ly_snippets, texstr_snippets, png_snippets):
 	if ly_names:
 		my_system (string.join ([cmd, 'snippet-map.ly'] + ly_names))
 
-LATEX_DOCUMENT = r'''
+LATEX_INSPECTION_DOCUMENT = r'''
+\nonstopmode
 %(preamble)s
 \begin{document}
 \typeout{textwidth=\the\textwidth}
@@ -1276,12 +1276,16 @@ LATEX_DOCUMENT = r'''
 def get_latex_textwidth (source):
 	m = re.search (r'''(?P<preamble>\\begin\s*{document})''', source)
 	preamble = source[:m.start (0)]
-	latex_document = LATEX_DOCUMENT % vars ()
+	latex_document = LATEX_INSPECTION_DOCUMENT % vars ()
 	# Workaround problems with unusable $TMP on Cygwin:
 	tempfile.tempdir = ''
 	tmpfile = tempfile.mktemp('.tex')
-	cmd = latex_filter_cmd % vars ()
-	parameter_string = filter_pipe (latex_document, cmd)
+	logfile = os.path.splitext (tmpfile) + '.log'
+	open (tmpfile,'w').write (latex_document)
+	ly.system ('latex %s' % tmpfile)
+	parameter_string = open (logfile).read()
+	os.unlink (tmpfile)
+	os.unlink (logfile)
 
 	columns = 0
 	m = re.search ('columns=([0-9.]*)', parameter_string)
-- 
2.39.5