*** empty log message ***

[lilypond.git] / scm / lily.scm

diff --git a/scm/lily.scm b/scm/lily.scm
index 197936b3e4945c4179bc3f5753453ab47d47e13b..85c2f07dd7b0a56dea795b15cdabd0d6e0c8ff1e 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 
@@ -10,7 +10,7 @@
   (for-each (lambda (x)
              (ly:add-option (car x) (cadr x) (caddr x)))
          
-           '((point-and-click #t "use point & click")
+           `((point-and-click #t "use point & click")
              (paper-size "a4" "the default paper size")
              (midi-debug #f "generate human readable MIDI")
              (internal-type-checking #f "check every property assignment for types")
@@ -31,11 +31,13 @@ similar to chord syntax")
              (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")
+             (safe #f "Run safely")
+             (verbose ,(ly:command-line-verbose?) "value for the --verbose flag")
              (ttf-verbosity 0
                           "how much verbosity for TTF font embedding?")
              (debug-gc #f
-                       "dump GC protection info"))))
+                       "dump GC protection info"))
+           ))
 
 ;; FIXME: stray statement
 (define-scheme-options)
@@ -86,9 +88,6 @@ similar to chord syntax")
 
 
 
-;; cpp hack to get useful error message
-(define ifdef "First run this through cpp.")
-(define ifndef "First run this through cpp.")
 
 ;; gettext wrapper for guile < 1.7.2
 (if (defined? 'gettext)
@@ -281,6 +280,7 @@ The syntax is the same as `define*-public'."
        (,ly:pitch? . "pitch")
        (,ly:translator? . "translator")
        (,ly:font-metric? . "font metric")
+       (,ly:simple-closure? . "simple closure")
        (,markup-list? . "list of markups")
        (,markup? . "markup")
        (,ly:music-list? . "list of music")
@@ -352,7 +352,7 @@ The syntax is the same as `define*-public'."
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (define-public (lilypond-main files)
   "Entry point for LilyPond."
-
+  
   (define (no-files-handler)
     (ly:usage)
     (exit 2))
@@ -374,9 +374,11 @@ The syntax is the same as `define*-public'."
          (exit 0)))))
 
 (define-public (lilypond-all files)
+
   (let* ((failed '())
         (handler (lambda (key failed-file)
                    (set! failed (append (list failed-file) failed)))))
+
     (for-each
      (lambda (x)
        (lilypond-file handler x)
@@ -403,6 +405,7 @@ The syntax is the same as `define*-public'."
        (ly:message (_ "Redirecting output to ~a...") log-name))
     (ly:stderr-redirect log-name "w")
     (ly:message "# -*-compilation-*-")
+    
     (let ((failed (lilypond-all files)))
       (if (pair? failed)
          (begin