Merge branch 'master-git.sv.gnu.org-lilypond.git' of /home/lilydev/vc/gub/downloads...

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

diff --git a/scm/backend-library.scm b/scm/backend-library.scm
index 02cd759ff9e608aba19f72fcd034a33eae2f5651..eaefaf786752821a525cdfa406a353cbac0e18c9 100644 (file)
--- a/scm/backend-library.scm
+++ b/scm/backend-library.scm
@@ -104,13 +104,7 @@
     ;;(ly:message (_ "Converting to `~a'...")
     ;;     (string-append (basename name ".ps") "-page1.png" )))
   (let* ((verbose (ly:get-option 'verbose))
-        (rename-page-1 #f)
-        (pixmap-default 'png16m)
-        (pixmap-setting (ly:get-option 'pixmap-format))
-        (pixmap-format (if (or (not (eq pixmap-setting pixmap-default))
-                               (ps-has-color name))
-                           pixmap-setting
-                           'pnggray)))
+        (rename-page-1 #f))
     (ly:message (_ "Converting to ~a...") "PNG")
     (make-ps-images name
                    #:resolution resolution
@@ -119,13 +113,14 @@
                    #:rename-page-1 rename-page-1
                    #:be-verbose verbose
                    #:anti-alias-factor (ly:get-option 'anti-alias-factor)
-                   #:pixmap-format pixmap-format)
+                   #: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)