X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fbackend-library.scm;h=0785386f45c9daa47b7baa71e4c36bc70d847f17;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=45b156a6c8d84a67a46ef4159f7d5f158b78a5e6;hpb=77cc001961a4931c002128b34638f69c082b9102;p=lilypond.git diff --git a/scm/backend-library.scm b/scm/backend-library.scm index 45b156a6c8..0785386f45 100644 --- a/scm/backend-library.scm +++ b/scm/backend-library.scm @@ -2,7 +2,7 @@ ;;;; ;;;; source file of the GNU LilyPond music typesetter ;;;; -;;;; (c) 2005--2007 Jan Nieuwenhuizen +;;;; (c) 2005--2008 Jan Nieuwenhuizen ;;;; Han-Wen Nienhuys ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -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