Imported Upstream version 2.16.0

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

diff --git a/scm/ps-to-png.scm b/scm/ps-to-png.scm
index 17f822247b763286137855573b7bbcc1b90ea658..5e78d0c7c0d3997267972f5d11053a3cc0d8bbb5 100644 (file)
--- a/scm/ps-to-png.scm
+++ b/scm/ps-to-png.scm
@@ -1,6 +1,6 @@
 ;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;; Copyright (C) 2005--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; Copyright (C) 2005--2012 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;
 ;;;; LilyPond is free software: you can redistribute it and/or modify
 ;;;; it under the terms of the GNU General Public License as published by
@@ -63,15 +63,11 @@
 ;; copy of ly:system. ly:* not available via lilypond-ps2png.scm
 (define (my-system be-verbose exit-on-error cmd)
   (define status 0)
-  (if be-verbose
-      (begin
-       (format (current-error-port) (_ "Invoking `~a'...") cmd)
-       (newline (current-error-port))))
+  (ly:debug (_ "Invoking `~a'...\n") cmd)
   (set! status (system cmd))
   (if (not (= status 0))
       (begin
-       (format (current-error-port)
-               (format #f (_ "~a exited with status: ~S") "GS" status))
+       (ly:error (_ "~a exited with status: ~S") "GS" status)
        (if exit-on-error (exit 1))))
   status)
 
@@ -84,7 +80,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)))
 
@@ -111,7 +107,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")
@@ -119,8 +115,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))
@@ -163,9 +159,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