- Item *finished_right_column = clique.top();
-
- for (int j = clique.size() - 2; j > 0; j--)
- {
- int count = 0;
- Real total_space = 0.0;
- Real total_fixed = 0.0;
-
- extract_grob_set (col, "spacing-wishes", wishes);
- for (int i = 0; i < wishes.size (); i++)
- {
- Grob *spacing = wishes[i];
- Real space = 0.0;
- Real fixed = 0.0;
-
- if (Staff_spacing::has_interface (spacing))
- {
- Staff_spacing::get_spacing_params (spacing, &space, &fixed);
- }
- else if (Note_spacing::has_interface (spacing))
- {
- Spacing_options options;
- options.init ();
-
- fixed = robust_relative_extent (col, col, X_AXIS)[RIGHT];
-
- Moment dt = Paper_column::when_mom (right) - Paper_column::when_mom (col);
- bool expand;
- space = options.get_duration_space (dt, &expand);
- Note_spacing::get_spacing (spacing, right, space, options.increment_,
- &space, &fixed);
- }
- else
- {
- continue;
- }
-
- count++;
-
- total_space += space;
- total_fixed += fixed;
- }
-
- Real distance_to_next = 0.0;
- Real right_point = 0.0;
- if (count)
- {
- total_space /= count;
- total_fixed /= count;
-
- distance_to_next = total_space;
- right_point
- = finished_right_column->relative_coordinate (common, X_AXIS);
- }
- else
- {
- Interval my_extent = robust_relative_extent (col, col, X_AXIS);
- distance_to_next = my_extent[RIGHT] + default_padding;
- right_point = robust_relative_extent (finished_right_column, common, X_AXIS)[LEFT];
- }
-
- Real my_offset = right_point - distance_to_next;
-
- col->system_ = which;
- col->translate_axis (my_offset - col->relative_coordinate (common, X_AXIS), X_AXIS);
-
- finished_right_column = col;
- }
+
+ clique.push_back (right);
+
+ /*
+ We use two vectors to keep track of loose column spacing:
+ clique_spacing keeps track of ideal spaces.
+ clique_tight_spacing keeps track of minimum spaces.
+ Below, a scale factor is applied to the shifting of loose columns that
+ aims to preserve clique_spacing but gets closer to clique_tight_spacing as the
+ space becomes smaller. This is used because the rods placed for loose columns
+ are tight (meaning they use minimum distances - see set_distances_for_loose_columns).
+ However, other rods may widen this distance, in which case we don't want a crammed score.
+ Thus, we aim for non-crammed, and fall back on crammed as needed.
+ */
+ vector<Real> clique_spacing;
+ vector<Real> clique_tight_spacing;
+ clique_spacing.push_back (0.0);
+ clique_tight_spacing.push_back (0.0);
+ for (vsize j = 1; j + 1 < clique.size (); j++)
+ {
+ Grob *clique_col = clique[j];
+
+ Paper_column *loose_col = dynamic_cast<Paper_column *> (clique[j]);
+ Paper_column *next_col = dynamic_cast<Paper_column *> (clique[j + 1]);
+
+ Grob *spacing = unsmob_grob (clique_col->get_object ("spacing"));
+ if (Grob *grace_spacing = unsmob_grob (clique_col->get_object ("grace-spacing")))
+ {
+ spacing = grace_spacing;
+ }
+
+ Spacing_options options;
+ if (spacing)
+ options.init_from_grob (spacing);
+ else
+ programming_error ("Column without spacing object");
+
+ Real base_note_space = 0.0;
+ Real tight_note_space = 0.0;
+
+ if (Paper_column::is_musical (next_col)
+ && Paper_column::is_musical (loose_col))
+ {
+ Real base = Spacing_spanner::note_spacing (spacing, loose_col, next_col,
+ &options);
+ if (Note_spacing::has_interface (spacing))
+ {
+ Spring spring = Note_spacing::get_spacing (spacing, next_col, base, options.increment_);;
+ base_note_space = spring.distance ();
+ tight_note_space = spring.min_distance ();
+ }
+ else
+ {
+ base_note_space = base;
+ tight_note_space = base;
+ }
+ }
+ else
+ {
+ Spring spring = Spacing_spanner::standard_breakable_column_spacing (spacing,
+ loose_col, next_col,
+ &options);
+
+ base_note_space = spring.distance ();
+ tight_note_space = spring.min_distance ();
+ }
+
+ clique_spacing.push_back (base_note_space);
+ clique_tight_spacing.push_back (tight_note_space);
+ }
+
+ Real permissible_distance = clique.back ()->relative_coordinate (common, X_AXIS) - robust_relative_extent (clique[0], common, X_AXIS)[RIGHT];
+ Real right_point = robust_relative_extent (clique.back (), common, X_AXIS)[LEFT];
+ Grob *finished_right_column = clique.back ();
+
+ Real sum_tight_spacing = 0;
+ Real sum_spacing = 0;
+ // currently a magic number - what would be a good grob to hold this property?
+ Real left_padding = 0.15;
+ for (vsize j = 0; j < clique_spacing.size (); j++)
+ {
+ sum_tight_spacing += clique_tight_spacing[j];
+ sum_spacing += clique_spacing[j];
+ }
+ Real scale_factor = max (0.0, min (1.0, (permissible_distance - left_padding - sum_tight_spacing) / (sum_spacing - sum_tight_spacing)));
+ for (vsize j = clique.size () - 2; j > 0; j--)
+ {
+ Paper_column *clique_col = dynamic_cast<Paper_column *> (clique[j]);
+
+ right_point = finished_right_column->relative_coordinate (common, X_AXIS);
+
+ Real distance_to_next = clique_tight_spacing[j] + (clique_spacing[j] - clique_tight_spacing[j]) * scale_factor;
+
+ Real my_offset = right_point - distance_to_next;
+
+ clique_col->translate_axis (my_offset - clique_col->relative_coordinate (common, X_AXIS), X_AXIS);
+
+ finished_right_column = clique_col;
+ }