CVSROOT:        /cvsroot/lilypond
Module name:    lilypond
Branch:         
Changes by:     Mats Bengtsson <[EMAIL PROTECTED]>      05/06/23 10:56:07

Modified files:
        .              : ChangeLog 
        scripts        : lilypond-book.py 

Log message:
        * scripts/lilypond-book.py (LATEX_DOCUMENT): More or less ugly
        workaround since /dev/stdin doesn't work on Cygwin. Using a
        temporary file in the current directory since latex doesn't
        understand the path name to the default TMP in Cygwin (at least on
        win XP).

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3813&tr2=1.3814&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scripts/lilypond-book.py.diff?tr1=1.263&tr2=1.264&r1=text&r2=text

Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3813 lilypond/ChangeLog:1.3814
--- lilypond/ChangeLog:1.3813   Thu Jun 23 08:24:47 2005
+++ lilypond/ChangeLog  Thu Jun 23 10:56:06 2005
@@ -1,5 +1,11 @@
 2005-06-23  Mats Bengtsson  <[EMAIL PROTECTED]>
 
+       * scripts/lilypond-book.py (LATEX_DOCUMENT): More or less ugly
+       workaround since /dev/stdin doesn't work on Cygwin. Using a
+       temporary file in the current directory since latex doesn't
+       understand the path name to the default TMP in Cygwin (at least on
+       win XP).
+       
        * Documentation/user/global.itely (Creating titles): Correct
        misprint in example. Thanks to Rob Vlasaty.
 
Index: lilypond/scripts/lilypond-book.py
diff -u lilypond/scripts/lilypond-book.py:1.263 
lilypond/scripts/lilypond-book.py:1.264
--- lilypond/scripts/lilypond-book.py:1.263     Tue Jun 14 23:01:53 2005
+++ lilypond/scripts/lilypond-book.py   Thu Jun 23 10:56:07 2005
@@ -116,7 +116,7 @@
 use_hash_p = 1
 format = 0
 output_name = ''
-latex_filter_cmd = 'latex "\\nonstopmode \input /dev/stdin"'
+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]" }
@@ -1276,7 +1276,11 @@
        m = re.search (r'''(?P<preamble>\\begin\s*{document})''', source)
        preamble = source[:m.start (0)]
        latex_document = LATEX_DOCUMENT % vars ()
-       parameter_string = filter_pipe (latex_document, latex_filter_cmd)
+       # 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)
 
        columns = 0
        m = re.search ('columns=([0-9.]*)', parameter_string)


_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

Reply via email to