X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem.cc;h=947a429c23f472770474dd10c9fb8abb8a4053e6;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=8a755afaa5aec63946003a19017be335f0c39b80;hpb=6465274e66a851cccd4cd32a521abc853f3e79dd;p=lilypond.git diff --git a/lily/stem.cc b/lily/stem.cc index 8a755afaa5..947a429c23 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1996--2011 Han-Wen Nienhuys + Copyright (C) 1996--2015 Han-Wen Nienhuys Jan Nieuwenhuizen TODO: This is way too hairy @@ -91,7 +91,7 @@ Stem::get_beaming (Grob *me, Direction d) SCM lst = index_get_cell (pair, d); - int len = scm_ilength (lst); + int len = scm_ilength (lst); // -1 for dotted lists! return max (len, 0); } @@ -110,10 +110,10 @@ Stem::head_positions (Grob *me) Real Stem::chord_start_y (Grob *me) { - Interval hp = head_positions (me); - if (!hp.is_empty ()) - return hp[get_grob_direction (me)] * Staff_symbol_referencer::staff_space (me) - * 0.5; + if (head_count (me)) + return Staff_symbol_referencer::get_position (last_head (me)) + * Staff_symbol_referencer::staff_space (me) * 0.5; + return 0; } @@ -123,14 +123,17 @@ Stem::set_stem_positions (Grob *me, Real se) // todo: margins Direction d = get_grob_direction (me); - Grob *beam = unsmob_grob (me->get_object ("beam")); + Grob *beam = unsmob (me->get_object ("beam")); if (d && d * head_positions (me)[get_grob_direction (me)] >= se * d) me->warning (_ ("weird stem size, check for narrow beams")); - Interval height = me->pure_height (me, 0, INT_MAX); + // trigger note collision mechanisms + Real stem_beg = internal_calc_stem_begin_position (me, false); Real staff_space = Staff_symbol_referencer::staff_space (me); - Real half_space = staff_space * 0.5; + Real half_space = staff_space * 0.5; + Interval height; + height[-d] = stem_beg * half_space; height[d] = se * half_space + beam_end_corrective (me); Real stemlet_length = robust_scm2double (me->get_property ("stemlet-length"), @@ -149,8 +152,8 @@ Stem::set_stem_positions (Grob *me, Real se) 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]; @@ -160,7 +163,6 @@ Stem::set_stem_positions (Grob *me, Real se) 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)); - (void) me->extent (me, Y_AXIS); } /* Note head that determines hshift for upstems @@ -223,8 +225,7 @@ Stem::extremal_heads (Grob *me) Grob *n = heads[i]; int p = Staff_symbol_referencer::get_rounded_position (n); - Direction d = LEFT; - do + for (LEFT_and_RIGHT (d)) { if (d * p > d * extpos[d]) { @@ -232,23 +233,27 @@ Stem::extremal_heads (Grob *me) extpos[d] = p; } } - while (flip (&d) != DOWN); } return exthead; } -/* The positions, in ascending order. */ +/* The staff positions, in ascending order. + * If FILTER, include the main column of noteheads only */ vector -Stem::note_head_positions (Grob *me) +Stem::note_head_positions (Grob *me, bool filter) { vector ps; extract_grob_set (me, "note-heads", heads); + Grob *xref = common_refpoint_of_array (heads, me, X_AXIS); for (vsize i = heads.size (); i--;) { Grob *n = heads[i]; - int p = Staff_symbol_referencer::get_rounded_position (n); + if (filter + && n->relative_coordinate (xref, X_AXIS) != 0.0) + continue; + int p = Staff_symbol_referencer::get_rounded_position (n); ps.push_back (p); } @@ -261,24 +266,30 @@ Stem::add_head (Grob *me, Grob *n) { n->set_object ("stem", me->self_scm ()); - if (Note_head::has_interface (n)) + if (has_interface (n)) Pointer_group_interface::add_grob (me, ly_symbol2scm ("note-heads"), n); - else if (Rest::has_interface (n)) + else if (has_interface (n)) Pointer_group_interface::add_grob (me, ly_symbol2scm ("rests"), n); } bool Stem::is_invisible (Grob *me) { - return !is_normal_stem (me) - && (robust_scm2double (me->get_property ("stemlet-length"), - 0.0) == 0.0); + if (is_normal_stem (me)) + return false; + else if (head_count (me)) + return true; + else // if there are no note-heads, we might want stemlets + return 0.0 == robust_scm2double (me->get_property ("stemlet-length"), 0.0); } 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; + + return scm_to_int (me->get_property ("duration-log")) >= 1; } MAKE_SCHEME_CALLBACK (Stem, pure_height, 3) @@ -287,7 +298,7 @@ Stem::pure_height (SCM smob, SCM /* start */, SCM /* end */) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); return ly_interval2scm (internal_pure_height (me, true)); } @@ -297,31 +308,52 @@ Stem::internal_pure_height (Grob *me, bool calc_beam) if (!is_normal_stem (me)) return Interval (0.0, 0.0); - Grob *beam = unsmob_grob (me->get_object ("beam")); + Grob *beam = unsmob (me->get_object ("beam")); Interval iv = internal_height (me, false); 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); - Direction d = DOWN; - do + for (DOWN_and_UP (d)) overshoot[d] = d == dir ? dir * infinity_f : iv[d]; - while (flip (&d) != DOWN); vector heights; vector 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 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); @@ -335,10 +367,8 @@ Stem::cache_pure_height (Grob *me, Interval iv, Interval my_iv) { Interval overshoot; Direction dir = get_grob_direction (me); - Direction d = DOWN; - do + for (DOWN_and_UP (d)) overshoot[d] = d == dir ? dir * infinity_f : my_iv[d]; - while (flip (&d) != DOWN); iv.intersect (overshoot); dynamic_cast (me)->cache_pure_height (iv); @@ -348,7 +378,7 @@ MAKE_SCHEME_CALLBACK (Stem, calc_stem_end_position, 1) SCM Stem::calc_stem_end_position (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); return scm_from_double (internal_calc_stem_end_position (me, true)); } @@ -358,7 +388,7 @@ Stem::pure_calc_stem_end_position (SCM smob, SCM, /* start */ SCM /* end */) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); return scm_from_double (internal_calc_stem_end_position (me, false)); } @@ -391,7 +421,6 @@ Stem::internal_calc_stem_end_position (Grob *me, bool calc_beam) if (scm_is_pair (s)) length = 2 * scm_to_double (robust_list_ref (durlog - 2, s)); - /* Stems in unnatural (forced) direction should be shortened, according to [Roush & Gourlay] */ Interval hp = head_positions (me); @@ -426,8 +455,8 @@ Stem::internal_calc_stem_end_position (Grob *me, bool calc_beam) length *= robust_scm2double (me->get_property ("length-fraction"), 1.0); /* Tremolo stuff. */ - Grob *t_flag = unsmob_grob (me->get_object ("tremolo-flag")); - if (t_flag && (!unsmob_grob (me->get_object ("beam")) || !calc_beam)) + Grob *t_flag = unsmob (me->get_object ("tremolo-flag")); + if (t_flag && (!unsmob (me->get_object ("beam")) || !calc_beam)) { /* Crude hack: add extra space if tremolo flag is there. @@ -477,7 +506,7 @@ MAKE_SCHEME_CALLBACK (Stem, calc_positioning_done, 1); SCM Stem::calc_positioning_done (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); if (!head_count (me)) return SCM_BOOL_T; @@ -504,7 +533,8 @@ Stem::calc_positioning_done (SCM smob) bool is_harmonic_centered = false; for (vsize i = 0; i < heads.size (); i++) is_harmonic_centered = is_harmonic_centered - || heads[i]->get_property ("style") == ly_symbol2scm ("harmonic"); + || scm_is_eq (heads[i]->get_property ("style"), + ly_symbol2scm ("harmonic")); is_harmonic_centered = is_harmonic_centered && is_invisible (me); Real w = hed->extent (hed, X_AXIS)[dir]; @@ -517,10 +547,12 @@ Stem::calc_positioning_done (SCM smob) = hed->extent (hed, X_AXIS).linear_combination (CENTER) - heads[i]->extent (heads[i], X_AXIS).linear_combination (CENTER); - heads[i]->translate_axis (amount, X_AXIS); + if (!isnan (amount)) // empty heads can produce NaN + heads[i]->translate_axis (amount, X_AXIS); } bool parity = true; Real lastpos = Real (Staff_symbol_referencer::get_position (heads[0])); + int threshold = robust_scm2int (me->get_property ("note-collision-threshold"), 1); for (vsize i = 1; i < heads.size (); i++) { Real p = Staff_symbol_referencer::get_position (heads[i]); @@ -530,7 +562,7 @@ Stem::calc_positioning_done (SCM smob) dy should always be 0.5, 0.0, 1.0, but provide safety margin for rounding errors. */ - if (dy < 1.1) + if (dy < 0.1 + threshold) { if (parity) { @@ -545,14 +577,32 @@ Stem::calc_positioning_done (SCM smob) stem 100% whereas reversed heads only overlaps the stem 50% */ - Real reverse_overlap = 0.5; - heads[i]->translate_axis ((ell - thick * reverse_overlap) * d, - X_AXIS); + + /* + However, the first reverse head has to be shifted even + more than the full reverse overlap if it is the same + height as the first head or there will be a gap + because of the head slant (issue 346). + */ + + if (i == 1 && dy < 0.1) + reverse_overlap = 1.1; if (is_invisible (me)) - heads[i]->translate_axis (-thick * (2 - reverse_overlap) * d, - X_AXIS); + { + // Semibreves and longer are tucked in considerably + // to be recognizable as chorded rather than + // parallel voices. During the course of issue 346 + // there was a discussion to change this for unisons + // (dy < 0.1) to reduce overlap but without reaching + // agreement and with Gould being rather on the + // overlapping front. + reverse_overlap = 2; + } + + heads[i]->translate_axis ((ell - thick * reverse_overlap) * d, + X_AXIS); /* TODO: @@ -583,9 +633,9 @@ MAKE_SCHEME_CALLBACK (Stem, calc_direction, 1); SCM Stem::calc_direction (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); Direction dir = CENTER; - if (Grob *beam = unsmob_grob (me->get_object ("beam"))) + if (Grob *beam = unsmob (me->get_object ("beam"))) { SCM ignore_me = beam->get_property ("direction"); (void) ignore_me; @@ -606,13 +656,13 @@ MAKE_SCHEME_CALLBACK (Stem, calc_default_direction, 1); SCM Stem::calc_default_direction (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); Direction dir = CENTER; int staff_center = 0; - Interval hp = head_positions (me); - if (!hp.is_empty ()) + if (head_count (me)) { + Interval hp = head_positions (me); int udistance = (int) (UP * hp[UP] - staff_center); int ddistance = (int) (DOWN * hp[DOWN] - staff_center); @@ -628,11 +678,11 @@ MAKE_SCHEME_CALLBACK (Stem, height, 1); SCM Stem::height (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); return ly_interval2scm (internal_height (me, true)); } -Grob* +Grob * Stem::get_reference_head (Grob *me) { return to_boolean (me->get_property ("avoid-note-head")) @@ -643,7 +693,7 @@ Stem::get_reference_head (Grob *me) Real Stem::beam_end_corrective (Grob *me) { - Grob *beam = unsmob_grob (me->get_object ("beam")); + Grob *beam = unsmob (me->get_object ("beam")); Direction dir = get_grob_direction (me); if (beam) { @@ -661,7 +711,7 @@ Interval Stem::internal_height (Grob *me, bool calc_beam) { Grob *beam = get_beam (me); - if (!is_valid_stem (me) && ! beam) + if (!is_valid_stem (me) && !beam) return Interval (); Direction dir = get_grob_direction (me); @@ -672,20 +722,27 @@ Stem::internal_height (Grob *me, bool calc_beam) (void) beam->get_property ("quantized-positions"); } + /* + If there is a beam but no stem, slope calculations depend on this + routine to return where the stem end /would/ be. + */ + if (calc_beam && !beam && !unsmob (me->get_property ("stencil"))) + return Interval (); + 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; + ? 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; + Interval stem_y = Interval (min (y1, y2), max (y2, y1)) * half_space; return stem_y; } @@ -694,7 +751,7 @@ MAKE_SCHEME_CALLBACK (Stem, width, 1); SCM Stem::width (SCM e) { - Grob *me = unsmob_grob (e); + Grob *me = unsmob (e); Interval r; @@ -720,7 +777,7 @@ MAKE_SCHEME_CALLBACK (Stem, calc_stem_begin_position, 1); SCM Stem::calc_stem_begin_position (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); return scm_from_double (internal_calc_stem_begin_position (me, true)); } @@ -730,7 +787,7 @@ Stem::pure_calc_stem_begin_position (SCM smob, SCM, /* start */ SCM /* end */) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); return scm_from_double (internal_calc_stem_begin_position (me, false)); } @@ -759,26 +816,53 @@ Stem::internal_calc_stem_begin_position (Grob *me, bool calc_beam) Real y_attach = Note_head::stem_attachment_coordinate (head, Y_AXIS); y_attach = head_height.linear_combination (y_attach); - pos += d * y_attach * 2 / ss; + if (!isinf (y_attach) && !isnan (y_attach)) // empty heads + pos += d * y_attach * 2 / ss; } return pos; } + +MAKE_SCHEME_CALLBACK (Stem, pure_calc_length, 3); +SCM +Stem::pure_calc_length (SCM smob, SCM /*start*/, SCM /*end*/) +{ + Grob *me = unsmob (smob); + Real beg = robust_scm2double (me->get_pure_property ("stem-begin-position", 0, INT_MAX), 0.0); + Real res = fabs (internal_calc_stem_end_position (me, false) - beg); + return scm_from_double (res); +} + +MAKE_SCHEME_CALLBACK (Stem, calc_length, 1); +SCM +Stem::calc_length (SCM smob) +{ + Grob *me = unsmob (smob); + if (unsmob (me->get_object ("beam"))) + { + me->programming_error ("ly:stem::calc-length called but will not be used for beamed stem."); + return scm_from_double (0.0); + } + + Real beg = robust_scm2double (me->get_property ("stem-begin-position"), 0.0); + Real res = fabs (internal_calc_stem_end_position (me, true) - beg); + return scm_from_double (res); +} + bool Stem::is_valid_stem (Grob *me) { /* TODO: make the stem start a direction ? This is required to avoid stems passing in tablature chords. */ + if (!me) + return false; Grob *lh = get_reference_head (me); - Grob *beam = unsmob_grob (me->get_object ("beam")); + Grob *beam = unsmob (me->get_object ("beam")); if (!lh && !beam) return false; - if (lh && robust_scm2int (lh->get_property ("duration-log"), 0) < 1) - return false; - if (is_invisible (me)) return false; @@ -789,7 +873,7 @@ MAKE_SCHEME_CALLBACK (Stem, print, 1); SCM Stem::print (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); if (!is_valid_stem (me)) return SCM_EOL; @@ -799,7 +883,7 @@ Stem::print (SCM smob) Real half_space = Staff_symbol_referencer::staff_space (me) * 0.5; - Interval stem_y = Interval (min (y1, y2), max (y2, y1)) * half_space; + Interval stem_y = Interval (min (y1, y2), max (y2, y1)) * half_space; stem_y[dir] -= beam_end_corrective (me); @@ -825,13 +909,13 @@ MAKE_SCHEME_CALLBACK (Stem, offset_callback, 1); SCM Stem::offset_callback (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); extract_grob_set (me, "rests", rests); if (rests.size ()) { Grob *rest = rests.back (); - Real r = rest->extent (rest, X_AXIS).center (); + Real r = robust_relative_extent (rest, rest, X_AXIS).center (); return scm_from_double (r); } @@ -847,10 +931,13 @@ Stem::offset_callback (SCM smob) Direction d = get_grob_direction (me); Real real_attach = head_wid.linear_combination (d * attach); - Real r = real_attach; + Real r = isnan(real_attach)? 0.0: 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; @@ -866,7 +953,7 @@ Spanner * Stem::get_beam (Grob *me) { SCM b = me->get_object ("beam"); - return dynamic_cast (unsmob_grob (b)); + return unsmob (b); } Stem_info @@ -885,7 +972,7 @@ MAKE_SCHEME_CALLBACK (Stem, calc_stem_info, 1); SCM Stem::calc_stem_info (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); Direction my_dir = get_grob_direction (me); if (!my_dir) @@ -935,7 +1022,7 @@ Stem::calc_stem_info (SCM smob) : 0.0); Real height_of_my_trem = 0.0; - Grob *trem = unsmob_grob (me->get_object ("tremolo-flag")); + Grob *trem = unsmob (me->get_object ("tremolo-flag")); if (trem) { height_of_my_trem @@ -985,7 +1072,7 @@ Stem::calc_stem_info (SCM smob) 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 @@ -1034,7 +1121,7 @@ Stem::beam_multiplicity (Grob *stem) bool Stem::is_cross_staff (Grob *stem) { - Grob *beam = unsmob_grob (stem->get_object ("beam")); + Grob *beam = unsmob (stem->get_object ("beam")); return beam && Beam::is_cross_staff (beam); } @@ -1042,13 +1129,13 @@ MAKE_SCHEME_CALLBACK (Stem, calc_cross_staff, 1) SCM Stem::calc_cross_staff (SCM smob) { - return scm_from_bool (is_cross_staff (unsmob_grob (smob))); + return scm_from_bool (is_cross_staff (unsmob (smob))); } -Grob* +Grob * Stem::flag (Grob *me) { - return unsmob_grob (me->get_object ("flag")); + return unsmob (me->get_object ("flag")); } /* FIXME: Too many properties */ @@ -1087,15 +1174,18 @@ ADD_INTERFACE (Stem, "default-direction " "details " "direction " + "double-stem-separation " "duration-log " "flag " "french-beaming " "length " "length-fraction " "max-beam-connect " + "melody-spanner " "neutral-direction " "no-stem-extend " "note-heads " + "note-collision-threshold " "positioning-done " "rests " "stem-begin-position " @@ -1103,6 +1193,7 @@ ADD_INTERFACE (Stem, "stemlet-length " "thickness " "tremolo-flag " + "tuplet-start " ); /****************************************************************/