X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fbackend-library.scm;h=de44c4054a2df94b4a86b44d364eb4c3cfafee5d;hb=1c43641c240c896489997913515211668cde7e2c;hp=a008fd28dd57816b38cfe68133eaf627a1a68cc4;hpb=e43ea6a8e015ce281d0213490ba8ef52319e9ed5;p=lilypond.git

diff --git a/scm/backend-library.scm b/scm/backend-library.scm
index a008fd28dd..de44c4054a 100644
--- a/scm/backend-library.scm
+++ b/scm/backend-library.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c)  2005 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 2005--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 
@@ -10,10 +10,11 @@
 
 (define-public (ly:system command)
   (let* ((status 0)
-	 (silenced
-	  (string-append command (if (ly:get-option 'verbose)
-				     ""
-				     " > /dev/null 2>&1 "))))
+	 (dev-null "/dev/null")
+	 (silenced (if (or (ly:get-option 'verbose)
+			   (not (access? dev-null W_OK)))
+		       command
+		       (format #f "~a > ~a 2>&1 " command dev-null))))
     (if (ly:get-option 'verbose)
 	(ly:message (_ "Invoking `~a'...") command))
     
@@ -26,53 +27,112 @@
 	  (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 (postscript->pdf papersizename name)
-  (let* ((cmd (format #f "ps2pdf -sPAPERSIZE=~a '~a'"
-		      (sanitize-command-option papersizename) name))
-	 (pdf-name (string-append (basename name ".ps") ".pdf" )))
+(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)
+  
+  ;; must be sure that we don't catch stuff from old GUBs.
+  (search-executable '("gs")))
+  
+(define-public (postscript->pdf paper-width paper-height name)
+  (let* ((pdf-name (string-append
+		    (basename (basename name ".ps") ".eps")
+		    ".pdf"))
+	 (is-eps (string-match "\\.eps$" name))
+	 (paper-size-string (if is-eps
+				" -dEPSCrop "
+				(format "-dDEVICEWIDTHPOINTS=~,2f \
+-dDEVICEHEIGHTPOINTS=~,2f "
+					paper-width paper-height )))
+
+	 (cmd (format #f
+		      "~a\
+ ~a\
+ ~a\
+ ~a\
+ -dCompatibilityLevel=1.4 \
+ -dNOPAUSE\
+ -dBATCH\
+ -r1200 \
+ -sDEVICE=pdfwrite\
+ -sOutputFile=~S\
+ -c .setpdfwrite\
+ -f ~S\
+"
+		      (search-gs)
+		      (if (ly:get-option 'verbose) "" "-q")
+		      (if (ly:get-option 'gs-font-load)
+			  " -dNOSAFER "
+			  " -dSAFER ")
+		      paper-size-string
+		      pdf-name
+		      name)))
+    ;; The wrapper on windows cannot handle `=' signs,
+    ;; gs has a workaround with #.
+    (if (eq? PLATFORM 'windows)
+	(begin
+	  (set! cmd (string-regexp-substitute "=" "#" cmd))
+	  (set! cmd (string-regexp-substitute "-dSAFER " "" cmd))))
 
     (if (access? pdf-name W_OK)
 	(delete-file pdf-name))
 
     (ly:message (_ "Converting to `~a'...") pdf-name)
     (ly:progress "\n")
-    (ly:system cmd)))
+    (ly:system cmd)
+    ))
 
-(define-public (postscript->png resolution papersizename name)
-  (let* ((prefix (ly:effective-prefix))
+(use-modules (scm ps-to-png))
 
-	 ;; run the source, if  we are in the build-directory
-	 (ps2png-source (if prefix
-			   (format "~a/scripts/lilypond-ps2png.py" prefix)
-			   "lilypond-ps2png"))
-	 (cmd (format #f
-		      "~a --resolution=~S --papersize=~a~a '~a'"
-		      (if (file-exists? ps2png-source)
-			  (format "python ~a" ps2png-source)
-			  "lilypond-ps2png")
-		      resolution
-		      (sanitize-command-option papersizename)
-		      (if (ly:get-option 'verbose) " --verbose " "")
-		      name)))
+(define-public (postscript->png resolution paper-width paper-height 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 ((verbose (ly:get-option 'verbose))
+	(rename-page-1 #f))
+
     (ly:message (_ "Converting to ~a...") "PNG")
-    (ly:system cmd)
+    (make-ps-images name resolution paper-width paper-height 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 (format "convert-to-~a" 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 '())