X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fps-to-png.scm;h=1f567aae88340890a1dc412092701214c80df0d4;hb=941dff9d2a67080e0dd8474f1e70f0c72ace6424;hp=474a89628adad1fe968adfa9724618595629868d;hpb=2d54fb4a885cb851718a7bd5c800f01d6337895f;p=lilypond.git

diff --git a/scm/ps-to-png.scm b/scm/ps-to-png.scm
index 474a89628a..1f567aae88 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--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
@@ -116,19 +126,20 @@
 	  (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\
+ -q\
  -dTextAlphaBits=4\
  -dNOPAUSE\
  -sDEVICE=~a\
  -sOutputFile=~S\
- -r~S\
+ -r~a\
  ~S\
  -c quit"
 		       (search-gs)