(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)
+ (define (helper path lst)
+ (if (null? (cdr lst))
+ (car lst)
+ (if (search-path path (car lst)) (car lst)
+ (helper path (cdr lst)))))
+
+ (let ((path (parse-path (getenv "PATH"))))
+ (helper path names)))
+
+(define-public (search-gs)
+ (search-executable '("gs-nox" "gs-8.15" "gs")))
+
(define-public (postscript->pdf papersizename name)
- (let* ((pdf-name (string-append (basename name ".ps") ".pdf" ))
+ (let* ((pdf-name (string-append (basename name ".ps") ".pdf"))
(cmd (format #f
- "gs\
+ "~a\
+ ~a\
+ ~a\
-dCompatibilityLevel=1.4 \
- -dSAFER\
-sPAPERSIZE=~a\
- -q\
-dNOPAUSE\
-dBATCH\
+ -r1200 \
-sDEVICE=pdfwrite\
-sOutputFile=~S\
-c .setpdfwrite\
-f ~S\
"
+ (search-gs)
+ (if (ly:get-option 'verbose) "" "-q")
+ (if (ly:get-option 'gs-font-load)
+ " -dNOSAFER "
+ " -dSAFER ")
(sanitize-command-option papersizename)
pdf-name
name)))
+ ;; The wrapper on windows cannot handle `=' signs,
+ ;; gs has a workaround with #.
+ (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))
(ly:message (_ "Converting to `~a'...") pdf-name)
(ly:progress "\n")
- (ly:system cmd)))
+ (ly:system cmd)
+ ))
-(define-public (postscript->png resolution papersizename name)
- (let* ((prefix (ly:effective-prefix))
+(use-modules (scm ps-to-png))
- ;; run the source, if we are in the build-directory
- (ps2png-source (if prefix
- (format "~a/scripts/lilypond-ps2png.py" prefix)
- "lilypond-ps2png"))
- (cmd (format #f
- "~a --resolution=~S --papersize=~a~a ~S"
- (if (file-exists? ps2png-source)
- (format "python ~a" ps2png-source)
- "lilypond-ps2png")
- resolution
- (sanitize-command-option papersizename)
- (if (ly:get-option 'verbose) " --verbose " "")
- name)))
+(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.
;;(ly:message (_ "Converting to `~a'...")
;; (string-append (basename name ".ps") "-page1.png" )))
+ (let ((paper-size (sanitize-command-option paper-size-name))
+ (verbose (ly:get-option 'verbose))
+ (rename-page-1 #f))
+
(ly:message (_ "Converting to ~a...") "PNG")
- (ly:system cmd)
+ (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)
- (for-each
- (lambda (f)
- ((eval (string->symbol (string-append "convert-to-" f)) module)
- paper-book filename))
- formats))
+ (let*
+ ((completed (completize-formats formats))
+ (base (string-regexp-substitute "\\.[a-z]+$" "" filename))
+ (intermediate (remove
+ (lambda (x)
+ (member x formats))
+ completed)))
+ (for-each
+ (lambda (f)
+ ((eval (string->symbol (string-append "convert-to-" f)) module)
+ paper-book filename))
+ completed)
+
+ (if (ly:get-option 'delete-intermediate-files)
+ (for-each
+ (lambda (f)
+ (delete-file (string-append base "." f)))
+ intermediate))
+ ))
(define-public (completize-formats formats)
(define new-fmts '())