From 81331f1ceae158224c1b747cd2a71d122af7177b Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 23 Oct 2006 21:46:12 +0000 Subject: [PATCH] (calc_position_and_height): robustness: detect suicide in nested tuplets. --- ChangeLog | 5 +++++ lily/tuplet-bracket.cc | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c8a28b6bb0..e067bd281d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-10-23 Han-Wen Nienhuys + + * lily/tuplet-bracket.cc (calc_position_and_height): robustness: + detect suicide in nested tuplets. + 2006-10-23 Werner Lemberg * lily/pango-font.cc (Pango_font::pango_item_string_stencil): Fix diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc index a5f8b6c242..261b086c3f 100644 --- a/lily/tuplet-bracket.cc +++ b/lily/tuplet-bracket.cc @@ -567,8 +567,12 @@ Tuplet_bracket::calc_position_and_height (Grob *me_grob, Real *offset, Real *dy) Interval tuplet_x (tuplets[i]->extent (commonx, X_AXIS)); Interval tuplet_y (tuplets[i]->extent (commony, Y_AXIS)); + if (!tuplets[i]->is_live ()) + continue; + Direction d = LEFT; - Drul_array positions = ly_scm2realdrul (tuplets[i]->get_property ("positions")); + Drul_array positions = robust_scm2interval (tuplets[i]->get_property ("positions"), + Interval (0,0)); Real other_dy = positions[RIGHT] - positions[LEFT]; -- 2.39.5