X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Flily.scm;h=fca785740675f930f848dd4c6bf657a3c32b93b9;hb=ff7c77a63fb6686cb8eeaea72b4ab9d94cf7314f;hp=d62c70bb0ff471637ce3aabe05f7c01fc40e1295;hpb=cfc4cbf34569db6a6c8968694f86e36b206a9d05;p=lilypond.git diff --git a/scm/lily.scm b/scm/lily.scm index d62c70bb0f..fca7857406 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -1,9 +1,20 @@ -;;;; lily.scm -- top-level Scheme stuff +;;;; This file is part of LilyPond, the GNU music typesetter. ;;;; -;;;; source file of the GNU LilyPond music typesetter -;;;; -;;;; (c) 1998--2009 Jan Nieuwenhuizen +;;;; Copyright (C) 1998--2009 Jan Nieuwenhuizen ;;;; Han-Wen Nienhuys +;;;; +;;;; LilyPond is free software: you can redistribute it and/or modify +;;;; it under the terms of the GNU General Public License as published by +;;;; the Free Software Foundation, either version 3 of the License, or +;;;; (at your option) any later version. +;;;; +;;;; LilyPond is distributed in the hope that it will be useful, +;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;;; GNU General Public License for more details. +;;;; +;;;; You should have received a copy of the GNU General Public License +;;;; along with LilyPond. If not, see . ;; Internationalisation: (_i "to be translated") gets an entry in the ;; POT file; (gettext ...) must be invoked explicitly to do the actual @@ -38,9 +49,12 @@ "Render at higher resolution (using given factor) and scale down result to prevent jaggies in PNG images.") + (aux-files #t +"Create .tex, .texi, .count files in the +EPS backend.") (backend ps "Select backend. Possible values: 'eps, 'null, -'ps, 'scm, 'svg.") +'ps, 'scm, 'socket, 'svg.") (check-internal-types #f "Check every property assignment for types.") (clip-systems #f @@ -65,7 +79,7 @@ configurations.") "Debug cyclic callback chains.") (debug-skylines #f "Debug skylines.") - (delete-intermediate-files #f + (delete-intermediate-files #t "Delete unusable, intermediate PostScript files.") (dump-profile #f "Dump memory and time information for each file.") @@ -152,6 +166,9 @@ second. Dump results to `FILE.stacks' and "List available font names.") (verbose ,(ly:command-line-verbose?) "Value of the --verbose flag (read-only).") + (warning-as-error #f +"Change all warning and programming_error +messages into errors.") )) ;; Need to do this in the beginning. Other parts of the Scheme @@ -303,16 +320,6 @@ Print a message at LOCATION if any predicate failed." (recursion-helper (cdr signature) (cdr arguments) (1+ count))))) (recursion-helper signature arguments 1)) -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; output - -;; (define-public (output-framework) (write "hello\n")) - -(define output-ps-module - (make-module 1021 (list (resolve-interface '(scm output-ps))))) - -(define-public (ps-output-expression expr port) - (display (eval expr output-ps-module) port)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Safe definitions utility @@ -368,6 +375,7 @@ LilyPond safe mode. The syntax is the same as `define*-public'." "part-combiner.scm" "autochange.scm" "define-music-properties.scm" + "beam-settings.scm" "auto-beam.scm" "chord-name.scm" @@ -398,6 +406,7 @@ LilyPond safe mode. The syntax is the same as `define*-public'." "paper.scm" "backend-library.scm" "x11-color.scm" + "tablature.scm" ;; must be after everything has been defined "safe-lily.scm")) @@ -405,8 +414,8 @@ LilyPond safe mode. The syntax is the same as `define*-public'." (for-each ly:load init-scheme-files) (set! type-p-name-alist - `((,boolean-or-symbol? . "boolean or symbol") - (,boolean? . "boolean") + `((,boolean? . "boolean") + (,boolean-or-symbol? . "boolean or symbol") (,char? . "char") (,grob-list? . "list of grobs") (,hash-table? . "hash table") @@ -417,17 +426,22 @@ LilyPond safe mode. The syntax is the same as `define*-public'." (,ly:dimension? . "dimension, in staff space") (,ly:dir? . "direction") (,ly:duration? . "duration") + (,ly:font-metric? . "font metric") (,ly:grob? . "layout object") + (,ly:grob-array? . "array of grobs") (,ly:input-location? . "input location") (,ly:moment? . "moment") (,ly:music? . "music") + (,ly:music-list? . "list of music objects") + (,ly:music-output? . "music output") (,ly:pitch? . "pitch") (,ly:translator? . "translator") - (,ly:font-metric? . "font metric") + (,ly:score? . "score") (,ly:simple-closure? . "simple closure") + (,ly:skyline-pair? . "pair of skylines") + (,ly:stencil? . "stencil") (,markup-list? . "list of markups") (,markup? . "markup") - (,ly:music-list? . "list of music") (,number-or-grob? . "number or grob") (,number-or-string? . "number or string") (,number-pair? . "pair of numbers") @@ -449,8 +463,8 @@ LilyPond safe mode. The syntax is the same as `define*-public'." (stats (gc-stats))) (list (- (+ (tms:cutime t) (tms:utime t)) - (ly:assoc-get 'gc-time-taken stats)) - (ly:assoc-get 'total-cells-allocated stats 0)))) + (assoc-get 'gc-time-taken stats)) + (assoc-get 'total-cells-allocated stats 0)))) (define (dump-profile base last this) (let* ((outname (format "~a.profile" (dir-basename base ".ly"))) @@ -531,10 +545,8 @@ LilyPond safe mode. The syntax is the same as `define*-public'." (format "~a ~a ~a\n" gc-protect-stat-count sym - (let ((sym-stat (assoc sym stats))) - (if sym-stat - (cdr sym-stat) - "?"))) + (assoc-get sym stats "?")) + outfile)) '(protected-objects bytes-malloced cell-heap-size))) (set! gc-dumping #f)