source file of the GNU LilyPond music typesetter
- (c) 2001--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2001--2007 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"
#include "output-def.hh"
#include "pointer-group-interface.hh"
-
/*
TODO: detect hshifts due to collisions, and account for them in
spacing?
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]);
if (d == RIGHT && it->break_status_dir () != col_dir)
- {
- it = it->find_prebroken_piece (col_dir);
- }
+ it = it->find_prebroken_piece (col_dir);
+
/*
some kind of mismatch, eg. a note column, that is behind a
linebreak.
continue;
}
- if (d == LEFT)
+ if (d == LEFT
+ && Note_column::has_interface (it))
{
SCM r = it->get_object ("rest");
Grob *g = unsmob_grob (r);
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));
extents[d].unite (v);
}
+
+ if (Grob *arpeggio = Note_column::arpeggio (it))
+ extents[d].unite (arpeggio->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
(extents[LEFT][RIGHT] - left_head_wid[RIGHT]) / 2))
/*
- What is sticking out of the right note:
+ What is sticking out on the left side of the right note:
*/
- + (extents[RIGHT].is_empty () ? 0.0 : - extents[RIGHT][LEFT] / 2);
+ + (extents[RIGHT].is_empty ()
+ ? 0.0
+ : ((- extents[RIGHT][LEFT] / 2)
+
+ /*
+ Add that which sticks out a lot.
+ */
+ + 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);
}
if (!me->is_live ())
return 0;
- Grob_array * a = unsmob_grob_array (me->get_object ("right-items"));
+ Grob_array *a = unsmob_grob_array (me->get_object ("right-items"));
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);
+ if (dynamic_cast<Item *> (right[i])->get_column () != mincol)
+ 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]);
if (d == RIGHT && Separation_item::has_interface (it))
{
if (it->get_column () != rcolumn)
- {
- it = it->find_prebroken_piece (rcolumn->break_status_dir ());
- }
+ it = it->find_prebroken_piece (rcolumn->break_status_dir ());
Grob *last = Separation_item::extremal_break_aligned_grob (it, LEFT, &bar_xextent);
stems_drul[d] = stem;
beams_drul[d] = Stem::get_beam (stem);
- Direction sd = Stem::get_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
*/
if (d == LEFT
&& Stem::duration_log (stem) > 2 && !Stem::get_beam (stem))
- {
- correct_stem_dirs = false;
- }
+ 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);
}
}
{
stem_dirs[RIGHT] = -stem_dirs[LEFT];
stem_posns[RIGHT] = bar_yextent;
+ stem_posns[RIGHT] *= 2;
}
if (correct_stem_dirs && stem_dirs[LEFT] * stem_dirs[RIGHT] == -1)
}
if (!bar_yextent.is_empty ())
- {
- correction *= 0.5;
- }
+ correction *= 0.5;
}
}
else if (correct_stem_dirs && stem_dirs[LEFT] * stem_dirs[RIGHT] == UP)
Real delta = head_posns[-lowest][DOWN] - head_posns[lowest][UP];
Real corr = robust_scm2double (me->get_property ("same-direction-correction"), 0);
-
+
if (delta > 1)
correction = -lowest * corr;
}
*/
}
-ADD_INTERFACE (Note_spacing, "note-spacing-interface",
+ADD_INTERFACE (Note_spacing,
"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 "
+
+ );