X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fps-to-png.scm;h=e220d8c7ca899021f4d913464b55147ec81c6372;hb=b3f0c2f6c352a850f03dc44a947776199eb3fa0b;hp=deca66008a977edd6738e895c9695ff5f5c24e6a;hpb=d4ba37c298813e0f7008ef8388e126c34d8f8dd3;p=lilypond.git

diff --git a/scm/ps-to-png.scm b/scm/ps-to-png.scm
index deca66008a..e220d8c7ca 100644
--- a/scm/ps-to-png.scm
+++ b/scm/ps-to-png.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2005--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 2005--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 
 (define-module (scm ps-to-png))
 
@@ -108,7 +108,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))
@@ -120,7 +120,7 @@
 	       (format #f "-dDEVICEWIDTHPOINTS=~,2f -dDEVICEHEIGHTPOINTS=~,2f"
 		       page-width page-height)
 	       "-dEPSCrop"))
-	  (cmd (format #f "~a\
+	  (cmd (ly:format "~a\
  ~a\
  ~a\
  -dGraphicsAlphaBits=4\
@@ -128,7 +128,7 @@
  -dNOPAUSE\
  -sDEVICE=~a\
  -sOutputFile=~S\
- -r~S\
+ -r~a\
  ~S\
  -c quit"
 		       (search-gs)