From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Thu, 25 Jan 2007 23:35:50 +0000 (+0100)
Subject: handle -dhelp from scheme.
X-Git-Tag: release/2.11.14-1~25
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=11c5f843dee7efbdae99c59c2afcaf0256204107;p=lilypond.git

handle -dhelp from scheme.
---

diff --git a/lily/program-option.cc b/lily/program-option.cc
index 5d9bebd738..5ae59f9569 100644
--- a/lily/program-option.cc
+++ b/lily/program-option.cc
@@ -179,12 +179,6 @@ LY_DEFINE (ly_set_option, "ly:set-option", 1, 1, 0, (SCM var, SCM val),
   SCM_ASSERT_TYPE (scm_is_symbol (var), var, SCM_ARG1,
 		   __FUNCTION__, "symbol");
 
-  if (ly_symbol2scm ("help") == var)
-    {
-      ly_option_usage ();
-      exit (0);
-    }
-
   if (val == SCM_UNDEFINED)
     val = SCM_BOOL_T;
 
diff --git a/scm/lily.scm b/scm/lily.scm
index 69e00b4d44..893cc59243 100644
--- 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") 
@@ -638,6 +638,10 @@ 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)