Grob * rc = unsmob_grob (them->get_grob_property ("rest-collision"));
- if (rc && !to_boolean (rc->get_grob_property ("rest-collision-done")))
+ if (rc && !to_boolean (rc->get_grob_property ("positioning-done")))
{
- rc->set_grob_property ("rest-collision-done", SCM_BOOL_T);
+ rc->set_grob_property ("positioning-done", SCM_BOOL_T);
do_shift (rc);
}
for (; i > display_count; i--)
{
Grob* r = unsmob_grob (rests[i-1]->get_grob_property ("rest"));
-#if 1
if (r)
{
Grob * d = unsmob_grob (r->get_grob_property ("dot"));
r->suicide ();
}
rests[i-1]->suicide ();
-#else
- if (r)
- {
-
- r->set_grob_property ("transparent", gh_bool2scm(1));
- r = unsmob_grob (r->get_grob_property ("dot"));
- if (r)
- r->set_grob_property ("transparent", gh_bool2scm(1));
- }
-#endif
}
}
else
Grob * r = unsmob_grob (rcol->get_grob_property ("rest"));
Interval restdim = r->extent (r, Y_AXIS); // ??
- if (restdim.empty_b ())
+ if (restdim.is_empty ())
return SCM_UNSPECIFIED;
ADD_INTERFACE (Rest_collision,"rest-collision-interface",
"Move around ordinary rests (not multi-measure-rests) to avoid "
"conflicts.",
- "maximum-rest-count minimum-distance rest-collision-done elements");
+ "maximum-rest-count minimum-distance positioning-done elements");