Merge branch 'cvs-head' of http://lilypond.org/vc/lilypond into master-hanwen

diff --combined scm/lily.scm
index 7bd67c0fc64f92f307b2d659d5e1ecc1aec6a017,edd99461d5d7a7e7aca37959e6b633f3f11c1824..ee17b9fbc77c9f20f027b408c0b90d22cfab7c70
--- 1/scm/lily.scm
--- 2/scm/lily.scm
+++ b/scm/lily.scm
@@@ -22,9 -22,6 +22,12 @@@
              (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-midi #f "generate human readable MIDI")
++            (debug-parser #f "debug the bison parser")
++            (debug-lexer #f "debug the flex lexer")
              (debug-midi #f "generate human readable MIDI")
              (debug-parser #f "debug the bison parser")
              (debug-lexer #f "debug the flex lexer")
@@@ -389,8 -386,6 +392,8 @@@ The syntax is the same as `define*-publ
          (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")
@@@ -450,7 -445,6 +453,7 @@@
  
      (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)
@@@ -464,7 -458,8 +467,7 @@@
         (lambda () (ly:parse-file file-name))
         (lambda (x . args) (handler x file-name))))
  
 -(use-modules (scm editor)
 -           )
 +(use-modules (scm editor))
  
  (define-public (gui-main files)
    (if (null? files)