Merge remote branch 'origin' into release/unstable

[lilypond.git] / scm / ps-to-png.scm

diff --git a/scm/ps-to-png.scm b/scm/ps-to-png.scm
index 4436ea3fbbed95543b4fe83becaf21da8f113f50..caffb9aeda8d3dd717d607917684cddaf9a009b6 100644 (file)
--- a/scm/ps-to-png.scm
+++ b/scm/ps-to-png.scm
@@ -27,6 +27,8 @@
  (lily)
  )
 
+;; FIXME: use backend-library for duplicates and stubs; lilypond-ps2png.scm is no more
+
 (define-public _ gettext)
 
 (define PLATFORM
@@ -82,7 +84,7 @@
       (my-system
        be-verbose #t
        (format #f
-              "pngtopnm ~a | pnmscale -reduce ~a 2>/dev/null | pnmtopng -compression 9 2>/dev/null > ~a"
+              "pngtopnm \"~a\" | pnmscale -reduce ~a 2>/dev/null | pnmtopng -compression 9 2>/dev/null > \"~a\""
               old factor file))
       (delete-file old)))
 
@@ -109,7 +111,7 @@
     (pixmap-format 'png16m)
     (anti-alias-factor 1))
 
-   (let* ((format-str (format "~a" pixmap-format))
+   (let* ((format-str (format #f "~a" pixmap-format))
          (extension (cond
                      ((string-contains format-str "png") "png")
                      ((string-contains format-str "jpg") "jpeg")
@@ -117,8 +119,8 @@
                      (else
                       (ly:error "Unknown pixmap format ~a" pixmap-format))))
          (base (dir-basename ps-name ".ps" ".eps"))
-         (png1 (format "~a.~a" base extension))
-         (pngn (format  "~a-page%d.~a" base extension))
+         (png1 (format #f "~a.~a" base extension))
+         (pngn (format #f "~a-page%d.~a" base extension))
          (page-count (ps-page-count ps-name))
          (multi-page? (> page-count 1))
          (output-file (if multi-page? pngn png1))
@@ -161,9 +163,9 @@
           (if multi-page?
               (map
                (lambda (n)
-                 (format "~a-page~a.png" base (1+ n)))
+                 (format #f "~a-page~a.png" base (1+ n)))
                (iota page-count))
-              (list (format "~a.png" base))))
+              (list (format #f "~a.png" base))))
      
      (if (not (= 0 status))
         (begin