* lily/beam.cc (set_stem_lengths): do set_stemend for invisible

stems too. Fixes #5

* lily/parenthesis-engraver.cc (acknowledge_grob): set parent of
parenthesis item. This fixes premature Y-extent triggering. Fixes
issue #95.

* VERSION (PATCH_LEVEL): bump version.

diff --git a/ChangeLog b/ChangeLog
index 83ebd684314add3a8c24858d88d031988933dd91..2eeb86c31328534fe28ca25fe74dd94f456293ef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-10-05  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * lily/beam.cc (set_stem_lengths): do set_stemend for invisible
+       stems too. Fixes #5
+
+       * lily/parenthesis-engraver.cc (acknowledge_grob): set parent of
+       parenthesis item. This fixes premature Y-extent triggering. Fixes
+       issue #95. 
+ 
+       * VERSION (PATCH_LEVEL): bump version.
+
 2006-10-04  Graham Percival  <gpermus@gmail.com>
 
        * Documentation/user/advanced-notation.itely: added
@@ -13,7 +24,8 @@
 
        * VERSION: release 2.9.21
 
-       * Documentation/topdocs/NEWS.tely (Top): simpler, more clearer override.
+       * Documentation/topdocs/NEWS.tely (Top): simpler, more clearer
+       override.
 
 2006-10-04  Mats Bengtsson  <mabe@drongo.s3.kth.se>
 

diff --git a/VERSION b/VERSION
index 1ea3df49fb86623f4fafbdfc6b754859a44d6176..0d42f4b514ce8cb06fa86a50572463680c27765f 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=9
-PATCH_LEVEL=21
+PATCH_LEVEL=22
 MY_PATCH_LEVEL=
 

diff --git a/lily/beam.cc b/lily/beam.cc
index 4a59a069be9ae407f2b5786d87eff2f92d76d288..d114c69fc363f2caa5f73a5d16c1ef72988b536f 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -1169,8 +1169,6 @@ Beam::set_stem_lengths (SCM smob)
   for (vsize i = 0; i < stems.size (); i++)
     {
       Grob *s = stems[i];
-      if (Stem::is_invisible (s))
-       continue;
 
       bool french = to_boolean (s->get_property ("french-beaming"));
       Real stem_y = calc_stem_y (me, s, common,
@@ -1181,9 +1179,14 @@ Beam::set_stem_lengths (SCM smob)
        Make the stems go up to the end of the beam. This doesn't matter
        for normal beams, but for tremolo beams it looks silly otherwise.
       */
-      if (gap)
+      if (gap
+          && !Stem::is_invisible (s))
        stem_y += thick * 0.5 * get_grob_direction (s);
 
+      /*
+       Do set_stemend for invisible stems too, so tuplet brackets
+       have a reference point for sloping
+       */
       Stem::set_stemend (s, 2 * stem_y / staff_space);
     }
 

diff --git a/lily/parenthesis-engraver.cc b/lily/parenthesis-engraver.cc
index b9ef4d8dce34b774a66297d5cee92b48eaa73c9a..2c48c2597a09d7cace394b26dae2e99c68a28b6a 100644 (file)
--- a/lily/parenthesis-engraver.cc
+++ b/lily/parenthesis-engraver.cc
@@ -41,8 +41,9 @@ Parenthesis_engraver::acknowledge_grob (Grob_info info)
            {
              Engraver *eng = dynamic_cast<Engraver*> (info.origin_translator ());
              Item *paren = eng->make_item ("ParenthesesItem", victim->self_scm ());
-
              Pointer_group_interface::add_grob (paren, ly_symbol2scm ("elements"), victim);
+
+             paren->set_parent (victim, Y_AXIS);
              
              Real size = robust_scm2double (paren->get_property ("font-size"), 0.0)
                + robust_scm2double (victim->get_property ("font-size"), 0.0);