X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fbackend-library.scm;h=eaefaf786752821a525cdfa406a353cbac0e18c9;hb=e0caac883553c23c92d4b51070b721fe2207ddcb;hp=aa432017db6301e658dd77d65822f229333d6a8b;hpb=d84c7587117731add28b3b3591e9ef3d92fa827c;p=lilypond.git

diff --git a/scm/backend-library.scm b/scm/backend-library.scm
index aa432017db..eaefaf7867 100644
--- a/scm/backend-library.scm
+++ b/scm/backend-library.scm
@@ -94,8 +94,7 @@
 
     (ly:message (_ "Converting to `~a'...") pdf-name)
     (ly:progress "\n")
-    (ly:system cmd)
-    ))
+    (ly:system cmd)))
 
 (use-modules (scm ps-to-png))
 
@@ -104,49 +103,40 @@
     ;; 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))
-
+  (let* ((verbose (ly:get-option 'verbose))
+	 (rename-page-1 #f))
     (ly:message (_ "Converting to ~a...") "PNG")
-    (make-ps-images name resolution paper-width paper-height rename-page-1 verbose
-		    (ly:get-option 'anti-alias-factor))
+    (make-ps-images name
+		    #:resolution resolution
+		    #:page-width paper-width
+		    #:page-height paper-height
+		    #:rename-page-1 rename-page-1
+		    #:be-verbose verbose
+		    #:anti-alias-factor (ly:get-option 'anti-alias-factor)
+		    #:pixmap-format (ly:get-option 'pixmap-format))
     (ly:progress "\n")))
 
 (define-public (postprocess-output paper-book module 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)
-
+  (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))
-    ))
+	(for-each (lambda (f)
+		    (delete-file (string-append base "." f))) intermediate))))
 
 (define-public (completize-formats formats)
   (define new-fmts '())
-
   (if (member "png" formats)
       (set! formats (cons "ps" formats)))
   (if (member "pdf" formats)
       (set! formats (cons "ps" formats)))
-
-  (for-each
-   (lambda (x)
-     (if (member x formats) (set! new-fmts (cons x new-fmts))))
-   '("tex" "dvi" "ps" "pdf" "png"))
-
+  (for-each (lambda (x)
+	      (if (member x formats) (set! new-fmts (cons x new-fmts))))
+	    '("tex" "dvi" "ps" "pdf" "png"))
   (uniq-list (reverse new-fmts)))
 
 (define (header-to-file file-name key value)
@@ -158,7 +148,10 @@
 	      (if (equal? "-" file-name) "<stdout>" file-name))
   (if (equal? file-name "-")
       (display value)
-      (display value (open-file file-name "w")))
+      (let ((port (open-file file-name "w")))
+	(display value port)
+	(close-port port)))
+
   (ly:progress "\n")
   "")