X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam.cc;h=d511651d4a14884de9750731c3a09511fce921c7;hb=ee9d99190ecd2a054322eabca66b1e0c2507474f;hp=d96e15a637bcd0921b38793e176e652250dada3a;hpb=ffe548cfbb3c3b37c8969f49b5aba04ef998d080;p=lilypond.git diff --git a/lily/beam.cc b/lily/beam.cc index d96e15a637..d511651d4a 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -1,106 +1,153 @@ /* beam.cc -- implement Beam - + source file of the GNU LilyPond music typesetter - - (c) 1997--2000 Han-Wen Nienhuys - Jan Nieuwenhuizen - + + (c) 1997--2002 Han-Wen Nienhuys + Jan Nieuwenhuizen + */ /* [TODO] - * less hairy code - * move paper vars to scm -*/ + * Fix TODO + + * Junk stem_info. + + * Remove #'direction from beam. A beam has no direction per se. + It may only set directions for stems. + * Rewrite stem_beams. + + */ -#include // tanh. +#include // tanh. + +#include "molecule.hh" #include "directional-element-interface.hh" #include "beaming.hh" -#include "dimensions.hh" #include "beam.hh" #include "misc.hh" -#include "debug.hh" #include "least-squares.hh" #include "stem.hh" #include "paper-def.hh" #include "lookup.hh" #include "group-interface.hh" #include "staff-symbol-referencer.hh" -#include "cross-staff.hh" -#include "lily-guile.icc" +#include "item.hh" +#include "spanner.hh" +#include "warn.hh" +#include "text-item.hh" // debug output. +#include "font-interface.hh" // debug output. + + -Beam::Beam () +static Real +shrink_extra_weight (Real x) { - Group_interface g (this, "stems"); - g.set_interface (); + return fabs (x) * ((x < 0) ? 1.5 : 1.0); } void -Beam::add_stem (Stem*s) +Beam::add_stem (Grob *me, Grob *s) { - Group_interface gi (this, "stems"); - gi.add_element (s); + Pointer_group_interface::add_grob (me, ly_symbol2scm ("stems"), s); - s->add_dependency (this); + s->add_dependency (me); - assert (!s->beam_l ()); - s->set_elt_property ("beam", self_scm_); + assert (!Stem::beam_l (s)); + s->set_grob_property ("beam", me->self_scm ()); - if (!spanned_drul_[LEFT]) - set_bounds (LEFT,s); - else - set_bounds (RIGHT,s); + add_bound_item (dynamic_cast (me), dynamic_cast (s)); +} + +Real +Beam::get_interbeam (Grob *me) +{ + Real slt = me->paper_l ()->get_var ("stafflinethickness"); + Real ss = Staff_symbol_referencer::staff_space (me); + Real thickness = gh_scm2double (me->get_grob_property ("thickness")) + * ss; + + int multiplicity = get_multiplicity (me); + Real interbeam = multiplicity < 4 + ? (2*ss + slt - thickness) / 2.0 + : (3*ss + slt - thickness) / 3.0; + + return interbeam; } int -Beam::get_multiplicity () const +Beam::get_multiplicity (Grob *me) { int m = 0; - for (SCM s = get_elt_property ("stems"); gh_pair_p (s); s = gh_cdr (s)) + for (SCM s = me->get_grob_property ("stems"); gh_pair_p (s); s = ly_cdr (s)) { - Score_element * sc = unsmob_element (gh_car (s)); + Grob *sc = unsmob_grob (ly_car (s)); - if (Stem * st = dynamic_cast (sc)) - m = m >? st->beam_count (LEFT) >? st->beam_count (RIGHT); + if (Stem::has_interface (sc)) + m = m >? Stem::beam_count (sc, LEFT) >? Stem::beam_count (sc, RIGHT); } return m; } -/* - After pre-processing all directions should be set. - Several post-processing routines (stem, slur, script) need stem/beam - direction. - Currenly, this means that beam has set all stem's directions. - [Alternatively, stems could set its own directions, according to - their beam, during 'final-pre-processing'.] - */ -void -Beam::do_pre_processing () +/* After pre-processing all directions should be set. + Several post-processing routines (stem, slur, script) need stem/beam + direction. + Currenly, this means that beam has set all stem's directions. + [Alternatively, stems could set its own directions, according to + their beam, during 'final-pre-processing'.] */ +MAKE_SCHEME_CALLBACK (Beam, before_line_breaking, 1); +SCM +Beam::before_line_breaking (SCM smob) { - // Why? - if (visible_stem_count () < 2) + Grob *me = unsmob_grob (smob); + + /* Beams with less than 2 two stems don't make much sense, but could happen + when you do + + [r8 c8 r8]. + + For a beam that only has one stem, we try to do some disappearance magic: + we revert the flag, and move on to The Eternal Engraving Fields. */ + + int count = visible_stem_count (me); + if (count < 2) { - warning (_ ("beam has less than two stems")); - // set_elt_property ("transparent", SCM_BOOL_T); - } + me->warning (_ ("beam has less than two visible stems")); + + SCM stems = me->get_grob_property ("stems"); + if (scm_ilength (stems) == 1) + { + me->warning (_ ("Beam has less than two stems. Removing beam.")); - if (!directional_element (this).get ()) - directional_element (this).set (get_default_dir ()); + unsmob_grob (gh_car (stems))->remove_grob_property ("beam"); + me->suicide (); - auto_knees (); - set_stem_directions (); - set_stem_shorten (); + return SCM_UNSPECIFIED; + } + else if (scm_ilength (stems) == 0) + { + me->suicide (); + return SCM_UNSPECIFIED; + } + } + if (count >= 1) + { + if (!Directional_element_interface::get (me)) + Directional_element_interface::set (me, get_default_dir (me)); + + consider_auto_knees (me); + set_stem_directions (me); + set_stem_shorten (me); + } + return SCM_EOL; } -/* - FIXME - */ Direction -Beam::get_default_dir () const +Beam::get_default_dir (Grob *me) { Drul_array total; total[UP] = total[DOWN] = 0; @@ -108,472 +155,748 @@ Beam::get_default_dir () const count[UP] = count[DOWN] = 0; Direction d = DOWN; - for (int i=0; i stems= + Pointer_group_interface__extract_grobs (me, (Item*)0, "stems"); + + for (int i=0; i get_center_distance ((Direction)-d); + : Stem::get_center_distance (s, (Direction)-d); if (current) { total[d] += current; count[d] ++; } - - } while (flip(&d) != DOWN); + } while (flip (&d) != DOWN); + SCM func = me->get_grob_property ("dir-function"); + SCM s = gh_call2 (func, + gh_cons (gh_int2scm (count[UP]), + gh_int2scm (count[DOWN])), + gh_cons (gh_int2scm (total[UP]), + gh_int2scm (total[DOWN]))); - SCM s = scm_eval (gh_list (ly_symbol2scm ("beam-dir-algorithm"), - ly_quote_scm (gh_cons (gh_int2scm (count[UP]), - gh_int2scm (count[DOWN]))), - ly_quote_scm (gh_cons (gh_int2scm (total[UP]), - gh_int2scm (total[DOWN]))), - SCM_UNDEFINED)); if (gh_number_p (s) && gh_scm2int (s)) return to_dir (s); - /* - If dir is not determined: get from paper - */ - return (Direction)(int) - paper_l ()->get_var ("stem_default_neutral_direction"); + /* If dir is not determined: get default */ + return to_dir (me->get_grob_property ("neutral-direction")); } -/* - Set all stems with non-forced direction to beam direction. - Urg: non-forced should become `without/with unforced' direction, - once stem gets cleaned-up. - */ +/* Set all stems with non-forced direction to beam direction. + Urg: non-forced should become `without/with unforced' direction, + once stem gets cleaned-up. */ void -Beam::set_stem_directions () +Beam::set_stem_directions (Grob *me) { - Direction d = directional_element (this).get (); - for (int i=0; i stems + =Pointer_group_interface__extract_grobs (me, (Item*) 0, "stems"); + Direction d = Directional_element_interface::get (me); + + for (int i=0; i remove_elt_property ("dir-forced"); + Grob *s = stems[i]; + SCM force = s->remove_grob_property ("dir-forced"); if (!gh_boolean_p (force) || !gh_scm2bool (force)) - directional_element (s).set (d); + Directional_element_interface::set (s, d); } } -void -Beam::auto_knees () -{ - if (!auto_knee ("auto-interstaff-knee-gap", true)) - auto_knee ("auto-knee-gap", false); -} - -/* - Simplistic auto-knees; only consider vertical gap between two - adjacent chords. +/* Simplistic auto-knees; only consider vertical gap between two + adjacent chords. `Forced' stem directions are ignored. If you don't want auto-knees, - don't set, or unset autoKneeGap/autoInterstaffKneeGap. - */ -bool -Beam::auto_knee (String gap_str, bool interstaff_b) + don't set, or unset auto-knee-gap. */ +void +Beam::consider_auto_knees (Grob *me) { - bool knee_b = false; - int knee_y = 0; - SCM gap = get_elt_property (gap_str); - Direction d = directional_element (this).get (); - - if (gh_number_p (gap)) + SCM scm = me->get_grob_property ("auto-knee-gap"); + + if (gh_number_p (scm)) { - int auto_gap_i = gh_scm2int (gap); - for (int i=1; i < stem_count (); i++) + bool knee_b = false; + Real knee_y = 0; + Real staff_space = Staff_symbol_referencer::staff_space (me); + Real gap = gh_scm2double (scm) / staff_space; + + Direction d = Directional_element_interface::get (me); + Link_array stems= + Pointer_group_interface__extract_grobs (me, (Item*)0, "stems"); + + Grob *common = me->common_refpoint (stems[0], Y_AXIS); + for (int i=1; i < stems.size (); i++) + if (!Stem::invisible_b (stems[i])) + common = common->common_refpoint (stems[i], Y_AXIS); + + int l = 0; + for (int i=1; i < stems.size (); i++) { - bool is_b = (bool)(calc_interstaff_dist (stem (i), this) - - calc_interstaff_dist (stem (i-1), this)); - int l_y = (int)(stem (i-1)->head_positions()[d]) - + (int)calc_interstaff_dist (stem (i-1), this); - int r_y = (int)(stem (i)->head_positions()[d]) - + (int)calc_interstaff_dist (stem (i), this); - int gap_i = r_y - l_y; - - if ((abs (gap_i) >= auto_gap_i) && (!interstaff_b || is_b)) + if (!Stem::invisible_b (stems[i-1])) + l = i - 1; + if (Stem::invisible_b (stems[l])) + continue; + if (Stem::invisible_b (stems[i])) + continue; + + Real left = Stem::extremal_heads (stems[l])[d] + ->relative_coordinate (common, Y_AXIS); + Real right = Stem::extremal_heads (stems[i])[-d] + ->relative_coordinate (common, Y_AXIS); + + Real dy = right - left; + + if (abs (dy) >= gap) { - knee_y = (r_y + l_y) / 2; + knee_y = (right + left) / 2; knee_b = true; break; } } - } - if (knee_b) - { - for (int i=0; i < stem_count (); i++) - { - int y = (int)(stem (i)->head_positions()[d]) - + (int)calc_interstaff_dist (stem (i), this); - directional_element (stem (i)).set (y < knee_y ? UP : DOWN); - stem (i)->set_elt_property ("dir-forced", SCM_BOOL_T); + + if (knee_b) + { + for (int i=0; i < stems.size (); i++) + { + if (Stem::invisible_b (stems[i])) + continue; + Item *s = stems[i]; + Real y = Stem::extremal_heads (stems[i])[d] + ->relative_coordinate (common, Y_AXIS); + + Directional_element_interface::set (s, y < knee_y ? UP : DOWN); + s->set_grob_property ("dir-forced", SCM_BOOL_T); + } } } - return knee_b; } -/* - Set stem's shorten property if unset. - TODO: - take some y-position (chord/beam/nearest?) into account - scmify forced-fraction - */ +/* Set stem's shorten property if unset. + TODO: + take some y-position (chord/beam/nearest?) into account + scmify forced-fraction */ void -Beam::set_stem_shorten () +Beam::set_stem_shorten (Grob *m) { - if (!visible_stem_count ()) - return; + Spanner*me = dynamic_cast (m); - Real forced_fraction = forced_stem_count () / visible_stem_count (); - if (forced_fraction < 0.5) - return; + Real forced_fraction = forced_stem_count (me) / visible_stem_count (me); - int multiplicity = get_multiplicity (); - // grace stems? - SCM shorten = ly_eval_str ("beamed-stem-shorten"); + int multiplicity = get_multiplicity (me); - Array a; - scm_to_array (shorten, &a); - if (!a.size ()) + SCM shorten = me->get_grob_property ("beamed-stem-shorten"); + if (shorten == SCM_EOL) return; - Staff_symbol_referencer_interface st (this); - Real staff_space = st.staff_space (); - Real shorten_f = a[multiplicity set_grob_property ("shorten", gh_double2scm (shorten_f)); +} - for (int i=0; i < stem_count (); i++) - { - Stem* s = stem (i); - if (s->invisible_b ()) - continue; - if (gh_number_p (s->get_elt_property ("shorten"))) - s->set_elt_property ("shorten", gh_double2scm (shorten_f)); - } +/* Call list of y-dy-callbacks, that handle setting of + grob-properties y, dy. + + User may set grob-properties: y-position-hs and height-hs + (to be fixed) that override the calculated y and dy. + + Because y and dy cannot be calculated and quanted separately, we + always calculate both, then check for user override. */ +MAKE_SCHEME_CALLBACK (Beam, after_line_breaking, 1); +SCM +Beam::after_line_breaking (SCM smob) +{ + Grob *me = unsmob_grob (smob); + + /* Copy to mutable list. */ + SCM s = ly_deep_copy (me->get_grob_property ("positions")); + me->set_grob_property ("positions", s); + + if (ly_car (s) != SCM_BOOL_F) + return SCM_UNSPECIFIED; + + SCM callbacks = me->get_grob_property ("position-callbacks"); + for (SCM i = callbacks; gh_pair_p (i); i = ly_cdr (i)) + gh_call1 (ly_car (i), smob); + + return SCM_UNSPECIFIED; } +struct Quant_score +{ + Real yl; + Real yr; + Real demerits; +}; + /* - Set elt properties height and y-position if not set. - Adjust stem lengths to reach beam. + TODO: + - Make all demerits customisable + - One sensible check per demerit + - Add demerits for quants per se, as to forbid a specific quant + entirely */ -void -Beam::do_post_processing () +MAKE_SCHEME_CALLBACK (Beam, quanting, 1); +SCM +Beam::quanting (SCM smob) { - /* first, calculate y, dy */ - Real y, dy; - calc_position_and_height (&y, &dy); - if (visible_stem_count ()) - { - if (suspect_slope_b (y, dy)) - dy = 0; + Grob *me = unsmob_grob (smob); - Real damped_dy = calc_slope_damping_f (dy); - Real quantised_dy = quantise_dy_f (damped_dy); + SCM s = me->get_grob_property ("positions"); + Real yl = gh_scm2double (gh_car (s)); + Real yr = gh_scm2double (gh_cdr (s)); - y += (dy - quantised_dy) / 2; - dy = quantised_dy; - } - /* - until here, we used only stem_info, which acts as if dir=up - */ - y *= directional_element (this).get (); - dy *= directional_element (this).get (); - - Staff_symbol_referencer_interface st (this); - Real half_space = st.staff_space () / 2; - - /* check for user-override of dy */ - SCM s = remove_elt_property ("height-hs"); - if (gh_number_p (s)) - { - dy = gh_scm2double (s) * half_space; - } - set_elt_property ("height", gh_double2scm (dy)); + Real ss = Staff_symbol_referencer::staff_space (me); + Real thickness = gh_scm2double (me->get_grob_property ("thickness")) / ss; + Real slt = me->paper_l ()->get_var ("stafflinethickness") / ss; + + Real straddle = 0.0; + Real sit = (thickness - slt) / 2; + Real inter = 0.5; + Real hang = 1.0 - (thickness - slt) / 2; + Real quants [] = {straddle, sit, inter, hang }; + + int num_quants = int (sizeof (quants)/sizeof (Real)); + Array quantsl; + Array quantsr; + + const int REGION_SIZE = 3; + // -> result indexes between 70 and 575 + for (int i = -REGION_SIZE ; i < REGION_SIZE; i++) + for (int j = 0; j < num_quants; j++) + { + quantsl.push (i + quants[j] + int (yl)); + quantsr.push (i + quants[j] + int (yr)); + } + + Array qscores; + + for (int l =0; l < quantsl.size (); l++) + for (int r =0; r < quantsr.size (); r++) + { + Quant_score qs; + qs.yl = quantsl[l]; + qs.yr = quantsr[r]; + qs.demerits = 0.0; + + qscores.push (qs); + } - /* check for user-override of y */ - s = remove_elt_property ("y-position-hs"); - if (gh_number_p (s)) + + SCM score_funcs = me->get_grob_property ("quant-score-functions"); + for (SCM s = score_funcs; gh_pair_p (s); s = gh_cdr (s)) { - y = gh_scm2double (s) * half_space; + SCM f = gh_car (s); + for (int i = qscores.size (); i--;) + { + // best scores < 30; + // if (qscores[i].demerits < 1000) + if (qscores[i].demerits < 100) + { + SCM score = gh_call3 (f, + me->self_scm (), + gh_double2scm (qscores[i].yl), + gh_double2scm (qscores[i].yr)); + + qscores[i].demerits += gh_scm2double (score); + } + } } - else - { - /* we can modify y, so we should quantise y */ - Real y_shift = check_stem_length_f (y, dy); - y += y_shift; - y = quantise_y_f (y, dy, 0); - set_stem_length (y, dy); - y_shift = check_stem_length_f (y, dy); - - if (y_shift > half_space / 4) + + Real best = 1e6; + int best_idx = -1; + for (int i = qscores.size (); i--;) + { + if (qscores[i].demerits < best) { - y += y_shift; - - /* - for significantly lengthened or shortened stems, - request quanting the other way. - */ - int quant_dir = 0; - if (abs (y_shift) > half_space / 2) - quant_dir = sign (y_shift) * directional_element (this).get (); - y = quantise_y_f (y, dy, quant_dir); + best = qscores [i].demerits ; + best_idx = i; } } - // UGH. Y is not in staff position unit? - // Ik dacht datwe daar juist van weg wilden? - set_stem_length (y, dy); - set_elt_property ("y-position", gh_double2scm (y)); + + + me->set_grob_property ("positions", + gh_cons (gh_double2scm (qscores[best_idx].yl), + gh_double2scm (qscores[best_idx].yr)) + ); + + if (0) + { + // debug quanting + me->set_grob_property ("quant-score", + gh_double2scm (qscores[best_idx].demerits)); + me->set_grob_property ("best-idx", gh_int2scm (best_idx)); + } + + return SCM_UNSPECIFIED; } -/* - See Documentation/tex/fonts.doc - */ -void -Beam::calc_position_and_height (Real* y, Real* dy) const +MAKE_SCHEME_CALLBACK (Beam, score_slopes_dy, 3); +SCM +Beam::score_slopes_dy (SCM smob, SCM syl, SCM syr) { - *y = *dy = 0; - if (visible_stem_count () <= 1) - return; + Grob*me = unsmob_grob (smob); + Real yl = gh_scm2double (syl); + Real yr = gh_scm2double (syr); + Real dy = yr - yl; - Real first_ideal = first_visible_stem ()->calc_stem_info ().idealy_f_; - if (first_ideal == last_visible_stem ()->calc_stem_info ().idealy_f_) - { - *dy = 0; - *y = first_ideal; - return; - } + SCM sdy = me->get_grob_property ("least-squares-dy"); + SCM posns = me->get_grob_property ("positions"); + + Real dy_mus = gh_number_p (sdy) ? gh_scm2double (sdy) : 0.0; + Real dy_damp = - gh_scm2double (gh_car (posns)) + gh_scm2double (gh_cdr (posns)); - Array ideals; - Real x0 = first_visible_stem ()->hpos_f (); - for (int i=0; i < stem_count (); i++) + Real dem = 0.0; + if (sign (dy_damp) != sign (dy)) { - Stem* s = stem (i); - if (s->invisible_b ()) - continue; - ideals.push (Offset (s->hpos_f () - x0, - s->calc_stem_info ().idealy_f_)); + dem += 800; } - Real dydx; - minimise_least_squares (&dydx, y, ideals); // duh, takes references + + dem += 400* (0 >? (fabs (dy) - fabs (dy_mus))); + - Real dx = last_visible_stem ()->hpos_f () - x0; - *dy = dydx * dx; + dem += shrink_extra_weight (fabs (dy_damp) - fabs (dy))* 10; + return gh_double2scm (dem); } -bool -Beam::suspect_slope_b (Real y, Real dy) const +MAKE_SCHEME_CALLBACK (Beam, score_stem_lengths, 3); +SCM +Beam::score_stem_lengths (SCM smob, SCM syl, SCM syr) { - /* first, calculate y, dy */ - /* - steep slope running against lengthened stem is suspect - */ - Real first_ideal = first_visible_stem ()->calc_stem_info ().idealy_f_; - Real last_ideal = last_visible_stem ()->calc_stem_info ().idealy_f_; - Real lengthened = paper_l ()->get_var ("beam_lengthened"); - Real steep = paper_l ()->get_var ("beam_steep_slope"); + Grob*me = unsmob_grob (smob); + Real yl = gh_scm2double (syl); + Real yr = gh_scm2double (syr); - Real dx = last_visible_stem ()->hpos_f () - first_visible_stem ()->hpos_f (); - Real dydx = dy && dx ? dy/dx : 0; + Link_array stems= + Pointer_group_interface__extract_grobs (me, (Item*)0, "stems"); - if (((y - first_ideal > lengthened) && (dydx > steep)) - || ((y + dy - last_ideal > lengthened) && (dydx < -steep))) + Real demerit_score = 0.0 ; + + for (int i=0; i < stems.size (); i++) { - return true; + Item* s = stems[i]; + if (Stem::invisible_b (s)) + continue; + + Real current_y = calc_stem_y (me, s, Interval (yl, yr)); + Stem_info info = Stem::calc_stem_info (s); + Direction d = Directional_element_interface::get (s); + + demerit_score += 500 * ( 0 >? (info.min_y - d * current_y)); + demerit_score += 500 * ( 0 >? (d * current_y - info.max_y)); + + demerit_score += 5 * shrink_extra_weight (d * current_y - info.ideal_y); } - return false; + + demerit_score *= 2.0 /stems.size (); + + return gh_double2scm (demerit_score); } -/* - This neat trick is by Werner Lemberg, - damped = tanh (slope) - corresponds with some tables in [Wanske] -*/ -Real -Beam::calc_slope_damping_f (Real dy) const +static Real +my_modf (Real x) { - SCM damp = get_elt_property ("damping"); // remove? - int damping = 1; // ugh. - if (gh_number_p (damp)) - damping = gh_scm2int (damp); + return x - floor (x); +} - if (damping) + + +MAKE_SCHEME_CALLBACK (Beam, score_forbidden_quants, 3); +SCM +Beam::score_forbidden_quants (SCM smob, SCM syl, SCM syr) +{ + Grob*me = unsmob_grob (smob); + Real yl = gh_scm2double (syl); + Real yr = gh_scm2double (syr); + Real dy = yr - yl; + Real rad = Staff_symbol_referencer::staff_radius (me); + Real dem = 0.0; + if (fabs (yl) < rad && fabs ( my_modf (yl) - 0.5) < 1e-3) + dem += 1000; + if (fabs (yr) < rad && fabs ( my_modf (yr) - 0.5) < 1e-3) + dem += 1000; + + + int multiplicity = get_multiplicity (me); + // todo: use multiplicity of outer stems. + if (multiplicity >= 2) { - Real dx = last_visible_stem ()->hpos_f () - - first_visible_stem ()->hpos_f (); - Real dydx = dy && dx ? dy/dx : 0; - dydx = 0.6 * tanh (dydx) / damping; - return dydx * dx; + Real slt = me->paper_l ()->get_var ("stafflinethickness"); + Real ss = Staff_symbol_referencer::staff_space (me); + Real thickness = gh_scm2double (me->get_grob_property ("thickness")) + * ss; + + Real interbeam = multiplicity < 4 + ? (2*ss + slt - thickness) / 2.0 + : (3*ss + slt - thickness) / 3.0; + + Real straddle = 0.0; + Real sit = (thickness - slt) / 2; + Real inter = 0.5; + Real hang = 1.0 - (thickness - slt) / 2; + + Direction dir = Directional_element_interface::get (me); + if (fabs (yl - dir * interbeam) < rad + && fabs (my_modf (yl) - inter) < 1e-3) + dem += 15; + if (fabs (yr - dir * interbeam) < rad + && fabs (my_modf (yr) - inter) < 1e-3) + dem += 15; + + // hmm, without Interval/Drul_array, you get ~ 4x same code... + if (fabs (yl - dir * interbeam) < rad + inter) + { + if (dir == UP && dy <= 1e-3 + && fabs (my_modf (yl) - sit) < 1e-3) + dem += 15; + + if (dir == DOWN && dy >= 1e-3 + && fabs (my_modf (yl) - hang) < 1e-3) + dem += 15; + } + + if (fabs (yr - dir * interbeam) < rad + inter) + { + if (dir == UP && dy >= 1e-3 + && fabs (my_modf (yr) - sit) < 1e-3) + dem += 15; + + if (dir == DOWN && dy <= 1e-3 + && fabs (my_modf (yr) - hang) < 1e-3) + dem += 15; + } + + if (multiplicity >= 3) + { + if (fabs (yl - 2 * dir * interbeam) < rad + inter) + { + if (dir == UP && dy <= 1e-3 + && fabs (my_modf (yl) - straddle) < 1e-3) + dem += 15; + + if (dir == DOWN && dy >= 1e-3 + && fabs (my_modf (yl) - straddle) < 1e-3) + dem += 15; + } + + if (fabs (yr - 2 * dir * interbeam) < rad + inter) + { + if (dir == UP && dy >= 1e-3 + && fabs (my_modf (yr) - straddle) < 1e-3) + dem += 15; + + if (dir == DOWN && dy <= 1e-3 + && fabs (my_modf (yr) - straddle) < 1e-3) + dem += 15; + } + } } - return dy; + + return gh_double2scm ( dem); } -Real -Beam::calc_stem_y_f (Stem* s, Real y, Real dy) const + + +MAKE_SCHEME_CALLBACK (Beam, least_squares, 1); +SCM +Beam::least_squares (SCM smob) { - Real thick = gh_scm2double (get_elt_property ("beam-thickness")); - int beam_multiplicity = get_multiplicity (); - int stem_multiplicity = (s->flag_i () - 2) >? 0; + Grob *me = unsmob_grob (smob); - Real interbeam_f = paper_l ()->interbeam_f (beam_multiplicity); - Real x0 = first_visible_stem ()->hpos_f (); - Real dx = last_visible_stem ()->hpos_f () - x0; - Real stem_y = (dy && dx ? (s->hpos_f () - x0) / dx * dy : 0) + y; + int count = visible_stem_count (me); + Interval pos (0, 0); + + if (count <= 1) + { + me->set_grob_property ("positions", ly_interval2scm (pos)); + return SCM_UNSPECIFIED; + } + + Direction dir = Directional_element_interface::get (me); - /* knee */ - Direction dir = directional_element(this).get (); - Direction sdir = directional_element (s).get (); - - /* knee */ - if (dir!= sdir) - { - stem_y -= dir - * (thick / 2 + (beam_multiplicity - 1) * interbeam_f); + Interval ideal (Stem::calc_stem_info (first_visible_stem (me)).ideal_y, + Stem::calc_stem_info (last_visible_stem (me)).ideal_y); + + if (!ideal.delta ()) + { + Interval chord (Stem::chord_start_f (first_visible_stem (me)), + Stem::chord_start_f (last_visible_stem (me))); - Staff_symbol_referencer_interface me (s); - Staff_symbol_referencer_interface last (last_visible_stem ()); - - // huh, why not for first visible? - if (//(s != first_visible_stem ()) && - me.staff_symbol_l () != last.staff_symbol_l ()) - stem_y += directional_element (this).get () - * (beam_multiplicity - stem_multiplicity) * interbeam_f; + + /* + TODO : use scoring for this. + + complicated, because we take stem-info.ideal for determining + beam slopes. + + */ + /* Make simple beam on middle line have small tilt */ + if (!ideal[LEFT] && chord.delta () && count == 2) + { + Direction d = (Direction) (sign (chord.delta ()) * dir); + pos[d] = gh_scm2double (me->get_grob_property ("thickness")) / 2 + * dir; + pos[-d] = - pos[d]; + } + else + { + pos = ideal; + pos[LEFT] *= dir ; + pos[RIGHT] *= dir ; + } } - return stem_y; + else + { + Array ideals; + + // ugh -> use commonx + Real x0 = first_visible_stem (me)->relative_coordinate (0, X_AXIS); + Link_array stems= + Pointer_group_interface__extract_grobs (me, (Item*)0, "stems"); + + for (int i=0; i < stems.size (); i++) + { + Item* s = stems[i]; + if (Stem::invisible_b (s)) + continue; + ideals.push (Offset (s->relative_coordinate (0, X_AXIS) - x0, + Stem::calc_stem_info (s).ideal_y)); + } + Real y; + Real dydx; + minimise_least_squares (&dydx, &y, ideals); + + Real dx = last_visible_stem (me)->relative_coordinate (0, X_AXIS) - x0; + Real dy = dydx * dx; + me->set_grob_property ("least-squares-dy", gh_double2scm (dy * dir)); + + pos = Interval (y*dir, (y+dy) * dir); + } + + me->set_grob_property ("positions", ly_interval2scm (pos)); + return SCM_UNSPECIFIED; } -Real -Beam::check_stem_length_f (Real y, Real dy) const +MAKE_SCHEME_CALLBACK (Beam, check_concave, 1); +SCM +Beam::check_concave (SCM smob) { - Real shorten = 0; - Real lengthen = 0; - Direction dir = directional_element (this).get (); + Grob *me = unsmob_grob (smob); + + Link_array stems = + Pointer_group_interface__extract_grobs (me, (Item*) 0, "stems"); + + for (int i = 0; i < stems.size ();) + { + if (Stem::invisible_b (stems[i])) + stems.del (i); + else + i++; + } + + if (stems.size () < 3) + return SCM_UNSPECIFIED; + + /* Concaveness try #2: Sum distances of inner noteheads that + fall outside the interval of the two outer noteheads */ + Real concave = 0; + Interval iv (Stem::chord_start_f (stems[0]), + Stem::chord_start_f (stems.top ())); - for (int i=0; i < stem_count (); i++) + if (iv[MAX] < iv[MIN]) + iv.swap (); + + for (int i = 1; i < stems.size () - 1; i++) { - Stem* s = stem (i); - if (s->invisible_b ()) - continue; + Real c = 0; + Real f = Stem::chord_start_f (stems[i]); + if ((c = f - iv[MAX]) > 0) + concave += c; + else if ((c = f - iv[MIN]) < 0) + concave += c; + } - Real stem_y = calc_stem_y_f (s, y, dy); - - stem_y *= dir; - Stem_info info = s->calc_stem_info (); + Direction dir = Directional_element_interface::get (me); + concave *= dir; + + Real concaveness = concave / (stems.size () - 2); + /* ugh: this is the a kludge to get input/regression/beam-concave.ly + to behave as baerenreiter. */ + concaveness /= (stems.size () - 2); + + Real r = gh_scm2double (me->get_grob_property ("concaveness-threshold")); - // if (0 > info.maxy_f_ - stem_y) - shorten = shorten ? info.miny_f_ - stem_y; + /* TODO: some sort of damping iso -> plain horizontal */ + if (concaveness > r) + { + Interval pos = ly_scm2interval (me->get_grob_property ("positions")); + Real r = pos.linear_combination (0); + me->set_grob_property ("positions", ly_interval2scm (Interval (r, r))); + me->set_grob_property ("least-squares-dy", gh_double2scm (0)); } - if (lengthen && shorten) - warning (_ ("weird beam vertical offset")); - - /* when all stems are too short, normal stems win */ - return dir * ((shorten) ? shorten : lengthen); + return SCM_UNSPECIFIED; } -/* - Hmm. At this time, beam position and slope are determined. Maybe, - stem directions and length should set to relative to the chord's - position of the beam. */ -void -Beam::set_stem_length (Real y, Real dy) +/* This neat trick is by Werner Lemberg, + damped = tanh (slope) + corresponds with some tables in [Wanske] CHECKME */ +MAKE_SCHEME_CALLBACK (Beam, slope_damping, 1); +SCM +Beam::slope_damping (SCM smob) { - Staff_symbol_referencer_interface st (this); - Real half_space = st.staff_space ()/2; - for (int i=0; i < stem_count (); i++) - { - Stem* s = stem (i); - if (s->invisible_b ()) - continue; + Grob *me = unsmob_grob (smob); - Real stem_y = calc_stem_y_f (s, y, dy); + if (visible_stem_count (me) <= 1) + return SCM_UNSPECIFIED; - /* caution: stem measures in staff-positions */ - s->set_stemend ((stem_y + calc_interstaff_dist (s, this)) / half_space); + SCM s = me->get_grob_property ("damping"); + int damping = gh_scm2int (s); + + if (damping) + { + Interval pos = ly_scm2interval (me->get_grob_property ("positions")); + Real dy = pos.delta (); + + // ugh -> use commonx + Real dx = last_visible_stem (me)->relative_coordinate (0, X_AXIS) + - first_visible_stem (me)->relative_coordinate (0, X_AXIS); + Real dydx = dy && dx ? dy/dx : 0; + dydx = 0.6 * tanh (dydx) / damping; + + Real damped_dy = dydx * dx; + pos[LEFT] += (dy - damped_dy) / 2; + pos[RIGHT] -= (dy - damped_dy) / 2; + + me->set_grob_property ("positions", ly_interval2scm (pos)); } + return SCM_UNSPECIFIED; +} + +MAKE_SCHEME_CALLBACK (Beam, end_after_line_breaking, 1); +SCM +Beam::end_after_line_breaking (SCM smob) +{ + Grob *me = unsmob_grob (smob); + set_stem_lengths (me); + + return SCM_UNSPECIFIED; } /* - [Ross] (simplification of) - Set dy complying with: - - zero - - thick / 2 + staffline_f / 2 - - thick + staffline_f - + n * staff_space -*/ + Calculate the Y position of the stem-end, given the Y-left, Y-right + in POS, and for stem S. + */ Real -Beam::quantise_dy_f (Real dy) const +Beam::calc_stem_y (Grob *me, Item* s, Interval pos) { - SCM quants = ly_eval_str ("beam-height-quants"); + int beam_multiplicity = get_multiplicity (me); + int stem_multiplicity = (Stem::flag_i (s) - 2) >? 0; - Array a; - scm_to_array (quants, &a); - if (a.size () <= 1) - return dy; + Real thick = gh_scm2double (me->get_grob_property ("thickness")); + Real interbeam = get_interbeam (me); - Staff_symbol_referencer_interface st (this); - Real staff_space = st.staff_space (); - - Interval iv = quantise_iv (a, abs (dy)/staff_space) * staff_space; - Real q = (abs (dy) - iv[SMALLER] <= iv[BIGGER] - abs (dy)) - ? iv[SMALLER] - : iv[BIGGER]; + // ugh -> use commonx + Real x0 = first_visible_stem (me)->relative_coordinate (0, X_AXIS); + Real dx = last_visible_stem (me)->relative_coordinate (0, X_AXIS) - x0; + Real dy = pos.delta (); + Real stem_y = (dy && dx + ? (s->relative_coordinate (0, X_AXIS) - x0) / dx + * dy + : 0) + pos[LEFT]; + + /* knee */ + Direction dir = Directional_element_interface::get (me); + Direction sdir = Directional_element_interface::get (s); - return q * sign (dy); + /* knee */ + if (dir!= sdir) + { + stem_y -= dir * (thick / 2 + (beam_multiplicity - 1) * interbeam); + + // huh, why not for first visible? + if (Staff_symbol_referencer::staff_symbol_l (s) + != Staff_symbol_referencer::staff_symbol_l (last_visible_stem (me))) + stem_y += Directional_element_interface::get (me) + * (beam_multiplicity - stem_multiplicity) * interbeam; + } + + return stem_y; } /* - Prevent interference from stafflines and beams. - See Documentation/tex/fonts.doc - - We only need to quantise the (left) y-position of the beam, - since dy is quantised too. - if extend_b then stems must *not* get shorter - */ -Real -Beam::quantise_y_f (Real y, Real dy, int quant_dir) + Hmm. At this time, beam position and slope are determined. Maybe, + stem directions and length should set to relative to the chord's + position of the beam. */ +void +Beam::set_stem_lengths (Grob *me) { - int multiplicity = get_multiplicity (); - Staff_symbol_referencer_interface st (this); - Real staff_space = st.staff_space (); - SCM quants = scm_eval (gh_list ( - ly_symbol2scm ("beam-vertical-position-quants"), - gh_int2scm (multiplicity), - gh_double2scm (dy/staff_space), - SCM_UNDEFINED)); - Array a; - scm_to_array (quants, &a); - if (a.size () <= 1) - return y; - - Real up_y = directional_element (this).get () * y; - Interval iv = quantise_iv (a, up_y/staff_space) * staff_space; - - Real q = up_y - iv[SMALLER] <= iv[BIGGER] - up_y - ? iv[SMALLER] : iv[BIGGER]; - if (quant_dir) - q = iv[(Direction)quant_dir]; - - return q * directional_element (this).get (); + Link_array stems= + Pointer_group_interface__extract_grobs (me, (Item*)0, "stems"); + + if (stems.size () <= 1) + return; + + Grob *common = me->common_refpoint (stems[0], Y_AXIS); + for (int i=1; i < stems.size (); i++) + if (!Stem::invisible_b (stems[i])) + common = common->common_refpoint (stems[i], Y_AXIS); + + Direction dir = Directional_element_interface::get (me); + Interval pos = ly_scm2interval (me->get_grob_property ("positions")); + Real staff_space = Staff_symbol_referencer::staff_space (me); + Real thick = gh_scm2double (me->get_grob_property ("thickness")); + bool ps_testing = to_boolean (ly_symbol2scm ("ps-testing")); + for (int i=0; i < stems.size (); i++) + { + Item* s = stems[i]; + if (Stem::invisible_b (s)) + continue; + + Real stem_y = calc_stem_y (me, s, pos); + + // doesn't play well with dvips + if (ps_testing) + if (Stem::get_direction (s) == dir) + stem_y += Stem::get_direction (s) * thick / 2; + + /* caution: stem measures in staff-positions */ + Real id = me->relative_coordinate (common, Y_AXIS) + - stems[i]->relative_coordinate (common, Y_AXIS); + Stem::set_stemend (s, (stem_y + id) / staff_space * 2); + } } void -Beam::set_beaming (Beaming_info_list *beaming) +Beam::set_beaming (Grob *me, Beaming_info_list *beaming) { + Link_array stems= + Pointer_group_interface__extract_grobs (me, (Grob *)0, "stems"); + Direction d = LEFT; - for (int i=0; i < stem_count (); i++) + for (int i=0; i < stems.size (); i++) { do { - if (stem (i)->beam_count (d) == 0) - stem (i)->set_beaming ( beaming->infos_.elem (i).beams_i_drul_[d],d); + /* Don't overwrite user override (?) */ + if (Stem::beam_count (stems[i], d) == -1 + /* Don't set beaming for outside of outer stems */ + && ! (d == LEFT && i == 0) + && ! (d == RIGHT && i == stems.size () -1)) + { + int b = beaming->infos_.elem (i).beams_i_drul_[d]; + Stem::set_beaming (stems[i], b, d); + } } while (flip (&d) != LEFT); } @@ -584,64 +907,69 @@ Beam::set_beaming (Beaming_info_list *beaming) /* beams to go with one stem. - BURP - clean me up. + FIXME: clean me up. */ Molecule -Beam::stem_beams (Stem *here, Stem *next, Stem *prev) const +Beam::stem_beams (Grob *me, Item *here, Item *next, Item *prev, Real dydx) { - if ((next && !(next->hpos_f () > here->hpos_f ())) || - (prev && !(prev->hpos_f () < here->hpos_f ()))) - programming_error ("Beams are not left-to-right"); - - Real staffline_f = paper_l ()->get_var ("stafflinethickness"); - int multiplicity = get_multiplicity (); - - - Real interbeam_f = paper_l ()->interbeam_f (multiplicity); - Real thick = gh_scm2double (get_elt_property ("beam-thickness"));; - - Real bdy = interbeam_f; - Real stemdx = staffline_f; - - Real dx = visible_stem_count () ? - last_visible_stem ()->hpos_f () - first_visible_stem ()->hpos_f () - : 0.0; - Real dy = get_real ("height"); - Real dydx = dy && dx ? dy/dx : 0; - + // ugh -> use commonx + if ((next + && ! (next->relative_coordinate (0, X_AXIS) + > here->relative_coordinate (0, X_AXIS))) + || (prev + && ! (prev->relative_coordinate (0, X_AXIS) + < here->relative_coordinate (0, X_AXIS)))) + programming_error ("Beams are not left-to-right"); + + Real thick = gh_scm2double (me->get_grob_property ("thickness")); + Real bdy = get_interbeam (me); + Molecule leftbeams; Molecule rightbeams; - // UGH Real nw_f; - if (!here->first_head ()) + if (!Stem::first_head (here)) nw_f = 0; - else if (here->type_i ()== 1) - nw_f = paper_l ()->get_var ("wholewidth"); - else if (here->type_i () == 2) - nw_f = paper_l ()->get_var ("notewidth") * 0.8; - else - nw_f = paper_l ()->get_var ("quartwidth"); + else { + int t = Stem::type_i (here); + + SCM proc = me->get_grob_property ("flag-width-function"); + SCM result = gh_call1 (proc, gh_int2scm (t)); + nw_f = gh_scm2double (result); + } + + + Direction dir = Directional_element_interface::get (me); + + /* [Tremolo] beams on whole notes may not have direction set? */ + if (dir == CENTER) + dir = Directional_element_interface::get (here); - Direction dir = directional_element (this).get (); - /* half beams extending to the left. */ if (prev) { - int lhalfs= lhalfs = here->beam_count (LEFT) - prev->beam_count (RIGHT); - int lwholebeams= here->beam_count (LEFT) beam_count (RIGHT) ; - /* - Half beam should be one note-width, - but let's make sure two half-beams never touch - */ - Real w = here->hpos_f () - prev->hpos_f (); + int lhalfs= lhalfs = Stem::beam_count (here, LEFT) + - Stem::beam_count (prev, RIGHT); + int lwholebeams= Stem::beam_count (here, LEFT) + relative_coordinate (0, X_AXIS) + - prev->relative_coordinate (0, X_AXIS); + Real stem_w = gh_scm2double (prev->get_grob_property ("thickness")) + // URG + * me->paper_l ()->get_var ("stafflinethickness"); + w = w/2 beam (dydx, w, thick); + a = Lookup::beam (dydx, w + stem_w, thick); a.translate (Offset (-w, -w * dydx)); + a.translate_axis (-stem_w/2, X_AXIS); for (int j = 0; j < lhalfs; j++) { Molecule b (a); @@ -652,19 +980,27 @@ Beam::stem_beams (Stem *here, Stem *next, Stem *prev) const if (next) { - int rhalfs = here->beam_count (RIGHT) - next->beam_count (LEFT); - int rwholebeams= here->beam_count (RIGHT) beam_count (LEFT) ; + int rhalfs = Stem::beam_count (here, RIGHT) + - Stem::beam_count (next, LEFT); + int rwholebeams= Stem::beam_count (here, RIGHT) + relative_coordinate (0, X_AXIS) + - here->relative_coordinate (0, X_AXIS); - Real w = next->hpos_f () - here->hpos_f (); - Molecule a = lookup_l ()->beam (dydx, w + stemdx, thick); - a.translate_axis( - stemdx/2, X_AXIS); + Real stem_w = gh_scm2double (next->get_grob_property ("thickness")) + // URG + * me->paper_l ()->get_var ("stafflinethickness"); + + Molecule a = Lookup::beam (dydx, w + stem_w, thick); + a.translate_axis (- stem_w/2, X_AXIS); int j = 0; Real gap_f = 0; - - SCM gap = get_elt_property ("beam-gap"); + + SCM gap = me->get_grob_property ("gap"); if (gh_number_p (gap)) { - int gap_i = gh_scm2int ( (gap)); + int gap_i = gh_scm2int ((gap)); int nogap = rwholebeams - gap_i; for (; j < nogap; j++) @@ -673,22 +1009,30 @@ Beam::stem_beams (Stem *here, Stem *next, Stem *prev) const b.translate_axis (-dir * bdy * j, Y_AXIS); rightbeams.add_molecule (b); } - // TODO: notehead widths differ for different types - gap_f = nw_f / 2; + if (Stem::invisible_b (here)) + gap_f = nw_f; + else + gap_f = nw_f / 2; w -= 2 * gap_f; - a = lookup_l ()->beam (dydx, w + stemdx, thick); + a = Lookup::beam (dydx, w + stem_w, thick); } for (; j < rwholebeams; j++) { Molecule b (a); - b.translate (Offset (here->invisible_b () ? 0 : gap_f, -dir * bdy * j)); + Real tx = 0; + if (Stem::invisible_b (here)) + // ugh, see chord-tremolo.ly + tx = (-dir + 1) / 2 * nw_f * 1.5 + gap_f/4; + else + tx = gap_f; + b.translate (Offset (tx, -dir * bdy * j)); rightbeams.add_molecule (b); } w = w/2 beam (dydx, w, thick); + a = Lookup::beam (dydx, w, thick); for (; j < rwholebeams + rhalfs; j++) { @@ -700,66 +1044,97 @@ Beam::stem_beams (Stem *here, Stem *next, Stem *prev) const } leftbeams.add_molecule (rightbeams); - /* - Does beam quanting think of the asymetry of beams? - Refpoint is on bottom of symbol. (FIXTHAT) --hwn. - */ + /* Does beam quanting think of the asymetry of beams? + Refpoint is on bottom of symbol. (FIXTHAT) --hwn. */ return leftbeams; } -Molecule -Beam::do_brew_molecule () const +MAKE_SCHEME_CALLBACK (Beam, brew_molecule, 1); +SCM +Beam::brew_molecule (SCM smob) { + Grob *me =unsmob_grob (smob); + Molecule mol; - if (!stem_count ()) - return mol; - Real x0,dx; - if (visible_stem_count ()) + if (!gh_pair_p (me->get_grob_property ("stems"))) + return SCM_EOL; + Real x0, dx; + Link_arraystems = + Pointer_group_interface__extract_grobs (me, (Item*) 0, "stems"); + if (visible_stem_count (me)) { - x0 = first_visible_stem ()->hpos_f (); - dx = last_visible_stem ()->hpos_f () - x0; + // ugh -> use commonx + x0 = first_visible_stem (me)->relative_coordinate (0, X_AXIS); + dx = last_visible_stem (me)->relative_coordinate (0, X_AXIS) - x0; } else { - x0 = stem (0)->hpos_f (); - dx = stem_top ()->hpos_f () - x0; + x0 = stems[0]->relative_coordinate (0, X_AXIS); + dx = stems.top ()->relative_coordinate (0, X_AXIS) - x0; } - - - Real dy = get_real ("height"); + + Interval pos = ly_scm2interval (me->get_grob_property ("positions")); + Real dy = pos.delta (); Real dydx = dy && dx ? dy/dx : 0; - Real y = get_real ("y-position"); - for (int j=0; j 0)? stem (j-1) : 0; - Stem * next = (j < stem_count ()-1) ? stem (j+1) :0; + Item *item = stems[i]; + Item *prev = (i > 0)? stems[i-1] : 0; + Item *next = (i < stems.size ()-1) ? stems[i+1] :0; - Molecule sb = stem_beams (i, next, prev); - Real x = i->hpos_f ()-x0; - sb.translate (Offset (x, x * dydx + y)); + Molecule sb = stem_beams (me, item, next, prev, dydx); + Real x = item->relative_coordinate (0, X_AXIS) - x0; + sb.translate (Offset (x, x * dydx + pos[LEFT])); mol.add_molecule (sb); } + mol.translate_axis (x0 - - spanned_drul_[LEFT]->relative_coordinate (0, X_AXIS), X_AXIS); + - dynamic_cast (me) + ->get_bound (LEFT)->relative_coordinate (0, X_AXIS), + X_AXIS); + + if (0) + { + /* + This code prints the demerits for each beam. Perhaps this + should be switchable for those who want to twiddle with the + parameters. + */ + String str; + if (1) + { + str += to_str (gh_scm2int (me->get_grob_property ("best-idx"))); + str += ":"; + } + str += to_str (gh_scm2double (me->get_grob_property ("quant-score")), + "%.2f"); - return mol; + SCM properties = Font_interface::font_alist_chain (me); + + Molecule tm = Text_item::text2molecule (me, gh_str02scm (str.ch_C ()), properties); + mol.add_at_edge (Y_AXIS, UP, tm, 5.0); + } + + return mol.smobbed_copy (); } int -Beam::forced_stem_count () const +Beam::forced_stem_count (Grob *me) { + Link_arraystems = + Pointer_group_interface__extract_grobs (me, (Item*) 0, "stems"); int f = 0; - for (int i=0; i < stem_count (); i++) + for (int i=0; i < stems.size (); i++) { - Stem *s = stem (i); + Item *s = stems[i]; - if (s->invisible_b ()) + if (Stem::invisible_b (s)) continue; - if (((int)s->chord_start_f ()) - && (s->get_direction () != s->get_default_dir ())) + if (((int)Stem::chord_start_f (s)) + && (Stem::get_direction (s) != Stem::get_default_dir (s))) f++; } return f; @@ -767,66 +1142,124 @@ Beam::forced_stem_count () const -/* - TODO: Fix this class. This is wildly inefficient. - And it sux. Yet another array/list 'interface'. - */ -Stem * -Beam::stem (int i) const -{ - return Group_interface__extract_elements ((Beam*) this, (Stem*) 0, "stems")[i]; -} +/* TODO: + use filter and standard list functions. + */ int -Beam::stem_count () const -{ - Group_interface gi (this, "stems"); - return gi.count (); -} - -Stem* -Beam::stem_top () const -{ - SCM s = get_elt_property ("stems"); - - return gh_pair_p (s) ? dynamic_cast (unsmob_element (gh_car (s))) : 0; - - //Group_interface__extract_elements ((Beam*) this, (Stem*) 0, "stems")[stem_count () - 1]; -} - -/* burp */ -int -Beam::visible_stem_count () const +Beam::visible_stem_count (Grob *me) { + Link_arraystems = + Pointer_group_interface__extract_grobs (me, (Item*) 0, "stems"); int c = 0; - for (int i = 0; i < stem_count (); i++) + for (int i = stems.size (); i--;) { - if (!stem (i)->invisible_b ()) + if (!Stem::invisible_b (stems[i])) c++; } return c; } -Stem* -Beam::first_visible_stem () const +Item* +Beam::first_visible_stem (Grob *me) { - for (int i = 0; i < stem_count (); i++) + Link_arraystems = + Pointer_group_interface__extract_grobs (me, (Item*) 0, "stems"); + + for (int i = 0; i < stems.size (); i++) { - Stem* s = stem (i); - if (!s->invisible_b ()) - return s; + if (!Stem::invisible_b (stems[i])) + return stems[i]; } return 0; } -Stem* -Beam::last_visible_stem () const +Item* +Beam::last_visible_stem (Grob *me) { - for (int i = stem_count (); i > 0; i--) + Link_arraystems = + Pointer_group_interface__extract_grobs (me, (Item*) 0, "stems"); + for (int i = stems.size (); i--;) { - Stem* s = stem (i - 1); - if (!s->invisible_b ()) - return s; + if (!Stem::invisible_b (stems[i])) + return stems[i]; } return 0; } + + +/* + [TODO] + handle rest under beam (do_post: beams are calculated now) + what about combination of collisions and rest under beam. + + Should lookup + + rest -> stem -> beam -> interpolate_y_position () +*/ +MAKE_SCHEME_CALLBACK (Beam, rest_collision_callback, 2); +SCM +Beam::rest_collision_callback (SCM element_smob, SCM axis) +{ + Grob *rest = unsmob_grob (element_smob); + Axis a = (Axis) gh_scm2int (axis); + + assert (a == Y_AXIS); + + Grob *st = unsmob_grob (rest->get_grob_property ("stem")); + Grob *stem = st; + if (!stem) + return gh_double2scm (0.0); + Grob *beam = unsmob_grob (stem->get_grob_property ("beam")); + if (!beam + || !Beam::has_interface (beam) + || !Beam::visible_stem_count (beam)) + return gh_double2scm (0.0); + + // make callback for rest from this. + // todo: make sure this calced already. + + // Interval pos = ly_scm2interval (beam->get_grob_property ("positions")); + Interval pos (0, 0); + SCM s = beam->get_grob_property ("positions"); + if (gh_pair_p (s) && gh_number_p (ly_car (s))) + pos = ly_scm2interval (s); + + Real dy = pos.delta (); + // ugh -> use commonx + Real x0 = first_visible_stem (beam)->relative_coordinate (0, X_AXIS); + Real dx = last_visible_stem (beam)->relative_coordinate (0, X_AXIS) - x0; + Real dydx = dy && dx ? dy/dx : 0; + + Direction d = Stem::get_direction (stem); + Real beamy = (stem->relative_coordinate (0, X_AXIS) - x0) * dydx + pos[LEFT]; + + Real staff_space = Staff_symbol_referencer::staff_space (rest); + + + Real rest_dim = rest->extent (rest, Y_AXIS)[d]*2.0 / staff_space; // refp?? + + Real minimum_dist + = gh_scm2double (rest->get_grob_property ("minimum-beam-collision-distance")); + Real dist = + minimum_dist + -d * (beamy - rest_dim) >? 0; + + int stafflines = Staff_symbol_referencer::line_count (rest); + + // move discretely by half spaces. + int discrete_dist = int (ceil (dist)); + + // move by whole spaces inside the staff. + if (discrete_dist < stafflines+1) + discrete_dist = int (ceil (discrete_dist / 2.0)* 2.0); + + return gh_double2scm (-d * discrete_dist); +} + + +bool +Beam::has_interface (Grob *me) +{ + return me->has_interface (ly_symbol2scm ("beam-interface")); +} +