From f8187c670aac9bf7a545c65bf2c870733494603c Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 18 Aug 2002 09:28:20 +0000
Subject: [PATCH] * lily/main.cc (main, main_prog): Bugfix: move
 exit-upon-files back, until after evaluating init_scheme_code.

* scm/translator-property-description.scm (breakAlignOrder): Doco fix.
---
 ChangeLog                               |  5 +++++
 lily/auto-beam-engraver.cc              |  3 ++-
 lily/main.cc                            | 19 ++++++++++---------
 lily/scm-option.cc                      | 14 ++++----------
 ly/engraver-init.ly                     |  2 +-
 scm/translator-property-description.scm | 12 ++++++------
 6 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7b003ff7ab..3b1f4758eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2002-08-18  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+	* lily/main.cc (main, main_prog): Bugfix: move exit-upon-files
+	back, until after evaluating init_scheme_code.
+
+	* scm/translator-property-description.scm (breakAlignOrder): Doco fix.
+
 	* Documentation/user/lilypond-book.itely: Remove @cindex
 	without argument.
 
diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc
index 35706dde6b..bce4eac956 100644
--- a/lily/auto-beam-engraver.cc
+++ b/lily/auto-beam-engraver.cc
@@ -488,7 +488,8 @@ Auto_beam_engraver::process_acknowledged_grobs ()
         auto-beam-engraver.cc:459: warning: value computed is not used (gcc: 2.96) */
   count_ = count_ + 1;
 }
-ENTER_DESCRIPTION(Auto_beam_engraver,
+
+ENTER_DESCRIPTION (Auto_beam_engraver,
 /* descr */       "Generate beams based on measure characteristics and observed
 Stems.  Uses beatLength, measureLength and measurePosition to decide
 when to start and stop a beam.  Overriding beaming is done through
diff --git a/lily/main.cc b/lily/main.cc
index 6bf6435889..9fee2c5c5e 100644
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -352,7 +352,16 @@ main_prog (void *, int, char **)
   
   int p=0;
   const char *arg  = oparser_p_static->get_next_arg ();
-  
+
+  /* Only exit until after running init_scheme_code, for
+     (set-lily-option 'help) */
+  if (!arg)
+    {
+      usage ();
+      /* No FILE arguments is now a usage error */
+      exit (2);
+    }
+
   do
     {
       String infile (arg);
@@ -505,14 +514,6 @@ main (int argc, char **argv)
       exit (0);
     }
 
-
-  if (!oparser_p_static->current_arg () )
-    {
-      usage ();
-      /* No FILE arguments is now a usage error */
-      exit (2);
-    }
-
   scm_boot_guile (argc, argv, (void (*) (void*, int, char**))main_prog, 0);
 
   return 0;			// unreachable
diff --git a/lily/scm-option.cc b/lily/scm-option.cc
index ab4e73f1ca..9c484e3d9d 100644
--- a/lily/scm-option.cc
+++ b/lily/scm-option.cc
@@ -38,17 +38,13 @@ int testing_level_global;
  */
 bool internal_type_checking_global_b;
 
-/*
-
-add these as well:
+/* Add these as well:
 
 @item -T,--no-timestamps
 don't timestamp the output
 
 @item -t,--test
-Switch on any experimental features.  Not for general public use.
-
- */
+Switch on any experimental features.  Not for general public use. */
 
 LY_DEFINE(set_lily_option,"set-lily-option", 2, 0, 0,  (SCM var, SCM val),
 	  "Set a global option for the program. Supported options  include
@@ -67,10 +63,8 @@ This function is useful to call from the command line: @code{lilypond -e
 \"(set-lily-option 'midi-debug #t)\"}.
 ")
 {
-  /*
-    Scheme option usage:
-    lilypond -e "(set-lily-option 'help 0)"
-   */
+  /* Scheme option usage:
+    lilypond -e "(set-lily-option 'help 0)" */
   if (var == ly_symbol2scm ("help"))
     {
       printf ( _("lilypond -e EXPR means
diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 61f79362af..8a76844792 100644
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -65,7 +65,7 @@ StaffContainerContext = \translator {
 InnerChoirStaffContext = \translator {
 	\type "Engraver_group_engraver"
 	\name InnerChoirStaff
-	alignmentReference = #0
+	%% alignmentReference = #0 FIXME
 	\consists "System_start_delimiter_engraver"
 	systemStartDelimiter = #'SystemStartBracket
 	localKeySignature = #'()
diff --git a/scm/translator-property-description.scm b/scm/translator-property-description.scm
index 1e0a16018d..7cd0c0f7b8 100644
--- a/scm/translator-property-description.scm
+++ b/scm/translator-property-description.scm
@@ -135,12 +135,12 @@ key signatures after the bar lines:
 
 @example
 	\\property Score.breakAlignOrder = #'(
-	  Span_bar
-	  Breathing_sign
-	  Clef_item
-	  Staff_bar
-	  Key_item
-	  Time_signature
+	  span-bar
+	  breathing-sign
+	  clef
+	  staff-bar
+	  key
+	  time-signature
 	)
 @end example
 ")
-- 
2.39.5