Merge with git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond.git

[lilypond.git] / scm / lily.scm

diff --git a/scm/lily.scm b/scm/lily.scm
index 8385bbdd00918d6b224b096b0ee8c6798f76c676..f3767ca9f5fb04e8231a2387ab2cf405272cfc70 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -19,9 +19,14 @@
 
              (anti-alias-factor 1 "render at higher resolution and scale down result\nto prevent jaggies in PNG")
              (check-internal-types #f "check every property assignment for types")
-             (debug-gc #f
-                       "dump memory debugging statistics")
+             (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")
@@ -29,9 +34,9 @@
              (gs-load-fonts #f
                            "load fonts via Ghostscript.")
              (include-book-title-preview #t "include book-titles in preview images.")
-             (include-eps-fonts #f "Include fonts in separate-system EPS files.")
+             (include-eps-fonts #t "Include fonts in separate-system EPS files.")
 
-             (pad-eps-boxes #f "Pad EPS bounding boxes to guarantee alignment between systems")
+             (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")
              
@@ -47,7 +52,7 @@ 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")
@@ -68,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))
 
@@ -79,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
@@ -328,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")
@@ -376,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")
@@ -409,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)))))
@@ -435,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)