X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fbeam.cc;h=82491cd972bc365fa337d06ded36056d7287d31c;hb=9bb713ea8cca3e9924099bfc3c5ec0dd75a34c15;hp=f7c2f126ebfe88643961837a5c8af422a272fc29;hpb=04e1bc1c75af8f56a15013837ecd881ae4e4e319;p=lilypond.git diff --git a/lily/beam.cc b/lily/beam.cc index f7c2f126eb..82491cd972 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -1,24 +1,27 @@ /* 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] - * remove *-hs variables, and do all y-position stuff in staff-space. - This is not trivial, as Stem, and Stem_info both use point dimensions - (indicated by _f suffix) in several places too. + * Fix TODO + + * Junk stem_info. + + * Remove #'direction from beam. A beam has no direction per se. + It may only set directions for stems. - * shorter! (now +- 1000 lines) - * less hairy code - * move paper vars to scm + * Rewrite stem_beams. + * Use Number_pair i.s.o Interval to represent (yl, yr). + */ @@ -38,11 +41,23 @@ #include "item.hh" #include "spanner.hh" #include "warn.hh" +#include "text-item.hh" // debug output. +#include "font-interface.hh" // debug output. + + +#define DEBUG_QUANTING 0 + + +static Real +shrink_extra_weight (Real x) +{ + return fabs (x) * ((x < 0) ? 1.5 : 1.0); +} void -Beam::add_stem (Grob*me, Grob*s) +Beam::add_stem (Grob *me, Grob *s) { - Pointer_group_interface:: add_element(me, "stems", s); + Pointer_group_interface::add_grob (me, ly_symbol2scm ("stems"), s); s->add_dependency (me); @@ -52,44 +67,91 @@ Beam::add_stem (Grob*me, Grob*s) add_bound_item (dynamic_cast (me), dynamic_cast (s)); } + +/* + TODO: fix this for grace notes. + */ +Real +Beam::get_interbeam (Grob *me) +{ + int multiplicity = get_multiplicity (me); + Real ss = Staff_symbol_referencer::staff_space (me); + + SCM s = me->get_grob_property ("beam-space"); + if (gh_number_p (s)) + return gh_scm2double (s) * ss; + else if (s != SCM_EOL && gh_list_p (s)) + return gh_scm2double (scm_list_ref (s, + gh_int2scm (multiplicity - 1 + paper_l ()->get_var ("linethickness"); + 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; + + return interbeam; +} + int -Beam::get_multiplicity (Grob*me) +Beam::get_multiplicity (Grob *me) { int m = 0; - for (SCM s = me->get_grob_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)) { - Grob * sc = unsmob_grob (gh_car (s)); + Grob *sc = unsmob_grob (ly_car (s)); if (Stem::has_interface (sc)) - m = m >? Stem::beam_count (sc,LEFT) >? Stem::beam_count (sc,RIGHT); + 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'.] - */ -MAKE_SCHEME_CALLBACK(Beam,before_line_breaking,1); +/* 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) { - Grob * me = unsmob_grob (smob); - - // Why? - /* - Why what? Why the warning (beams with less than 2 stems are - degenerate beams, should never happen), or why would this ever - happen (don't know). */ - if (visible_stem_count (me) < 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")); + 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.")); + + unsmob_grob (gh_car (stems))->remove_grob_property ("beam"); + me->suicide (); + + return SCM_UNSPECIFIED; + } + else if (scm_ilength (stems) == 0) + { + me->suicide (); + return SCM_UNSPECIFIED; + } } - if (visible_stem_count (me) >= 1) + if (count >= 1) { if (!Directional_element_interface::get (me)) Directional_element_interface::set (me, get_default_dir (me)); @@ -102,7 +164,7 @@ Beam::before_line_breaking (SCM smob) } Direction -Beam::get_default_dir (Grob*me) +Beam::get_default_dir (Grob *me) { Drul_array total; total[UP] = total[DOWN] = 0; @@ -111,7 +173,7 @@ Beam::get_default_dir (Grob*me) Direction d = DOWN; Link_array stems= - Pointer_group_interface__extract_elements (me, (Item*)0, "stems"); + Pointer_group_interface__extract_grobs (me, (Item*)0, "stems"); for (int i=0; i get_grob_property ("dir-function"); SCM s = gh_call2 (func, @@ -138,23 +199,19 @@ Beam::get_default_dir (Grob*me) if (gh_number_p (s) && gh_scm2int (s)) return to_dir (s); - /* - If dir is not determined: get default - */ - return to_dir (me->get_grob_property ("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 (Grob*me) +Beam::set_stem_directions (Grob *me) { Link_array stems - =Pointer_group_interface__extract_elements (me, (Item*) 0, "stems"); + =Pointer_group_interface__extract_grobs (me, (Item*) 0, "stems"); Direction d = Directional_element_interface::get (me); for (int i=0; i remove_grob_property ("dir-forced"); if (!gh_boolean_p (force) || !gh_scm2bool (force)) - Directional_element_interface ::set (s,d); + Directional_element_interface::set (s, d); } } -/* - 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 auto-knee-gap. - */ + don't set, or unset auto-knee-gap. */ void Beam::consider_auto_knees (Grob *me) { @@ -187,7 +242,7 @@ Beam::consider_auto_knees (Grob *me) Direction d = Directional_element_interface::get (me); Link_array stems= - Pointer_group_interface__extract_elements (me, (Item*)0, "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++) @@ -236,20 +291,23 @@ Beam::consider_auto_knees (Grob *me) } } -/* - Set stem's shorten property if unset. +/* Set stem's shorten property if unset. + TODO: - take some y-position (chord/beam/nearest?) into account - scmify forced-fraction - */ + take some y-position (chord/beam/nearest?) into account + scmify forced-fraction + + TODO: + + why is shorten stored in beam, and not directly in stem? + +*/ void -Beam::set_stem_shorten (Grob*m) +Beam::set_stem_shorten (Grob *m) { Spanner*me = dynamic_cast (m); Real forced_fraction = forced_stem_count (me) / visible_stem_count (me); - if (forced_fraction < 0.5) - return; int multiplicity = get_multiplicity (me); @@ -260,82 +318,419 @@ Beam::set_stem_shorten (Grob*m) int sz = scm_ilength (shorten); Real staff_space = Staff_symbol_referencer::staff_space (me); - SCM shorten_elt = scm_list_ref (shorten, gh_int2scm (multiplicity set_grob_property ("shorten", gh_double2scm (shorten_f)); +} - Link_array stems= - Pointer_group_interface__extract_elements (me, (Item*)0, "stems"); +/* 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); - for (int i=0; i < stems.size (); i++) - { - Item* s = stems[i]; - if (Stem::invisible_b (s)) - continue; - if (gh_number_p (s->get_grob_property ("shorten"))) - s->set_grob_property ("shorten", gh_double2scm (shorten_f)); - } + 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; +}; + + /* - Call list of y-dy-callbacks, that handle setting of - grob-properties y, dy. + TODO: + + - Make all demerits customisable - User may set grob-properties: y-position-hs and height-hs - (to be fixed) that override the calculated y and dy. + - One sensible check per demerit (what's this --hwn) - 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); + - Add demerits for quants per se, as to forbid a specific quant + entirely + +*/ +MAKE_SCHEME_CALLBACK (Beam, quanting, 1); SCM -Beam::after_line_breaking (SCM smob) +Beam::quanting (SCM smob) { - Grob * me = unsmob_grob (smob); - - me->set_grob_property ("y", gh_double2scm (0)); - me->set_grob_property ("dy", gh_double2scm (0)); + Grob *me = unsmob_grob (smob); + + SCM s = me->get_grob_property ("positions"); + Real yl = gh_scm2double (gh_car (s)); + Real yr = gh_scm2double (gh_cdr (s)); + + 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 ("linethickness") / ss; + - /* Hmm, callbacks should be called by, a eh, callback mechanism - somewhere(?), I guess, not by looping here. */ + SCM sdy = me->get_grob_property ("least-squares-dy"); + Real dy_mus = gh_number_p (sdy) ? gh_scm2double (sdy) : 0.0; - SCM list = me->get_grob_property ("y-dy-callbacks"); - for (SCM i = list; gh_pair_p (i); i = gh_cdr (i)) - gh_call1 (gh_car (i), smob); + 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; + + /* + going to REGION_SIZE == 2, yields another 0.6 second with + wtk1-fugue2. + + + (result indexes between 70 and 575) ? --hwn. + + */ + + const int REGION_SIZE = 3; + 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)); + } - // UGH. Y is not in staff position unit? - // Ik dacht datwe daar juist van weg wilden? + Array qscores; - // Hmm, nu hebben we 3 dimensies, want inmiddels zijn we daar - // weer terug, maar dan / 2 - // (staff-space iso staff-position) + 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); + } + + + /* + This is a longish function, but we don't separate this out into + neat modular separate subfunctions, as the subfunctions would be + called for many values of YL, YR. By precomputing various + parameters outside of the loop, we can save a lot of time. + + */ + for (int i = qscores.size (); i--;) + if (qscores[i].demerits < 100) + { + qscores[i].demerits + += score_slopes_dy (me, qscores[i].yl, qscores[i].yr, + dy_mus, yr- yl); + } + + Real rad = Staff_symbol_referencer::staff_radius (me); + int multiplicity = get_multiplicity (me); + Real interbeam = multiplicity < 4 + ? (2*ss + slt - thickness) / 2.0 + : (3*ss + slt - thickness) / 3.0; + + for (int i = qscores.size (); i--;) + if (qscores[i].demerits < 100) + { + qscores[i].demerits + += score_forbidden_quants (me, qscores[i].yl, qscores[i].yr, + rad, slt, thickness, interbeam, + multiplicity); + } + + + /* + Do stem lengths. These depend on YL and YR linearly, so we can + precompute for every stem 2 factors. + */ + Link_array stems= + Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems"); + Array stem_infos; + Array lbase_lengths; + Array rbase_lengths; + + Array directions; + for (int i= 0; i < stems.size(); i++) + { + Grob*s = stems[i]; + stem_infos.push( Stem::calc_stem_info (s)); + + Real b = calc_stem_y (me, s, Interval (1,0)); + lbase_lengths.push (b); + + b = calc_stem_y (me, s, Interval (0,1)); + rbase_lengths.push (b); + directions.push( Directional_element_interface::get( s)); + } + + for (int i = qscores.size (); i--;) + if (qscores[i].demerits < 100) + { + qscores[i].demerits + += score_stem_lengths (stems, stem_infos, + lbase_lengths, rbase_lengths, + directions, + me, qscores[i].yl, qscores[i].yr); + } + + + Real best = 1e6; + int best_idx = -1; + for (int i = qscores.size (); i--;) + { + if (qscores[i].demerits < best) + { + best = qscores [i].demerits ; + best_idx = i; + } + } + - set_stem_lengths (me); + me->set_grob_property ("positions", + gh_cons (gh_double2scm (qscores[best_idx].yl), + gh_double2scm (qscores[best_idx].yr)) + ); + + if (DEBUG_QUANTING) + { + // 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; } +Real +Beam::score_stem_lengths (Link_arraystems, + Array stem_infos, + Array left_factor, + Array right_factor, + Array directions, + Grob*me, Real yl, Real yr) +{ + Real demerit_score = 0.0 ; + + for (int i=0; i < stems.size (); i++) + { + Grob* s = stems[i]; + if (Stem::invisible_b (s)) + continue; + + Real current_y = + yl * left_factor[i] + right_factor[i]* yr; + + Stem_info info = stem_infos[i]; + Direction d = Direction (directions[i]); + + 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); + } + + demerit_score *= 2.0 /stems.size (); + + return demerit_score; +} + +Real +Beam::score_slopes_dy (Grob *me, Real yl, Real yr, + Real dy_mus, Real dy_damp) +{ + Real dy = yr - yl; + + Real dem = 0.0; + if (sign (dy_damp) != sign (dy)) + { + dem += 800; + } + + dem += 400* (0 >? (fabs (dy) - fabs (dy_mus))); + + + dem += shrink_extra_weight (fabs (dy_damp) - fabs (dy))* 10; + return dem; +} + +static Real +my_modf (Real x) +{ + return x - floor (x); +} + +Real +Beam::score_forbidden_quants (Grob*me, + Real yl, Real yr, + Real rad, + Real slt, + Real thickness, Real interbeam, + int multiplicity) +{ + Real dy = yr - yl; + + 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; + + // todo: use multiplicity of outer stems. + if (multiplicity >= 2) + { + + 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; + + Real eps = 1e-3; + + /* + Can't we simply compute the distance between the nearest + staffline and the secondary beam? That would get rid of the + silly case analysis here (which is probably not when we have + different beam-thicknesses.) + + --hwn + */ + + // hmm, without Interval/Drul_array, you get ~ 4x same code... + if (fabs (yl - dir * interbeam) < rad + inter) + { + if (dir == UP && dy <= eps + && fabs (my_modf (yl) - sit) < eps) + dem += 15; + + if (dir == DOWN && dy >= eps + && fabs (my_modf (yl) - hang) < eps) + dem += 15; + } + + if (fabs (yr - dir * interbeam) < rad + inter) + { + if (dir == UP && dy >= eps + && fabs (my_modf (yr) - sit) < eps) + dem += 15; + + if (dir == DOWN && dy <= eps + && fabs (my_modf (yr) - hang) < eps) + dem += 15; + } + + if (multiplicity >= 3) + { + if (fabs (yl - 2 * dir * interbeam) < rad + inter) + { + if (dir == UP && dy <= eps + && fabs (my_modf (yl) - straddle) < eps) + dem += 15; + + if (dir == DOWN && dy >= eps + && fabs (my_modf (yl) - straddle) < eps) + dem += 15; + } + + if (fabs (yr - 2 * dir * interbeam) < rad + inter) + { + if (dir == UP && dy >= eps + && fabs (my_modf (yr) - straddle) < eps) + dem += 15; + + if (dir == DOWN && dy <= eps + && fabs (my_modf (yr) - straddle) < eps) + dem += 15; + } + } + } + + return dem; +} + + MAKE_SCHEME_CALLBACK (Beam, least_squares, 1); SCM Beam::least_squares (SCM smob) { - Grob *me = unsmob_grob (smob); - - if (visible_stem_count (me) <= 1) - return SCM_UNSPECIFIED; + Grob *me = unsmob_grob (smob); - Real y = 0; - Real dy = 0; + 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); - Real first_ideal = Stem::calc_stem_info (first_visible_stem (me)).idealy_f_; - if (first_ideal == Stem::calc_stem_info (last_visible_stem (me)).idealy_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 ()) { - y = first_ideal; - dy = 0; + Interval chord (Stem::chord_start_f (first_visible_stem (me)), + Stem::chord_start_f (last_visible_stem (me))); + + + /* + 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 ; + } } else { @@ -344,65 +739,122 @@ Beam::least_squares (SCM smob) // ugh -> use commonx Real x0 = first_visible_stem (me)->relative_coordinate (0, X_AXIS); Link_array stems= - Pointer_group_interface__extract_elements (me, (Item*)0, "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).idealy_f_)); + 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; - dy = dydx * dx; + 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 ("y", gh_double2scm (y)); - me->set_grob_property ("dy", gh_double2scm (dy)); + me->set_grob_property ("positions", ly_interval2scm (pos)); return SCM_UNSPECIFIED; } -MAKE_SCHEME_CALLBACK (Beam, cancel_suspect_slope, 1); +MAKE_SCHEME_CALLBACK (Beam, check_concave, 1); SCM -Beam::cancel_suspect_slope (SCM smob) +Beam::check_concave (SCM smob) { 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 (visible_stem_count (me) <= 1) + if (stems.size () < 3) return SCM_UNSPECIFIED; - - Real y = gh_scm2double (me->get_grob_property ("y")); - Real dy = gh_scm2double (me->get_grob_property ("dy")); - /* steep slope running against lengthened stem is suspect */ - Real first_ideal = Stem::calc_stem_info (first_visible_stem (me)).idealy_f_; - Real last_ideal = Stem::calc_stem_info (last_visible_stem (me)).idealy_f_; - Real lengthened = gh_scm2double (me->get_grob_property ("outer-stem-length-limit")); - Real steep = gh_scm2double (me->get_grob_property ("slope-limit")); + Direction dir = Directional_element_interface::get (me); + /* Concaveness #1: If distance of an inner notehead to line between + two outer noteheads is bigger than CONCAVENESS-GAP (2.0ss), + beam is concave (Heinz Stolba). */ + bool concaveness1 = false; + Real r1 = gh_scm2double (me->get_grob_property ("concaveness-gap")); + if (r1 > 0) + { + Real dy = Stem::chord_start_f (stems.top ()) + - Stem::chord_start_f (stems[0]); + Real slope = dy / (stems.size () - 1); + + Real y0 = Stem::chord_start_f (stems[0]); + for (int i = 1; i < stems.size () - 1; i++) + { + Real c = (Stem::chord_start_f (stems[i]) - y0) - i * slope; + if (c > r1) + { + concaveness1 = true; + break; + } + } + } - // 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; + + /* Concaveness #2: Sum distances of inner noteheads that fall + outside the interval of the two outer noteheads */ + Real concaveness2 = 0; + Real r2 = gh_scm2double (me->get_grob_property ("concaveness-threshold")); + if (!concaveness1 && r2 > 0) + { + Real concave = 0; + Interval iv (Stem::chord_start_f (stems[0]), + Stem::chord_start_f (stems.top ())); + + if (iv[MAX] < iv[MIN]) + iv.swap (); + + for (int i = 1; i < stems.size () - 1; i++) + { + 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; + } + + concave *= dir; - if (((y - first_ideal > lengthened) && (dydx > steep)) - || ((y + dy - last_ideal > lengthened) && (dydx < -steep))) + concaveness2 = concave / (stems.size () - 2); + /* ugh: this is the a kludge to get input/regression/beam-concave.ly + to behave as baerenreiter. */ + concaveness2 /= (stems.size () - 2); + } + + /* TODO: some sort of damping iso -> plain horizontal */ + if (concaveness1 || concaveness2 > r2) { - Real adjusted_y = y + dy / 2; - me->set_grob_property ("y", gh_double2scm (adjusted_y)); - me->set_grob_property ("dy", gh_double2scm (0)); + 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)); } + return SCM_UNSPECIFIED; } -/* - This neat trick is by Werner Lemberg, - damped = tanh (slope) - corresponds with some tables in [Wanske] -*/ +/* 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) @@ -417,8 +869,8 @@ Beam::slope_damping (SCM smob) if (damping) { - Real y = gh_scm2double (me->get_grob_property ("y")); - Real dy = gh_scm2double (me->get_grob_property ("dy")); + 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) @@ -427,231 +879,70 @@ Beam::slope_damping (SCM smob) dydx = 0.6 * tanh (dydx) / damping; Real damped_dy = dydx * dx; - Real adjusted_y = y + (dy - damped_dy) / 2; - me->set_grob_property ("y", gh_double2scm (adjusted_y)); - me->set_grob_property ("dy", gh_double2scm (damped_dy)); + pos[LEFT] += (dy - damped_dy) / 2; + pos[RIGHT] -= (dy - damped_dy) / 2; + + me->set_grob_property ("positions", ly_interval2scm (pos)); } return SCM_UNSPECIFIED; } -/* - Quantise dy (height) of beam. - Generalisation of [Ross]. - */ -MAKE_SCHEME_CALLBACK (Beam, quantise_dy, 1); +MAKE_SCHEME_CALLBACK (Beam, end_after_line_breaking, 1); SCM -Beam::quantise_dy (SCM smob) +Beam::end_after_line_breaking (SCM smob) { Grob *me = unsmob_grob (smob); - - if (visible_stem_count (me) <= 1) - return SCM_UNSPECIFIED; - - Array a; - SCM proc = me->get_grob_property ("height-quants"); - SCM quants = gh_call2 (proc, me->self_scm (), - gh_double2scm (me->paper_l ()->get_var ("stafflinethickness") - / 1.0)); - - for (SCM s = quants; gh_pair_p (s); s = gh_cdr (s)) - a.push (gh_scm2double (gh_car (s))); - - if (a.size () > 1) - { - Real y = gh_scm2double (me->get_grob_property ("y")); - Real dy = gh_scm2double (me->get_grob_property ("dy")); - - Real staff_space = Staff_symbol_referencer::staff_space (me); - - 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]; - - Real quantised_dy = q * sign (dy); - Real adjusted_y = y + (dy - quantised_dy) / 2; - me->set_grob_property ("y", gh_double2scm (adjusted_y)); - me->set_grob_property ("dy", gh_double2scm (quantised_dy)); - } - return SCM_UNSPECIFIED; -} - - -/* - What to do? Why do we have two dimensions (staff-position and - staff-space)? Do other grobs export staff-position to the user, - should we junk that? - - height-hs -> staff-position-height - y-position-hs -> staff-position - - or - - height-hs -> height / 2 - y-postion-hs -> y-position / 2 - - - UGHUGH. IF this callback is omitted, we hang. - FIXME: until here, we used only stem_info, which acts as if dir=up. -*/ -MAKE_SCHEME_CALLBACK (Beam, user_override, 1); -SCM -Beam::user_override (SCM smob) -{ - Grob *me = unsmob_grob (smob); - Real half_space = Staff_symbol_referencer::staff_space (me) / 2; - - Real y = gh_scm2double (me->get_grob_property ("y")); - Real dy = gh_scm2double (me->get_grob_property ("dy")); - - - SCM s = me->get_grob_property ("y-position-hs"); - if (gh_number_p (s)) - y = gh_scm2double (s) * half_space; - else - // ughugh - y *= Directional_element_interface::get (me); - - s = me->get_grob_property ("height-hs"); - if (gh_number_p (s)) - dy = gh_scm2double (s) * half_space; - else - // ughugh - dy *= Directional_element_interface::get (me); - - - me->set_grob_property ("y", gh_double2scm (y)); - me->set_grob_property ("dy", gh_double2scm (dy)); + set_stem_lengths (me); return SCM_UNSPECIFIED; } /* - Ugh, this must be last, after user_override - Assumes directionised y/dy. + Calculate the Y position of the stem-end, given the Y-left, Y-right + in POS, and for stem S. */ -MAKE_SCHEME_CALLBACK (Beam, do_quantise_y, 1); -SCM -Beam::do_quantise_y (SCM smob) -{ - Grob *me = unsmob_grob (smob); - - /* - If the user set y-position, we shouldn't do quanting. - */ - if (gh_number_p (me->get_grob_property ("y-position-hs"))) - return SCM_UNSPECIFIED; - - Real y = gh_scm2double (me->get_grob_property ("y")); - Real dy = gh_scm2double (me->get_grob_property ("dy")); - - /* we can modify y, so we should quantise y */ - Real half_space = Staff_symbol_referencer::staff_space (me) / 2; - Real y_shift = check_stem_length_f (me, y, dy); - y += y_shift; - y = quantise_y_f (me, y, dy, 0); - - /* - Hmm, this is a bit keyhole operation: we're passing `this' as a - parameter, and member vars as SCM properties. We should decide on - SCM/C/C++ boundary */ - me->set_grob_property ("y", gh_double2scm (y)); - set_stem_lengths (me); - y = gh_scm2double (me->get_grob_property ("y")); - - y_shift = check_stem_length_f (me, y, dy); - - if (y_shift > half_space / 4) - { - 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_interface::get (me); - y = quantise_y_f (me, y, dy, quant_dir); - } - - me->set_grob_property ("y", gh_double2scm (y)); - // me->set_grob_property ("dy", gh_double2scm (dy)); - return SCM_UNSPECIFIED; -} - - Real -Beam::calc_stem_y_f (Grob*me,Item* s, Real y, Real dy) +Beam::calc_stem_y (Grob *me, Grob* s, Interval pos) { int beam_multiplicity = get_multiplicity (me); int stem_multiplicity = (Stem::flag_i (s) - 2) >? 0; - SCM space_proc = me->get_grob_property ("space-function"); - SCM space = gh_call1 (space_proc, gh_int2scm (beam_multiplicity)); - - Real thick = gh_scm2double (me->get_grob_property ("thickness")) ; - Real interbeam_f = gh_scm2double (space) ; + Real thick = gh_scm2double (me->get_grob_property ("thickness")); + Real interbeam = get_interbeam (me); // 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 stem_y = (dy && dx ? (s->relative_coordinate (0, X_AXIS) - x0) / dx * dy : 0) + y; + 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); - - /* knee */ - if (dir!= sdir) - { - stem_y -= dir - * (thick / 2 + (beam_multiplicity - 1) * interbeam_f); - - - - // 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_f; - } - - return stem_y; -} - -Real -Beam::check_stem_length_f (Grob*me,Real y, Real dy) -{ - Real shorten = 0; - Real lengthen = 0; - Direction dir = Directional_element_interface::get (me); - - Link_array stems= - Pointer_group_interface__extract_elements (me, (Item*)0, "stems"); - - for (int i=0; i < stems.size(); i++) + Direction dir = Directional_element_interface::get (me); + Direction sdir = Directional_element_interface::get (s); + + /* knee */ + if (dir!= sdir) { - Item* s = stems[i]; - if (Stem::invisible_b (s)) - continue; + stem_y -= dir * (thick / 2 + (beam_multiplicity - 1) * interbeam); - Real stem_y = calc_stem_y_f (me, s, y, dy); - - stem_y *= dir; - Stem_info info = Stem::calc_stem_info (s); + // huh, why not for first visible? - // if (0 > info.maxy_f_ - stem_y) - shorten = shorten ? info.miny_f_ - stem_y; + Grob *last_visible = last_visible_stem (me); + if (last_visible) + { + if ( Staff_symbol_referencer::staff_symbol_l (s) + != Staff_symbol_referencer::staff_symbol_l (last_visible)) + stem_y += Directional_element_interface::get (me) + * (beam_multiplicity - stem_multiplicity) * interbeam; + } + else + programming_error ("No last visible stem"); } - if (lengthen && shorten) - warning (_ ("weird beam vertical offset")); - - /* when all stems are too short, normal stems win */ - return dir * ((shorten) ? shorten : lengthen); + return stem_y; } /* @@ -661,92 +952,55 @@ Beam::check_stem_length_f (Grob*me,Real y, Real dy) void Beam::set_stem_lengths (Grob *me) { - if (visible_stem_count (me) <= 1) - return; - - Real y = gh_scm2double (me->get_grob_property ("y")); - Real dy = gh_scm2double (me->get_grob_property ("dy")); - - Real half_space = Staff_symbol_referencer::staff_space (me)/2; Link_array stems= - Pointer_group_interface__extract_elements (me, (Item*)0, "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_f (me, s, y, dy); + 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) / half_space); + Stem::set_stemend (s, (stem_y + id) / staff_space * 2); } } -/* - Prevent interference from stafflines and beams. - - We only need to quantise the (left) y of the beam, - since dy is quantised too. - if extend_b then stems must *not* get shorter - */ -Real -Beam::quantise_y_f (Grob*me,Real y, Real dy, int quant_dir) -{ - int multiplicity = get_multiplicity (me); - - Real staff_space = Staff_symbol_referencer::staff_space (me); - Real thick = me->paper_l ()->get_var ("stafflinethickness"); - - - SCM proc = me->get_grob_property ("vertical-position-quant-function"); - SCM quants = scm_apply (proc, - me->self_scm (), - gh_list (gh_int2scm (multiplicity), - gh_double2scm (dy/staff_space), - gh_double2scm (thick/staff_space), - SCM_EOL, SCM_UNDEFINED)); - - Array a; - - for (; gh_pair_p (quants); quants = gh_cdr (quants)) - a.push (gh_scm2double (gh_car (quants))); - - if (a.size () <= 1) - return y; - - Real up_y = Directional_element_interface::get (me) * 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_interface::get (me); -} - void -Beam::set_beaming (Grob*me,Beaming_info_list *beaming) +Beam::set_beaming (Grob *me, Beaming_info_list *beaming) { Link_array stems= - Pointer_group_interface__extract_elements (me, (Grob*)0, "stems"); + Pointer_group_interface__extract_grobs (me, (Grob *)0, "stems"); Direction d = LEFT; - for (int i=0; i < stems.size(); i++) + for (int i=0; i < stems.size (); i++) { do { /* Don't overwrite user override (?) */ - if (Stem::beam_count (stems[i], d) == 0 + 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)) @@ -767,32 +1021,20 @@ Beam::set_beaming (Grob*me,Beaming_info_list *beaming) FIXME: clean me up. */ Molecule -Beam::stem_beams (Grob*me,Item *here, Item *next, Item *prev) +Beam::stem_beams (Grob *me, Item *here, Item *next, Item *prev, Real dydx) { // 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 staffline_f = me->paper_l ()->get_var ("stafflinethickness"); - int multiplicity = get_multiplicity (me); - - SCM space_proc = me->get_grob_property ("space-function"); - SCM space = gh_call1 (space_proc, gh_int2scm (multiplicity)); - - Real thick = gh_scm2double (me->get_grob_property ("thickness")) ; - Real interbeam_f = gh_scm2double (space) ; - - Real bdy = interbeam_f; - Real stemdx = staffline_f; - - // ugh -> use commonx - Real dx = visible_stem_count (me) ? - last_visible_stem (me)->relative_coordinate (0, X_AXIS) - first_visible_stem (me)->relative_coordinate (0, X_AXIS) - : 0.0; - Real dy = gh_scm2double (me->get_grob_property ("dy")); - Real dydx = dy && dx ? dy/dx : 0; - + 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; @@ -809,22 +1051,36 @@ Beam::stem_beams (Grob*me,Item *here, Item *next, Item *prev) 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); + + /* half beams extending to the left. */ if (prev) { - 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); + 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 ("linethickness"); + w = w/2 relative_coordinate (0, X_AXIS) + - here->relative_coordinate (0, X_AXIS); - Real w = next->relative_coordinate (0, X_AXIS) - here->relative_coordinate (0, X_AXIS); - Molecule a = Lookup::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 ("linethickness"); + + 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 = 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++) @@ -856,16 +1120,24 @@ Beam::stem_beams (Grob*me,Item *here, Item *next, Item *prev) 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::beam (dydx, w + stemdx, thick); + a = Lookup::beam (dydx, w + stem_w, thick); } for (; j < rwholebeams; j++) { Molecule b (a); - b.translate (Offset (Stem::invisible_b (here) ? 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); } @@ -883,65 +1155,87 @@ Beam::stem_beams (Grob*me,Item *here, Item *next, Item *prev) } 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; } -MAKE_SCHEME_CALLBACK(Beam,brew_molecule,1); + +MAKE_SCHEME_CALLBACK (Beam, brew_molecule, 1); SCM Beam::brew_molecule (SCM smob) { - Grob * me =unsmob_grob (smob); + Grob *me =unsmob_grob (smob); Molecule mol; if (!gh_pair_p (me->get_grob_property ("stems"))) return SCM_EOL; - Real x0,dx; + Real x0, dx; Link_arraystems = - Pointer_group_interface__extract_elements (me, (Item*) 0, "stems"); + Pointer_group_interface__extract_grobs (me, (Item*) 0, "stems"); if (visible_stem_count (me)) { - // ugh -> use commonx + // 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 = stems[0]->relative_coordinate (0, X_AXIS); - dx = stems.top()->relative_coordinate (0, X_AXIS) - x0; + dx = stems.top ()->relative_coordinate (0, X_AXIS) - x0; } - - - Real dy = gh_scm2double (me->get_grob_property ("dy")); - Real dydx = dy && dx ? dy/dx : 0; - Real y = gh_scm2double (me->get_grob_property ("y")); + Interval pos = ly_scm2interval (me->get_grob_property ("positions")); + Real dy = pos.delta (); + Real dydx = dy && dx ? dy/dx : 0; - for (int j=0; j 0)? stems[j-1] : 0; - Item * next = (j < stems.size()-1) ? stems[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 (me, i, next, prev); - Real x = i->relative_coordinate (0, X_AXIS)-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 - - dynamic_cast (me)->get_bound (LEFT)->relative_coordinate (0, X_AXIS), X_AXIS); + - dynamic_cast (me) + ->get_bound (LEFT)->relative_coordinate (0, X_AXIS), + X_AXIS); + + if (DEBUG_QUANTING) + { + /* + 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"); + 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 (Grob*me) +Beam::forced_stem_count (Grob *me) { Link_arraystems = - Pointer_group_interface__extract_elements ( me, (Item*) 0, "stems"); + Pointer_group_interface__extract_grobs (me, (Item*) 0, "stems"); int f = 0; for (int i=0; i < stems.size (); i++) { @@ -951,7 +1245,7 @@ Beam::forced_stem_count (Grob*me) continue; if (((int)Stem::chord_start_f (s)) - && (Stem::get_direction (s ) != Stem::get_default_dir (s ))) + && (Stem::get_direction (s) != Stem::get_default_dir (s))) f++; } return f; @@ -960,14 +1254,11 @@ Beam::forced_stem_count (Grob*me) -/* TODO: - use filter and standard list functions. - */ int -Beam::visible_stem_count (Grob*me) +Beam::visible_stem_count (Grob *me) { Link_arraystems = - Pointer_group_interface__extract_elements (me, (Item*) 0, "stems"); + Pointer_group_interface__extract_grobs (me, (Item*) 0, "stems"); int c = 0; for (int i = stems.size (); i--;) { @@ -978,10 +1269,10 @@ Beam::visible_stem_count (Grob*me) } Item* -Beam::first_visible_stem(Grob*me) +Beam::first_visible_stem (Grob *me) { Link_arraystems = - Pointer_group_interface__extract_elements ( me, (Item*) 0, "stems"); + Pointer_group_interface__extract_grobs (me, (Item*) 0, "stems"); for (int i = 0; i < stems.size (); i++) { @@ -992,10 +1283,10 @@ Beam::first_visible_stem(Grob*me) } Item* -Beam::last_visible_stem(Grob*me) +Beam::last_visible_stem (Grob *me) { Link_arraystems = - Pointer_group_interface__extract_elements ( me, (Item*) 0, "stems"); + Pointer_group_interface__extract_grobs (me, (Item*) 0, "stems"); for (int i = stems.size (); i--;) { if (!Stem::invisible_b (stems[i])) @@ -1007,6 +1298,7 @@ Beam::last_visible_stem(Grob*me) /* [TODO] + handle rest under beam (do_post: beams are calculated now) what about combination of collisions and rest under beam. @@ -1014,7 +1306,7 @@ Beam::last_visible_stem(Grob*me) rest -> stem -> beam -> interpolate_y_position () */ -MAKE_SCHEME_CALLBACK(Beam,rest_collision_callback,2); +MAKE_SCHEME_CALLBACK (Beam, rest_collision_callback, 2); SCM Beam::rest_collision_callback (SCM element_smob, SCM axis) { @@ -1023,40 +1315,38 @@ Beam::rest_collision_callback (SCM element_smob, SCM axis) assert (a == Y_AXIS); - Grob * st = unsmob_grob (rest->get_grob_property ("stem")); - Grob * stem = st; + 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)) + 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. - Real beam_dy = 0; - Real beam_y = 0; + // 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); - // todo: make sure this calced already. - SCM s = beam->get_grob_property ("dy"); - if (gh_number_p (s)) - beam_dy = gh_scm2double (s); - - s = beam->get_grob_property ("y"); - if (gh_number_p (s)) - beam_y = gh_scm2double (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 = beam_dy && dx ? beam_dy/dx : 0; - + 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 + beam_y; + Real beamy = (stem->relative_coordinate (0, X_AXIS) - x0) * dydx + pos[LEFT]; - Real staff_space = Staff_symbol_referencer::staff_space (rest); + Real staff_space = Staff_symbol_referencer::staff_space (rest); - Real rest_dim = rest->extent (rest, Y_AXIS)[d]*2.0 / staff_space ; // refp?? + 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")); @@ -1072,25 +1362,34 @@ Beam::rest_collision_callback (SCM element_smob, SCM axis) if (discrete_dist < stafflines+1) discrete_dist = int (ceil (discrete_dist / 2.0)* 2.0); - return gh_double2scm (-d * discrete_dist); + return gh_double2scm (-d * discrete_dist); } bool -Beam::has_interface (Grob*me) +Beam::has_interface (Grob *me) { return me->has_interface (ly_symbol2scm ("beam-interface")); } -void -Beam::set_interface (Grob*me) -{ -#if 0 - /* - why the init? No way to tell difference between default and user - override. */ - me->set_grob_property ("y" ,gh_double2scm (0)); - me->set_grob_property ("dy", gh_double2scm (0)); - me->set_interface (ly_symbol2scm("beam-interface")); -#endif -} + +ADD_INTERFACE (Beam, "beam-interface", + "A beam. + +#'thickness= weight of beams, in staffspace + + +We take the least squares line through the ideal-length stems, and +then damp that using + + damped = tanh (slope) + +this gives an unquantized left and right position for the beam end. +Then we take all combinations of quantings near these left and right +positions, and give them a score (according to how close they are to +the ideal slope, how close the result is to the ideal stems, etc.). We +take the best scoring combination. + +", + "beam-space concaveness-gap concaveness-threshold dir-function quant-score auto-knee-gap gap chord-tremolo beamed-stem-shorten shorten least-squares-dy direction damping flag-width-function neutral-direction positions thickness"); +