X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fps-to-png.scm;h=cbe6d23e4bae71023f0a525a66ff1f69600ef8c4;hb=9e205dd2ae57dce8b8e3a42f86b945517374265a;hp=7b7e3eb157deb3f3d49475a53f8faa13f6edc656;hpb=5225c5f57f7120683be517c7eea8e391c976004a;p=lilypond.git

diff --git a/scm/ps-to-png.scm b/scm/ps-to-png.scm
index 7b7e3eb157..cbe6d23e4b 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--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; Copyright (C) 2005--2010 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,7 @@
  (lily)
  )
 
-;; gettext wrapper for guile < 1.7.2
-(if (defined? 'gettext)
-    (define-public _ gettext)
-    (define-public (_ x) x))
+(define-public _ gettext)
 
 (define PLATFORM
   (string->symbol
@@ -97,7 +105,7 @@
     (page-width  100)
     (page-height 100)
     (rename-page-1 #f)
-    (be-verbose #f)
+    (be-verbose (ly:get-option 'verbose))
     (pixmap-format 'png16m)
     (anti-alias-factor 1))
 
@@ -108,7 +116,7 @@
 		      ((string-contains format-str "jpeg") "jpeg")
 		      (else
 		       (ly:error "Unknown pixmap format ~a" pixmap-format))))
-	  (base (basename (re-sub "[.]e?ps" "" ps-name)))
+	  (base (dir-basename ps-name ".ps" ".eps"))
 	  (png1 (format "~a.~a" base extension))
 	  (pngn (format  "~a-page%d.~a" base extension))
 	  (page-count (ps-page-count ps-name))
@@ -116,20 +124,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\
+	    ;; ps-page-count returns 0 for EPS files
+	    (if (zero? page-count)
+		"-dEPSCrop"
+		(format #f "-dDEVICEWIDTHPOINTS=~,2f -dDEVICEHEIGHTPOINTS=~,2f"
+			page-width page-height)))
+	  (cmd (ly:format "~a\
  ~a\
  ~a\
  -dGraphicsAlphaBits=4\
  -dTextAlphaBits=4\
- -q
  -dNOPAUSE\
  -sDEVICE=~a\
  -sOutputFile=~S\
- -r~S\
+ -r~a\
  ~S\
  -c quit"
 		       (search-gs)