;;;;
;;;; source file of the GNU LilyPond music typesetter
;;;;
-;;;; (c) 2005 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 2005--2006 Jan Nieuwenhuizen <janneke@gnu.org>
;;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-public (ly:system command)
(let* ((status 0)
- (silenced
- (string-append command (if (ly:get-option 'verbose)
- ""
- " > /dev/null 2>&1 "))))
-
+ (dev-null "/dev/null")
+ (silenced (if (or (ly:get-option 'verbose)
+ (not (access? dev-null W_OK)))
+ command
+ (format #f "~a > ~a 2>&1 " command dev-null))))
(if (ly:get-option 'verbose)
- (format (current-error-port) (_ "Invoking `~a'...") command))
+ (ly:message (_ "Invoking `~a'...") command))
(set! status (system silenced))
(if (> status 0)
(begin
- (format (current-error-port) (_ "`~a' failed (~a)") command status)
- (newline (current-error-port))
-
+ (ly:message (_ "`~a' failed (~a)") command status)
+ (ly:progress "\n")
;; hmmm. what's the best failure option?
(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 (postscript->pdf papersizename name)
- (let* ((cmd (format #f "ps2pdf -sPAPERSIZE=~a '~a'"
- (sanitize-command-option papersizename) name))
- (pdf-name (string-append (basename name ".ps") ".pdf" )))
+(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)))))
- (if (access? pdf-name W_OK)
- (delete-file pdf-name))
+ (let ((path (parse-path (getenv "PATH"))))
+ (helper path names)))
- (format (current-error-port) (_ "Converting to `~a'...") pdf-name)
- (newline (current-error-port))
- (ly:system cmd)))
+(define-public (search-gs)
+
+ ;; must be sure that we don't catch stuff from old GUBs.
+ (search-executable '("gs")))
-(define-public (postscript->png resolution papersizename name)
- (let* ((prefix (ly:effective-prefix))
- ;; FIXME: should scripts/ps2png.py be installed in PREFIX?
- (ps2png-source (if prefix
- (format "~a/scripts/ps2png.py" prefix)
- "ps2png"))
+(define-public (postscript->pdf papersizename name)
+ (let* ((pdf-name (string-append (basename name ".ps") ".pdf"))
(cmd (format #f
- "~a --resolution=~S --papersize=~a~a '~a'"
- (if (file-exists? ps2png-source)
- (format "python ~a" ps2png-source)
- "ps2png")
- resolution
+ "~a\
+ ~a\
+ ~a\
+ -dCompatibilityLevel=1.4 \
+ -sPAPERSIZE=~a\
+ -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)
- (if (ly:get-option 'verbose) " --verbose " "")
+ 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)
+ ))
+
+(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.
- ;;(format (current-error-port) (_ "Converting to `~a'...")
+ ;;(ly:message (_ "Converting to `~a'...")
;; (string-append (basename name ".ps") "-page1.png" )))
- (format (current-error-port) (_ "Converting to ~a...") "PNG")
- (newline (current-error-port))
- (ly:system cmd)))
+ (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
+ (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 '())
(if (member x formats) (set! new-fmts (cons x new-fmts))))
'("tex" "dvi" "ps" "pdf" "png"))
- (reverse new-fmts))
+ (uniq-list (reverse new-fmts)))
(define (header-to-file file-name key value)
(set! key (symbol->string key))
(if (not (equal? "-" file-name))
(set! file-name (string-append file-name "." key)))
- (format (current-error-port)
- (_ "Writing header field `~a' to `~a'...")
- key
- (if (equal? "-" file-name) "<stdout>" file-name))
+ (ly:message (_ "Writing header field `~a' to `~a'...")
+ key
+ (if (equal? "-" file-name) "<stdout>" file-name))
(if (equal? file-name "-")
(display value)
(display value (open-file file-name "w")))
- (newline (current-error-port))
+ (ly:progress "\n")
"")
(define-public (output-scopes scopes fields basename)
projects / lilypond.git / blobdiff