From 4953a582bab48171cab4261f744275c55daffef7 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Thu, 16 Jun 2005 11:13:02 +0000
Subject: [PATCH] * make/mutopia-rules.make ($(outdir)/%.png $(outdir)/%.pdf
 $(outdir)/%.ly $(outdir)/%.ps):

* ly/engraver-init.ly: make Staff default child of ChoirStaff.
---
 ChangeLog               |  8 ++++++++
 lily/program-option.cc  | 15 ++++++++++++---
 ly/engraver-init.ly     |  2 +-
 make/mutopia-rules.make |  2 +-
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 25f496be91..44af8dd808 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-16  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+	* make/mutopia-rules.make ($(outdir)/%.png $(outdir)/%.pdf $(outdir)/%.ly $(outdir)/%.ps): 
+
+	* ly/engraver-init.ly: make Staff default child of ChoirStaff.
+
 2005-06-16  Jan Nieuwenhuizen  <janneke@gnu.org>
 
 	* ChangeLog: Recode utf-8.
@@ -11,6 +17,8 @@
 
 2005-06-15  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* make/mutopia-rules.make: switch off ps, p&c for lilypond runs.
+	
 	* scm/framework-ps.scm (write-preamble): remove status check.
 
 	* Documentation/user/invoking.itely (Updating files with
diff --git a/lily/program-option.cc b/lily/program-option.cc
index de2065041d..552987904b 100644
--- a/lily/program-option.cc
+++ b/lily/program-option.cc
@@ -71,6 +71,9 @@ const int HELP_INDENT = 30;
 const int INDENT = 2; 
 const int SEPARATION = 5; 
 
+/*
+  Hmmm. should do in SCM / C++  ?
+ */
 static String
 get_help_string ()
 {
@@ -78,7 +81,8 @@ get_help_string ()
   SCM convertor = ly_lily_module_constant ("scm->string");
   
   
-  String help ("Options supported by ly:set-option\n\n");
+  Array<String> opts;
+  
   for (SCM s = alist; scm_is_pair (s); s = scm_cdr (s))
     {
       SCM sym = scm_caar (s);
@@ -105,9 +109,14 @@ get_help_string ()
 			   String ("\n")
 			   + String_convert::char_string (' ', HELP_INDENT));
       
-      help += opt_spec + opt_help + "\n";
+      opts.push (opt_spec + opt_help + "\n");
     }
-  
+
+  String help ("Options supported by ly:set-option\n\n");
+  opts.sort (String::compare);
+  for (int  i = 0; i < opts.size (); i++)
+    help += opts[i];
+    
   help += String ("\n");
   return help;
 }
diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 73afe8ccf2..50d042bc48 100644
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -104,7 +104,7 @@
   \InnerChoirStaff
   \name ChoirStaff
   
-  \defaultchild "InnerChoirStaff"
+  \defaultchild "Staff"
   \accepts "InnerChoirStaff"
   \accepts "InnerStaffGroup"
   \description "Identical to @code{StaffGroup} except that the
diff --git a/make/mutopia-rules.make b/make/mutopia-rules.make
index b914429ea0..a4c287cb82 100644
--- a/make/mutopia-rules.make
+++ b/make/mutopia-rules.make
@@ -15,7 +15,7 @@ $(outdir)/%.ly: %.abc
 
 # hmm. notdir builds srcdir builds? 
 $(outdir)/%.png $(outdir)/%.pdf $(outdir)/%.ly $(outdir)/%.ps: $(outdir)/%.ly
-	cd $(outdir); $(LILYPOND) --pdf --ps --png -I $(shell pwd)/ $(notdir $<)
+	cd $(outdir); $(LILYPOND) --pdf --png -ddelete-intermediate-files -dno-point-and-click -I $(shell pwd)/ $(notdir $<)
 	touch $(outdir)/$(basename $(notdir $<)).png
 
 $(outdir)/%.ly: %.ly
-- 
2.39.2