#include "staff-spacing.hh"
+#include "spacing-options.hh"
#include "system.hh"
#include "paper-column.hh"
#include "column-x-positions.hh"
#include "spacing-spanner.hh"
#include "note-spacing.hh"
#include "moment.hh"
+#include "grob-array.hh"
#include "break-align-interface.hh"
#include "warn.hh"
(Otherwise, we might risk core dumps, and other weird stuff.)
*/
static bool
-is_loose_column (Grob *l, Grob *c, Grob *r, Spacing_options const *options)
+is_loose_column (Grob *l, Grob *col, Grob *r, Spacing_options const *options)
{
- if (options->float_nonmusical_columns_
- && Paper_column::when_mom (c).grace_part_)
+ if (!to_boolean (col->get_property ("allow-loose-spacing")))
+ return false;
+
+ if ((options->float_nonmusical_columns_
+ ||options->float_grace_columns_)
+ && Paper_column::when_mom (col).grace_part_)
return true;
- if (Paper_column::is_musical (c)
- || Item::is_breakable (c))
+ if (Paper_column::is_musical (col)
+ || Paper_column::is_breakable (col))
return false;
- extract_grob_set (c, "right-neighbors", rns);
- extract_grob_set (c, "left-neighbors", lns);
+ extract_grob_set (col, "right-neighbors", rns);
+ extract_grob_set (col, "left-neighbors", lns);
/*
If this column doesn't have a proper neighbor, we should really
such a borderline case.)
*/
- if (lns.is_empty () || rns.is_empty ())
+ if (lns.empty () || rns.empty ())
return false;
Item *l_neighbor = dynamic_cast<Item *> (lns[0]);
some cases (two isolated, consecutive clef changes) won't be
nicely folded, but hey, then don't do that.
*/
- if (! ((Paper_column::is_musical (l_neighbor) || Item::is_breakable (l_neighbor))
- && (Paper_column::is_musical (r_neighbor) || Item::is_breakable (r_neighbor))))
+ if (! ((Paper_column::is_musical (l_neighbor) || Paper_column::is_breakable (l_neighbor))
+ && (Paper_column::is_musical (r_neighbor) || Paper_column::is_breakable (r_neighbor))))
return false;
/*
in any case, we don't want to move bar lines.
*/
- extract_grob_set (c, "elements", elts);
- for (int i = elts.size (); i--;)
+ extract_grob_set (col, "elements", elts);
+ for (vsize i = elts.size (); i--;)
{
Grob *g = elts[i];
- if (g && Break_align_interface::has_interface (g))
+ if (g && Break_alignment_interface::has_interface (g))
{
extract_grob_set (g, "elements", gelts);
- for (int j = gelts.size (); j--;)
+ for (vsize j = gelts.size (); j--;)
{
Grob *h = gelts[j];
between.
*/
void
-Spacing_spanner::prune_loose_columns (Grob *me, Link_array<Grob> *cols,
+Spacing_spanner::prune_loose_columns (Grob *me, vector<Grob*> *cols,
Spacing_options const *options)
{
- Link_array<Grob> newcols;
+ vector<Grob*> newcols;
- for (int i = 0; i < cols->size (); i++)
+ for (vsize i = 0; i < cols->size (); i++)
{
- Grob *c = cols->elem (i);
+ Grob *c = cols->at (i);
bool loose = (i > 0 && i < cols->size () - 1)
- && is_loose_column (cols->elem (i - 1), c, cols->elem (i + 1), options);
+ && is_loose_column (cols->at (i - 1), c, cols->at (i + 1), options);
if (loose)
{
extract_grob_set (c, "right-neighbors", rns_arr);
extract_grob_set (c, "left-neighbors", lns_arr);
- SCM lns = lns_arr.size () ? lns_arr.top ()->self_scm () : SCM_BOOL_F;
- SCM rns = rns_arr.size () ? rns_arr.top ()->self_scm () : SCM_BOOL_F;
+ 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;
/*
Either object can be non existent, if the score ends
/*
Set distance constraints for loose columns
*/
- Drul_array<Grob *> next_door;
- next_door[LEFT] = cols->elem (i - 1);
- next_door[RIGHT] = cols->elem (i + 1);
+ Drul_array<Grob *> next_door (cols->at (i - 1),
+ cols->at (i + 1));
Direction d = LEFT;
Drul_array<Real> dists (0, 0);
do
{
- dists[d] = 0.0;
Item *lc = dynamic_cast<Item *> ((d == LEFT) ? next_door[LEFT] : c);
Item *rc = dynamic_cast<Item *> (d == LEFT ? c : next_door[RIGHT]);
extract_grob_set (lc, "spacing-wishes", wishes);
- for (int k = wishes.size (); k--;)
+ for (vsize k = wishes.size (); k--;)
{
Grob *sp = wishes[k];
if (Note_spacing::left_column (sp) != lc
|| Note_spacing::right_column (sp) != rc)
continue;
- Real space, fixed;
- fixed = 0.0;
- bool dummy;
-
if (Note_spacing::has_interface (sp))
{
/*
The note spacing should be taken from the musical
columns.
-
*/
+ Real space = 0.0;
+ Real fixed = 0.0;
+ bool dummy = false;
+
Real base = note_spacing (me, lc, rc, options, &dummy);
- Note_spacing::get_spacing (sp, rc, base, options->increment_, &space, &fixed);
+ Note_spacing::get_spacing (sp, rc, base, options->increment_,
+ &space, &fixed);
space -= options->increment_;
}
else if (Staff_spacing::has_interface (sp))
{
- Real space, fixed_space;
+ Real space = 0;
+ Real fixed_space = 0;
Staff_spacing::get_spacing_params (sp,
&space, &fixed_space);
Rod r;
r.distance_ = dists[LEFT] + dists[RIGHT];
- r.item_drul_[LEFT] = dynamic_cast<Item *> (cols->elem (i - 1));
- r.item_drul_[RIGHT] = dynamic_cast<Item *> (cols->elem (i + 1));
+ r.item_drul_[LEFT] = dynamic_cast<Item *> (cols->at (i - 1));
+ r.item_drul_[RIGHT] = dynamic_cast<Item *> (cols->at (i + 1));
r.add_to_cols ();
}
else
- newcols.push (c);
+ newcols.push_back (c);
}
*cols = newcols;
Set neighboring columns determined by the spacing-wishes grob property.
*/
void
-Spacing_spanner::set_explicit_neighbor_columns (Link_array<Grob> const &cols)
+Spacing_spanner::set_explicit_neighbor_columns (vector<Grob*> const &cols)
{
- for (int i = 0; i < cols.size (); i++)
+ 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 = 100000; // inf.
extract_grob_set (cols[i], "spacing-wishes", wishes);
- for (int k = wishes.size (); k--;)
+ for (vsize k = wishes.size (); k--;)
{
Item *wish = dynamic_cast<Item *> (wishes[k]);
extract_grob_set (rc, "left-neighbors", lns_arr);
if (lns_arr.size ())
{
- Item *it = dynamic_cast<Item *> (lns_arr.top ());
+ Item *it = dynamic_cast<Item *> (lns_arr.back ());
maxrank = Paper_column::get_rank (it->get_column ());
}
yet. Only do breakable non-musical columns, and musical columns.
*/
void
-Spacing_spanner::set_implicit_neighbor_columns (Link_array<Grob> const &cols)
+Spacing_spanner::set_implicit_neighbor_columns (vector<Grob*> const &cols)
{
- for (int i = 0; i < cols.size (); i++)
+ for (vsize i = 0; i < cols.size (); i++)
{
Item *it = dynamic_cast<Item *> (cols[i]);
- if (!Item::is_breakable (it) && !Paper_column::is_musical (it))
+ 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.
*/
extract_grob_set (cols[i], "left-neighbors", lns);
- if (lns.is_empty () && i)
+ if (lns.empty () && i)
{
SCM ga_scm = Grob_array::make_array ();
Grob_array *ga = unsmob_grob_array (ga_scm);
cols[i]->set_object ("left-neighbors", ga_scm);
}
extract_grob_set (cols[i], "right-neighbors", rns);
- if (rns.is_empty () && i < cols.size () - 1)
+ if (rns.empty () && i < cols.size () - 1)
{
SCM ga_scm = Grob_array::make_array ();
Grob_array *ga = unsmob_grob_array (ga_scm);
projects / lilypond.git / blobdiff