/*
- 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--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
- (c) 1999--2007 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"
#include "paper-score.hh"
#include "pointer-group-interface.hh"
#include "separation-item.hh"
+#include "skyline-pair.hh"
#include "spaceable-grob.hh"
#include "spacing-interface.hh"
#include "staff-spacing.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;
}
}
}
- int max_idx = -1;
+ vsize max_idx = VPOS;
int max_count = 0;
for (vsize i = durations.size (); i--;)
{
if (Moment *m = unsmob_moment (bsd))
d = m->main_part_;
- if (max_idx >= 0)
+ if (max_idx != VPOS)
d = min (d, durations[max_idx]);
return Moment (d).smobbed_copy ();
if (Paper_column::is_musical (left_col))
{
if (!Paper_column::is_musical (right_col)
- && options->float_nonmusical_columns_
+ && (options->float_nonmusical_columns_ || to_boolean (right_col->get_property ("maybe-loose")))
&& after_right_col
&& Paper_column::is_musical (after_right_col))
{
prev = col;
}
- set_column_rods (cols, 0.1); // FIXME: padding
+ Real padding = robust_scm2double (prev->get_property ("padding"), 0.1);
+ set_column_rods (cols, padding);
}
/*
else
{
vector<Spring> springs;
- extract_grob_set (left_col, "right-neighbors", neighbors);
+ extract_grob_set (left_col, "spacing-wishes", wishes);
- for (vsize i = 0; i < neighbors.size (); i++)
+ for (vsize i = 0; i < wishes.size (); i++)
{
- Grob *wish = neighbors[i];
+ Grob *wish = wishes[i];
+ if (Spacing_interface::left_column (wish) != left_col)
+ {
+ /* This shouldn't really happen, but the ancient music
+ stuff really messes up the spacing code, grrr
+ */
+ continue;
+ }
- 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;
+ extract_grob_set (wish, "right-items", right_items);
+ bool found_matching_column = false;
+ for (vsize j = 0; j < right_items.size (); j++)
+ {
+ Item *it = dynamic_cast<Item*> (right_items[j]);
+ if (it && (right_col == it->get_column ()
+ || right_col->original () == it->get_column ()))
+ found_matching_column = true;
+ }
/*
This is probably a waste of time in the case of polyphonic
music. */
- if (Note_spacing::has_interface (wish))
+ if (found_matching_column && Note_spacing::has_interface (wish))
{
Real inc = options->increment_;
Grob *gsp = unsmob_grob (left_col->get_object ("grace-spacing"));
else
{
/*
- Fixed should be 0.0. If there are no spacing wishes, we're
- likely dealing with polyphonic spacing of hemiolas.
-
- We used to have min_distance_ = options->increment_
-
- but this can lead to numeric instability problems when we
- do
-
- inverse_strength = (distance_ - min_distance_)
-
+ Min distance should be 0.0. If there are no spacing
+ wishes, we're probably dealing with polyphonic spacing
+ of hemiolas.
*/
spring = Spring (base_note_space, 0.0);
}
{
/*
In packed mode, pack notes as tight as possible. This makes
- sense mostly in combination with raggedright mode: the notes
+ sense mostly in combination with ragged-right mode: the notes
are then printed at minimum distance. This is mostly useful
for ancient notation, but may also be useful for some flavours
- of contemporary music. If not in raggedright mode, lily will
- pack as much bars of music as possible into a line, but the
+ of contemporary music. If not in ragged-right mode, lily will
+ pack as many bars of music as possible into a line, but the
line will then be stretched to fill the whole linewidth.
+
+ Note that we don't actually pack things as tightly as possible:
+ we don't allow the next column to begin before this one ends.
+ */
+ /* FIXME: the else clause below is the "right" thing to do,
+ but we can't do it because of all the empty columns that the
+ ligature-engravers leave lying around. In that case, the extent of
+ the column is incorrect because it includes note-heads that aren't
+ there. We get around this by only including the column extent if
+ the left-hand column is "genuine". This is a dirty hack and it
+ should be fixed in the ligature-engravers. --jneem
*/
- spring.set_distance (spring.min_distance ());
+ if (Paper_column::is_extraneous_column_from_ligature (left_col))
+ spring.set_distance (spring.min_distance ());
+ else
+ spring.set_distance (max (left_col->extent (left_col, X_AXIS)[RIGHT],
+ spring.min_distance ()));
+
spring.set_inverse_stretch_strength (1.0);
}
&& l->break_status_dir () == CENTER
&& fills_measure (me, l, r))
{
- spring.set_distance (spring.distance () + 1.0);
- spring.set_default_strength ();
+ 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_compress_strength ();
}
if (options->stretch_uniformly_ && l->break_status_dir () != RIGHT)
projects / lilypond.git / blobdiff