* lily/tie.cc (print): idem.

[lilypond.git] / scm / framework-tex.scm

diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm
index 9661f3ec25364c1a343ee47a024c3db8a214b9e4..3674054c6822b02c7c216bc41b27e4b5c486e86f 100644 (file)
--- a/scm/framework-tex.scm
+++ b/scm/framework-tex.scm
@@ -14,13 +14,14 @@
             (guile)
             (srfi srfi-1)
             (srfi srfi-13)
+            (srfi srfi-14)
             (lily))
 
 (define (output-formats)
   (define formats (ly:output-formats))
   (set! formats (completize-formats formats))
   (if (member "ps" formats)
-      (set! formats (cons "dvi" formats))) 
+      (set! formats (cons "dvi" formats)))
   (if (member "dvi" formats)
       (set! formats (cons "tex" formats)))
 
@@ -311,32 +312,32 @@
 (define-public (convert-to-ps book name)
   (let* ((paper (ly:paper-book-paper book))
         (preview? (string-contains name ".preview"))
-
         (papersizename (ly:output-def-lookup paper 'papersizename))
         (landscape? (eq? #t (ly:output-def-lookup paper 'landscape)))
         (base (basename name ".tex"))
-        (cmd (string-append "dvips "
+        (ps-name (format "~a.ps"  base ".ps"))
+        (cmd (string-append "dvips"
                             (if preview?
-                                "-E "
+                                " -E"
                                 (string-append
-                                 "-t"
+                                 " -t"
                                  ;; careful: papersizename is user-set.
                                  (sanitize-command-option papersizename)
-                                 " "))
-                            (if landscape? "-t landscape " "")
+                                 ""))
+                            (if landscape? " -tlandscape" "")
                             (if (ly:kpathsea-find-file "lm.map")
-                                "-u+lm.map " "")
+                                " -u+lm.map" "")
                             (if (ly:kpathsea-find-file "ecrm10.pfa")
-                                "-u+ec-mftrace.map " "")
-                            "-u+lilypond.map -Ppdf " ""
-                            base)))
-    (let ((ps-name (string-append base ".ps")))
-      (if (access? ps-name W_OK)
-         (delete-file ps-name)))
+                                " -u+ec-mftrace.map" "")
+                            " -u+lilypond.map -Ppdf" ""
+                            " -o" ps-name
+                            " " base)))
+    (if (access? ps-name W_OK)
+       (delete-file ps-name))
     (if (not (ly:get-option 'verbose))
        (begin
-         (format (current-error-port) (_ "Converting to `~a'...")
-                 (string-append base ".dvi"))
+         (format (current-error-port)
+                 (_ "Converting to `~a'...") (string-append base ".ps"))
          (newline (current-error-port))))
     (ly:system cmd)))
 
@@ -348,8 +349,15 @@
            (ly:kpathsea-expand-variable "$extra_mem_top")
            'pre "" 'post)))
         (base (basename name ".tex"))
-        (cmd (string-append
-              "latex \\\\nonstopmode \\\\input " name)))
+        (cmd (format
+              #f "latex \\\\nonstopmode \\\\input '~a'" name)))
+
+    ;; FIXME: latex 'foo bar' works, but \input 'foe bar' does not?
+    (if (string-index name (char-set #\space #\ht #\newline #\cr))
+       (error (format
+               #f
+               (_"TeX file name must not contain whitespace: `~a'") name)))
+
     (setenv "extra_mem_top" (number->string (max curr-extra-mem 1024000)))
     (let ((dvi-name (string-append base ".dvi")))
       (if (access? dvi-name W_OK)
@@ -360,7 +368,7 @@
                  (string-append base ".dvi"))
          (newline (current-error-port))))
 
-    ;; fixme: set in environment?
+    ;; FIXME: set in environment?
     (if (ly:get-option 'safe)
        (set! cmd (string-append "openout_any=p " cmd)))