Merge with master

[lilypond.git] / scm / lily.scm

diff --git a/scm/lily.scm b/scm/lily.scm
index 69e00b4d4431f62e70c1169960f050ba0af2cb22..f455829be69924bc8456c847c1ea80a4e9487fe7 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -45,7 +45,7 @@ ensure that all refs to parsed objects are dead.  This is an internal option, an
     (gs-load-fonts #f
                   "load fonts via Ghostscript.")
     (gui #f "running from gui; redirect stderr to log file")
-
+    (help #f "show this help.") 
     (include-book-title-preview #t "include book-titles in preview images.")
     (include-eps-fonts #t "Include fonts in separate-system EPS files.")
     (job-count #f "Process in parallel") 
@@ -633,11 +633,16 @@ 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)))))
 
 (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)