Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / scm / lily.scm

diff --git a/scm/lily.scm b/scm/lily.scm
index b366507f5d1a05e909d7772a89795f80dc45135c..cee1e74e800423d72e25d75e1985556638e09c38 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -31,11 +31,14 @@
     (backend ps "which backend to use by default; Options: eps, ps [default], scm, svg, tex, texstr)")
     (check-internal-types #f "check every property assignment for types")
     (clip-systems #f "Generate cut-out snippets of a score")
+    (datadir #f "LilyPond prefix for data files (Readonly).")
     (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.  This is an internal option, and is switched on automatically for -ddebug-gc.") 
     (debug-lexer #f "debug the flex lexer")
+    (debug-page-breaking-scoring #f "dump scores for many different page breaking configurations")
     (debug-parser #f "debug the bison parser")
+    (debug-property-callbacks #f "debug cyclic callback chains")
     (debug-skylines #f "debug skylines")
     (delete-intermediate-files #f
                               "delete unusable PostScript files")
@@ -58,6 +61,8 @@ similar to chord syntax")
     (point-and-click #t "use point & click")
     (paper-size "a4" "the default paper size")
     (pixmap-format "png16m" "GS format to use for pixel images")
+    (preview #f "make a incipit image. ")
+    (print-pages #t "print pages normally. ")
     (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.")
@@ -540,17 +545,28 @@ 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))
 
   (eval-string (ly:command-line-code))
+
+  (if (ly:get-option 'help)
+      (begin
+       (ly:option-usage)
+       (exit 0)))
+
+  (if (ly:get-option 'show-available-fonts)
+      (begin
+       (ly:font-config-display-fonts)
+       (exit 0)
+       ))
+  
   
   (if (ly:get-option 'gui)
       (gui-main files))
 
   (if (null? files)
-      (no-files-handler))
+      (begin
+       (ly:usage)
+       (exit 2)))
 
   (if (ly:get-option 'read-file-list)
       (set! files
@@ -639,16 +655,6 @@ The syntax is the same as `define*-public'."
          (exit 0)))))
 
 (define-public (lilypond-all files)
-  (if (ly:get-option 'help)
-      (begin
-       (ly:option-usage)
-       (exit 0)))
-  (if (ly:get-option 'show-available-fonts)
-      (begin
-       (ly:font-config-display-fonts)
-       (exit 0)
-       ))
-  
   (let* ((failed '())
         (separate-logs (ly:get-option 'separate-log-files))
         (do-measurements (ly:get-option 'dump-profile))