#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
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);
+ 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 (vsize j = gelts.size (); 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 (vsize i = 0; i < cols->size (); i++)
{
/*
Set distance constraints for loose columns
*/
- Drul_array<Grob *> next_door;
- next_door[LEFT] = cols->at (i - 1);
- next_door[RIGHT] = cols->at (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]);
|| 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);
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 (vsize i = 0; i < cols.size (); i++)
{
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 (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