else
{
int wish_count = 0;
-
+
extract_grob_set (left_col, "right-neighbors", neighbors);
/*
if (compound_note_space < 0 || wish_count == 0)
{
- /*
- Fixed should be 0.0. If there are no spacing wishes, we're
- likely dealing with polyphonic spacing of hemiolas.
+
+ if (!Paper_column::is_musical (right_col))
+ {
+ Real left_col_stick_out = robust_relative_extent (left_col, left_col, X_AXIS)[RIGHT];
+ compound_fixed_note_space = max (left_col_stick_out, options->increment_);
+
+ compound_note_space = max (base_note_space,
+ base_note_space - options->increment_ + left_col_stick_out);
+ }
+ else
+ {
+ /*
+ Fixed should be 0.0. If there are no spacing wishes, we're
+ likely dealing with polyphonic spacing of hemiolas.
- We used to have compound_fixed_note_space = options->increment_
+ We used to have compound_fixed_note_space = options->increment_
- but this can lead to numeric instability problems when we
- do
+ but this can lead to numeric instability problems when we
+ do
- inverse_strength = (compound_note_space - compound_fixed_note_space)
+ inverse_strength = (compound_note_space - compound_fixed_note_space)
- */
-
- compound_note_space = base_note_space;
- compound_fixed_note_space = 0.0;
+ */
+
+ compound_note_space = base_note_space;
+ compound_fixed_note_space = 0.0;
+ }
}
else if (to_boolean (me->get_property ("average-spacing-wishes")))
{