#include "pointer-group-interface.hh"
#include "spacing-spanner.hh"
#include "note-spacing.hh"
#include "pointer-group-interface.hh"
#include "spacing-spanner.hh"
#include "note-spacing.hh"
-is_loose_column (Grob *l, Grob *c, Grob *r)
+is_loose_column (Grob *l, Grob *c, Grob *r, Spacing_options const *options)
extract_grob_set (c, "right-neighbors", rns);
extract_grob_set (c, "left-neighbors", lns);
extract_grob_set (c, "right-neighbors", rns);
extract_grob_set (c, "left-neighbors", lns);
/*
If this column doesn't have a proper neighbor, we should really
make it loose, but spacing it correctly is more than we can
/*
If this column doesn't have a proper neighbor, we should really
make it loose, but spacing it correctly is more than we can
*/
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) || Item::is_breakable (l_neighbor))
&& (Paper_column::is_musical (r_neighbor) || Item::is_breakable (r_neighbor))))
in any case, we don't want to move bar lines.
*/
extract_grob_set (c, "elements", elts);
in any case, we don't want to move bar lines.
*/
extract_grob_set (c, "elements", elts);
{
Grob *g = elts[i];
if (g && Break_align_interface::has_interface (g))
{
extract_grob_set (g, "elements", gelts);
{
Grob *g = elts[i];
if (g && Break_align_interface::has_interface (g))
{
extract_grob_set (g, "elements", gelts);
- if (is_loose_column (cols->elem (i - 1), c, cols->elem (i + 1)))
+
+ bool loose = (i > 0 && i < cols->size () - 1)
+ && is_loose_column (cols->elem (i - 1), c, cols->elem (i + 1), options);
+
+ if (loose)
{
extract_grob_set (c, "right-neighbors", rns_arr);
extract_grob_set (c, "left-neighbors", lns_arr);
{
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.top ()->self_scm () : SCM_BOOL_F;
+ SCM rns = rns_arr.size () ? rns_arr.top ()->self_scm () : SCM_BOOL_F;
+
Item *lc = dynamic_cast<Item *> ((d == LEFT) ? next_door[LEFT] : c);
Item *rc = dynamic_cast<Item *> (d == LEFT ? c : next_door[RIGHT]);
Item *lc = dynamic_cast<Item *> ((d == LEFT) ? next_door[LEFT] : c);
Item *rc = dynamic_cast<Item *> (d == LEFT ? c : next_door[RIGHT]);
*/
Real base = note_spacing (me, lc, rc, options, &dummy);
*/
Real base = note_spacing (me, lc, rc, options, &dummy);
- Note_spacing::get_spacing (sp, rc, base, increment, &space, &fixed);
+ Note_spacing::get_spacing (sp, rc, base, options->increment_, &space, &fixed);
int min_rank = 100000; // inf.
extract_grob_set (cols[i], "spacing-wishes", wishes);
int min_rank = 100000; // inf.
extract_grob_set (cols[i], "spacing-wishes", wishes);
sloppy with typing left/right-neighbors should take list, but paper-column found instead.
*/
extract_grob_set (cols[i], "left-neighbors", lns);
sloppy with typing left/right-neighbors should take list, but paper-column found instead.
*/
extract_grob_set (cols[i], "left-neighbors", lns);
cols[i]->set_object ("left-neighbors", ga_scm);
}
extract_grob_set (cols[i], "right-neighbors", rns);
if (rns.is_empty () && i < cols.size () - 1)
{
cols[i]->set_object ("left-neighbors", ga_scm);
}
extract_grob_set (cols[i], "right-neighbors", rns);
if (rns.is_empty () && i < cols.size () - 1)
{