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 e220d8c7ca899021f4d913464b55147ec81c6372..caffb9aeda8d3dd717d607917684cddaf9a009b6 100644 (file)
--- a/scm/ps-to-png.scm
+++ b/scm/ps-to-png.scm
@@ -1,8 +1,19 @@
-;;;; ps-to-png.scm --
+;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;;  source file of the GNU LilyPond music typesetter
-;;;; 
-;;;; (c) 2005--2009 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; Copyright (C) 2005--2011 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
+;;;; the Free Software Foundation, either version 3 of the License, or
+;;;; (at your option) any later version.
+;;;;
+;;;; LilyPond is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (scm ps-to-png))
 
@@ -16,10 +27,9 @@
  (lily)
  )
 
-;; gettext wrapper for guile < 1.7.2
-(if (defined? 'gettext)
-    (define-public _ gettext)
-    (define-public (_ x) x))
+;; FIXME: use backend-library for duplicates and stubs; lilypond-ps2png.scm is no more
+
+(define-public _ gettext)
 
 (define PLATFORM
   (string->symbol
@@ -74,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)))
 
@@ -101,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")
@@ -109,17 +119,17 @@
                      (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))
 
          (gs-variable-options
-          (if multi-page?
-              (format #f "-dDEVICEWIDTHPOINTS=~,2f -dDEVICEHEIGHTPOINTS=~,2f"
-                      page-width page-height)
-              "-dEPSCrop"))
+           (if (string-suffix-ci? ".eps" ps-name)
+               "-dEPSCrop"
+               (format #f "-dDEVICEWIDTHPOINTS=~,2f -dDEVICEHEIGHTPOINTS=~,2f"
+                       page-width page-height)))
          (cmd (ly:format "~a\
  ~a\
  ~a\
@@ -153,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