/*
- spacing-spanner.cc -- implement Spacing_spanner
+ This file is part of LilyPond, the GNU music typesetter.
- source file of the GNU LilyPond music typesetter
+ Copyright (C) 1999--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
- (c) 1999--2009 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ LilyPond is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
*/
#include "spacing-spanner.hh"
vsize end = binary_search (all, (Grob*) me->get_bound (RIGHT),
&Paper_column::less_than);
- all = vector<Grob*>::vector<Grob*> (all.begin () + start,
- all.begin () + end + 1);
+ all = vector<Grob*> (all.begin () + start,
+ all.begin () + end + 1);
return all;
}
bool touches = right_stickout - left_stickout + cur_dist[d] < 0.0;
Real dist = 0.0;
- /* we set a distance for the line-starter column even if it's non-broken counterpart
+ /* we set a distance for the line-starter column even if its non-broken counterpart
doesn't touch the right column. */
if (lb)
Separation_item::set_distance (lb, r_col, padding);
if (j == i-1)
cur_dist[d] = distances[j];
+ cur_dist[d] = max (cur_dist[d], dist);
done = done && !touches;
}
while (flip (&d) != LEFT && rb);
{
Real full_measure_extra_space = robust_scm2double (l->get_property ("full-measure-extra-space"), 1.0);
spring.set_distance (spring.distance () + full_measure_extra_space);
- spring.set_default_strength ();
+ spring.set_default_compress_strength ();
}
if (options->stretch_uniformly_ && l->break_status_dir () != RIGHT)