Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / scm / backend-library.scm

diff --git a/scm/backend-library.scm b/scm/backend-library.scm
index 42cc2688da6b3a558f6e59e655cb9cc690be9937..5258bcf516249978a06d25166fa46b6b50964dc4 100644 (file)
--- a/scm/backend-library.scm
+++ b/scm/backend-library.scm
@@ -3,7 +3,7 @@
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
 ;;;; (c) 2005--2006 Jan Nieuwenhuizen <janneke@gnu.org>
-;;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 
 ;; backend helpers.
@@ -58,8 +58,7 @@
                                " -dEPSCrop "
                                (format "-dDEVICEWIDTHPOINTS=~,2f \
 -dDEVICEHEIGHTPOINTS=~,2f "
-                                       paper-width
-                                       paper-height)))
+                                       paper-width paper-height )))
 
         (cmd (format #f
                      "~a\
@@ -77,7 +76,7 @@
 "
                      (search-gs)
                      (if (ly:get-option 'verbose) "" "-q")
-                     (if (ly:get-option 'gs-font-load)
+                     (if (ly:get-option 'gs-load-fonts)
                          " -dNOSAFER "
                          " -dSAFER ")
                      paper-size-string
@@ -109,8 +108,17 @@
        (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)
@@ -159,7 +167,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")
   "")