source file of the GNU LilyPond music typesetter
- (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "system.hh"
#include "staff-spacing.hh"
#include "note-spacing.hh"
#include "spacing-spanner.hh"
-
+#include "warn.hh"
#include "moment.hh"
+#include "spacing-options.hh"
/* Find the loose columns in POSNS, and drape them around the columns
specified in BETWEEN-COLS. */
if (!loose_col_count)
return;
- Real default_padding = 1.0;
for (int i = 0; i < loose_col_count; i++)
{
int divide_over = 1;
Item *left = 0;
Item *right = 0;
- Link_array__Item_ clique;
+ vector<Item*> clique;
while (1)
{
SCM between = loose->get_object ("between-cols");
loose = right = re->get_column ();
}
- if (!right->get_system ())
+ if (right->get_system ())
+ ; /* do nothing */
+ else if (right->find_prebroken_piece (LEFT)
+ && right->find_prebroken_piece (LEFT)->get_system () == which)
right = right->find_prebroken_piece (LEFT);
+ else if (Paper_column::get_rank (which->get_bound (RIGHT)) < Paper_column::get_rank (right))
+
+ right = which->get_bound (RIGHT);
+ else
+ {
+ clique.back ()->programming_error ("Loose column does not have right side to attach to.");
+ System *base_system = dynamic_cast<System*> (which->original ());
+ int j = Paper_column::get_rank (clique.back ()) + 1;
+ int end_rank = Paper_column::get_rank (which->get_bound (RIGHT));
+ extract_grob_set (base_system, "columns", base_cols);
+ for (; j < end_rank; j++)
+ {
+ if (base_cols[j]->get_system () == which)
+ right = dynamic_cast<Item*> ((Grob*)base_cols[j]);
+ }
+ }
+
- clique.push_back (right);
-
+ if (!right)
+ {
+ programming_error ("Can't attach loose column sensibly. Attaching to end of system.");
+ right = which->get_bound (RIGHT);
+ }
Grob *common = right->common_refpoint (left, X_AXIS);
- Item *finished_right_column = clique.back ();
- for (vsize j = clique.size () - 2; j > 0; j--)
+ clique.push_back (right);
+
+ vector<Real> clique_spacing;
+ clique_spacing.push_back (0.0);
+ for (vsize j = 1; j + 1 < clique.size (); j ++)
{
- int count = 0;
- Real total_space = 0.0;
- Real total_fixed = 0.0;
+ Grob *clique_col = clique[j];
- extract_grob_set (col, "spacing-wishes", wishes);
- for (vsize i = 0; i < wishes.size (); i++)
+ 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 = 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;
+ spacing = grace_spacing;
}
+
+ Spacing_options options;
+ if (spacing)
+ options.init_from_grob (spacing);
+ else
+ programming_error ("Column without spacing object");
- Real distance_to_next = 0.0;
- Real right_point = 0.0;
- if (count)
- {
- total_space /= count;
- total_fixed /= count;
+ Real base_note_space = 0.0;
- distance_to_next = total_space;
- right_point
- = finished_right_column->relative_coordinate (common, X_AXIS);
- }
+ 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);
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];
+ Spring spring = Spacing_spanner::standard_breakable_column_spacing (spacing,
+ loose_col, next_col,
+ &options);
+
+ base_note_space = spring.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]);
+
+ clique_spacing.push_back (base_note_space);
+ }
+
+ Real default_padding = 1.0;
+ clique_spacing.push_back (default_padding);
+
+ Real right_point = robust_relative_extent (clique.back (), common, X_AXIS)[LEFT];
+
+
+ Grob *finished_right_column = clique.back ();
+
+ 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 my_offset = right_point - distance_to_next;
- col->system_ = which;
- col->translate_axis (my_offset - col->relative_coordinate (common, X_AXIS), X_AXIS);
+ clique_col->set_system (which);
+ clique_col->translate_axis (my_offset - clique_col->relative_coordinate (common, X_AXIS), X_AXIS);
- finished_right_column = col;
+ finished_right_column = clique_col;
}
+
}
}
projects / lilypond.git / blobdiff