X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Flily.scm;h=5fb635b06c21aa4f626e31d54c1c03fdfd285ba9;hb=aa8523e4fa16352a1708065e447aac65426d82a4;hp=c39b243648613d4a0f475f8e40aca3a0b8dfa17c;hpb=e0a5069fde625a2ad97f424e535b0cfafe3b4741;p=lilypond.git

diff --git a/scm/lily.scm b/scm/lily.scm
index c39b243648..5fb635b06c 100644
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -38,9 +38,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 +68,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 +155,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
@@ -242,7 +248,7 @@ second.  Dump results to `FILE.stacks' and
 	(ly:error (_ "cannot find: ~A") x))
     (primitive-load file-name)
     (if (ly:get-option 'verbose)
-	(ly:progress "]"))))
+	(ly:progress "]\n"))))
 
 (define-public DOS
   (let ((platform (string-tokenize
@@ -303,16 +309,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 +364,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 +395,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 +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")
@@ -449,8 +451,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 +533,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)
@@ -688,7 +688,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)
@@ -750,6 +750,6 @@ PIDs or the number of the process."
 	 ;; FIXME: soft-code, localize
 	 (welcome-ly (string-append ly "Welcome_to_LilyPond.ly"))
 	 (cmd (get-editor-command welcome-ly 0 0 0)))
-    (ly:message (_ "Invoking `~a'...") cmd)
+    (ly:message (_ "Invoking `~a'...\n") cmd)
     (system cmd)
     (exit 1)))