/*
- spacing-determine-loose-columns.cc -- implement Spacing_spanner
- methods that decide which columns to turn loose.
+ This file is part of LilyPond, the GNU music typesetter.
- source file of the GNU LilyPond music typesetter
+ Copyright (C) 2005--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
- (c) 2005--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 "staff-spacing.hh"
#include "paper-column.hh"
#include "column-x-positions.hh"
#include "pointer-group-interface.hh"
+#include "spacing-interface.hh"
#include "spacing-spanner.hh"
#include "note-spacing.hh"
#include "moment.hh"
}
- if (Paper_column::is_musical (col)
- || Paper_column::is_breakable (col))
+ if (Paper_column::is_musical (col))
return false;
/*
*/
- extract_grob_set (col, "right-neighbors", rns);
- extract_grob_set (col, "left-neighbors", lns);
-
- if (lns.empty () || rns.empty ())
- return false;
-
-
- Item *l_neighbor = dynamic_cast<Item *> (lns[0]);
- Item *r_neighbor = dynamic_cast<Item *> (rns[0]);
+ Item *r_neighbor = unsmob_item (col->get_object ("right-neighbor"));
+ Item *l_neighbor = unsmob_item (col->get_object ("left-neighbor"));
if (!l_neighbor || !r_neighbor)
return false;
- l_neighbor = l_neighbor->get_column ();
- r_neighbor = dynamic_cast<Item *> (Note_spacing::right_column (r_neighbor));
-
- if (l == l_neighbor && r == r_neighbor)
- return false;
-
- if (!l_neighbor || !r_neighbor)
- return false;
+ /* If a non-empty column (ie. not \bar "") is placed nicely in series with
+ its neighbor (ie. no funny polyphonic stuff), don't make it loose.
+ */
+ if (l == l_neighbor && r == r_neighbor && col->extent (col, X_AXIS).length () > 0)
+ return false;
/*
Only declare loose if the bounds make a little sense. This means
Grob *h = gelts[j];
if (h && h->get_property ("break-align-symbol") == ly_symbol2scm ("staff-bar"))
- return false;
+ {
+ extract_grob_set (h, "elements", helts);
+ for (vsize k = helts.size (); k--;)
+ if ("" != robust_scm2string (helts[k]->get_property ("glyph-name"), ""))
+ return false;
+ }
}
}
}
for (vsize k = wishes.size (); k--;)
{
Grob *sp = wishes[k];
- if (Note_spacing::left_column (sp) != lc
- || Note_spacing::right_column (sp) != rc)
+ if (Spacing_interface::left_column (sp) != lc
+ || Spacing_interface::right_column (sp) != rc)
continue;
if (Note_spacing::has_interface (sp))
The note spacing should be taken from the musical
columns.
*/
- Real space = 0.0;
- Real fixed = 0.0;
-
Real base = note_spacing (me, lc, rc, options);
- Note_spacing::get_spacing (sp, rc, base, options->increment_,
- &space, &fixed);
+ Spring spring = Note_spacing::get_spacing (sp, rc, base, options->increment_);
- space -= options->increment_;
-
- dists[d] = max (dists[d], space);
+ dists[d] = max (dists[d], spring.min_distance ());
}
else if (Staff_spacing::has_interface (sp))
{
- Spring spring = Staff_spacing::get_spacing_params (sp);
- Real fixed = spring.distance_ - spring.inverse_compress_strength_;
+ Spring spring = Staff_spacing::get_spacing (sp, rc);
- dists[d] = max (dists[d], fixed);
+ dists[d] = max (dists[d], spring.min_distance ());
}
else
programming_error ("Subversive spacing wish");
bool loose = (i > 0 && i + 1 < cols->size ())
&& is_loose_column (cols->at (i - 1), c, cols->at (i + 1), options);
- if (loose)
+ /* Breakable columns never get pruned; even if they are loose,
+ their broken pieces are not. However, we mark them so that
+ the spacing can take their mid-line looseness into account. */
+ if (loose && Paper_column::is_breakable (c))
{
- extract_grob_set (c, "right-neighbors", rns_arr);
- extract_grob_set (c, "left-neighbors", lns_arr);
+ loose = false;
+ c->set_property ("maybe-loose", SCM_BOOL_T);
+ }
+ /*
+ Unbreakable columns which only contain page-labels also
+ never get pruned, otherwise the labels are lost before they can
+ be collected by the System: so we mark these columns too.
+ */
+ if (!loose && !Paper_column::is_breakable (c)
+ && scm_is_pair (c->get_property ("labels")))
+ {
+ extract_grob_set (c, "elements", elts);
+ if (elts.empty ())
+ c->set_property ("maybe-loose", SCM_BOOL_T);
+ }
- SCM lns = lns_arr.size () ? lns_arr.back ()->self_scm () : SCM_BOOL_F;
- SCM rns = rns_arr.size () ? rns_arr.back ()->self_scm () : SCM_BOOL_F;
+ if (loose)
+ {
+ Grob *right_neighbor = unsmob_grob (c->get_object ("right-neighbor"));
+ Grob *left_neighbor = unsmob_grob (c->get_object ("left-neighbor"));
/*
Either object can be non existent, if the score ends
prematurely.
*/
-
- extract_grob_set (unsmob_grob (rns), "right-items", right_items);
- if (right_items.size () == 0 || !unsmob_grob (lns))
+ if (!right_neighbor || !left_neighbor)
{
c->programming_error ("Cannot determine neighbors for floating column. ");
c->set_object ("between-cols", scm_cons (cols->at (i-1)->self_scm (),
}
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,
- min_item->self_scm ()));
+ c->set_object ("between-cols", scm_cons (left_neighbor->self_scm (),
+ right_neighbor->self_scm ()));
+
/*
Set distance constraints for loose columns
{
for (vsize i = 0; i < cols.size (); i++)
{
- SCM right_neighbors = Grob_array::make_array ();
- Grob_array *rn_arr = unsmob_grob_array (right_neighbors);
- int min_rank = INT_MAX;
-
extract_grob_set (cols[i], "spacing-wishes", wishes);
- for (vsize k = wishes.size (); k--;)
+ for (vsize j = wishes.size (); j--;)
{
- Item *wish = dynamic_cast<Item *> (wishes[k]);
-
- Item *lc = wish->get_column ();
- Grob *right = Note_spacing::right_column (wish);
-
- if (!right)
- continue;
-
- Item *rc = dynamic_cast<Item *> (right);
-
- int right_rank = Paper_column::get_rank (rc);
- int left_rank = Paper_column::get_rank (lc);
-
- /*
- update the left column.
- */
- if (right_rank <= min_rank)
- {
- if (right_rank < min_rank)
- rn_arr->clear ();
-
- min_rank = right_rank;
- rn_arr->add (wish);
- }
+ Item *wish = dynamic_cast<Item*> (wishes[j]);
+ Item *left_col = wish->get_column ();
+ int left_rank = Paper_column::get_rank (left_col);
+ int min_right_rank = INT_MAX;
- /*
- update the right column of the wish.
- */
- int maxrank = 0;
-
- extract_grob_set (rc, "left-neighbors", lns_arr);
- if (lns_arr.size ())
+ extract_grob_set (wish, "right-items", right_items);
+ for (vsize k = right_items.size (); k--;)
{
- Item *it = dynamic_cast<Item *> (lns_arr.back ());
- maxrank = Paper_column::get_rank (it->get_column ());
- }
+ Item *right_col = dynamic_cast<Item*> (right_items[k])->get_column ();
+ int right_rank = Paper_column::get_rank (right_col);
- if (left_rank >= maxrank)
- {
-
- if (left_rank > maxrank)
+ if (right_rank < min_right_rank)
{
- Grob_array *ga = unsmob_grob_array (rc->get_object ("left-neighbors"));
- if (ga)
- ga->clear ();
+ left_col->set_object ("right-neighbor", right_col->self_scm ());
+ min_right_rank = right_rank;
}
- Pointer_group_interface::add_grob (rc, ly_symbol2scm ("left-neighbors"), wish);
+ Grob *old_left_neighbor = unsmob_grob (right_col->get_object ("left-neighbor"));
+ if (!old_left_neighbor || left_rank > Paper_column::get_rank (old_left_neighbor))
+ right_col->set_object ("left-neighbor", left_col->self_scm ());
}
}
-
- if (rn_arr->size ())
- cols[i]->set_object ("right-neighbors", right_neighbors);
}
}
/*
Set neighboring columns that have no left/right-neighbor set
yet. Only do breakable non-musical columns, and musical columns.
+ Why only these? --jneem
*/
void
Spacing_spanner::set_implicit_neighbor_columns (vector<Grob*> const &cols)
if (!Paper_column::is_breakable (it) && !Paper_column::is_musical (it))
continue;
- /*
- sloppy with typing left/right-neighbors should take list, but paper-column found instead.
- */
- extract_grob_set (cols[i], "left-neighbors", lns);
- if (lns.empty () && i)
- {
- SCM ga_scm = Grob_array::make_array ();
- Grob_array *ga = unsmob_grob_array (ga_scm);
- ga->add (cols[i - 1]);
- cols[i]->set_object ("left-neighbors", ga_scm);
- }
- extract_grob_set (cols[i], "right-neighbors", rns);
- if (rns.empty () && i + 1 < cols.size ())
- {
- SCM ga_scm = Grob_array::make_array ();
- Grob_array *ga = unsmob_grob_array (ga_scm);
- ga->add (cols[i + 1]);
- cols[i]->set_object ("right-neighbors", ga_scm);
- }
+ if (i && !unsmob_grob (cols[i]->get_object ("left-neighbor")))
+ cols[i]->set_object ("left-neighbor", cols[i-1]->self_scm ());
+ if (i + 1 < cols.size () && !unsmob_grob (cols[i]->get_object ("right-neighbor")))
+ cols[i]->set_object ("right-neighbor", cols[i+1]->self_scm ());
}
}