/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1999--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1999--2014 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
static void
set_column_rods (vector<Grob *> const &cols, Real padding)
{
- /* distances[i] will be the distance betwen cols[i-1] and cols[i]
+ /* distances[i] will be the distance betwen cols[i-1] and cols[i], and
+ overhangs[j] the amount by which cols[0 thru j] extend beyond cols[j]
when each column is placed as far to the left as possible. */
vector<Real> distances (cols.size ());
+ vector<Real> overhangs (cols.size ());
- for (vsize i = 1; i < cols.size (); i++)
+ for (vsize i = 0; i < cols.size (); i++)
{
Item *r = dynamic_cast<Item *> (cols[i]);
Item *rb = r->find_prebroken_piece (LEFT);
continue;
Skyline_pair *skys = Skyline_pair::unsmob (r->get_property ("horizontal-skylines"));
+ overhangs[i] = skys ? (*skys)[RIGHT].max_height () : 0.0;
+
+ if (0 == i) continue;
- /* min rather than max because stickout_i will be negative if the right-hand column
+ /* min rather than max because stickout will be negative if the right-hand column
sticks out a lot to the left */
- Real stickout_i = min (skys ? (*skys)[LEFT].max_height () : 0.0,
- Separation_item::conditional_skyline (r, cols[i - 1]).max_height ());
+ Real stickout = min (skys ? (*skys)[LEFT].max_height () : 0.0,
+ Separation_item::conditional_skyline (r, cols[i - 1]).max_height ());
Real prev_distances = 0.0;
a constant number of times per iteration of the outer loop. */
for (vsize j = i; j--;)
{
+ if (overhangs[j] + padding <= prev_distances + distances[i] + stickout)
+ break; // cols[0 thru j] cannot reach cols[i]
+
Item *l = dynamic_cast<Item *> (cols[j]);
Item *lb = l->find_prebroken_piece (RIGHT);
- Skyline_pair *skys = Skyline_pair::unsmob (l->get_property ("horizontal-skylines"));
- Real stickout_j = skys ? (*skys)[RIGHT].max_height () : 0.0;
-
- bool touches = stickout_i - stickout_j + prev_distances + distances[i] < 0.0;
- Real dist = 0.0;
- if (touches || j == i - 1)
- {
- dist = Separation_item::set_distance (l, r, padding);
- if (rb)
- Separation_item::set_distance (l, rb, padding);
- }
+ Real dist = Separation_item::set_distance (l, r, padding);
distances[i] = max (distances[i], dist - prev_distances);
- /* 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, padding);
+ {
+ dist = Separation_item::set_distance (lb, r, padding);
+ // The left-broken version might reach more columns to the
+ // right than the unbroken version, by extending farther and/or
+ // nesting more closely;
+ if (j == i - 1) // check this, the first time we see each lb.
+ overhangs[j] = max (overhangs[j],
+ lb->extent (lb, X_AXIS)[RIGHT]
+ + distances[i] - dist);
+ }
+ if (rb)
+ Separation_item::set_distance (l, rb, padding);
if (lb && rb)
Separation_item::set_distance (lb, rb, padding);
prev_distances += distances[j];
- /* we need the empty check for gregorian notation, where there are a lot of
- extraneous paper-columns that we need to skip over */
- if (!touches && !Separation_item::is_empty (l))
- break;
}
+ overhangs[i] = max (overhangs[i],
+ overhangs[i - 1] - distances[i]);
}
}
Item *right_col,
Spacing_options const *options)
{
- Real base_note_space = note_spacing (me, left_col, right_col, options);
- Spring spring;
+ Spring spring = note_spacing (me, left_col, right_col, options);
if (options->stretch_uniformly_)
- spring = Spring (base_note_space, 0.0);
+ {
+ spring.set_min_distance (0.0);
+ spring.set_default_strength ();
+ }
else
{
vector<Spring> springs;
grace_opts.init_from_grob (gsp);
inc = grace_opts.increment_;
}
- springs.push_back (Note_spacing::get_spacing (wish, right_col, base_note_space, inc));
+ springs.push_back (Note_spacing::get_spacing (wish, right_col, spring, inc));
}
}
if (springs.empty ())
{
-
- if (!Paper_column::is_musical (right_col))
- {
- /*
- 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.
- */
- spring = Spring (max (base_note_space, options->increment_),
- options->increment_);
- }
- else
+ if (Paper_column::is_musical (right_col))
{
/*
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);
+ spring.set_min_distance (0.0);
}
}
else
projects / lilypond.git / blobdiff