From: Han-Wen Nienhuys Date: Thu, 5 Oct 2006 12:11:32 +0000 (+0000) Subject: * lily/beam.cc (set_stem_lengths): do set_stemend for invisible X-Git-Tag: cvs/HEAD~7 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5c47a9ba90c4bee91077bd943e4ff79b2c93fe76;p=lilypond.git * 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 83ebd68431..2eeb86c313 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2006-10-05 Han-Wen Nienhuys + + * 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 * 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 diff --git a/VERSION b/VERSION index 1ea3df49fb..0d42f4b514 100644 --- 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 4a59a069be..d114c69fc3 100644 --- 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 b9ef4d8dce..2c48c2597a 100644 --- 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 (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);