X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Flily.scm;h=f3767ca9f5fb04e8231a2387ab2cf405272cfc70;hb=6f664e0e318a1651f6fe9317a842bf9c7f476f08;hp=5601d1e72722c1c01d8c4ab0140e93bbcae243ce;hpb=1afc7f48df3385e078d5ec99214559b4b09eccd9;p=lilypond.git

diff --git a/scm/lily.scm b/scm/lily.scm
index 5601d1e727..f3767ca9f5 100644
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -3,7 +3,7 @@
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
 ;;;; (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
-;;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 
 (define (define-scheme-options)
@@ -11,20 +11,35 @@
 	      (ly:add-option (car x) (cadr x) (caddr x)))
 	  
 	    `(
+
+	      ;; 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")
-	      (book-title-preview #t "include book-titles in preview images.")
-	      (debug-gc #f
-			"dump memory debugging statistics")
+	      (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")
-	      (eps-font-include #f "Include fonts in separate-system EPS files.")
-	      (eps-pad-boxes #f "Pad EPS bounding boxes to guarantee alignment between systems")
-	      (gs-font-load #f
+	      (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")
-	      (internal-type-checking #f "check every property assignment for types")
-	      (midi-debug #f "generate human readable MIDI")
+	      
 	      (old-relative #f
 			    "relative for simultaneous music works
 similar to chord syntax")
@@ -32,18 +47,23 @@ similar to chord syntax")
 			   "experimental mechanism for remembering tweaks")
 	      (point-and-click #t "use point & click")
 	      (paper-size "a4" "the default paper size")
-	      (parse-protect #t "continue when finding errors in inline
+	      (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 bitmaps")
+	      
+	      (resolution 101 "resolution for generating PNG bitmaps")
 	      (read-file-list #f "Read files to be processed from command line arguments")
+
 	      (safe #f "Run safely")
 	      (strict-infinity-checking #f "If yes, crash on encountering Inf/NaN")
+
 	      (ttf-verbosity 0
 			   "how much verbosity for TTF font embedding?")
+
 	      (show-available-fonts #f
 				    "List  font names available.")
+
 	      (verbose ,(ly:command-line-verbose?) "value for the --verbose flag")
 	      )))
 
@@ -53,6 +73,8 @@ on errors, and print a stack trace.")
 ;;
 (define-scheme-options)
 
+(debug-set! stack 0)
+
 (if (defined? 'set-debug-cell-accesses!)
     (set-debug-cell-accesses! #f))
 
@@ -64,7 +86,10 @@ on errors, and print a stack trace.")
 	     (oop goops)
 	     (srfi srfi-1)
 	     (srfi srfi-13)
-	     (srfi srfi-14))
+	     (srfi srfi-14)
+	     (scm clip-region)
+
+	     )
 
 
 ;; my display
@@ -223,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.
 
@@ -307,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")
@@ -355,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")
@@ -388,6 +422,7 @@ The syntax is the same as `define*-public'."
 	  (ly:error (_ "failed files: ~S") (string-join failed))
 	  (exit 1))
 	(begin
+	  (ly:do-atexit)
 	  ;; HACK: be sure to exit with single newline
 	  (ly:message "")
 	  (exit 0)))))
@@ -414,6 +449,7 @@ The syntax is the same as `define*-public'."
 
     (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)