From: Joe Neeman <joeneeman@gmail.com>
Date: Thu, 1 Jul 2010 07:55:14 +0000 (+0300)
Subject: Fix cyclic dependence with rest-collisions.
X-Git-Tag: release/2.13.27-1~40
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ec376e079a0dc586ba3fe17113993525f2be69c2;hp=e036a8b8a67f08c1fee0b558a0dee88b1d5e54ce;p=lilypond.git

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 079030bc88..ee6935c7d8 100644
--- 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;