X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fps-to-png.scm;h=5e78d0c7c0d3997267972f5d11053a3cc0d8bbb5;hb=ecc41fd08c437396edb27d1fb82c977e7404803e;hp=deca66008a977edd6738e895c9695ff5f5c24e6a;hpb=17098f34eace028d047ee7f9cd6f81a84e0e7537;p=lilypond.git

diff --git a/scm/ps-to-png.scm b/scm/ps-to-png.scm
index deca66008a..5e78d0c7c0 100644
--- 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--2007 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
+;;;; 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
@@ -53,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)
 
@@ -74,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)))
 
@@ -101,26 +107,26 @@
     (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")
 		      ((string-contains format-str "jpeg") "jpeg")
 		      (else
 		       (ly:error "Unknown pixmap format ~a" pixmap-format))))
-	  (base (basename (re-sub "[.]e?ps" "" ps-name)))
-	  (png1 (format "~a.~a" base extension))
-	  (pngn (format  "~a-page%d.~a" base extension))
+	  (base (dir-basename ps-name ".ps" ".eps"))
+	  (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"))
-	  (cmd (format #f "~a\
+	    (if (string-suffix-ci? ".eps" ps-name)
+		"-dEPSCrop"
+		(format #f "-dDEVICEWIDTHPOINTS=~,2f -dDEVICEHEIGHTPOINTS=~,2f"
+			page-width page-height)))
+	  (cmd (ly:format "~a\
  ~a\
  ~a\
  -dGraphicsAlphaBits=4\
@@ -128,7 +134,7 @@
  -dNOPAUSE\
  -sDEVICE=~a\
  -sOutputFile=~S\
- -r~S\
+ -r~a\
  ~S\
  -c quit"
 		       (search-gs)
@@ -153,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