X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fbackend-library.scm;h=71275a9ea938de74fe33931a30d6a97e2826c3b9;hb=0a1eb1cb92c0ed9d34e9b9d9492e7b118a8bb3a0;hp=bcbcad46b68ff88c90566d0b0eae2ae90c885e2d;hpb=5a01cdf6b59f5320228a6bf2e68aa28eaa4d15c4;p=lilypond.git diff --git a/scm/backend-library.scm b/scm/backend-library.scm index bcbcad46b6..71275a9ea9 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 Jan Nieuwenhuizen +;;;; (c) 2005--2006 Jan Nieuwenhuizen ;;;; Han-Wen Nienhuys ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -27,9 +27,11 @@ (throw 'ly-file-failed))))) (define-public (sanitize-command-option str) + "Kill dubious shell quoting" + (string-append "\"" - (regexp-substitute/global #f "[^- 0-9,.a-zA-Z'\"\\]" str 'pre 'post) + (regexp-substitute/global #f "[^-_ 0-9,.a-zA-Z'\"\\]" str 'pre 'post) "\"")) (define-public (search-executable names) @@ -85,6 +87,7 @@ )) (use-modules (scm ps-to-png)) + (define-public (postscript->png resolution paper-size-name name) ;; Do not try to guess the name of the png file, ;; GS produces PNG files like BASE-page%d.png. @@ -93,8 +96,10 @@ (let ((paper-size (sanitize-command-option paper-size-name)) (verbose (ly:get-option 'verbose)) (rename-page-1 #f)) + (ly:message (_ "Converting to ~a...") "PNG") - (make-ps-images name resolution paper-size rename-page-1 verbose) + (make-ps-images name resolution paper-size rename-page-1 verbose + (ly:get-option 'anti-alias-factor)) (ly:progress "\n"))) (define-public (postprocess-output paper-book module filename formats) @@ -114,8 +119,6 @@ (if (ly:get-option 'delete-intermediate-files) (for-each (lambda (f) - (display (string-append base "." f)) - (display "del\n") (delete-file (string-append base "." f))) intermediate)) ))