X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem.cc;h=4b5a68510b2752cc43fe4a160e40add3d4673c0b;hb=0b716515bfd610a04bbe4289f171f3cd80a0fc14;hp=d4456817c6023915c5efe3b716803f01b22c2247;hpb=f0978ed121192fee9bdf2453a325d98693148acf;p=lilypond.git diff --git a/lily/stem.cc b/lily/stem.cc index d4456817c6..4b5a68510b 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--2012 Han-Wen Nienhuys Jan Nieuwenhuizen TODO: This is way too hairy @@ -24,6 +24,19 @@ along with LilyPond. If not, see . */ +/* + Note that several internal functions have a calc_beam bool argument. + This argument means: "If set, acknowledge the fact that there is a beam + and deal with it. If not, give me the measurements as if there is no beam." + Most pure functions are called WITHOUT calc_beam, whereas non-pure functions + are called WITH calc_beam. + + The only exception to this is ::pure_height, which calls internal_pure_height + with "true" for calc_beam in order to trigger the calculations of other + pure heights in case there is a beam. It passes false, however, to + internal_height and internal_pure_height for all subsequent iterations. +*/ + #include "stem.hh" #include "spanner.hh" @@ -105,15 +118,51 @@ Stem::chord_start_y (Grob *me) } void -Stem::set_stemend (Grob *me, Real se) +Stem::set_stem_positions (Grob *me, Real se) { // todo: margins Direction d = get_grob_direction (me); + Grob *beam = unsmob_grob (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")); - me->set_property ("stem-end-position", scm_from_double (se)); + // 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; + + 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"), + 0.0); + bool stemlet = stemlet_length > 0.0; + + Grob *lh = get_reference_head (me); + + if (!lh) + { + if (stemlet && beam) + { + Real beam_translation = Beam::get_beam_translation (beam); + Real beam_thickness = Beam::get_beam_thickness (beam); + int beam_count = beam_multiplicity (me).length () + 1; + + height[-d] = (height[d] - d + * (0.5 * beam_thickness + + beam_translation * max (0, (beam_count - 1)) + + stemlet_length)); + } + else if (!stemlet && beam) + height[-d] = height[d]; + else if (stemlet && !beam) + me->programming_error ("Can't have a stemlet without a beam."); + } + + 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 @@ -176,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]) { @@ -185,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); } @@ -231,7 +283,12 @@ Stem::is_invisible (Grob *me) 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) @@ -241,47 +298,79 @@ Stem::pure_height (SCM smob, SCM /* end */) { Grob *me = unsmob_grob (smob); - Interval iv; + return ly_interval2scm (internal_pure_height (me, true)); +} +Interval +Stem::internal_pure_height (Grob *me, bool calc_beam) +{ if (!is_normal_stem (me)) - return ly_interval2scm (iv); + return Interval (0.0, 0.0); - Real ss = Staff_symbol_referencer::staff_space (me); - Real rad = Staff_symbol_referencer::staff_radius (me); + Grob *beam = unsmob_grob (me->get_object ("beam")); + + Interval iv = internal_height (me, false); - if (!to_boolean (me->get_property ("cross-staff"))) + if (!beam) + return iv; + if (calc_beam) { - Real len_in_halfspaces; - SCM user_set_len_scm = me->get_property_data ("length"); - if (scm_is_number (user_set_len_scm)) - len_in_halfspaces = scm_to_double (user_set_len_scm); - else - len_in_halfspaces = scm_to_double (calc_length (smob)); - Real len = len_in_halfspaces * ss / 2; + Interval overshoot; Direction dir = get_grob_direction (me); - - Interval hp = head_positions (me); - if (dir == UP) - iv = Interval (0, len); - else - iv = Interval (-len, 0); - - if (!hp.is_empty ()) + for (DOWN_and_UP (d)) + overshoot[d] = d == dir ? dir * infinity_f : iv[d]; + + vector heights; + vector my_stems; + extract_grob_set (beam, "normal-stems", normal_stems); + for (vsize i = 0; i < normal_stems.size (); i++) + if (get_grob_direction (normal_stems[i]) == dir) + { + 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 ()); + // 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++) { - iv.translate (hp[dir] * ss / 2); - iv.add_point (hp[-dir] * ss / 2); + heights[i][dir] += dir == DOWN + ? coords[i] - max_pos + : coords[i] - min_pos; } - /* extend the stem (away from the head) to cover the staff */ - if (dir == UP) - iv[UP] = max (iv[UP], rad * ss); - else - iv[DOWN] = min (iv[DOWN], -rad * ss); + 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); } - else - iv = Interval (-rad * ss, rad * ss); - return ly_interval2scm (iv); + return iv; +} + +void +Stem::cache_pure_height (Grob *me, Interval iv, Interval my_iv) +{ + Interval overshoot; + Direction dir = get_grob_direction (me); + for (DOWN_and_UP (d)) + overshoot[d] = d == dir ? dir * infinity_f : my_iv[d]; + + iv.intersect (overshoot); + dynamic_cast (me)->cache_pure_height (iv); } MAKE_SCHEME_CALLBACK (Stem, calc_stem_end_position, 1) @@ -289,52 +378,48 @@ SCM Stem::calc_stem_end_position (SCM smob) { Grob *me = unsmob_grob (smob); + return scm_from_double (internal_calc_stem_end_position (me, true)); +} + +MAKE_SCHEME_CALLBACK (Stem, pure_calc_stem_end_position, 3) +SCM +Stem::pure_calc_stem_end_position (SCM smob, + SCM, /* start */ + SCM /* end */) +{ + Grob *me = unsmob_grob (smob); + return scm_from_double (internal_calc_stem_end_position (me, false)); +} +Real +Stem::internal_calc_stem_end_position (Grob *me, bool calc_beam) +{ if (!head_count (me)) - return scm_from_double (0.0); + return 0.0; + + Grob *beam = get_beam (me); + Real ss = Staff_symbol_referencer::staff_space (me); + Direction dir = get_grob_direction (me); - if (Grob *beam = get_beam (me)) + if (beam && calc_beam) { (void) beam->get_property ("quantized-positions"); - return me->get_property ("stem-end-position"); + return robust_scm2double (me->get_property ("length"), 0.0) + + dir * robust_scm2double (me->get_property ("stem-begin-position"), 0.0); } vector a; /* WARNING: IN HALF SPACES */ - Real length = robust_scm2double (me->get_property ("length"), 7); - - Direction dir = get_grob_direction (me); - Interval hp = head_positions (me); - Real stem_end = dir ? hp[dir] + dir * length : 0; - - /* TODO: change name to extend-stems to staff/center/'() */ - bool no_extend = to_boolean (me->get_property ("no-stem-extend")); - if (!no_extend && dir * stem_end < 0) - stem_end = 0.0; - - return scm_from_double (stem_end); -} - -/* Length is in half-spaces (or: positions) here. */ -MAKE_SCHEME_CALLBACK (Stem, calc_length, 1) -SCM -Stem::calc_length (SCM smob) -{ - Grob *me = unsmob_grob (smob); - SCM details = me->get_property ("details"); int durlog = duration_log (me); - Real ss = Staff_symbol_referencer::staff_space (me); Real staff_rad = Staff_symbol_referencer::staff_radius (me); Real length = 7; SCM s = ly_assoc_get (ly_symbol2scm ("lengths"), details, SCM_EOL); 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); @@ -370,7 +455,7 @@ Stem::calc_length (SCM smob) /* Tremolo stuff. */ Grob *t_flag = unsmob_grob (me->get_object ("tremolo-flag")); - if (t_flag && !unsmob_grob (me->get_object ("beam"))) + if (t_flag && (!unsmob_grob (me->get_object ("beam")) || !calc_beam)) { /* Crude hack: add extra space if tremolo flag is there. @@ -398,8 +483,16 @@ Stem::calc_length (SCM smob) length = max (length, minlen + 1.0); } - return scm_from_double (length); + Real stem_end = dir ? hp[dir] + dir * length : 0; + + /* TODO: change name to extend-stems to staff/center/'() */ + bool no_extend = to_boolean (me->get_property ("no-stem-extend")); + if (!no_extend && dir * stem_end < 0) + stem_end = 0.0; + + return stem_end; } + /* The log of the duration (Number of hooks on the flag minus two) */ int Stem::duration_log (Grob *me) @@ -557,29 +650,29 @@ Stem::calc_default_direction (SCM smob) return scm_from_int (dir); } +// note - height property necessary to trigger quantized beam positions +// otherwise, we could just use Grob::stencil_height_proc MAKE_SCHEME_CALLBACK (Stem, height, 1); SCM Stem::height (SCM smob) { Grob *me = unsmob_grob (smob); - if (!is_normal_stem (me)) - return ly_interval2scm (Interval ()); - - Direction dir = get_grob_direction (me); + return ly_interval2scm (internal_height (me, true)); +} - Grob *beam = get_beam (me); - if (beam) - { - /* trigger set-stem-lengths. */ - beam->get_property ("quantized-positions"); - } +Grob * +Stem::get_reference_head (Grob *me) +{ + return to_boolean (me->get_property ("avoid-note-head")) + ? last_head (me) + : first_head (me); +} - /* - Can't get_stencil (), since that would cache stencils too early. - This causes problems with beams. - */ - Stencil *stencil = unsmob_stencil (print (smob)); - Interval iv = stencil ? stencil->extent (Y_AXIS) : Interval (); +Real +Stem::beam_end_corrective (Grob *me) +{ + Grob *beam = unsmob_grob (me->get_object ("beam")); + Direction dir = get_grob_direction (me); if (beam) { if (dir == CENTER) @@ -587,16 +680,42 @@ Stem::height (SCM smob) programming_error ("no stem direction"); dir = UP; } - iv[dir] += dir * Beam::get_beam_thickness (beam) * 0.5; + return dir * Beam::get_beam_thickness (beam) * 0.5; } - - return ly_interval2scm (iv); + return 0.0; } -Real -Stem::stem_end_position (Grob *me) +Interval +Stem::internal_height (Grob *me, bool calc_beam) { - return robust_scm2double (me->get_property ("stem-end-position"), 0); + Grob *beam = get_beam (me); + if (!is_valid_stem (me) && ! beam) + return Interval (); + + Direction dir = get_grob_direction (me); + + if (beam && calc_beam) + { + /* trigger set-stem-lengths. */ + (void) beam->get_property ("quantized-positions"); + } + + 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; + + return stem_y; } MAKE_SCHEME_CALLBACK (Stem, width, 1); @@ -630,12 +749,35 @@ SCM Stem::calc_stem_begin_position (SCM smob) { Grob *me = unsmob_grob (smob); + return scm_from_double (internal_calc_stem_begin_position (me, true)); +} + +MAKE_SCHEME_CALLBACK (Stem, pure_calc_stem_begin_position, 3); +SCM +Stem::pure_calc_stem_begin_position (SCM smob, + SCM, /* start */ + SCM /* end */) +{ + Grob *me = unsmob_grob (smob); + return scm_from_double (internal_calc_stem_begin_position (me, false)); +} + +Real +Stem::internal_calc_stem_begin_position (Grob *me, bool calc_beam) +{ + Grob *beam = get_beam (me); + Real ss = Staff_symbol_referencer::staff_space (me); + if (beam && calc_beam) + { + (void) beam->get_property ("quantized-positions"); + return robust_scm2double (me->get_property ("stem-begin-position"), 0.0); + } + Direction d = get_grob_direction (me); - Real half_space = Staff_symbol_referencer::staff_space (me) * 0.5; - Grob *lh - = to_boolean (me->get_property ("avoid-note-head")) - ? last_head (me) - : first_head (me); + Grob *lh = get_reference_head (me); + + if (!lh) + return 0.0; Real pos = Staff_symbol_referencer::get_position (lh); @@ -645,64 +787,49 @@ Stem::calc_stem_begin_position (SCM smob) Real y_attach = Note_head::stem_attachment_coordinate (head, Y_AXIS); y_attach = head_height.linear_combination (y_attach); - pos += d * y_attach / half_space; + pos += d * y_attach * 2 / ss; } - return scm_from_double (pos); + return pos; } -MAKE_SCHEME_CALLBACK (Stem, print, 1); -SCM -Stem::print (SCM smob) +bool +Stem::is_valid_stem (Grob *me) { - Grob *me = unsmob_grob (smob); - Grob *beam = get_beam (me); - - Stencil mol; - Direction d = get_grob_direction (me); - - Real stemlet_length = robust_scm2double (me->get_property ("stemlet-length"), - 0.0); - bool stemlet = stemlet_length > 0.0; - /* TODO: make the stem start a direction ? This is required to avoid stems passing in tablature chords. */ - Grob *lh - = to_boolean (me->get_property ("avoid-note-head")) - ? last_head (me) - : first_head (me); + Grob *lh = get_reference_head (me); + Grob *beam = unsmob_grob (me->get_object ("beam")); - if (!lh && !stemlet) - return SCM_EOL; - - if (!lh && stemlet && !beam) - return SCM_EOL; + if (!lh && !beam) + return false; if (lh && robust_scm2int (lh->get_property ("duration-log"), 0) < 1) - return SCM_EOL; + return false; if (is_invisible (me)) + return false; + + return true; +} + +MAKE_SCHEME_CALLBACK (Stem, print, 1); +SCM +Stem::print (SCM smob) +{ + Grob *me = unsmob_grob (smob); + if (!is_valid_stem (me)) return SCM_EOL; - Real y2 = robust_scm2double (me->get_property ("stem-end-position"), 0.0); - Real y1 = y2; + 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; - if (lh) - y2 = robust_scm2double (me->get_property ("stem-begin-position"), 0.0); - else if (stemlet) - { - Real beam_translation = Beam::get_beam_translation (beam); - Real beam_thickness = Beam::get_beam_thickness (beam); - int beam_count = beam_multiplicity (me).length () + 1; - - y2 -= d - * (0.5 * beam_thickness - + beam_translation * max (0, (beam_count - 1)) - + stemlet_length) / half_space; - } + Interval stem_y = Interval (min (y1, y2), max (y2, y1)) * half_space; - Interval stem_y (min (y1, y2), max (y2, y1)); + stem_y[dir] -= beam_end_corrective (me); // URG Real stem_width = thickness (me); @@ -710,8 +837,9 @@ Stem::print (SCM smob) = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter")); Box b = Box (Interval (-stem_width / 2, stem_width / 2), - Interval (stem_y[DOWN] * half_space, stem_y[UP] * half_space)); + stem_y); + Stencil mol; Stencil ss = Lookup::round_filled_box (b, blot); mol.add_stencil (ss); @@ -750,7 +878,10 @@ Stem::offset_callback (SCM smob) 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; @@ -885,7 +1016,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 @@ -945,7 +1076,7 @@ Stem::calc_cross_staff (SCM smob) return scm_from_bool (is_cross_staff (unsmob_grob (smob))); } -Grob* +Grob * Stem::flag (Grob *me) { return unsmob_grob (me->get_object ("flag")); @@ -993,17 +1124,18 @@ ADD_INTERFACE (Stem, "length " "length-fraction " "max-beam-connect " + "melody-spanner " "neutral-direction " "no-stem-extend " "note-heads " "positioning-done " "rests " "stem-begin-position " - "stem-end-position " "stem-info " "stemlet-length " "thickness " "tremolo-flag " + "tuplet-start " ); /****************************************************************/