source file of the GNU LilyPond music typesetter
- (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "staff-spacing.hh"
if ((options->float_nonmusical_columns_
- ||options->float_grace_columns_)
+ || options->float_grace_columns_)
&& Paper_column::when_mom (col).grace_part_)
{
return true;
return false;
/*
- A rather hairy check, but we really only want to move around
- clefs. (anything else?)
-
in any case, we don't want to move bar lines.
*/
extract_grob_set (col, "elements", elts);
{
Grob *h = gelts[j];
- /*
- ugh. -- fix staff-bar name?
- */
if (h && h->get_property ("break-align-symbol") == ly_symbol2scm ("staff-bar"))
return false;
}
between.
*/
void
-Spacing_spanner::prune_loose_columns (Grob *me, vector<Grob*> *cols,
- Spacing_options const *options)
+Spacing_spanner::prune_loose_columns (Grob *me,
+ vector<Grob*> *cols,
+ Spacing_options *options)
{
vector<Grob*> newcols;
{
Grob *c = cols->at (i);
- bool loose = (i > 0 && i < cols->size () - 1)
+ bool loose = (i > 0 && i + 1 < cols->size ())
&& is_loose_column (cols->at (i - 1), c, cols->at (i + 1), options);
if (loose)
}
else
{
+ Grob *min_item = 0;
+ int min_rank = INT_MAX;
+ for (vsize j = 0; j < right_items.size (); j ++)
+ {
+ int rank = dynamic_cast<Item*> (right_items[j])->get_column ()->get_rank ();
+ if (rank < min_rank)
+ {
+ min_item = right_items[j];
+ min_rank = rank;
+ }
+ }
+
c->set_object ("between-cols", scm_cons (lns,
- right_items[0]->self_scm ()));
+ min_item->self_scm ()));
/*
Set distance constraints for loose columns
{
SCM right_neighbors = Grob_array::make_array ();
Grob_array *rn_arr = unsmob_grob_array (right_neighbors);
- int min_rank = 100000; // inf.
+ int min_rank = INT_MAX;
extract_grob_set (cols[i], "spacing-wishes", wishes);
for (vsize k = wishes.size (); k--;)
if (!Paper_column::is_breakable (it) && !Paper_column::is_musical (it))
continue;
- // it->breakable || it->musical
-
/*
sloppy with typing left/right-neighbors should take list, but paper-column found instead.
*/
cols[i]->set_object ("left-neighbors", ga_scm);
}
extract_grob_set (cols[i], "right-neighbors", rns);
- if (rns.empty () && i < cols.size () - 1)
+ if (rns.empty () && i + 1 < cols.size ())
{
SCM ga_scm = Grob_array::make_array ();
Grob_array *ga = unsmob_grob_array (ga_scm);