From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 23 Oct 2006 21:46:12 +0000 (+0000)
Subject: (calc_position_and_height): robustness:
X-Git-Tag: release/2.10.0-2~96
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=81331f1ceae158224c1b747cd2a71d122af7177b;p=lilypond.git

(calc_position_and_height): robustness:
detect suicide in nested tuplets.
---

diff --git a/ChangeLog b/ChangeLog
index c8a28b6bb0..e067bd281d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-23  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+	* lily/tuplet-bracket.cc (calc_position_and_height): robustness:
+	detect suicide in nested tuplets.
+
 2006-10-23  Werner Lemberg  <wl@gnu.org>
 
 	* 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<Real> positions = ly_scm2realdrul (tuplets[i]->get_property ("positions"));
+      Drul_array<Real> positions = robust_scm2interval (tuplets[i]->get_property ("positions"),
+							Interval (0,0));
 
       
       Real other_dy = positions[RIGHT] - positions[LEFT];