From 7ef08d4a113c3ef6c0895286fea819af6c1f712a Mon Sep 17 00:00:00 2001 From: hanwen Date: Thu, 4 Aug 2005 15:13:24 +0000 Subject: [PATCH] (parallel_beam): broken bracket never is synched to a beam. --- ChangeLog | 3 +++ input/regression/tuplet-broken.ly | 2 +- lily/tuplet-bracket.cc | 11 ++++++++--- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 97ae6c0cd2..4ad6844a11 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-08-04 Han-Wen Nienhuys + * lily/tuplet-bracket.cc (parallel_beam): broken bracket never is + synched to a beam. + * lily/beam.cc (shift_region_to_valid): divide by zero fix. This fixes beams with a single stem (eg. beams across linebreaks.) diff --git a/input/regression/tuplet-broken.ly b/input/regression/tuplet-broken.ly index 87a17f8f35..95fb4cf98c 100644 --- a/input/regression/tuplet-broken.ly +++ b/input/regression/tuplet-broken.ly @@ -21,7 +21,7 @@ \override TupletBracket #'edge-text = #(cons (markup #:fontsize 6 - #:arrow-head Y LEFT #f) + #:arrow-head X LEFT #f) (markup #:arrow-head X RIGHT #f)) \times 11/19 { c4 c4 c4 c4 diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc index bb55ca2d01..bc91d17aea 100644 --- a/lily/tuplet-bracket.cc +++ b/lily/tuplet-bracket.cc @@ -62,21 +62,26 @@ get_x_bound_item (Grob *me_grob, Direction hdir, Direction my_dir) } Grob * -Tuplet_bracket::parallel_beam (Grob *me, Link_array const &cols, bool *equally_long) +Tuplet_bracket::parallel_beam (Grob *me_grob, Link_array const &cols, bool *equally_long) { /* ugh: code dup. */ + Spanner *me = dynamic_cast (me_grob); + + if (me->get_bound (LEFT)->break_status_dir () + || me->get_bound (RIGHT)->break_status_dir ()) + return 0; + Grob *s1 = Note_column::get_stem (cols[0]); Grob *s2 = Note_column::get_stem (cols.top ()); Grob *b1 = s1 ? Stem::get_beam (s1) : 0; Grob *b2 = s2 ? Stem::get_beam (s2) : 0; - Spanner *sp = dynamic_cast (me); *equally_long = false; - if (! (b1 && (b1 == b2) && !sp->is_broken ())) + if (! (b1 && (b1 == b2) && !me->is_broken ())) return 0; extract_grob_set (b1, "stems", beam_stems); -- 2.39.5