/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2005--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
if (!loose->get_system ())
break;
- Paper_column *le = dynamic_cast<Paper_column *> (unsmob_grob (scm_car (between)));
- Paper_column *re = dynamic_cast<Paper_column *> (unsmob_grob (scm_cdr (between)));
+ Paper_column *le = unsmob<Paper_column> (scm_car (between));
+ Paper_column *re = unsmob<Paper_column> (scm_cdr (between));
if (! (le && re))
break;
if (!right)
{
- programming_error ("Can't attach loose column sensibly. Attaching to end of system.");
+ programming_error ("Can't attach loose column sensibly."
+ " Attaching to end of system.");
right = which->get_bound (RIGHT);
}
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")))
+ Grob *spacing = unsmob<Grob> (clique_col->get_object ("spacing"));
+ if (Grob *grace_spacing = unsmob<Grob> (clique_col->get_object ("grace-spacing")))
{
spacing = grace_spacing;
}
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))
- base_note_space = Spacing_spanner::note_spacing (spacing, loose_col, next_col,
- &options);
+ {
+ Spring spring = Spacing_spanner::note_spacing (spacing, loose_col,
+ next_col, &options);
+ if (has_interface<Note_spacing> (spacing))
+ spring = Note_spacing::get_spacing (spacing, next_col,
+ spring, options.increment_);
+
+ base_note_space = spring.distance ();
+ tight_note_space = spring.min_distance ();
+ }
else
{
Spring spring = Spacing_spanner::standard_breakable_column_spacing (spacing,
&options);
base_note_space = spring.distance ();
+ tight_note_space = spring.min_distance ();
}
- base_note_space = max (base_note_space,
- robust_relative_extent (loose_col, loose_col, X_AXIS)[RIGHT]
- - robust_relative_extent (next_col, next_col, X_AXIS)[LEFT]);
+ Real loose_col_horizontal_length = loose_col->extent (loose_col, X_AXIS).length ();
+ base_note_space = max (base_note_space, loose_col_horizontal_length);
+ tight_note_space = max (tight_note_space, loose_col_horizontal_length);
clique_spacing.push_back (base_note_space);
+ clique_tight_spacing.push_back (tight_note_space);
}
- Real default_padding = 1.0;
- clique_spacing.push_back (default_padding);
-
+ 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_spacing[j];
+ 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;