X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fbackend-library.scm;h=c2c89eed77ed71f90a327b2f9b77f502636850c3;hb=9afca041a3068199609d98f580ffe2a175b90b0f;hp=45b156a6c8d84a67a46ef4159f7d5f158b78a5e6;hpb=77cc001961a4931c002128b34638f69c082b9102;p=lilypond.git

diff --git a/scm/backend-library.scm b/scm/backend-library.scm
index 45b156a6c8..c2c89eed77 100644
--- a/scm/backend-library.scm
+++ b/scm/backend-library.scm
@@ -71,7 +71,7 @@
   
 (define-public (postscript->pdf paper-width paper-height name)
   (let* ((pdf-name (string-append
-		    (basename (basename name ".ps") ".eps")
+		    (dir-basename name ".ps" ".eps")
 		    ".pdf"))
 	 (is-eps (string-match "\\.eps$" name))
 	 (paper-size-string (if is-eps
@@ -109,10 +109,9 @@
     (if (eq? PLATFORM 'windows)
 	(begin
 	  (set! cmd (string-regexp-substitute "=" "#" cmd))
-	  (set! cmd (string-regexp-substitute "-dSAFER " "" cmd))))
-
-    (if (access? pdf-name W_OK)
-	(delete-file pdf-name))
+	  (set! cmd (string-regexp-substitute "-dSAFER " "" cmd))
+	  (if (access? pdf-name W_OK)
+	      (delete-file pdf-name))))
 
     (ly:message (_ "Converting to `~a'...") pdf-name)
     (ly:progress "\n")
@@ -121,12 +120,11 @@
 (use-modules (scm ps-to-png))
 
 (define-public (postscript->png resolution paper-width paper-height name)
-    ;; Do not try to guess the name of the png file,
-    ;; GS produces PNG files like BASE-page%d.png.
-    ;;(ly:message (_ "Converting to `~a'...")
-    ;;	    (string-append (basename name ".ps") "-page1.png" )))
   (let* ((verbose (ly:get-option 'verbose))
 	 (rename-page-1 #f))
+
+    ;; Do not try to guess the name of the png file,
+    ;; GS produces PNG files like BASE-page%d.png.
     (ly:message (_ "Converting to ~a...") "PNG")
     (make-ps-images name
 		    #:resolution resolution