/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1996--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1996--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
TODO: This is way too hairy
me->warning (_ ("weird stem size, check for narrow beams"));
Interval height = me->pure_height (me, 0, INT_MAX);
- Real half_space = Staff_symbol_referencer::staff_space (me) * 0.5;
+ Real staff_space = Staff_symbol_referencer::staff_space (me);
+ Real half_space = staff_space * 0.5;
height[d] = se * half_space + beam_end_corrective (me);
height[-d] = (height[d] - d
* (0.5 * beam_thickness
- + beam_translation * max (0, (beam_count - 1))
- + stemlet_length));
+ + beam_translation * max (0, (beam_count - 1))
+ + stemlet_length));
}
else if (!stemlet && beam)
height[-d] = height[d];
me->programming_error ("Can't have a stemlet without a beam.");
}
- me->set_property ("Y-extent", ly_interval2scm (height));
+ me->set_property ("stem-begin-position", scm_from_double (height[-d] * 2 / staff_space));
+ me->set_property ("length", scm_from_double (height.length () * 2 / staff_space));
}
/* Note head that determines hshift for upstems
bool
Stem::is_normal_stem (Grob *me)
{
- return head_count (me) && scm_to_int (me->get_property ("duration-log")) >= 1;
+ if (!head_count (me))
+ return false;
+
+ extract_grob_set (me, "note-heads", heads);
+ SCM style = heads[0]->get_property ("style");
+ return style != ly_symbol2scm ("kievan") && scm_to_int (me->get_property ("duration-log")) >= 1;
}
MAKE_SCHEME_CALLBACK (Stem, pure_height, 3)
if (!beam)
return iv;
- if (!to_boolean (me->get_property ("cross-staff")) && calc_beam)
+ if (calc_beam)
{
Interval overshoot;
Direction dir = get_grob_direction (me);
vector<Grob *> my_stems;
extract_grob_set (beam, "normal-stems", normal_stems);
for (vsize i = 0; i < normal_stems.size (); i++)
- if (normal_stems[i] != me && get_grob_direction (normal_stems[i]) == dir)
+ if (get_grob_direction (normal_stems[i]) == dir)
{
- heights.push_back (Stem::internal_pure_height (normal_stems[i], false));
+ if (normal_stems[i] != me)
+ heights.push_back (Stem::internal_pure_height (normal_stems[i], false));
+ else
+ heights.push_back (iv);
my_stems.push_back (normal_stems[i]);
- iv.unite (heights.back ());
}
+ //iv.unite (heights.back ());
+ // look for cross staff effects
+ vector<Real> coords;
+ Grob *common = common_refpoint_of_array (my_stems, me, Y_AXIS);
+ Real min_pos = infinity_f;
+ Real max_pos = -infinity_f;
+ for (vsize i = 0; i < my_stems.size (); i++)
+ {
+ coords.push_back (my_stems[i]->pure_relative_y_coordinate (common, 0, INT_MAX));
+ min_pos = min (min_pos, coords[i]);
+ max_pos = max (max_pos, coords[i]);
+ }
+ for (vsize i = 0; i < heights.size (); i++)
+ {
+ heights[i][dir] += dir == DOWN
+ ? coords[i] - max_pos
+ : coords[i] - min_pos;
+ }
+
+ for (vsize i = 0; i < heights.size (); i++) iv.unite (heights[i]);
+
for (vsize i = 0; i < my_stems.size (); i++)
cache_pure_height (my_stems[i], iv, heights[i]);
iv.intersect (overshoot);
Grob *beam = get_beam (me);
Real ss = Staff_symbol_referencer::staff_space (me);
+ Direction dir = get_grob_direction (me);
+
if (beam && calc_beam)
{
(void) beam->get_property ("quantized-positions");
- return me->extent (me, Y_AXIS)[get_grob_direction (me)] * ss * 2;
+ return robust_scm2double (me->get_property ("length"), 0.0)
+ + dir * robust_scm2double (me->get_property ("stem-begin-position"), 0.0);
}
vector<Real> a;
if (scm_is_pair (s))
length = 2 * scm_to_double (robust_list_ref (durlog - 2, s));
- Direction dir = get_grob_direction (me);
-
/* Stems in unnatural (forced) direction should be shortened,
according to [Roush & Gourlay] */
Interval hp = head_positions (me);
return ly_interval2scm (internal_height (me, true));
}
-Grob*
+Grob *
Stem::get_reference_head (Grob *me)
{
return to_boolean (me->get_property ("avoid-note-head"))
Interval
Stem::internal_height (Grob *me, bool calc_beam)
{
- if (!is_valid_stem (me))
+ Grob *beam = get_beam (me);
+ if (!is_valid_stem (me) && ! beam)
return Interval ();
Direction dir = get_grob_direction (me);
- Grob *beam = get_beam (me);
if (beam && calc_beam)
{
/* trigger set-stem-lengths. */
(void) beam->get_property ("quantized-positions");
- return me->extent (me, Y_AXIS);
}
- Real y2 = internal_calc_stem_end_position (me, calc_beam);
- Real y1 = internal_calc_stem_begin_position (me, calc_beam);
+ Real y1 = robust_scm2double ((calc_beam
+ ? me->get_property ("stem-begin-position")
+ : me->get_pure_property ("stem-begin-position", 0, INT_MAX)),
+ 0.0);
+
+ Real y2 = dir * robust_scm2double ((calc_beam
+ ? me->get_property ("length")
+ : me->get_pure_property ("length", 0, INT_MAX)),
+ 0.0)
+ + y1;
Real half_space = Staff_symbol_referencer::staff_space (me) * 0.5;
- Interval stem_y = Interval (min (y1, y2), max (y2, y1)) * half_space;
- stem_y[dir] += beam_end_corrective (me);
+ Interval stem_y = Interval (min (y1, y2), max (y2, y1)) * half_space;
return stem_y;
}
if (beam && calc_beam)
{
(void) beam->get_property ("quantized-positions");
- return me->extent (me, Y_AXIS)[-get_grob_direction (me)] * ss * 2;
+ return robust_scm2double (me->get_property ("stem-begin-position"), 0.0);
}
Direction d = get_grob_direction (me);
Grob *lh = get_reference_head (me);
+ if (!lh)
+ return 0.0;
+
Real pos = Staff_symbol_referencer::get_position (lh);
if (Grob *head = support_head (me))
{
/* TODO: make the stem start a direction ?
This is required to avoid stems passing in tablature chords. */
- Real stemlet_length = robust_scm2double (me->get_property ("stemlet-length"),
- 0.0);
- bool stemlet = stemlet_length > 0.0;
-
Grob *lh = get_reference_head (me);
Grob *beam = unsmob_grob (me->get_object ("beam"));
- if (!lh && !stemlet)
- return false;
-
- if (!lh && stemlet && !beam)
+ if (!lh && !beam)
return false;
if (lh && robust_scm2int (lh->get_property ("duration-log"), 0) < 1)
if (!is_valid_stem (me))
return SCM_EOL;
- Interval stem_y = me->extent (me, Y_AXIS);
Direction dir = get_grob_direction (me);
+ Real y1 = robust_scm2double (me->get_property ("stem-begin-position"), 0.0);
+ Real y2 = dir * robust_scm2double (me->get_property ("length"), 0.0) + y1;
+
+ Real half_space = Staff_symbol_referencer::staff_space (me) * 0.5;
+
+ Interval stem_y = Interval (min (y1, y2), max (y2, y1)) * half_space;
stem_y[dir] -= beam_end_corrective (me);
Real r = real_attach;
/* If not centered: correct for stem thickness. */
- if (attach)
+ string style = robust_symbol2string (f->get_property ("style"), "default");
+ if (attach && style != "mensural"
+ && style != "neomensural"
+ && style != "petrucci")
{
Real rule_thick = thickness (me);
r += -d * rule_thick * 0.5;
Also, not for knees. Seems to be a good thing. */
bool no_extend = to_boolean (me->get_property ("no-stem-extend"));
- bool is_knee = to_boolean (beam->get_property ("knee"));
+ bool is_knee = Beam::is_knee (beam);
if (!no_extend && !is_knee)
{
/* Highest beam of (UP) beam must never be lower than middle
return scm_from_bool (is_cross_staff (unsmob_grob (smob)));
}
-Grob*
+Grob *
Stem::flag (Grob *me)
{
return unsmob_grob (me->get_object ("flag"));
"duration-log "
"flag "
"french-beaming "
+ "length "
"length-fraction "
"max-beam-connect "
+ "melody-spanner "
"neutral-direction "
"no-stem-extend "
"note-heads "
"positioning-done "
"rests "
+ "stem-begin-position "
"stem-info "
"stemlet-length "
"thickness "
"tremolo-flag "
+ "tuplet-start "
);
/****************************************************************/
projects / lilypond.git / blobdiff