From: hanwen <hanwen>
Date: Mon, 6 Jun 2005 20:58:23 +0000 (+0000)
Subject: add \defaultchild to InnerStaffGroup.
X-Git-Tag: release/2.5.32^2~60
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3bc3e56142a06980ed02f8b43bd6b7fb96f8d88e;p=lilypond.git

add \defaultchild to InnerStaffGroup.
---

diff --git a/ChangeLog b/ChangeLog
index 661e5e44cc..dbd565de47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-06-06  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* ly/engraver-init.ly: add \defaultchild to InnerStaffGroup. 
+
 	* scm/ps-to-png.scm (gulp-port): rename from read. Don't redefine
 	system primitives.
 	(gulp-port): using read-string!/partial. We don't want to read an
diff --git a/lily/source-file.cc b/lily/source-file.cc
index 2d3e70a317..04f2bab93a 100644
--- a/lily/source-file.cc
+++ b/lily/source-file.cc
@@ -234,6 +234,10 @@ Source_file::get_column (char const *pos_str0) const
   while (left > 0)
     {
       wchar_t multibyte[2];
+
+      /*
+	FIXME, this is apparently locale dependent.
+      */
       size_t thislen = mbrtowc (multibyte, line_chars, left, &state);
       
       /* Stop converting at invalid character;
@@ -241,6 +245,7 @@ Source_file::get_column (char const *pos_str0) const
 	 of a valid character.  */
       if (thislen == (size_t) -1)
 	break;
+      
       /* We want to handle embedded NUL bytes
 	 but the return value is 0.  Correct this.  */
       if (thislen == 0)
diff --git a/lily/system-start-delimiter-engraver.cc b/lily/system-start-delimiter-engraver.cc
index 55ef8fd32c..bf6daa8b9e 100644
--- a/lily/system-start-delimiter-engraver.cc
+++ b/lily/system-start-delimiter-engraver.cc
@@ -52,9 +52,6 @@ System_start_delimiter_engraver::acknowledge_grob (Grob_info inf)
 	       && scm_is_string (my_gl) && ly_c_equal_p (my_gl, scm_makfrom0str ("bracket")))
 	{
 	  inf.grob ()->translate_axis (-0.8, X_AXIS); // ugh
-	  inf.grob ()->set_property ("arch-height",
-				   scm_make_real (scm_to_double (inf.grob ()->get_property
-								 ("arch-height")) + 0.5));
 	}
     }
 }
diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 314f141a3b..73afe8ccf2 100644
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -297,6 +297,8 @@ contained staves are not connected vertically."
   systemStartDelimiter = #'SystemStartBracket
 
   \consists "System_start_delimiter_engraver"
+
+  \defaultchild "Staff"
   \accepts "Staff"
   \accepts "RhythmicStaff"
   \accepts "DrumStaff"