Interval left_head_wid;
do
{
- Link_array<Grob> const &items (ly_scm2link_array (props [d]));
- for (int i = items.size (); i--;)
+ vector<Grob*> const &items (ly_scm2link_array (props [d]));
+ for (vsize i = items.size (); i--;)
{
Item *it = dynamic_cast<Item *> (items[i]);
first note head will be.
*/
if (g)
- left_head_wid = g->extent (it_col, X_AXIS);
+ {
+ if (g->common_refpoint (it_col, X_AXIS) != it_col)
+ programming_error ("Note_spacing::get_spacing(): Common refpoint incorrect");
+ else
+ left_head_wid = g->extent (it_col, X_AXIS);
+ }
}
extents[d].unite (it->extent (it_col, X_AXIS));
/*
We look at the width of the note head, since smaller heads get less space
+
eg. a quarter rest gets almost 0.5 ss less horizontal space than a note.
What is sticking out of the note head (eg. a flag), doesn't get
/*
Add that which sticks out a lot.
*/
- + max (0.0, -extents[RIGHT][LEFT] - (base_space - increment))));
+ + max (0.0, -extents[RIGHT][LEFT] - (base_space - 0.5 * increment))));
/*
We don't do complicated stuff: (base_space - increment) is the
we drop it.
*/
if (!extents[RIGHT].is_empty ()
- && (Item::is_breakable (right_col)
- || right_col->original ()))
+ && (Paper_column::is_breakable (right_col)))
{
/*
This is for the situation
Item *mincol = 0;
int min_rank = INT_MAX;
bool prune = false;
- for (int i = 0; a && i < a->size (); i++)
+ for (vsize i = 0; a && i < a->size (); i++)
{
Item *ri = a->item (i);
Item *col = ri->get_column ();
if (prune && a)
{
- Link_array<Grob> &right = a->array_reference ();
- for (int i = right.size (); i--;)
+ vector<Grob*> &right = a->array_reference ();
+ for (vsize i = right.size (); i--;)
{
if (dynamic_cast<Item *> (right[i])->get_column () != mincol)
- right.del (i);
+ right.erase (right.begin () + i);
}
}
do
{
- Link_array<Grob> const &items (ly_scm2link_array (props [d]));
- for (int i = 0; i < items.size (); i++)
+ vector<Grob*> const &items (ly_scm2link_array (props [d]));
+ for (vsize i = 0; i < items.size (); i++)
{
Item *it = dynamic_cast<Item *> (items[i]);
stems_drul[d] = stem;
beams_drul[d] = Stem::get_beam (stem);
- Direction sd = get_grob_direction (stem);
- if (stem_dirs[d] && stem_dirs[d] != sd)
+ Direction stem_dir = get_grob_direction (stem);
+ if (stem_dirs[d] && stem_dirs[d] != stem_dir)
{
correct_stem_dirs = false;
continue;
}
- stem_dirs[d] = sd;
+ stem_dirs[d] = stem_dir;
/*
Correction doesn't seem appropriate when there is a large flag
correct_stem_dirs = false;
Interval hp = Stem::head_positions (stem);
- if (!hp.is_empty ())
+ if (correct_stem_dirs
+ && !hp.is_empty ())
{
- Real chord_start = hp[sd];
- Real stem_end = Stem::stem_end_position (stem);
+ Real chord_start = hp[stem_dir];
+
+ /*
+ can't look at stem-end-position, since that triggers
+ beam slope computations.
+ */
+ Real stem_end = hp[stem_dir] +
+ stem_dir * robust_scm2double (stem->get_property ("length"), 7);
- stem_posns[d] = Interval (min (chord_start, stem_end), max (chord_start, stem_end));
+ stem_posns[d] = Interval (min (chord_start, stem_end),
+ max (chord_start, stem_end));
head_posns[d].unite (hp);
}
}
ADD_INTERFACE (Note_spacing, "note-spacing-interface",
"This object calculates spacing wishes for individual voices.",
- "left-items right-items stem-spacing-correction same-direction-correction knee-spacing-correction");
+
+
+ "knee-spacing-correction "
+ "left-items "
+ "right-items "
+ "same-direction-correction "
+ "stem-spacing-correction "
+
+ );