X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Flily.scm;h=f3767ca9f5fb04e8231a2387ab2cf405272cfc70;hb=6f664e0e318a1651f6fe9317a842bf9c7f476f08;hp=85c2f07dd7b0a56dea795b15cdabd0d6e0c8ff1e;hpb=d9fd890ef4a7d067dc8b39fcb7da3e27f948dd83;p=lilypond.git diff --git a/scm/lily.scm b/scm/lily.scm index 85c2f07dd7..f3767ca9f5 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -3,45 +3,78 @@ ;;;; source file of the GNU LilyPond music typesetter ;;;; ;;;; (c) 1998--2006 Jan Nieuwenhuizen -;;;; Han-Wen Nienhuys +;;;; 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") - (paper-size "a4" "the default paper size") - (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.") + + (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") + (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") + (point-and-click #t "use point & click") + (paper-size "a4" "the default paper size") + (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") - (verbose ,(ly:command-line-verbose?) "value for the --verbose flag") + (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")) - )) -;; FIXME: stray statement + (show-available-fonts #f + "List font names available.") + + (verbose ,(ly:command-line-verbose?) "value for the --verbose flag") + ))) + + +;; 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)) @@ -53,7 +86,10 @@ similar to chord syntax") (oop goops) (srfi srfi-1) (srfi srfi-13) - (srfi srfi-14)) + (srfi srfi-14) + (scm clip-region) + + ) ;; my display @@ -87,6 +123,9 @@ similar to chord syntax") ".")) +;; TeX C++ code actually hooks into TEX_STRING_HASHLIMIT +(define-public TEX_STRING_HASHLIMIT 10000000) + ;; gettext wrapper for guile < 1.7.2 @@ -98,12 +137,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) ;; @@ -155,6 +194,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)) @@ -172,6 +212,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)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -207,7 +248,13 @@ 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. @@ -215,6 +262,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" @@ -231,6 +279,7 @@ The syntax is the same as `define*-public'." "chord-name.scm" "parser-ly-from-scheme.scm" + "ly-syntax-constructors.scm" "define-context-properties.scm" "translation-functions.scm" @@ -248,7 +297,6 @@ The syntax is the same as `define*-public'." "define-grobs.scm" "define-grob-interfaces.scm" "define-stencil-commands.scm" - "layout-page-layout.scm" "titling.scm" "paper.scm" @@ -290,7 +338,8 @@ 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") @@ -338,6 +387,8 @@ The syntax is the same as `define*-public'." (display "Live object statistics: GC'ing\n") (gc) (gc) + (ly:set-option 'debug-gc-assert-parsed-dead #t) + (gc) (set! stats (gc-live-object-stats)) (display "Dumping live object statistics.\n") @@ -350,6 +401,8 @@ The syntax is the same as `define*-public'." (string (string-length s) 0)) + (apply append + (map (lambda (f) (string-split (ly:gulp-file f) #\nl)) + files))) + )) + (if (ly:get-option 'show-available-fonts) + (begin + (ly:font-config-display-fonts) + (exit 0) + )) + (let* ((failed '()) (handler (lambda (key failed-file) (set! failed (append (list failed-file) failed))))) (for-each (lambda (x) + (ly:set-option 'debug-gc-assert-parsed-dead #f) (lilypond-file handler x) (ly:clear-anonymous-modules) (if (ly:get-option 'debug-gc)