add \defaultchild to InnerStaffGroup.

diff --git a/ChangeLog b/ChangeLog
index 661e5e44cc960835fd37173588728e6ba90c1912..dbd565de479fd189f94a79d816f8ecdd35a74cd2 100644 (file)
--- 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 2d3e70a3175c481f78272d3f0077b8387f9a50e3..04f2bab93ad1d30fe1914d19f275cbd855f1da7c 100644 (file)
--- 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 55ef8fd32cfae271563f2dac8af6acacba999587..bf6daa8b9e8ea4e45e2ff65cedbae4a7ed88a497 100644 (file)
--- 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 314f141a3b5d8fc7d7f74481b14c642e2b8dc4c7..73afe8ccf2b09c88d4656a4740fc70599ea5debf 100644 (file)
--- 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"