X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam.cc;h=3b76c373b96178950c25993a77d275764ecdc75f;hb=d765f3af45be51f15da55cf570a4b172200e1035;hp=d58054aa8f3c13c095ca3120c0f3490457504a1d;hpb=393b9995a68387816c3d945fbc0808504804fc5f;p=lilypond.git diff --git a/lily/beam.cc b/lily/beam.cc index d58054aa8f..3b76c373b9 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -1,19 +1,29 @@ /* 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] +TODO: + + * Use Number_pair i.s.o Interval to represent (yl, yr). + + - Determine auto knees based on positions if it's set by the user. + + +Notes: - * shorter! (now +- 1000 lines) - * less hairy code - */ + + - Stems run to the Y-center of the beam. + + - beam_translation is the offset between Y centers of the beam. + +*/ #include // tanh. @@ -33,70 +43,451 @@ #include "spanner.hh" #include "warn.hh" + +#define DEBUG_QUANTING 0 + + +#if DEBUG_QUANTING +#include "text-item.hh" // debug output. +#include "font-interface.hh" // debug output. +#endif + + 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); - assert (!Stem::beam_l (s)); + assert (!Stem::get_beam (s)); s->set_grob_property ("beam", me->self_scm ()); add_bound_item (dynamic_cast (me), dynamic_cast (s)); } + +Real +Beam::get_thickness (Grob * me) +{ + SCM th = me->get_grob_property ("thickness"); + if (gh_number_p (th)) + return gh_scm2double (th)* Staff_symbol_referencer::staff_space (me); + else + return 0.0; +} + +/* Return the translation between 2 adjoining beams. */ +Real +Beam::get_beam_translation (Grob *me) +{ + SCM func = me->get_grob_property ("space-function"); + SCM s = gh_call2 (func, me->self_scm (), scm_int2num (get_beam_count (me))); + return gh_scm2double (s); +} + +/* Maximum beam_count. */ int -Beam::get_multiplicity (Grob*me) +Beam::get_beam_count (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)); - - if (Stem::has_interface (sc)) - m = m >? Stem::beam_count (sc,LEFT) >? Stem::beam_count (sc,RIGHT); + Grob *stem = unsmob_grob (ly_car (s)); + m = m >? (Stem::beam_multiplicity (stem).length () + 1); } 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); +MAKE_SCHEME_CALLBACK (Beam, space_function, 2); SCM -Beam::before_line_breaking (SCM smob) +Beam::space_function (SCM smob, SCM beam_count) { - Grob * me = unsmob_grob (smob); + Grob *me = unsmob_grob (smob); + + Real staff_space = Staff_symbol_referencer::staff_space (me); + Real line = me->get_paper ()->get_var ("linethickness"); + Real thickness = get_thickness (me); + + Real beam_translation = gh_scm2int (beam_count) < 4 + ? (2*staff_space + line - thickness) / 2.0 + : (3*staff_space + line - thickness) / 3.0; + + return gh_double2scm (beam_translation); +} - // 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) + +/* 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); + + /* 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))->set_grob_property ("beam", SCM_EOL); + 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)); - + Direction d = get_default_dir (me); + consider_auto_knees (me); - set_stem_directions (me); + set_stem_directions (me, d); + + connect_beams (me); + set_stem_shorten (me); } + return SCM_EOL; } + +/* + We want a maximal number of shared beams, but if there is choice, we + take the one that is closest to the end of the stem. This is for situations like + + x + | + | + |===| + |= + | + x + + + */ +int +position_with_maximal_common_beams (SCM left_beaming, SCM right_beaming, + Direction left_dir, + Direction right_dir) +{ + Slice lslice = int_list_to_slice (gh_cdr (left_beaming)); + + int best_count = 0; + int best_start = 0; + for (int i = lslice[-left_dir]; + (i - lslice[left_dir])* left_dir <= 0 ; i+= left_dir) + { + int count =0; + for ( SCM s = gh_car (right_beaming); gh_pair_p (s); s = gh_cdr (s)) + { + int k = - right_dir * gh_scm2int (gh_car (s)) + i; + if (scm_memq (scm_int2num (k), left_beaming) != SCM_BOOL_F) + count ++; + } + + if (count >= best_count) + { + best_count = count; + best_start = i; + } + } + + return best_start; +} + +void +Beam::connect_beams (Grob *me) +{ + Link_array stems= + Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems"); + + Slice last_int; + last_int.set_empty(); + SCM last_beaming = SCM_EOL; + Direction last_dir = CENTER; + for (int i = 0; i< stems.size(); i++) + { + Grob *this_stem = stems[i]; + SCM this_beaming = this_stem->get_grob_property ("beaming"); + + Direction this_dir = Directional_element_interface::get(this_stem); + if (i > 0) + { + int start_point = position_with_maximal_common_beams + (last_beaming, this_beaming, + last_dir, this_dir); + + Direction d = LEFT; + Slice new_slice ; + do + { + if (d == RIGHT && i == stems.size()-1) + continue; + + new_slice.set_empty(); + SCM s = index_get_cell (this_beaming, d); + for (; gh_pair_p (s); s = gh_cdr (s)) + { + int new_beam_pos = + start_point - this_dir * gh_scm2int (gh_car (s)); + + new_slice.add_point (new_beam_pos); + gh_set_car_x (s, scm_int2num (new_beam_pos)); + } + + + } + while (flip (&d) != LEFT); + + if (!new_slice.empty_b()) + last_int = new_slice; + } + else + { + gh_set_car_x ( this_beaming, SCM_EOL); + SCM s = gh_cdr (this_beaming); + for (; gh_pair_p (s); s = gh_cdr (s)) + { + int np = - this_dir * gh_scm2int (gh_car(s)); + gh_set_car_x (s, scm_int2num (np)); + last_int.add_point (np); + } + } + + if (i == stems.size () -1) + { + gh_set_cdr_x (this_beaming, SCM_EOL); + } + + if (scm_ilength (gh_cdr (this_beaming)) > 0) + { + last_beaming = this_beaming; + last_dir = this_dir; + } + } + } + +MAKE_SCHEME_CALLBACK (Beam, brew_molecule, 1); +SCM +Beam::brew_molecule (SCM grob) +{ + Grob *me = unsmob_grob (grob); + Link_array stems= + Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems"); + Grob* xcommon = common_refpoint_of_array (stems, me, X_AXIS); + + Real x0, dx; + if (visible_stem_count (me)) + { + // ugh -> use commonx + x0 = first_visible_stem (me)->relative_coordinate (xcommon, X_AXIS); + dx = last_visible_stem (me)->relative_coordinate (xcommon, X_AXIS) - x0; + } + else + { + x0 = stems[0]->relative_coordinate (xcommon, X_AXIS); + dx = stems.top ()->relative_coordinate (xcommon, X_AXIS) - x0; + } + + SCM posns = me->get_grob_property ("positions"); + Interval pos; + if (!ly_number_pair_p (posns)) + { + programming_error ("No beam posns"); + pos = Interval (0,0); + } + else + pos= ly_scm2interval (posns); + + Real dy = pos.delta (); + Real dydx = dy && dx ? dy/dx : 0; + + Real thick = get_thickness (me); + Real bdy = get_beam_translation (me); + + SCM last_beaming = SCM_EOL;; + Real last_xposn = -1; + Real last_width = -1 ; + + + SCM gap = me->get_grob_property ("gap"); + Molecule the_beam; + Real lt = me->get_paper ()->get_var ("linethickness"); + for (int i = 0; i< stems.size(); i++) + { + Grob * st =stems[i]; + + SCM this_beaming = st->get_grob_property ("beaming"); + Real xposn = st->relative_coordinate (xcommon, X_AXIS); + Real stem_width = gh_scm2double (st->get_grob_property ("thickness")) *lt; + + if (i > 0) + { + SCM left = gh_cdr (last_beaming); + SCM right = gh_car (this_beaming); + + Array fullbeams; + Array lfliebertjes; + Array rfliebertjes; + + for (SCM s = left; + gh_pair_p (s); s =gh_cdr (s)) + { + int b = gh_scm2int (gh_car (s)); + if (scm_memq (gh_car(s), right) != SCM_BOOL_F) + { + fullbeams.push (b); + } + else + { + lfliebertjes.push (b); + } + } + for (SCM s = right; + gh_pair_p (s); s =gh_cdr (s)) + { + int b = gh_scm2int (gh_car (s)); + if (scm_memq (gh_car(s), left) == SCM_BOOL_F) + { + rfliebertjes.push (b); + } + } + + + Real w = xposn - last_xposn; + Real stem_offset = 0.0; + Real width_corr = 0.0; + if (i == 1) + { + stem_offset -= last_width/2; + width_corr += last_width/2; + } + + if (i == stems.size() -1) + { + width_corr += stem_width/2; + } + + if (gh_number_p (gap)) + { + Real g = gh_scm2double (gap); + stem_offset += g; + width_corr -= 2*g; + } + + Molecule whole = Lookup::beam (dydx, w + width_corr, thick); + for (int j = fullbeams.size(); j--;) + { + Molecule b (whole); + b.translate_axis (last_xposn - x0 + stem_offset, X_AXIS); + b.translate_axis (dydx * (last_xposn - x0) + bdy * fullbeams[j], Y_AXIS); + the_beam.add_molecule (b); + } + + if (lfliebertjes.size() || rfliebertjes.size()) + { + + Real nw_f; + if (!Stem::first_head (st)) + nw_f = 0; + else + { + int t = Stem::duration_log (st); + + SCM proc = me->get_grob_property ("flag-width-function"); + SCM result = gh_call1 (proc, scm_int2num (t)); + nw_f = gh_scm2double (result); + } + + /* Half beam should be one note-width, + but let's make sure two half-beams never touch */ + + Real w = xposn - last_xposn; + w = w/2 relative_coordinate (xcommon, X_AXIS), X_AXIS); + the_beam.translate_axis (pos[LEFT], Y_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_string (gh_scm2int (me->get_grob_property ("best-idx"))); + str += ":"; + } + str += to_string (gh_scm2double (me->get_grob_property ("quant-score")), + "%.2f"); + + SCM properties = Font_interface::font_alist_chain (me); + + + Molecule tm = Text_item::text2molecule (me, scm_makfrom0str (str.to_str0 ()), properties); + the_beam.add_at_edge (Y_AXIS, UP, tm, 5.0); + } +#endif + + + + return the_beam.smobbed_copy(); +} + + + + Direction -Beam::get_default_dir (Grob*me) +Beam::get_default_dir (Grob *me) { Drul_array total; total[UP] = total[DOWN] = 0; @@ -104,305 +495,608 @@ Beam::get_default_dir (Grob*me) count[UP] = count[DOWN] = 0; Direction d = DOWN; - Link_array stems= - Pointer_group_interface__extract_elements (me, (Item*)0, "stems"); + Link_array stems= + Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems"); for (int i=0; i ? 0; + int current = sd ? (1 + d * sd)/2 : center_distance; 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]))); + gh_cons (scm_int2num (count[UP]), + scm_int2num (count[DOWN])), + gh_cons (scm_int2num (total[UP]), + scm_int2num (total[DOWN]))); 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, Direction d) { - Link_array stems - =Pointer_group_interface__extract_elements (me, (Item*) 0, "stems"); - Direction d = Directional_element_interface::get (me); + Link_array stems + =Pointer_group_interface__extract_grobs (me, (Grob*) 0, "stems"); for (int i=0; i remove_grob_property ("dir-forced"); - if (!gh_boolean_p (force) || !gh_scm2bool (force)) - Directional_element_interface ::set (s,d); + + SCM forcedir = s->get_grob_property ("direction"); + if (!to_dir (forcedir)) + Directional_element_interface::set (s, d); } -} +} /* - Simplistic auto-knees; only consider vertical gap between two - adjacent chords. + A union of intervals in the real line. - `Forced' stem directions are ignored. If you don't want auto-knees, - don't set, or unset auto-knee-gap. + Abysmal performance (quadratic) for large N, hopefully we don't have + that large N. In any case, this should probably be rewritten to use + a balanced tree. + */ +struct Int_set +{ + Array allowed_regions_; + + Int_set() + { + set_full(); + } + + void set_full() + { + allowed_regions_.clear(); + Interval s; + s.set_full (); + allowed_regions_.push (s); + } + + void remove_interval (Interval rm) + { + for (int i = 0; i < allowed_regions_.size(); ) + { + Interval s = rm; + + s.intersect (allowed_regions_[i]); + + if (!s.empty_b ()) + { + Interval before = allowed_regions_[i]; + Interval after = allowed_regions_[i]; + + before[RIGHT] = s[LEFT]; + after[LEFT] = s[RIGHT]; + + if (!before.empty_b() && before.length () > 0.0) + { + allowed_regions_.insert (before, i); + i++; + } + allowed_regions_.del (i); + if (!after.empty_b () && after.length () > 0.0) + { + allowed_regions_.insert (after, i); + i++; + } + } + else + i++; + } + } +}; + + +/* + Only try horizontal beams for knees. No reliable detection of + anything else is possible here, since we don't know funky-beaming + settings, or X-distances (slopes!) People that want sloped + knee-beams, should set the directions manually. */ void -Beam::consider_auto_knees (Grob *me) +Beam::consider_auto_knees (Grob* me) { SCM scm = me->get_grob_property ("auto-knee-gap"); + if (!gh_number_p (scm)) + return ; - if (gh_number_p (scm)) - { - 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_elements (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++) - { - 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 threshold = gh_scm2double (scm); + + Int_set gaps; - Real dy = right - left; + gaps.set_full (); - if (abs (dy) >= gap) + Link_array stems= + Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems"); + + Grob *common = common_refpoint_of_array (stems, me, Y_AXIS); + Real staff_space = Staff_symbol_referencer::staff_space (me); + + Array hps_array; + for (int i=0; i < stems.size (); i++) + { + Grob* stem = stems[i]; + if (Stem::invisible_b (stem)) + continue; + + Interval hps = Stem::head_positions (stem); + if(!hps.empty_b()) + { + hps[LEFT] += -1; + hps[RIGHT] += 1; + hps *= staff_space * 0.5 ; + + /* + We could subtract beam Y position, but this routine only + sets stem directions, a constant shift does not have an + influence. + + */ + hps += stem->relative_coordinate (common, Y_AXIS); + + if (to_dir (stem->get_grob_property ("direction"))) { - knee_y = (right + left) / 2; - knee_b = true; - break; + Direction stemdir = to_dir (stem->get_grob_property ("direction")); + hps[-stemdir] = - stemdir * infinity_f; } } + hps_array.push (hps); + + gaps.remove_interval (hps); + } + + Interval max_gap; + Real max_gap_len =0.0; + + for (int i = gaps.allowed_regions_.size() -1; i >= 0 ; i--) + { + Interval gap = gaps.allowed_regions_[i]; + + /* + the outer gaps are not knees. + */ + if (isinf (gap[LEFT]) || isinf(gap[RIGHT])) + continue; - if (knee_b) + if (gap.length () >= max_gap_len) { - 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); + max_gap_len = gap.length(); + max_gap = gap; + } + } - Directional_element_interface::set (s, y < knee_y ? UP : DOWN); - s->set_grob_property ("dir-forced", SCM_BOOL_T); - } + if (max_gap_len > threshold) + { + int j = 0; + for (int i = 0; i < stems.size(); i++) + { + Grob* stem = stems[i]; + if (Stem::invisible_b (stem)) + continue; + + Interval hps = hps_array[j++]; + + + Direction d = (hps.center () < max_gap.center()) ? + UP : DOWN ; + + stem->set_grob_property ("direction", scm_int2num (d)); + + hps.intersect (max_gap); + assert (hps.empty_b () || hps.length () < 1e-6 ); } } } -/* - 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 + + This is done in beam because the shorten has to be uniform over the + entire beam. + +*/ void -Beam::set_stem_shorten (Grob*m) +Beam::set_stem_shorten (Grob *me) { - Spanner*me = dynamic_cast (m); - - Real forced_fraction = forced_stem_count (me) / visible_stem_count (me); - if (forced_fraction < 0.5) - return; + /* + shortening looks silly for x staff beams + */ + if (knee_b(me)) + return ; + + Real forced_fraction = 1.0 * forced_stem_count (me) + / visible_stem_count (me); - int multiplicity = get_multiplicity (me); + int beam_count = get_beam_count (me); - SCM shorten = me->get_grob_property ("beamed-stem-shorten"); - if (shorten == SCM_EOL) + SCM shorten_list = me->get_grob_property ("beamed-stem-shorten"); + if (shorten_list == SCM_EOL) return; - int sz = scm_ilength (shorten); - Real staff_space = Staff_symbol_referencer::staff_space (me); - SCM shorten_elt = scm_list_ref (shorten, gh_int2scm (multiplicity stems= - Pointer_group_interface__extract_elements (me, (Item*)0, "stems"); - - 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 (shorten_f) + me->set_grob_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. +/* Call list of y-dy-callbacks, that handle setting of + grob-properties - 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); + Grob *me = unsmob_grob (smob); - me->set_grob_property ("y", gh_double2scm (0)); - me->set_grob_property ("dy", gh_double2scm (0)); + /* Copy to mutable list. */ + SCM s = ly_deep_copy (me->get_grob_property ("positions")); + me->set_grob_property ("positions", s); - /* Hmm, callbacks should be called by, a eh, callback mechanism - somewhere(?), I guess, not by looping here. */ - - 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); + if (ly_car (s) == SCM_BOOL_F) + { - // UGH. Y is not in staff position unit? - // Ik dacht datwe daar juist van weg wilden? - - // Hmm, nu hebben we 3 dimensies, want inmiddels zijn we daar - // weer terug, maar dan / 2 - // (staff-space iso staff-position) - - set_stem_lengths (me); + // one wonders if such genericity is necessary --hwn. + 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); + } + set_stem_lengths (me); return SCM_UNSPECIFIED; } - MAKE_SCHEME_CALLBACK (Beam, least_squares, 1); SCM Beam::least_squares (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob_grob (smob); - if (visible_stem_count (me) <= 1) - return SCM_UNSPECIFIED; + int count = visible_stem_count (me); + Interval pos (0, 0); + + if (count <= 1) + { + me->set_grob_property ("positions", ly_interval2scm (pos)); + return SCM_UNSPECIFIED; + } - Real y = 0; - Real dy = 0; - /* Stem_info, and thus y,dy in this function are corrected for beam-dir */ - 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_) + Array x_posns ; + Link_array stems= + Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems"); + Grob *commonx = common_refpoint_of_array (stems, me, X_AXIS); + Grob *commony = common_refpoint_of_array (stems, me, Y_AXIS); + + Real my_y = me->relative_coordinate (commony, Y_AXIS); + + Grob *fvs = first_visible_stem (me); + Grob *lvs = last_visible_stem (me); + + Interval ideal (Stem::get_stem_info (fvs).ideal_y_ + + fvs->relative_coordinate (commony, Y_AXIS) -my_y, + Stem::get_stem_info (lvs).ideal_y_ + + lvs->relative_coordinate (commony, Y_AXIS) - my_y); + + Real x0 = first_visible_stem (me)->relative_coordinate (commonx, X_AXIS); + for (int i=0; i < stems.size (); i++) { - y = first_ideal; - dy = 0; + Grob* s = stems[i]; + + Real x = s->relative_coordinate (commonx, X_AXIS) - x0; + x_posns.push (x); } - else + Real dx = last_visible_stem (me)->relative_coordinate (commonx, X_AXIS) - x0; + + Real y =0; + Real dydx = 0; + Real dy = 0; + + if (!ideal.delta ()) { - Array ideals; + Interval chord (Stem::chord_start_y (first_visible_stem (me)), + Stem::chord_start_y (last_visible_stem (me))); - // 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"); + /* Simple beams (2 stems) on middle line should be allowed to be + slightly sloped. + + However, if both stems reach middle line, + ideal[LEFT] == ideal[RIGHT] and ideal.delta () == 0. + For that case, we apply artificial slope */ + if (!ideal[LEFT] && chord.delta () && count == 2) + { + /* FIXME. -> UP */ + Direction d = (Direction) (sign (chord.delta ()) * UP); + pos[d] = gh_scm2double (me->get_grob_property ("thickness")) / 2; + pos[-d] = - pos[d]; + } + else + { + pos = ideal; + } + + y = pos[LEFT]; + dy = pos[RIGHT]- y; + dydx = dy/dx; + } + else + { + Array ideals; for (int i=0; i < stems.size (); i++) { - Item* s = stems[i]; + Grob* 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 (x_posns[i], + Stem::get_stem_info (s).ideal_y_ + + s->relative_coordinate (commony, Y_AXIS) + - my_y)); } - Real dydx; minimise_least_squares (&dydx, &y, ideals); - Real dx = last_visible_stem (me)->relative_coordinate (0, X_AXIS) - x0; - dy = dydx * dx; - } + dy = dydx * dx; + me->set_grob_property ("least-squares-dy", gh_double2scm (dy)); + pos = Interval (y, (y+dy)); + } + + me->set_grob_property ("positions", ly_interval2scm (pos)); + + return SCM_UNSPECIFIED; +} + + +/* + We can't combine with previous function, since check concave and + slope damping comes first. + */ +MAKE_SCHEME_CALLBACK (Beam, shift_region_to_valid, 1); +SCM +Beam::shift_region_to_valid (SCM grob) +{ + Grob *me = unsmob_grob (grob); + /* + Code dup. + */ + Array x_posns ; + Link_array stems= + Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems"); + Grob *commonx = common_refpoint_of_array (stems, me, X_AXIS); + Grob *commony = common_refpoint_of_array (stems, me, Y_AXIS); + + Grob *fvs = first_visible_stem (me); + + if (!fvs) + return SCM_UNSPECIFIED; + + Real x0 =fvs->relative_coordinate (commonx, X_AXIS); + for (int i=0; i < stems.size (); i++) + { + Grob* s = stems[i]; + + Real x = s->relative_coordinate (commonx, X_AXIS) - x0; + x_posns.push (x); + } + + Grob *lvs = last_visible_stem (me); + if (!lvs) + return SCM_UNSPECIFIED; + + Real dx = lvs->relative_coordinate (commonx, X_AXIS) - x0; + + Interval pos = ly_scm2interval ( me->get_grob_property ("positions")); + Real dy = pos.delta(); + Real y = pos[LEFT]; + Real dydx =dy/dx; + + + /* + Shift the positions so that we have a chance of finding good + quants (i.e. no short stem failures.) + */ + Interval feasible_left_point; + feasible_left_point.set_full (); + for (int i=0; i < stems.size (); i++) + { + Grob* s = stems[i]; + if (Stem::invisible_b (s)) + continue; + + Direction d = Stem::get_direction (s); + + Real left_y = + Stem::get_stem_info (s).shortest_y_ + - dydx * x_posns [i]; + + /* + left_y is now relative to the stem S. We want relative to + ourselves, so translate: + */ + left_y += + + s->relative_coordinate (commony, Y_AXIS) + - me->relative_coordinate (commony, Y_AXIS); + + Interval flp ; + flp.set_full (); + flp[-d] = left_y; + + feasible_left_point.intersect (flp); + } + + if (feasible_left_point.empty_b()) + { + warning (_("Not sure that we can find a nice beam slope (no viable initial configuration found).")); + } + else if (!feasible_left_point.elem_b(y)) + { + if (isinf (feasible_left_point[DOWN])) + y = feasible_left_point[UP] - REGION_SIZE; + else if (isinf (feasible_left_point[UP])) + y = feasible_left_point[DOWN]+ REGION_SIZE; + else + y = feasible_left_point.center (); + } + pos = Interval (y, (y+dy)); + me->set_grob_property ("positions", ly_interval2scm (pos)); + return SCM_UNSPECIFIED; +} + + +MAKE_SCHEME_CALLBACK (Beam, check_concave, 1); +SCM +Beam::check_concave (SCM smob) +{ + Grob *me = unsmob_grob (smob); + + Link_array stems = + Pointer_group_interface__extract_grobs (me, (Grob*) 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 #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). + + In the case of knees, the line connecting outer heads is often + not related to the beam slope (it may even go in the other + direction). Skip the check when the outer stems point in + different directions. --hwn + + */ + bool concaveness1 = false; + SCM gap = me->get_grob_property ("concaveness-gap"); + if (gh_number_p (gap) + && Stem::get_direction(stems.top ()) + == Stem::get_direction(stems[0])) + { + Real r1 = gh_scm2double (gap); + Real dy = Stem::chord_start_y (stems.top ()) + - Stem::chord_start_y (stems[0]); + + + Real slope = dy / (stems.size () - 1); + + Real y0 = Stem::chord_start_y (stems[0]); + for (int i = 1; i < stems.size () - 1; i++) + { + Real c = (Stem::chord_start_y (stems[i]) - y0) - i * slope; + if (c > r1) + { + concaveness1 = true; + break; + } + } + } + + + /* Concaveness #2: Sum distances of inner noteheads that fall + outside the interval of the two outer noteheads. + + We only do this for beams where first and last stem have the same + direction. --hwn. - /* Store true, not dir-corrected values */ - Direction dir = Directional_element_interface::get (me); - me->set_grob_property ("y", gh_double2scm (y * dir)); - me->set_grob_property ("dy", gh_double2scm (dy * dir)); - return SCM_UNSPECIFIED; -} -MAKE_SCHEME_CALLBACK (Beam, cancel_suspect_slope, 1); -SCM -Beam::cancel_suspect_slope (SCM smob) -{ - Grob *me = unsmob_grob (smob); - - if (visible_stem_count (me) <= 1) - return SCM_UNSPECIFIED; - - /* Stem_info, and thus y,dy in this function are corrected for beam-dir */ - Direction dir = Directional_element_interface::get (me); - Real y = gh_scm2double (me->get_grob_property ("y")) * dir; - Real dy = gh_scm2double (me->get_grob_property ("dy")) * dir; + Note that "convex" stems compensate for "concave" stems. + (is that intentional?) --hwn. + */ - /* 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")); + Real concaveness2 = 0; + SCM thresh = me->get_grob_property ("concaveness-threshold"); + Real r2 = infinity_f; + if (!concaveness1 && gh_number_p (thresh) + && Stem::get_direction(stems.top ()) + == Stem::get_direction(stems[0])) + { + r2 = gh_scm2double (thresh); - // 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; + Direction dir = Stem::get_direction(stems.top ()); + Real concave = 0; + Interval iv (Stem::chord_start_y (stems[0]), + Stem::chord_start_y (stems.top ())); + + if (iv[MAX] < iv[MIN]) + iv.swap (); + + for (int i = 1; i < stems.size () - 1; i++) + { + Real f = Stem::chord_start_y (stems[i]); + concave += ((f - iv[MAX] ) >? 0) + + ((f - iv[MIN] ) lengthened) && (dydx > steep)) - || ((y + dy - last_ideal > lengthened) && (dydx < -steep))) + /* + huh? we're dividing twice (which is not scalable) meaning that + the longer the beam, the more unlikely it will be + concave. Maybe you would even expect the other way around?? + + --hwn. + + */ + concaveness2 /= (stems.size () - 2); + } + + /* TODO: some sort of damping iso -> plain horizontal */ + if (concaveness1 || concaveness2 > r2) { - Real adjusted_y = y + dy / 2; - /* Store true, not dir-corrected values */ - me->set_grob_property ("y", gh_double2scm (adjusted_y * dir)); - 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,225 +1111,87 @@ Beam::slope_damping (SCM smob) if (damping) { - /* y,dy in this function are corrected for beam-dir */ - Direction dir = Directional_element_interface::get (me); - Real y = gh_scm2double (me->get_grob_property ("y")) * dir; - Real dy = gh_scm2double (me->get_grob_property ("dy")) * dir; - - // 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; + Interval pos = ly_scm2interval (me->get_grob_property ("positions")); + Real dy = pos.delta (); - Real damped_dy = dydx * dx; - Real adjusted_y = y + (dy - damped_dy) / 2; - /* Store true, not dir-corrected values */ - me->set_grob_property ("y", gh_double2scm (adjusted_y * dir)); - me->set_grob_property ("dy", gh_double2scm (damped_dy * dir)); - } - return SCM_UNSPECIFIED; -} + Grob *fvs = first_visible_stem (me); + Grob *lvs = last_visible_stem (me); -/* - Quantise dy (height) of beam. - Generalisation of [Ross]. - */ -MAKE_SCHEME_CALLBACK (Beam, quantise_dy, 1); -SCM -Beam::quantise_dy (SCM smob) -{ - Grob *me = unsmob_grob (smob); + Grob *commonx = fvs->common_refpoint (lvs, X_AXIS); - 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) - { - /* y,dy in this function are corrected for beam-dir */ - Direction dir = Directional_element_interface::get (me); - Real y = gh_scm2double (me->get_grob_property ("y")) * dir; - Real dy = gh_scm2double (me->get_grob_property ("dy")) * dir; + Real dx = last_visible_stem (me)->relative_coordinate (commonx, X_AXIS) + - first_visible_stem (me)->relative_coordinate (commonx, X_AXIS); + Real dydx = dy && dx ? dy/dx : 0; + dydx = 0.6 * tanh (dydx) / damping; - 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 damped_dy = dydx * dx; + pos[LEFT] += (dy - damped_dy) / 2; + pos[RIGHT] -= (dy - damped_dy) / 2; - Real quantised_dy = q * sign (dy); - Real adjusted_y = y + (dy - quantised_dy) / 2; - /* Store true, not dir-corrected values */ - me->set_grob_property ("y", gh_double2scm (adjusted_y * dir)); - me->set_grob_property ("dy", gh_double2scm (quantised_dy * dir)); - } - return SCM_UNSPECIFIED; -} - -/* It's tricky to have the user override y,dy directly, so we use this - translation func. Also, if our staff_space != 1 (smaller staff, eg), - user will expect staff-position to be discrete values. */ -MAKE_SCHEME_CALLBACK (Beam, user_override, 1); -SCM -Beam::user_override (SCM smob) -{ - Grob *me = unsmob_grob (smob); - Real staff_space = Staff_symbol_referencer::staff_space (me); - - SCM s = me->get_grob_property ("staff-position"); - if (gh_number_p (s)) - { - Real y = gh_scm2double (s) * staff_space; - me->set_grob_property ("y", gh_double2scm (y)); - } - - /* Name suggestions? Tilt, slope, vertical-* ? */ - s = me->get_grob_property ("height"); - if (gh_number_p (s)) - { - Real dy = gh_scm2double (s) * staff_space; - me->set_grob_property ("dy", gh_double2scm (dy)); + me->set_grob_property ("positions", ly_interval2scm (pos)); } - return SCM_UNSPECIFIED; } /* - Ugh, this must be last, after user_override - Assumes directionised y/dy. + Report slice containing the numbers that are both in (car BEAMING) + and (cdr BEAMING) */ -MAKE_SCHEME_CALLBACK (Beam, do_quantise_y, 1); -SCM -Beam::do_quantise_y (SCM smob) +Slice +where_are_the_whole_beams(SCM beaming) { - 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")); + Slice l; - y_shift = check_stem_length_f (me, y, dy); - - if (y_shift > half_space / 4) + for( SCM s = gh_car (beaming); gh_pair_p (s) ; s = gh_cdr (s)) { - 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); + if (scm_memq (gh_car (s), gh_cdr (beaming)) != SCM_BOOL_F) + + l.add_point (gh_scm2int (gh_car (s))); } - - 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) -{ - 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) ; - - // 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; - - /* 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; + return l; } +/* Return the Y position of the stem-end, given the Y-left, Y-right + in POS for stem S. This Y position is relative to S. */ Real -Beam::check_stem_length_f (Grob*me,Real y, Real dy) +Beam::calc_stem_y (Grob *me, Grob* s, Grob ** common, + Real xl, Real xr, + Interval pos, bool french) { - Real shorten = 0; - Real lengthen = 0; - Direction dir = Directional_element_interface::get (me); + Real beam_translation = get_beam_translation (me); - Link_array stems= - Pointer_group_interface__extract_elements (me, (Item*)0, "stems"); - - for (int i=0; i < stems.size(); i++) + + Real r = s->relative_coordinate (common[X_AXIS], X_AXIS) - xl; + Real dy = pos.delta (); + Real dx = xr - xl; + Real stem_y_beam0 = (dy && dx + ? r / dx + * dy + : 0) + pos[LEFT]; + + Direction my_dir = Directional_element_interface::get (s); + SCM beaming = s->get_grob_property ("beaming"); + + Real stem_y = stem_y_beam0; + if (french) { - Item* s = stems[i]; - if (Stem::invisible_b (s)) - continue; - - Real stem_y = calc_stem_y_f (me, s, y, dy); - - stem_y *= dir; - Stem_info info = Stem::calc_stem_info (s); - - // if (0 > info.maxy_f_ - stem_y) - shorten = shorten ? info.miny_f_ - stem_y; + Slice bm = where_are_the_whole_beams (beaming); + if (!bm.empty_b()) + stem_y += beam_translation * bm[-my_dir]; } - - if (lengthen && shorten) - warning (_ ("weird beam vertical offset")); - - /* when all stems are too short, normal stems win */ - return dir * ((shorten) ? shorten : lengthen); + else + { + Slice bm = Stem::beam_multiplicity(s); + if (!bm.empty_b()) + stem_y +=bm[my_dir] * beam_translation; + } + + Real id = me->relative_coordinate (common[Y_AXIS], Y_AXIS) + - s->relative_coordinate (common[Y_AXIS], Y_AXIS); + + return stem_y + id; } /* @@ -645,297 +1201,109 @@ Beam::check_stem_length_f (Grob*me,Real y, Real dy) void Beam::set_stem_lengths (Grob *me) { - if (visible_stem_count (me) <= 1) + Link_array stems= + Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems"); + + if (stems.size () <= 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"); + Grob *common[2]; + for (int a = 2; a--;) + common[a] = common_refpoint_of_array (stems, me, Axis(a)); + + Interval pos = ly_scm2interval (me->get_grob_property ("positions")); + Real staff_space = Staff_symbol_referencer::staff_space (me); - 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); + bool french = to_boolean (me->get_grob_property ("french-beaming")); + + bool gap = false; + Real thick =0.0; + if (gh_number_p (me->get_grob_property ("gap")) + &&gh_scm2double (me->get_grob_property ("gap"))) + { + gap = true; + thick = get_thickness(me); + } + + // ugh -> use commonx + Grob * fvs = first_visible_stem (me); + Grob *lvs = last_visible_stem (me); + + Real xl = fvs ? fvs->relative_coordinate (common[X_AXIS], X_AXIS) : 0.0; + Real xr = lvs ? lvs->relative_coordinate (common[X_AXIS], X_AXIS) : 0.0; + for (int i=0; i < stems.size (); i++) { - Item* s = stems[i]; + Grob* 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, common, + xl, xr, + pos, french && i > 0&& (i < stems.size () -1)); - /* 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); + /* + Make the stems go up to the end of the beam. This doesn't matter + for normal beams, but for tremolo beams it looks silly otherwise. + */ + if (gap) + stem_y += thick * 0.5 * Directional_element_interface::get(s); + + Stem::set_stemend (s, 2* stem_y / staff_space); } } -/* - 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++) - { - do - { - /* Don't overwrite user override (?) */ - if (Stem::beam_count (stems[i], d) == 0 - /* 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); - } -} - - - -/* - beams to go with one stem. - - FIXME: clean me up. - */ -Molecule -Beam::stem_beams (Grob*me,Item *here, Item *next, Item *prev) -{ - // 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; - - Molecule leftbeams; - Molecule rightbeams; - - Real nw_f; - if (!Stem::first_head (here)) - nw_f = 0; - 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); - - /* half beams extending to the left. */ - if (prev) + for (int i=0; i < stems.size (); i++) { - 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); - w = w/2 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); - 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 nogap = rwholebeams - gap_i; - - for (; j < nogap; j++) + SCM beaming_prop = stems[i]->get_grob_property ("beaming"); + if (beaming_prop == SCM_EOL || + index_get_cell (beaming_prop, d) == SCM_EOL) { - Molecule b (a); - b.translate_axis (-dir * bdy * j, Y_AXIS); - rightbeams.add_molecule (b); + int b = beaming->infos_.elem (i).beams_i_drul_[d]; + Stem::set_beaming (stems[i], b, d); } - // TODO: notehead widths differ for different types - gap_f = nw_f / 2; - w -= 2 * gap_f; - a = Lookup::beam (dydx, w + stemdx, thick); - } - - for (; j < rwholebeams; j++) - { - Molecule b (a); - b.translate (Offset (Stem::invisible_b (here) ? 0 : gap_f, -dir * bdy * j)); - rightbeams.add_molecule (b); - } - - w = w/2 get_grob_property ("stems"))) - return SCM_EOL; - Real x0,dx; - Link_arraystems = - Pointer_group_interface__extract_elements (me, (Item*) 0, "stems"); - if (visible_stem_count (me)) - { - // 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; - } - - - 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")); - - - for (int j=0; j 0)? stems[j-1] : 0; - Item * next = (j < stems.size()-1) ? stems[j+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)); - mol.add_molecule (sb); + while (flip (&d) != LEFT); } - mol.translate_axis (x0 - - dynamic_cast (me)->get_bound (LEFT)->relative_coordinate (0, X_AXIS), X_AXIS); - - 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"); + Link_arraystems = + Pointer_group_interface__extract_grobs (me, (Grob*) 0, "stems"); int f = 0; for (int i=0; i < stems.size (); i++) { - Item *s = stems[i]; + Grob *s = stems[i]; if (Stem::invisible_b (s)) continue; - if (((int)Stem::chord_start_f (s)) - && (Stem::get_direction (s ) != Stem::get_default_dir (s ))) + /* I can imagine counting those boundaries as a half forced stem, + but let's count them full for now. */ + if (abs (Stem::chord_start_y (s)) > 0.1 + && (Stem::get_direction (s) != Stem::get_default_dir (s))) f++; } return f; @@ -944,14 +1312,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"); + Link_arraystems = + Pointer_group_interface__extract_grobs (me, (Grob*) 0, "stems"); int c = 0; for (int i = stems.size (); i--;) { @@ -961,11 +1326,11 @@ Beam::visible_stem_count (Grob*me) return c; } -Item* -Beam::first_visible_stem(Grob*me) +Grob* +Beam::first_visible_stem (Grob *me) { - Link_arraystems = - Pointer_group_interface__extract_elements ( me, (Item*) 0, "stems"); + Link_arraystems = + Pointer_group_interface__extract_grobs (me, (Grob*) 0, "stems"); for (int i = 0; i < stems.size (); i++) { @@ -975,11 +1340,11 @@ Beam::first_visible_stem(Grob*me) return 0; } -Item* -Beam::last_visible_stem(Grob*me) +Grob* +Beam::last_visible_stem (Grob *me) { - Link_arraystems = - Pointer_group_interface__extract_elements ( me, (Item*) 0, "stems"); + Link_arraystems = + Pointer_group_interface__extract_grobs (me, (Grob*) 0, "stems"); for (int i = stems.size (); i--;) { if (!Stem::invisible_b (stems[i])) @@ -991,6 +1356,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. @@ -998,7 +1364,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) { @@ -1007,40 +1373,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")); @@ -1056,25 +1420,73 @@ 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::knee_b (Grob* me) { - return me->has_interface (ly_symbol2scm ("beam-interface")); + SCM k = me->get_grob_property ("knee"); + if (gh_boolean_p (k)) + return gh_scm2bool (k); + + bool knee = false; + int d = 0; + for (SCM s = me->get_grob_property ("stems"); gh_pair_p (s); s = ly_cdr (s)) + { + Direction dir = Directional_element_interface::get + (unsmob_grob (ly_car (s))); + if (d && d != dir) + { + knee = true; + break; + } + d = dir; + } + + me->set_grob_property ("knee", gh_bool2scm (knee)); + + return knee; } -void -Beam::set_interface (Grob*me) +int +Beam::get_direction_beam_count (Grob *me, Direction d ) { -#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 + Link_arraystems = + Pointer_group_interface__extract_grobs (me, (Grob*) 0, "stems"); + int bc = 0; + + for (int i = stems.size (); i--;) + { + /* + Should we take invisible stems into account? + */ + if (Stem::get_direction (stems[i]) == d) + bc = bc >? (Stem::beam_multiplicity (stems[i]).length () + 1); + } + + return bc; } + + +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. + +", + "knee french-beaming position-callbacks concaveness-gap concaveness-threshold dir-function quant-score auto-knee-gap gap chord-tremolo beamed-stem-shorten shorten least-squares-dy damping flag-width-function neutral-direction positions space-function thickness"); + +