(calc_position_and_height): robustness:

detect suicide in nested tuplets.

diff --git a/ChangeLog b/ChangeLog
index c8a28b6bb01a0b634c003a35995a5335e09f8ced..e067bd281df19eb77af04b4bcdb8e7e59ecc335e 100644 (file)
--- 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 a5f8b6c2424610c46f7464ad76ca611a0bc3660e..261b086c3f4dea1605f3f9dab4c7aede94f8fbf6 100644 (file)
--- 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];