source file of the GNU LilyPond music typesetter
- (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "spacing-spanner.hh"
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);
+ vector<Grob*> cols = Spacing_spanner::get_columns (me);
+ set_explicit_neighbor_columns (cols);
- set_explicit_neighbor_columns (options.columns_);
-
- prune_loose_columns (me, &options);
- set_implicit_neighbor_columns (options.columns_);
- generate_springs (me, &options);
+ prune_loose_columns (me, &cols, &options);
+ set_implicit_neighbor_columns (cols);
+ generate_springs (me, cols, &options);
return SCM_UNSPECIFIED;
}
{
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.
void
Spacing_spanner::generate_springs (Grob *me,
+ vector<Grob*> const &cols,
Spacing_options const *options)
{
Paper_column *prev = 0;
- for (vsize i = 0; i < options->columns_.size (); i++)
+ for (vsize i = 0; i < cols.size (); i++)
{
- Paper_column *col = dynamic_cast<Paper_column *> (options->columns_[i]);
- Paper_column *next = (i < options->columns_.size()-1) ? dynamic_cast<Paper_column *> (options->columns_[i+1]) : 0;
+ Paper_column *col = dynamic_cast<Paper_column *> (cols[i]);
+ 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;
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
{
Spaceable_grob::add_spring (left_col, right_col, distance, inverse_strength);
}
+/*
+ Check if COL fills the whole measure.
+ */
bool
-Spacing_spanner::fills_measure (Grob *me, Item *l, Item *r)
+Spacing_spanner::fills_measure (Grob *me, Item *left, Item *col)
{
- return false;
System *sys = get_root_system (me);
- Grob *next = sys->column (r->get_column()->get_rank () + 1);
+ Item *next = sys->column (col->get_column ()->get_rank () + 1);
if (!next)
return false;
+ if (Paper_column::is_musical (next)
+ || Paper_column::is_musical (left)
+ || !Paper_column::is_musical (col)
+ || !Paper_column::is_used (next))
+ return false;
+
Moment dt =
- Paper_column::when_mom (next) - Paper_column::when_mom (r);
+ Paper_column::when_mom (next) - Paper_column::when_mom (col);
- Moment *len = unsmob_moment (l->get_property ("measure-length"));
+ Moment *len = unsmob_moment (left->get_property ("measure-length"));
if (!len)
return false;
- if (dt.main_part_ == len->main_part_)
+ /*
+ Don't check for exact measure length, since ending measures are
+ often shortened due to pickups.
+ */
+ if (dt.main_part_ > len->main_part_ / Rational (2)
+ && (next->is_broken ()
+ || next->break_status_dir ()))
return true;
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++;
}
}
}
- if (fills_measure (me, l, r))
+ if (Paper_column::is_musical (r)
+ && l->break_status_dir () == CENTER
+ && fills_measure (me, l, r))
{
compound_space += 1.0;
}
assert (!isinf (compound_space));
compound_space = max (compound_space, compound_fixed);
- /*
- There used to be code that changed spacing depending on
- raggedright setting. Ugh.
-
- Do it more cleanly, or rename the property.
-
- */
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);
}
);
-ADD_INTERFACE (Spacing_interface,
- "Something to do with line breaking and spacing. "
- "Kill this one after determining line breaks.",
-
- "");
-
projects / lilypond.git / blobdiff