source file of the GNU LilyPond music typesetter
- (c) 2001--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2001--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "note-spacing.hh"
+#include "directional-element-interface.hh"
#include "grob-array.hh"
#include "paper-column.hh"
#include "moment.hh"
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
*/
*space = (base_space - increment) + *fixed;
+#if 0
+ /*
+ The below situation is now handled by the "sticks out a lot" case
+ above. However we keep around the code for a few releases before
+ 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
*space += -extents[RIGHT][LEFT] / 2;
*fixed += -extents[RIGHT][LEFT] / 2;
}
-
+#endif
+
stem_dir_correction (me, right_col, increment, space, fixed);
}
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);
}
}
if (!mincol)
- {
- return 0;
- }
+ return 0;
return mincol;
}
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 = Stem::get_direction (stem);
+ Direction sd = get_grob_direction (stem);
if (stem_dirs[d] && stem_dirs[d] != sd)
{
correct_stem_dirs = false;