source file of the GNU LilyPond music typesetter
- (c) 2001--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2001--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "separation-item.hh"
#include "staff-spacing.hh"
#include "accidental-placement.hh"
+#include "paper-def.hh"
void
Note_spacing::get_spacing (Grob *me, Item* right_col,
if (!g)
g = Note_column::first_head (it);
+ /*
+ Ugh. If Stem is switched off, we don't know what the
+ first note head will be.
+ */
if (g)
left_head_wid = g->extent(it_col, X_AXIS);
}
}
}
- if (extents[d].empty_b ())
+ if (extents[d].is_empty ())
extents[d] = Interval (0,0);
}
while (flip (&d) != LEFT);
What is sticking out of the note head (eg. a flag), doesn't get
the full amount of space.
+
+ FIXED also includes the left part of the right object.
*/
- *fixed = left_head_wid.empty_b () ? increment : left_head_wid[RIGHT];
- *space = (base_space - increment) + *fixed +
- (extents[LEFT][RIGHT] - left_head_wid[RIGHT])/ 2;
- ;
+ *fixed =
+ (left_head_wid.is_empty () ? increment :
+ /*
+ Size of the head:
+ */
+ (left_head_wid[RIGHT]+
+
+ /*
+ What's sticking out of the head, eg. a flag:
+ */
+ (extents[LEFT][RIGHT] - left_head_wid[RIGHT])/2))
+
+ /*
+ What is sticking out of the right note:
+ */
+ + (extents[RIGHT].is_empty () ? 0.0 : - extents[RIGHT][LEFT] / 2);
- if (*space - *fixed < 2 * ((- extents[RIGHT][LEFT]) >? 0))
+ /*
+ We don't do complicated stuff: (base_space - increment) is the
+ normal amount of white, which also determines the amount of
+ stretch. Upon (extreme) stretching, notes with accidentals should
+ stretch as much as notes without accidentals.
+ */
+ *space = (base_space - increment) + *fixed ;
+
+ if (Item::breakable_b (right_col)
+ || right_col->original_)
{
/*
-
- What's sticking out at the left of the right side has less
- influence. We only take it into account if there is not enough
- space.
+ This is for the situation
- this sucks: this criterion is discontinuous; FIXME.
- */
- *space += 0.5 * (( -extents[RIGHT][LEFT]) >? 0);
+ rest | 3/4 (eol)
+
+ */
+ *space += -extents[RIGHT][LEFT];
+ *fixed += -extents[RIGHT][LEFT];
}
-
+
stem_dir_correction (me, right_col, increment, space, fixed);
}
me->get_grob_property ("right-items"));
Drul_array<Grob*> beams_drul(0,0);
- Real correction = 0.0;
+ Drul_array<Grob*> stems_drul(0,0);
stem_dirs[LEFT] = stem_dirs[RIGHT] = CENTER;
Interval intersect;
Interval bar_xextent;
Interval bar_yextent;
- bool correct = true;
+ bool correct_stem_dirs = true;
Direction d = LEFT;
bool acc_right = false;
Grob *stem = Note_column::get_stem (it);
- if (!stem)
+ if (!stem || !stem->live ())
{
if (d == RIGHT && Separation_item::has_interface (it))
{
it = it->find_prebroken_piece (rcolumn->break_status_dir ());
}
- Grob *last = Staff_spacing::extremal_break_aligned_grob (it, LEFT, &bar_xextent);
+ Grob *last = Separation_item::extremal_break_aligned_grob (it, LEFT, &bar_xextent);
if (last)
bar_yextent = Staff_spacing::bar_y_positions (last);
if(Stem::invisible_b (stem))
{
- return ;
+ correct_stem_dirs = false;
+ continue;
}
+ 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)
{
- return ;
+ correct_stem_dirs = false;
+ continue;
}
stem_dirs[d] = sd;
if (d == LEFT
&& Stem::duration_log (stem) > 2 && !Stem::get_beam (stem))
{
-
- return;
+ correct_stem_dirs = false;
}
-
-
Interval hp = Stem::head_positions (stem);
Real chord_start = hp[sd];
Real stem_end = Stem::stem_end_position (stem);
/*
don't correct if accidentals are sticking out of the right side.
-
*/
if (acc_right)
return ;
- if (!bar_yextent.empty_b())
+ Real correction = 0.0;
+
+ if (!bar_yextent.is_empty ())
{
stem_dirs[RIGHT] = - stem_dirs[LEFT];
stem_posns[RIGHT] = bar_yextent;
}
- if (correct &&stem_dirs[LEFT] *stem_dirs[RIGHT] == -1)
+ if (correct_stem_dirs && stem_dirs[LEFT] *stem_dirs[RIGHT] == -1)
{
if (beams_drul[LEFT] && beams_drul[LEFT] == beams_drul[RIGHT])
{
+
/*
this is a knee: maximal correction.
*/
-
- correction = increment* stem_dirs[LEFT];
- *fixed += increment* stem_dirs[LEFT];
+ Real note_head_width = increment;
+ Grob * st = stems_drul[RIGHT];
+ Grob * head = st ? Stem::support_head (st) : 0;
+
+ Interval head_extent;
+ if (head)
+ {
+ head_extent = head->extent (rcolumn, X_AXIS);
+
+ if (!head_extent.is_empty ())
+ note_head_width = head_extent[RIGHT];
+
+ if (st)
+ {
+ Real thick = Stem::thickness (st);
+
+ note_head_width -= thick;
+ }
+ }
+
+ correction = note_head_width* stem_dirs[LEFT];
+ correction *= robust_scm2double (me->get_grob_property ("knee-spacing-correction"), 0);
+ *fixed += correction;
}
else
{
intersect = stem_posns[LEFT];
intersect.intersect(stem_posns[RIGHT]);
- correct = correct && !intersect.empty_b ();
+ correct_stem_dirs = correct_stem_dirs && !intersect.is_empty ();
- if (!correct)
- return;
-
- correction = abs (intersect.length ());
+ if (correct_stem_dirs)
+ {
+ correction =abs (intersect.length ());
- /*
- Ugh. 7 is hardcoded.
- */
- correction = (correction/7) <? 1.0;
- correction *= stem_dirs[LEFT] ;
- correction *= gh_scm2double (me->get_grob_property ("stem-spacing-correction"));
-
- if (!bar_yextent.empty_b())
+ /*
+ Ugh. 7 is hardcoded.
+ */
+ correction = (correction/7) <? 1.0;
+ correction *= stem_dirs[LEFT] ;
+ correction *=
+ robust_scm2double (me->get_grob_property ("stem-spacing-correction"), 0);
+ }
+
+ if (!bar_yextent.is_empty ())
{
correction *= 0.5;
}
}
}
- else if (correct && stem_dirs[LEFT] *stem_dirs[RIGHT] == UP)
+ else if (correct_stem_dirs && stem_dirs[LEFT] *stem_dirs[RIGHT] == UP)
{
/*
Correct for the following situation:
Interval hp = head_posns[LEFT];
hp.intersect (head_posns[RIGHT]);
- if (!hp.empty_b())
+ if (!hp.is_empty ())
return ;
Direction lowest =
(head_posns[LEFT][DOWN] > head_posns[RIGHT][UP]) ? RIGHT : LEFT;
Real delta = head_posns[-lowest][DOWN] - head_posns[lowest][UP] ;
- Real corr = gh_scm2double (me->get_grob_property ("stem-spacing-correction"));
+ Real corr = robust_scm2double (me->get_grob_property ("stem-spacing-correction"), 0);
corr = (delta <= 1) ? 0.0 : 0.25;
correction= -lowest * corr ;
}
- if (!bar_xextent.empty_b())
- correction += - bar_xextent[LEFT];
-
*space += correction;
+
+ /* there used to be a correction for bar_xextent() here, but
+ it's unclear what that was good for ?
+ */
+
}
ADD_INTERFACE (Note_spacing,"note-spacing-interface",
"",
- "left-items right-items stem-spacing-correction");
+ "left-items right-items stem-spacing-correction knee-spacing-correction");
projects / lilypond.git / blobdiff