X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fbackend-library.scm;h=0030b15e1e5a355a13f89f23d4f0c7a50d13cf12;hb=c3377db03800f3850f6f920bae98a0212b1c0c9d;hp=f39ac71471c7c18b0c457bace009c9e70e207184;hpb=a96e4dbdb7f8429e8daa7be39d157d71d74850d3;p=lilypond.git

diff --git a/scm/backend-library.scm b/scm/backend-library.scm
index f39ac71471..0030b15e1e 100644
--- a/scm/backend-library.scm
+++ b/scm/backend-library.scm
@@ -27,19 +27,34 @@
 	  (throw 'ly-file-failed)))))
 
 (define-public (sanitize-command-option str)
+  "Kill dubious shell quoting"
+  
   (string-append
    "\""
-   (regexp-substitute/global #f "[^- 0-9,.a-zA-Z'\"\\]" str 'pre 'post)
+   (regexp-substitute/global #f "[^-_ 0-9,.a-zA-Z'\"\\]" str 'pre 'post)
    "\""))
 
+(define-public (search-executable names)
+  (define (helper path lst)
+    (if (null? (cdr lst))
+	(car lst)
+	(if (search-path path (car lst)) (car lst)
+	    (helper path (cdr lst)))))
+
+  (let ((path (parse-path (getenv "PATH"))))
+    (helper path names)))
+
+(define-public (search-gs)
+  (search-executable '("gs-nox" "gs-8.15" "gs")))
+
 (define-public (postscript->pdf papersizename name)
   (let* ((pdf-name (string-append (basename name ".ps") ".pdf"))
 	 (cmd (format #f
-		      "gs\
+		      "~a\
+ ~a\
  ~a\
  -dCompatibilityLevel=1.4 \
  -sPAPERSIZE=~a\
- -q\
  -dNOPAUSE\
  -dBATCH\
  -r1200 \
@@ -48,8 +63,9 @@
  -c .setpdfwrite\
  -f ~S\
 "
-		      (if (assoc 'gs-font-load
-				 (ly:get-option 'command-line-settings))
+		      (search-gs)
+		      (if (ly:get-option 'verbose) "" "-q")
+		      (if (ly:get-option 'gs-font-load)
 			  " -dNOSAFER "
 			  " -dSAFER ")
 		      (sanitize-command-option papersizename)
@@ -68,27 +84,44 @@
     (ly:message (_ "Converting to `~a'...") pdf-name)
     (ly:progress "\n")
     (ly:system cmd)
-    (if (running-from-gui?) (delete-file name))))
+    ))
 
 (use-modules (scm ps-to-png))
+
 (define-public (postscript->png resolution paper-size-name name)
     ;; Do not try to guess the name of the png file,
     ;; GS produces PNG files like BASE-page%d.png.
     ;;(ly:message (_ "Converting to `~a'...")
     ;;	    (string-append (basename name ".ps") "-page1.png" )))
   (let ((paper-size (sanitize-command-option paper-size-name))
-	(verbose? (ly:get-option 'verbose))
-	(rename-page-1? #f))
+	(verbose (ly:get-option 'verbose))
+	(rename-page-1 #f))
+
     (ly:message (_ "Converting to ~a...") "PNG")
-    (make-ps-images name resolution paper-size rename-page-1? verbose?)
+    (make-ps-images name resolution paper-size rename-page-1 verbose
+		    (ly:get-option 'anti-alias-factor))
     (ly:progress "\n")))
 
 (define-public (postprocess-output paper-book module filename formats)
-  (for-each
-   (lambda (f)
-     ((eval (string->symbol (string-append "convert-to-" f)) module)
-      paper-book filename))
-   formats))
+  (let*
+      ((completed (completize-formats formats))
+       (base (string-regexp-substitute "\\.[a-z]+$" "" filename))
+       (intermediate (remove
+		      (lambda (x)
+			(member x formats)) 
+		      completed)))
+    (for-each
+     (lambda (f)
+       ((eval (string->symbol (string-append "convert-to-" f)) module)
+	paper-book filename))
+     completed)
+
+    (if (ly:get-option 'delete-intermediate-files)
+	(for-each
+	 (lambda (f)
+	   (delete-file (string-append base "." f)))
+	 intermediate))
+    ))
 
 (define-public (completize-formats formats)
   (define new-fmts '())