;;;;
;;;; source file of the GNU LilyPond music typesetter
;;;;
-;;;; (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 1998--2007 Jan Nieuwenhuizen <janneke@gnu.org>
;;;; Han-Wen Nienhuys <hanwen@xs4all.nl>
;; Internationalisation: (_i "to be translated") gets an entry in the
(debug-skylines #f "debug skylines")
(delete-intermediate-files #f
"delete unusable PostScript files")
- (dump-profile #f "dump timing information for each file")
+ (dump-profile #f "dump memory and time information for each file")
+ (dump-cpu-profile #f "dump timing information (system-dependent)")
(dump-signatures #f "dump output signatures of each system. Used for regression testing.")
(eps-box-padding #f "Pad EPS bounding box left edge. Guarantee alignment between systems in LaTeX.")
(gs-load-fonts #f
"load fonts via Ghostscript.")
+ (gs-load-lily-fonts #f
+ "load only lilypond fonts via Ghostscript.")
(gui #f "running from gui; redirect stderr to log file")
(help #f "show this help.")
(include-book-title-preview #t "include book-titles in preview images.")
(safe #f "Run safely")
(strict-infinity-checking #f "If yes, crash on encountering Inf/NaN.")
+ (strip-output-dir #t "If yes, strip directories from input files.")
(separate-log-files #f "Output to FILE.log per file.")
(trace-memory-frequency #f "Record Scheme cell usage this many times per second, and dump to file.")
(trace-scheme-coverage #f "Record coverage of Scheme files")
(use-modules (ice-9 regex)
(ice-9 safe)
+ (ice-9 format)
(ice-9 rdelim)
(ice-9 optargs)
(oop goops)
(scm memory-trace)
(scm coverage)
)
+(define-public fancy-format format)
(define-public (ergonomic-simple-format dest . rest)
"Like ice-9 format, but without the memory consumption."
(apply simple-format (cons #f (cons dest rest)))
(apply simple-format (cons dest rest))))
-
(define format ergonomic-simple-format)
;; my display
;;; have a more sensible default.
(if (or (ly:get-option 'verbose)
- (ly:get-option 'trace-memory-frequencency)
+ (ly:get-option 'trace-memory-frequency)
(ly:get-option 'trace-scheme-coverage)
)
(begin
(define-public parser #f)
-(define-public (lilypond-version)
- (string-join
- (map (lambda (x) (if (symbol? x)
- (symbol->string x)
- (number->string x)))
- (ly:version))
- "."))
-
;; TeX C++ code actually hooks into TEX_STRING_HASHLIMIT
(define-public TEX_STRING_HASHLIMIT 10000000)
safe-objects))
,safe-symbol)))
+(define-safe-public (lilypond-version)
+ (string-join
+ (map (lambda (x) (if (symbol? x)
+ (symbol->string x)
+ (number->string x)))
+ (ly:version))
+ "."))
+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; init pitch system
"encoding.scm"
"fret-diagrams.scm"
- "define-markup-commands.scm"
+ "predefined-fretboards.scm"
+ "define-markup-commands.scm"
"define-grob-properties.scm"
"define-grobs.scm"
"define-grob-interfaces.scm"
(define (dump-profile base last this)
(let*
- ((outname (format "~a.profile" (basename base ".ly")))
+ ((outname (format "~a.profile" (dir-basename base ".ly")))
(diff (map (lambda (y) (apply - y)) (zip this last))))
(ly:progress "\nWriting timing to ~a..." outname)
(format (open-file outname "w")
"time: ~a\ncells: ~a\n"
- (car diff)
+ (if (ly:get-option 'dump-cpu-profile)
+ (car diff)
+ 0)
(cadr diff)
)))
(define (multi-fork count)
+ "Split this process in COUNT helpers. Returns either a list of pids,
+or the number of the process."
(define (helper count acc)
(if (> count 0)
(let*
(define-public (lilypond-main files)
"Entry point for LilyPond."
-
(eval-string (ly:command-line-code))
(if (ly:get-option 'help)
(if (and (number? (ly:get-option 'job-count))
(>= (length files) (ly:get-option 'job-count)))
-
(let*
((count (ly:get-option 'job-count))
(split-todo (split-list files count))
(if (number? joblist)
(begin
- (ly:set-option 'log-file (format "~a-~a"
- (ly:get-option 'log-file) joblist))
+ (ly:set-option
+ 'log-file (format "~a-~a"
+ (ly:get-option 'log-file) joblist))
(set! files (vector-ref split-todo joblist)))
(begin
(let* ((stat (cdr (waitpid pid))))
(if (not (= stat 0))
- (set! errors (acons (list-element-index joblist pid) stat errors)))))
+ (set! errors
+ (acons (list-element-index joblist pid)
+ stat errors)))))
joblist)
(for-each
(lambda (x)
(let* ((job (car x))
(state (cdr x))
- (logfile (format "~a-~a.log"
+ (logfile (format "~a-~a.log"
(ly:get-option 'log-file) job))
(log (ly:gulp-file logfile))
(len (string-length log))
(tail (substring log (max 0 (- len 1024)))))
(if (status:term-sig state)
- (ly:message "\n\n~a\n"
- (format (_ "job ~a terminated with signal: ~a")
- job
- (status:term-sig state)))
- (ly:message (_ "logfile ~a (exit ~a):\n~a") logfile (status:exit-val state) tail))))
+ (ly:message
+ "\n\n~a\n"
+ (format (_ "job ~a terminated with signal: ~a")
+ job (status:term-sig state)))
+ (ly:message
+ (_ "logfile ~a (exit ~a):\n~a")
+ logfile (status:exit-val state) tail))))
errors)
(dump-profile "lily-run-total" '(0 0) (profile-measurements)))
(exit (if (null? errors) 0 1))))))
-
(if (string-or-symbol? (ly:get-option 'log-file))
(ly:stderr-redirect (format "~a.log" (ly:get-option 'log-file)) "w"))
-
(let ((failed (lilypond-all files)))
(if (ly:get-option 'trace-scheme-coverage)
(begin
(coverage:show-all (lambda (f) (string-contains f "lilypond"))
)))
-
(if (pair? failed)
(begin
(define-public (lilypond-all files)
(let* ((failed '())
(separate-logs (ly:get-option 'separate-log-files))
+ (ping-log
+ (if separate-logs
+ (open-file (if (string-or-symbol? (ly:get-option 'log-file))
+ (format "~a.log" (ly:get-option 'log-file))
+ "/dev/tty") "a") #f))
(do-measurements (ly:get-option 'dump-profile))
(handler (lambda (key failed-file)
(set! failed (append (list failed-file) failed)))))
((start-measurements (if do-measurements
(profile-measurements)
#f))
- (base (basename x ".ly"))
+ (base (dir-basename x ".ly"))
(all-settings (ly:all-options)))
(if separate-logs
(ly:stderr-redirect (format "~a.log" base) "w"))
+ (if ping-log
+ (format ping-log "Procesing ~a\n" base))
+
(if (ly:get-option 'trace-memory-frequency)
(mtrace:start-trace (ly:get-option 'trace-memory-frequency)))
files)
;; we want the failed-files notice in the aggregrate logfile.
- (if (ly:get-option 'separate-logs)
- (ly:stderr-redirect
- (if (string-or-symbol? (ly:get-option 'log-file))
- (format "~a.log" (ly:get-option 'log-file))
- "/dev/tty") "a"))
-
+ (if ping-log
+ (format ping-log "Failed files: ~a\n" failed))
+
(if (ly:get-option 'dump-profile)
(dump-profile "lily-run-total" '(0 0) (profile-measurements)))
(gui-no-files-handler))
(if (not (string? (ly:get-option 'log-file)))
- (let* ((base (basename (car files) ".ly"))
+ (let* ((base (dir-basename (car files) ".ly"))
(log-name (string-append base ".log")))
(if (not (ly:get-option 'gui))
(ly:message (_ "Redirecting output to ~a...") log-name))