Spanner *me = unsmob_spanner (smob);
/*
- can't use get_system() ? --hwn.
+ can't use get_system () ? --hwn.
*/
Spacing_options options;
options.init_from_grob (me);
{
if (Paper_column::is_musical (left_col))
{
- bool skip_unbroken_right = false;
-
if (!Paper_column::is_musical (right_col)
&& options->float_nonmusical_columns_
&& after_right_col
&& Paper_column::is_musical (after_right_col))
- skip_unbroken_right = true;
-
- if (skip_unbroken_right)
{
/*
TODO: should generate rods to prevent collisions.
for (vsize i = 0; i < cols.size (); i++)
{
Paper_column *col = dynamic_cast<Paper_column *> (cols[i]);
- Paper_column *next = (i < cols.size()-1) ? dynamic_cast<Paper_column *> (cols[i+1]) : 0;
+ Paper_column *next = (i + 1 < cols.size ()) ? dynamic_cast<Paper_column *> (cols[i+1]) : 0;
if (i > 0)
generate_pair_spacing (me, prev, col, next, options);
}
/*
- Generate the space between two musical columns LEFT_COL and RIGHT_COL, given
- spacing parameters INCR and SHORTEST.
+ Generate the space between two musical columns LEFT_COL and RIGHT_COL.
*/
void
Spacing_spanner::musical_column_spacing (Grob *me,
Item *right_col,
Spacing_options const *options)
{
- bool expand_only = false;
- Real base_note_space = note_spacing (me, left_col, right_col, options, &expand_only);
+ Real base_note_space = note_spacing (me, left_col, right_col, options);
Real max_fixed = 0;
Real max_space = 0;
{
Grob *wish = neighbors[i];
- Item *wish_rcol = Note_spacing::right_column (wish);
- if (Note_spacing::left_column (wish) != left_col
+ Item *wish_rcol = Spacing_interface::right_column (wish);
+ if (Spacing_interface::left_column (wish) != left_col
|| (wish_rcol != right_col && wish_rcol != right_col->original ()))
continue;
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_);
-
+ /*
+ There used to be code that examined left_col->extent
+ (X_AXIS), but this is resulted in unexpected wide
+ spacing, because the width of s^"text" output is also
+ taken into account here.
+ */
+ compound_fixed_note_space = options->increment_;
compound_note_space = max (base_note_space,
- base_note_space - options->increment_ + left_col_stick_out);
+ options->increment_);
}
else
{
Spacing_spanner::fills_measure (Grob *me, Item *left, Item *col)
{
System *sys = get_root_system (me);
- Item *next = sys->column (col->get_column()->get_rank () + 1);
+ Item *next = sys->column (col->get_column ()->get_rank () + 1);
if (!next)
return false;
return false;
}
+
/*
Read hints from L and generate springs.
*/
if (!spacing_grob || !Staff_spacing::has_interface (spacing_grob))
continue;
- Real space = 0.;
- Real fixed_space = 0.;
-
/*
column for the left one settings should be ok due automatic
pointer munging.
*/
assert (spacing_grob->get_column () == l);
- Staff_spacing::get_spacing_params (spacing_grob,
- &space, &fixed_space);
+ Spring sp = Staff_spacing::get_spacing_params (spacing_grob);
+ Real space = sp.distance_;
+ Real fixed = sp.distance_ - sp.inverse_compress_strength_;
if (Paper_column::when_mom (r).grace_part_)
{
}
max_space = max (max_space, space);
- max_fixed = max (max_fixed, fixed_space);
+ max_fixed = max (max_fixed, fixed);
compound_space += space;
- compound_fixed += fixed_space;
+ compound_fixed += fixed;
wish_count++;
}
}
Real inverse_strength = (compound_space - compound_fixed);
Real distance = compound_space;
+ message (_f ("adding spring of length %f", distance));
Spaceable_grob::add_spring (l, r, distance, inverse_strength);
}