Fix cyclic dependence with rest-collisions.

Previously, the height of a Note_column with a rest depended
on the height of the rest, which invoked the rest-collision
callback, which depended on the Note_column again.

diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index 079030bc883d640856da6dfce999c02620ecb26d..ee6935c7d8578526d0a31d13a20ad574831c3d30 100644 (file)
--- a/lily/rest-collision.cc
+++ b/lily/rest-collision.cc
@@ -211,7 +211,7 @@ Rest_collision::calc_positioning_done (SCM smob)
       Grob *rest = Note_column::get_rest (rcol);
       Grob *common = common_refpoint_of_array (notes, rcol, Y_AXIS);
 
-      Interval restdim = rcol->extent (common, Y_AXIS);
+      Interval restdim = rest->extent (common, Y_AXIS);
       if (restdim.is_empty ())
        return SCM_BOOL_T;