Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / scm / lily.scm

diff --git a/scm/lily.scm b/scm/lily.scm
index 360e694053fafaf1b6a59b0110d6e6182f305b21..17063a9aef80eaccafd5cc31f49a083a6f534f28 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -40,7 +40,7 @@ and scale down result to prevent jaggies in
 PNG images.")
     (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 +65,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 +152,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
@@ -226,6 +229,11 @@ second.  Dump results to `FILE.stacks' and
 (if (ly:get-option 'trace-scheme-coverage)
     (coverage:enable))
 
+(if (ly:get-option 'warning-as-error)
+    (begin
+      (set! ly:warning ly:error)
+      (set! ly:programming-error ly:error)))
+
 (define-public parser #f)
 
 
@@ -303,16 +311,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
@@ -405,8 +403,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 +415,21 @@ 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: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")
@@ -688,7 +690,7 @@ PIDs or the number of the process."
         (if separate-logs
             (ly:stderr-redirect (format "~a.log" base) "w"))
         (if ping-log
-            (format ping-log "Procesing ~a\n" base))
+            (format ping-log "Processing ~a\n" base))
         (if (ly:get-option 'trace-memory-frequency)
             (mtrace:start-trace  (ly:get-option 'trace-memory-frequency)))
         (lilypond-file handler x)