X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Flily.scm;h=efa40f338be6236123df3c4c50d881e573af4155;hb=70cc70f3a6183472b93fc4c2b4c60cc0375b6d64;hp=893cc59243f8b7ef45819aa78465878f2bf64b19;hpb=e9a308e9c6002900fc336733950a0175bcbcc333;p=lilypond.git diff --git a/scm/lily.scm b/scm/lily.scm index 893cc59243..efa40f338b 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -2,7 +2,7 @@ ;;;; ;;;; source file of the GNU LilyPond music typesetter ;;;; -;;;; (c) 1998--2006 Jan Nieuwenhuizen +;;;; (c) 1998--2007 Jan Nieuwenhuizen ;;;; Han-Wen Nienhuys ;; Internationalisation: (_i "to be translated") gets an entry in the @@ -17,8 +17,6 @@ (read-enable 'positions) (debug-enable 'debug) - - (define scheme-options-definitions `( @@ -28,22 +26,29 @@ ;; - [subject-]-verb-object-object (anti-alias-factor 1 "render at higher resolution and scale down result\nto prevent jaggies in PNG") + (backend ps "which backend to use by default; Options: eps, ps [default], scm, svg, tex, texstr)") (check-internal-types #f "check every property assignment for types") (clip-systems #f "Generate cut-out snippets of a score") + (datadir #f "LilyPond prefix for data files (Readonly).") (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. This is an internal option, and is switched on automatically for -ddebug-gc.") (debug-lexer #f "debug the flex lexer") + (debug-page-breaking-scoring #f "dump scores for many different page breaking configurations") (debug-parser #f "debug the bison parser") + (debug-property-callbacks #f "debug cyclic callback chains") (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.") @@ -57,6 +62,8 @@ similar to chord syntax") (point-and-click #t "use point & click") (paper-size "a4" "the default paper size") (pixmap-format "png16m" "GS format to use for pixel images") + (preview #f "make a incipit image. ") + (print-pages #t "print pages normally. ") (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.") @@ -99,6 +106,7 @@ on errors, and print a stack trace.") (use-modules (ice-9 regex) (ice-9 safe) + (ice-9 format) (ice-9 rdelim) (ice-9 optargs) (oop goops) @@ -109,6 +117,15 @@ on errors, and print a stack trace.") (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." + + (if (string? dest) + (apply simple-format (cons #f (cons dest rest))) + (apply simple-format (cons dest rest)))) + +(define format ergonomic-simple-format) ;; my display (define-public (myd k v) (display k) (display ": ") (display v) (display ", ") @@ -137,18 +154,10 @@ on errors, and print a stack trace.") (coverage:enable)) (define-public tex-backend? - (member (ly:output-backend) '("texstr" "tex"))) + (member (ly:get-option 'backend) '(texstr tex))) (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) @@ -275,6 +284,14 @@ The syntax is the same as `define*-public'." 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 @@ -399,7 +416,9 @@ The syntax is the same as `define*-public'." (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) ))) @@ -447,9 +466,10 @@ The syntax is the same as `define*-public'." outfile) (format outfile "\nprotected symbols: ~a\n" - (length (filter symbol? (map car protects)))) - - + (apply + (map (lambda (obj-count) (if (symbol? (car obj-count)) + (cdr obj-count) + 0)) + protects))) ;; (display (ly:smob-protects)) (newline outfile) @@ -539,17 +559,28 @@ The syntax is the same as `define*-public'." (define-public (lilypond-main files) "Entry point for LilyPond." - (define (no-files-handler) - (ly:usage) - (exit 2)) (eval-string (ly:command-line-code)) + + (if (ly:get-option 'help) + (begin + (ly:option-usage) + (exit 0))) + + (if (ly:get-option 'show-available-fonts) + (begin + (ly:font-config-display-fonts) + (exit 0) + )) + (if (ly:get-option 'gui) (gui-main files)) (if (null? files) - (no-files-handler)) + (begin + (ly:usage) + (exit 2))) (if (ly:get-option 'read-file-list) (set! files @@ -638,16 +669,6 @@ The syntax is the same as `define*-public'." (exit 0))))) (define-public (lilypond-all files) - (if (ly:get-option 'help) - (begin - (ly:option-usage) - (exit 0))) - (if (ly:get-option 'show-available-fonts) - (begin - (ly:font-config-display-fonts) - (exit 0) - )) - (let* ((failed '()) (separate-logs (ly:get-option 'separate-log-files)) (do-measurements (ly:get-option 'dump-profile))