* lily/parser.yy (simple_string): allow \new STRING_IDENTIFIER.

[lilypond.git] / scm / lily.scm

diff --git a/scm/lily.scm b/scm/lily.scm
index abf238871a2a395a8ec4b6e0debdd92af66614dc..c91fcb2b888a651d56fa2f00e0857a89ceced355 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -6,6 +6,39 @@
 ;;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 
+(define (define-scheme-options)
+  (for-each (lambda (x)
+             (ly:add-option (car x) (cadr x) (caddr x)))
+         
+           '((point-and-click #t "use point & click")
+             (midi-debug #f "generate human readable MIDI")
+             (internal-type-checking #f "check every property assignment for types")
+             (parse-protect #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.")
+             (old-relative #f
+                           "relative for simultaneous music works
+similar to chord syntax")
+             (object-keys #f
+                          "experimental mechanism for remembering tweaks")
+             (resolution 101 "resolution for generating bitmaps")
+             (anti-alias-factor 1 "render at higher resolution and scale down result\nto prevent jaggies in PNG")
+             (preview-include-book-title #t "include book-titles in preview images.")
+             (gs-font-load #f
+                           "load fonts via Ghostscript.")
+             (gui #f "running from gui; redirect stderr to log file")
+             (delete-intermediate-files #f
+                                        "delete unusable PostScript files")
+             (verbose #f "value for the --verbose flag")
+             (ttf-verbosity 0
+                          "how much verbosity for TTF font embedding?")
+             (debug-gc #f
+                       "dump GC protection info"))))
+
+;; FIXME: stray statement
+(define-scheme-options)
+
 (if (defined? 'set-debug-cell-accesses!)
     (set-debug-cell-accesses! #f))
 
@@ -88,6 +121,12 @@
    (string-downcase
     (car (string-tokenize (vector-ref (uname) 0) char-set:letter)))))
 
+(define-public DOS
+  (let ((platform (string-tokenize
+                  (vector-ref (uname) 0) char-set:letter+digit)))
+    (if (null? (cdr platform)) #f
+       (member (string-downcase (cadr platform)) '("95" "98" "me")))))
+
 (case PLATFORM
   ((windows)
    (define native-getcwd getcwd)
@@ -188,6 +227,7 @@ The syntax is the same as `define*-public'."
            "bass-figure.scm"
            "music-functions.scm"
            "part-combiner.scm"
+           "autochange.scm"
            "define-music-properties.scm"
            "auto-beam.scm"
            "chord-name.scm"
@@ -268,6 +308,7 @@ The syntax is the same as `define*-public'."
                    (lambda (a b)
                      (< (object-address (car a))
                         (object-address (car b))))))
+
         (out-file-name (string-append
                         "gcstat-" (number->string gc-protect-stat-count)
                         ".scm"))
@@ -287,15 +328,33 @@ The syntax is the same as `define*-public'."
                 " ")
                "\n")))
           protects))
-     outfile)))
-
-(define-public (tweak-grob-property grob sym val)
-  (set! (ly:grob-property grob sym) val))
+     outfile)
+
+    (if (defined? 'gc-live-object-stats)
+       (let* ((stats #f))
+         (display "Live object statistics: GC'ing\n")
+         (gc)
+         (gc)
+         
+         (set! stats (gc-live-object-stats))
+         (display "Dumping live object statistics.\n")
+         
+         (for-each
+          (lambda (x)
+            (format outfile "~a: ~a\n" (car x) (cdr x)))
+          (sort (gc-live-object-stats)
+                (lambda (x y)
+                  (string<? (car x) (car y)))))))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (define-public (lilypond-main files)
   "Entry point for LilyPond."
 
+  (define (no-files-handler)
+    (ly:usage)
+    (exit 2))
+  
+
   (if (null? files)
       (no-files-handler))
 
@@ -309,16 +368,15 @@ The syntax is the same as `define*-public'."
          (ly:message "")
          (exit 0)))))
 
-(define (no-files-handler)
-  (ly:usage)
-  (exit 2))
-
 (define-public (lilypond-all files)
   (let* ((failed '())
         (handler (lambda (key failed-file)
                    (set! failed (append (list failed-file) failed)))))
-    ;;(handler (lambda (key . arg) (set! failed (append arg failed)))))
-    (for-each (lambda (x) (lilypond-file handler x)) files)
+    (for-each
+     (lambda (x)
+       (lilypond-file handler x)
+       (ly:clear-anonymous-modules))
+     files)
     failed))
 
 (define (lilypond-file handler file-name)
@@ -326,7 +384,7 @@ The syntax is the same as `define*-public'."
         (lambda () (ly:parse-file file-name))
         (lambda (x . args) (handler x file-name)))
 
-  (if #t
+  (if (ly:get-option 'debug-gc)
       (dump-gc-protects)))
 
 (use-modules (scm editor))
@@ -336,9 +394,14 @@ The syntax is the same as `define*-public'."
     ;; If no TTY and not using safe, assume running from GUI.
     (cond
      ((eq? PLATFORM 'windows)
+      ;; Always write to .log file.
+      (if DOS #t
       ;; This only works for i586-mingw32msvc-gcc -mwindows
       (not (string-match "standard input"
-                        (format #f "~S" (current-input-port)))))
+                        (format #f "~S" (current-input-port))))))
+     ;; FIXME: using -dgui would be nice, but it does not work
+     ((eq? PLATFORM 'foo-windows)
+      (ly:get-option 'gui))
      ((eq? PLATFORM 'darwin) #f)
      (else
       (not have-tty?)))))