X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Flily.scm;h=a016901bcb4754c54c8eb99b7afeb011efbece35;hb=9e69cb84d6ee5b0a861cd97869b10e3bdf0c833c;hp=c91fcb2b888a651d56fa2f00e0857a89ceced355;hpb=3db73bcf98d9ac3ccfe33e08ff3cd0292bf65d06;p=lilypond.git diff --git a/scm/lily.scm b/scm/lily.scm index c91fcb2b88..a016901bcb 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -2,47 +2,85 @@ ;;;; ;;;; source file of the GNU LilyPond music typesetter ;;;; -;;;; (c) 1998--2005 Jan Nieuwenhuizen -;;;; Han-Wen Nienhuys +;;;; (c) 1998--2006 Jan Nieuwenhuizen +;;;; Han-Wen Nienhuys (define (define-scheme-options) (for-each (lambda (x) (ly:add-option (car x) (cadr x) (caddr x))) - '((point-and-click #t "use point & click") - (midi-debug #f "generate human readable MIDI") - (internal-type-checking #f "check every property assignment for types") - (parse-protect #t "continue when finding errors in inline -scheme are caught in the parser. If off, halt -on errors, and print a stack trace.") - (profile-property-accesses #f "keep statistics of get_property() calls.") + `( + + ;; NAMING: either + + ;; - [subject-]object-object-verb +"ing" + ;; - [subject-]-verb-object-object + + (anti-alias-factor 1 "render at higher resolution and scale down result\nto prevent jaggies in PNG") + (check-internal-types #f "check every property assignment for types") + (clip-systems #f "Generate cut-out snippets of a score") + (debug-gc #f "dump memory debugging statistics") + (debug-gc-assert-parsed-dead + #f "for memory debugging: ensure that all refs to parsed objects are dead.") + (debug-lexer #f "debug the flex lexer") + (debug-midi #f "generate human readable MIDI") + (debug-parser #f "debug the bison parser") + (debug-skylines #f "debug skylines") + (delete-intermediate-files #f + "delete unusable PostScript files") + (dump-signatures #f "dump output signatures of each system") + (dump-tweaks #f "dump page layout and tweaks for each score having the tweak-key layout property set.") + (gs-load-fonts #f + "load fonts via Ghostscript.") + (include-book-title-preview #t "include book-titles in preview images.") + (include-eps-fonts #t "Include fonts in separate-system EPS files.") + (job-count #f "Process in parallel") + + (eps-box-padding #f "Pad EPS bounding box left edge by this much to guarantee alignment between systems") + + (gui #f "running from gui; redirect stderr to log file") + (log-file #f "redirect output to log FILE.log") (old-relative #f "relative for simultaneous music works similar to chord syntax") (object-keys #f "experimental mechanism for remembering tweaks") - (resolution 101 "resolution for generating bitmaps") - (anti-alias-factor 1 "render at higher resolution and scale down result\nto prevent jaggies in PNG") - (preview-include-book-title #t "include book-titles in preview images.") - (gs-font-load #f - "load fonts via Ghostscript.") - (gui #f "running from gui; redirect stderr to log file") - (delete-intermediate-files #f - "delete unusable PostScript files") - (verbose #f "value for the --verbose flag") + (point-and-click #t "use point & click") + (paper-size "a4" "the default paper size") + (pixmap-format "png16m" "GS format to use for pixel images") + (protected-scheme-parsing #t "continue when finding errors in inline +scheme are caught in the parser. If off, halt +on errors, and print a stack trace.") + (profile-property-accesses #f "keep statistics of get_property() calls.") + + (resolution 101 "resolution for generating PNG bitmaps") + (read-file-list #f "Read files to be processed from command line arguments") + + (safe #f "Run safely") + (strict-infinity-checking #f "If yes, crash on encountering Inf/NaN") + (ttf-verbosity 0 - "how much verbosity for TTF font embedding?") - (debug-gc #f - "dump GC protection info")))) + "how much verbosity for TTF font embedding?") + + (show-available-fonts #f + "List font names available.") + + (verbose ,(ly:command-line-verbose?) "value for the --verbose flag") + ))) -;; FIXME: stray statement + +;; need to do this in the beginning. Other parts of the +;; Scheme init depend on these options. +;; (define-scheme-options) +(debug-set! stack 0) + (if (defined? 'set-debug-cell-accesses!) (set-debug-cell-accesses! #f)) -;(set-debug-cell-accesses! 1000) + ;(set-debug-cell-accesses! 1000) (use-modules (ice-9 regex) (ice-9 safe) @@ -50,7 +88,10 @@ similar to chord syntax") (oop goops) (srfi srfi-1) (srfi srfi-13) - (srfi srfi-14)) + (srfi srfi-14) + (scm clip-region) + + ) ;; my display @@ -66,11 +107,11 @@ similar to chord syntax") (if (ly:get-option 'verbose) (begin + (ly:set-option 'protected-scheme-parsing #f) (debug-enable 'debug) (debug-enable 'backtrace) (read-enable 'positions))) - (define-public tex-backend? (member (ly:output-backend) '("texstr" "tex"))) @@ -85,10 +126,10 @@ similar to chord syntax") ".")) +;; TeX C++ code actually hooks into TEX_STRING_HASHLIMIT +(define-public TEX_STRING_HASHLIMIT 10000000) + -;; cpp hack to get useful error message -(define ifdef "First run this through cpp.") -(define ifndef "First run this through cpp.") ;; gettext wrapper for guile < 1.7.2 (if (defined? 'gettext) @@ -99,12 +140,12 @@ similar to chord syntax") (let* ((file-name (%search-load-path x))) (if (ly:get-option 'verbose) (ly:progress "[~A" file-name)) + (if (not file-name) + (ly:error (_ "Can't find ~A") x)) (primitive-load file-name) (if (ly:get-option 'verbose) (ly:progress "]")))) -(define-public TEX_STRING_HASHLIMIT 10000000) - ;; Cygwin ;; #(CYGWIN_NT-5.1 Hostname 1.5.12(0.116/4/2) 2004-11-10 08:34 i686) ;; @@ -137,7 +178,7 @@ similar to chord syntax") "//*" "/" (string-regexp-substitute "\\\\" "/" x)))) ;; FIXME: this prints a warning. - (define-public (ly-getcwd) + (define-public (ly-getcwd) (slashify (native-getcwd)))) (else (define-public ly-getcwd getcwd))) @@ -156,6 +197,7 @@ similar to chord syntax") (define (type-check-list location signature arguments) "Typecheck a list of arguments against a list of type predicates. Print a message at LOCATION if any predicate failed." + (define (recursion-helper signature arguments count) (define (helper pred? arg count) (if (not (pred? arg)) @@ -173,6 +215,7 @@ predicates. Print a message at LOCATION if any predicate failed." #t (and (helper (car signature) (car arguments) count) (recursion-helper (cdr signature) (cdr arguments) (1+ count))))) + (recursion-helper signature arguments 1)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -208,6 +251,12 @@ The syntax is the same as `define*-public'." safe-objects)) ,safe-symbol))) +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; init pitch system + +(ly:set-default-scale (ly:make-scale #(0 2 4 5 7 9 11))) + + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; other files. @@ -216,6 +265,7 @@ The syntax is the same as `define*-public'." ;; load-from-path '("lily-library.scm" "file-cache.scm" + "define-event-classes.scm" "define-music-types.scm" "output-lib.scm" "c++.scm" @@ -224,7 +274,6 @@ The syntax is the same as `define*-public'." "chord-generic-names.scm" "stencil.scm" "markup.scm" - "bass-figure.scm" "music-functions.scm" "part-combiner.scm" "autochange.scm" @@ -232,15 +281,16 @@ The syntax is the same as `define*-public'." "auto-beam.scm" "chord-name.scm" - "ly-from-scheme.scm" + "parser-ly-from-scheme.scm" + "ly-syntax-constructors.scm" "define-context-properties.scm" "translation-functions.scm" "script.scm" "midi.scm" - "beam.scm" - "clef.scm" - "slur.scm" + "layout-beam.scm" + "parser-clef.scm" + "layout-slur.scm" "font.scm" "encoding.scm" @@ -250,7 +300,6 @@ The syntax is the same as `define*-public'." "define-grobs.scm" "define-grob-interfaces.scm" "define-stencil-commands.scm" - "page-layout.scm" "titling.scm" "paper.scm" @@ -282,6 +331,7 @@ The syntax is the same as `define*-public'." (,ly:pitch? . "pitch") (,ly:translator? . "translator") (,ly:font-metric? . "font metric") + (,ly:simple-closure? . "simple closure") (,markup-list? . "list of markups") (,markup? . "markup") (,ly:music-list? . "list of music") @@ -291,15 +341,18 @@ The syntax is the same as `define*-public'." (,number? . "number") (,output-port? . "output port") (,pair? . "pair") - (,procedure? . "procedure") + (,procedure? . "procedure") + (,rhythmic-location? . "rhythmic location") (,scheme? . "any type") (,string? . "string") (,symbol? . "symbol") (,vector? . "vector"))) +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; debug mem leaks +(define gc-dumping #f) (define gc-protect-stat-count 0) (define-public (dump-gc-protects) (set! gc-protect-stat-count (1+ gc-protect-stat-count)) @@ -314,28 +367,38 @@ The syntax is the same as `define*-public'." ".scm")) (outfile (open-file out-file-name "w"))) - (display (format "Dumping gc protected objs to ~a...\n" out-file-name)) + (set! gc-dumping #t) + (display (format "Dumping GC statistics ~a...\n" out-file-name)) (display - (filter - (lambda (x) (not (symbol? x))) - (map (lambda (y) - (let ((x (car y)) - (c (cdr y))) - - (string-append - (string-join - (map object->string (list (object-address x) c x)) - " ") - "\n"))) + (map (lambda (y) + (let ((x (car y)) + (c (cdr y))) + (display + (format "~a (~a) = ~a\n" (object-address x) c x) + outfile))) + (filter + (lambda (x) + (not (symbol? (car x)))) protects)) outfile) + (format outfile "\nprotected symbols: ~a\n" + (length (filter symbol? (map car protects)))) + + + + ;; (display (ly:smob-protects)) + (newline outfile) (if (defined? 'gc-live-object-stats) (let* ((stats #f)) (display "Live object statistics: GC'ing\n") + (ly:reset-all-fonts) (gc) (gc) - + (ly:set-option 'debug-gc-assert-parsed-dead #t) + (gc) + (ly:set-option 'debug-gc-assert-parsed-dead #f) + (set! stats (gc-live-object-stats)) (display "Dumping live object statistics.\n") @@ -344,77 +407,180 @@ The syntax is the same as `define*-public'." (format outfile "~a: ~a\n" (car x) (cdr x))) (sort (gc-live-object-stats) (lambda (x y) - (string count 0) + (let* + ((pid (primitive-fork))) + (if (= pid 0) + (1- count) + (helper (1- count) (cons pid acc)))) + acc)) + (helper count '())) + + (define-public (lilypond-main files) "Entry point for LilyPond." - + (define (no-files-handler) (ly:usage) (exit 2)) - + + (if (ly:get-option 'gui) + (gui-main files)) (if (null? files) (no-files-handler)) + (if (ly:get-option 'read-file-list) + (set! files + (filter (lambda (s) + (> (string-length s) 0)) + (apply append + (map (lambda (f) (string-split (ly:gulp-file f) #\nl)) + files))) + )) + + (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)) + (joblist (multi-fork count)) + (errors '())) + + (if (not (string-or-symbol? (ly:get-option 'log-file))) + (ly:set-option 'log-file "lilypond-multi-run")) + + (if (number? joblist) + (begin + (ly:set-option 'log-file (format "~a-~a" + (ly:get-option 'log-file) joblist)) + (set! files (vector-ref split-todo joblist))) + + (begin + (ly:progress "\nForking into jobs: ~a\n" joblist) + (for-each + (lambda (pid) + (let* ((stat (cdr (waitpid pid)))) + + (if (not (= stat 0)) + (set! errors (cons (list-element-index joblist pid) errors))))) + joblist) + + (for-each + (lambda (x) + (let* ((logfile (format "~a-~a.log" + (ly:get-option 'log-file) x)) + (log (ly:gulp-file logfile)) + (len (string-length log)) + (tail (substring log (max 0 (- len 1024))))) + + (display (format "\n\nlogfile ~a:\n\n ~a" logfile tail)))) + + errors) + + (if (pair? errors) + (ly:error "Children ~a exited with errors." errors)) + + (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 (pair? failed) (begin (ly:error (_ "failed files: ~S") (string-join failed)) (exit 1)) (begin + (ly:do-atexit) ;; HACK: be sure to exit with single newline (ly:message "") (exit 0))))) (define-public (lilypond-all files) + + + (if (ly:get-option 'show-available-fonts) + (begin + (ly:font-config-display-fonts) + (exit 0) + )) + (let* ((failed '()) + (first #t) (handler (lambda (key failed-file) (set! failed (append (list failed-file) failed))))) + (for-each (lambda (x) + + ;; We don't carry info across file boundaries + (if first + (set! first #f) + (gc)) + (lilypond-file handler x) - (ly:clear-anonymous-modules)) + (ly:clear-anonymous-modules) + (if (ly:get-option 'debug-gc) + (dump-gc-protects) + (if (= (random 40) 1) + (ly:reset-all-fonts)))) + files) failed)) (define (lilypond-file handler file-name) (catch 'ly-file-failed (lambda () (ly:parse-file file-name)) - (lambda (x . args) (handler x file-name))) - - (if (ly:get-option 'debug-gc) - (dump-gc-protects))) + (lambda (x . args) (handler x file-name)))) (use-modules (scm editor)) -(define-public (running-from-gui?) - (let ((have-tty? (isatty? (current-input-port)))) - ;; If no TTY and not using safe, assume running from GUI. - (cond - ((eq? PLATFORM 'windows) - ;; Always write to .log file. - (if DOS #t - ;; This only works for i586-mingw32msvc-gcc -mwindows - (not (string-match "standard input" - (format #f "~S" (current-input-port)))))) - ;; FIXME: using -dgui would be nice, but it does not work - ((eq? PLATFORM 'foo-windows) - (ly:get-option 'gui)) - ((eq? PLATFORM 'darwin) #f) - (else - (not have-tty?))))) - (define-public (gui-main files) (if (null? files) (gui-no-files-handler)) - (let* ((base (basename (car files) ".ly")) - (log-name (string-append base ".log"))) - (if (not (running-from-gui?)) - (ly:message (_ "Redirecting output to ~a...") log-name)) - (ly:stderr-redirect log-name "w") - (ly:message "# -*-compilation-*-") + + (if (not (string? (ly:get-option 'log-file))) + (let* ((base (basename (car files) ".ly")) + (log-name (string-append base ".log"))) + (if (not (ly:get-option 'gui)) + (ly:message (_ "Redirecting output to ~a...") log-name)) + (ly:stderr-redirect log-name "w") + (ly:message "# -*-compilation-*-")) + (let ((failed (lilypond-all files))) (if (pair? failed) (begin @@ -434,7 +600,3 @@ The syntax is the same as `define*-public'." (ly:message (_ "Invoking `~a'...") cmd) (system cmd) (exit 1))) - -(or (not (running-from-gui?)) - (ly:get-option 'safe) - (define lilypond-main gui-main))