X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftuplet-bracket.cc;h=1eccaabc06ffb663718f2b65fbcf5bfc4f2ce1c9;hb=cb421d68dc69961ee1f8cda9c40f46d5b1146e76;hp=d566027d2af5d2e82dc89c12e6e85cef7e0f4494;hpb=30339cb3706f6399c84607426988b25f79b4998c;p=lilypond.git diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc index d566027d2a..1eccaabc06 100644 --- a/lily/tuplet-bracket.cc +++ b/lily/tuplet-bracket.cc @@ -92,8 +92,10 @@ Tuplet_bracket::parallel_beam (Grob *me_grob, vector const &cols, { Spanner *me = dynamic_cast (me_grob); - if (me->get_bound (LEFT)->break_status_dir () - || me->get_bound (RIGHT)->break_status_dir ()) + Item *left = me->get_bound (LEFT); + Item *right = me->get_bound (RIGHT); + if (!left || left->break_status_dir () + || !right || right->break_status_dir ()) return 0; Drul_array stems (Note_column::get_stem (cols[0]), @@ -650,10 +652,7 @@ Tuplet_bracket::calc_position_and_height (Grob *me_grob, Real *offset, Real *dy) // assume that if a script is avoiding slurs, it should not get placed // under a tuplet bracket - SCM avoid = scripts[i]->get_property ("avoid-slur"); - if (unsmob_grob (scripts[i]->get_object ("slur")) - && (avoid == ly_symbol2scm ("outside") - || avoid == ly_symbol2scm ("around"))) + if (unsmob_grob (scripts[i]->get_object ("slur"))) continue; Interval script_x (scripts[i]->extent (commonx, X_AXIS));