X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam.cc;h=7539ce8907ae55b531c500a1d2ba1170f6006b74;hb=43d1c731756070519bb1229b30c7a83f275e2c6e;hp=776ea32631c28c31092bf5692a2cbcb988f5704c;hpb=867530093ed5374d6e28d2c11a933f3b991c226e;p=lilypond.git diff --git a/lily/beam.cc b/lily/beam.cc index 776ea32631..7539ce8907 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -1,829 +1,1391 @@ /* beam.cc -- implement Beam - + source file of the GNU LilyPond music typesetter - - (c) 1997--2000 Han-Wen Nienhuys - Jan Nieuwenhuizen - + + (c) 1997--2004 Han-Wen Nienhuys + Jan Nieuwenhuizen */ /* - [TODO] - * shorter! (now +- 1000 lines) - * less hairy code - * move paper vars to scm +TODO: + + - Determine auto knees based on positions if it's set by the user. + + - the code is littered with * and / staff_space calls for + #'positions. Consider moving to real-world coordinates? + + Problematic issue is user tweaks (user tweaks are in staff-coordinates.) + +Notes: + + - Stems run to the Y-center of the beam. + + - beam_translation is the offset between Y centers of the beam. - remove *-hs variables, and do all y-position stuff in staff-space. */ #include // tanh. -#include "molecule.hh" +#include "stencil.hh" #include "directional-element-interface.hh" #include "beaming.hh" #include "beam.hh" #include "misc.hh" #include "least-squares.hh" #include "stem.hh" -#include "paper-def.hh" +#include "output-def.hh" #include "lookup.hh" #include "group-interface.hh" #include "staff-symbol-referencer.hh" -#include "cross-staff.hh" #include "item.hh" #include "spanner.hh" #include "warn.hh" + +#if DEBUG_QUANTING +#include "text-item.hh" // debug output. +#include "font-interface.hh" // debug output. +#endif + + void -Beam::add_stem (Score_element*me, Score_element*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)); - s->set_elt_property ("beam", me->self_scm ()); + assert (!Stem::get_beam (s)); + s->set_property ("beam", me->self_scm ()); add_bound_item (dynamic_cast (me), dynamic_cast (s)); } + +Real +Beam::get_thickness (Grob * me) +{ + return robust_scm2double (me->get_property ("thickness"), 0) + * Staff_symbol_referencer::staff_space (me); +} + +/* Return the translation between 2 adjoining beams. */ +Real +Beam::get_beam_translation (Grob *me) +{ + SCM func = me->get_property ("space-function"); + + if (ly_c_procedure_p (func)) + { + SCM s = scm_call_2 (func, me->self_scm (), scm_int2num (get_beam_count (me))); + return ly_scm2double (s); + } + else + { + return 0.81; + } +} + +/* Maximum beam_count. */ int -Beam::get_multiplicity (Score_element*me) +Beam::get_beam_count (Grob *me) { int m = 0; - for (SCM s = me->get_elt_property ("stems"); gh_pair_p (s); s = gh_cdr (s)) + for (SCM s = me->get_property ("stems"); ly_c_pair_p (s); s = ly_cdr (s)) { - Score_element * sc = unsmob_element (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'.] + Space return space between beams. */ -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) { - Score_element * me = unsmob_element (smob); + Grob *me = unsmob_grob (smob); + + Real staff_space = Staff_symbol_referencer::staff_space (me); + Real line = Staff_symbol_referencer::line_thickness (me); + Real thickness = get_thickness (me); + + Real beam_translation = ly_scm2int (beam_count) < 4 + ? (2*staff_space + line - thickness) / 2.0 + : (3*staff_space + line - thickness) / 3.0; + + return scm_make_real (beam_translation); +} - // Why? - 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_property ("stems"); + if (scm_ilength (stems) == 1) + { + me->warning (_ ("removing beam with less than two stems")); + + unsmob_grob (ly_car (stems))->set_property ("beam", SCM_EOL); + me->suicide (); + + return SCM_UNSPECIFIED; + } + else if (scm_ilength (stems) == 0) + { + me->suicide (); + return SCM_UNSPECIFIED; + } } + if (count >= 1) + { + Direction d = get_default_dir (me); - if (!Directional_element_interface::get (me)) - Directional_element_interface::set (me, get_default_dir (me)); + consider_auto_knees (me); + set_stem_directions (me, d); - auto_knees (me); - set_stem_directions (me); - set_stem_shorten (me); + connect_beams (me); + + set_stem_shorten (me); + } return SCM_EOL; } -Direction -Beam::get_default_dir (Score_element*me) -{ - Drul_array total; - total[UP] = total[DOWN] = 0; - Drul_array count; - count[UP] = count[DOWN] = 0; - Direction d = DOWN; - Link_array stems= - Pointer_group_interface__extract_elements (me, (Item*)0, "stems"); +/* + 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 - for (int i=0; i get_elt_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]))); + if (count >= best_count) + { + best_count = count; + best_start = i; + } + } - if (gh_number_p (s) && gh_scm2int (s)) - return to_dir (s); - - /* - If dir is not determined: get default - */ - return to_dir (me->get_elt_property ("default-neutral-direction")); + 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_property ("beaming"); + + Direction this_dir = get_grob_direction (this_stem); + if (ly_c_pair_p (last_beaming) && ly_c_pair_p (this_beaming)) + { + 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 (; ly_c_pair_p (s); s = ly_cdr (s)) + { + int new_beam_pos = + start_point - this_dir * ly_scm2int (ly_car (s)); + + new_slice.add_point (new_beam_pos); + scm_set_car_x (s, scm_int2num (new_beam_pos)); + } + + + } + while (flip (&d) != LEFT); + + if (!new_slice.is_empty ()) + last_int = new_slice; + } + else + { + scm_set_car_x ( this_beaming, SCM_EOL); + SCM s = ly_cdr (this_beaming); + for (; ly_c_pair_p (s); s = ly_cdr (s)) + { + int np = - this_dir * ly_scm2int (ly_car (s)); + scm_set_car_x (s, scm_int2num (np)); + last_int.add_point (np); + } + } + + if (i == stems.size () -1) + { + scm_set_cdr_x (this_beaming, SCM_EOL); + } + + if (scm_ilength (ly_cdr (this_beaming)) > 0) + { + last_beaming = this_beaming; + last_dir = this_dir; + } + } + } + /* - Set all stems with non-forced direction to beam direction. - Urg: non-forced should become `without/with unforced' direction, - once stem gets cleaned-up. + TODO: should not make beams per stem, but per Y-level. */ -void -Beam::set_stem_directions (Score_element*me) +MAKE_SCHEME_CALLBACK (Beam, print, 1); +SCM +Beam::print (SCM grob) { - Link_array stems - =Pointer_group_interface__extract_elements (me, (Item*) 0, "stems"); - Direction d = Directional_element_interface::get (me); + Spanner *me = unsmob_spanner (grob); + position_beam (me); - for (int i=0; i stems= + Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems"); + Grob* xcommon = common_refpoint_of_array (stems, me, X_AXIS); + + xcommon = me->get_bound (LEFT)->common_refpoint (xcommon, X_AXIS); + xcommon = me->get_bound (RIGHT)->common_refpoint (xcommon, X_AXIS); + + Real x0, dx; + if (visible_stem_count (me)) { - Score_element *s = stems[i]; - SCM force = s->remove_elt_property ("dir-forced"); - if (!gh_boolean_p (force) || !gh_scm2bool (force)) - Directional_element_interface ::set (s,d); + // 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; } -} -void -Beam::auto_knees (Score_element*me) -{ - if (!auto_knee (me,"auto-interstaff-knee-gap", true)) - auto_knee (me, "auto-knee-gap", false); -} + SCM posns = me->get_property ("positions"); + Drul_array pos; + if (!is_number_pair (posns)) + { + programming_error ("No beam posns"); + pos = Interval (0,0); + } + else + pos= ly_scm2realdrul (posns); -/* - Simplistic auto-knees; only consider vertical gap between two - adjacent chords. + scale_drul (&pos, Staff_symbol_referencer::staff_space (me)); + + Real dy = pos[RIGHT] - pos[LEFT]; + Real dydx = (dy && dx) ? dy/dx : 0; + + Real thick = get_thickness (me); + Real bdy = get_beam_translation (me); - `Forced' stem directions are ignored. If you don't want auto-knees, - don't set, or unset autoKneeGap/autoInterstaffKneeGap. - */ -bool -Beam::auto_knee (Score_element*me, String gap_str, bool interstaff_b) -{ - bool knee_b = false; - int knee_y = 0; - SCM gap = me->get_elt_property (gap_str.ch_C()); - - Direction d = Directional_element_interface::get (me); - Link_array stems= - Pointer_group_interface__extract_elements (me, (Item*)0, "stems"); - - if (gh_number_p (gap)) - { - Spanner*sp = dynamic_cast (me); - int auto_gap_i = gh_scm2int (gap); - for (int i=1; i < stems.size (); i++) - { - bool is_b = (bool)(calc_interstaff_dist (stems[i], sp) - - calc_interstaff_dist (stems[i-1], sp)); - int l_y = (int)(Stem::head_positions(stems[i-1])[d]) - + (int)calc_interstaff_dist (stems[i-1], sp); - int r_y = (int)(Stem::head_positions(stems[i])[d]) - + (int)calc_interstaff_dist (stems[i], sp); - int gap_i = r_y - l_y; - - if ((abs (gap_i) >= auto_gap_i) && (!interstaff_b || is_b)) + SCM last_beaming = SCM_EOL; + Real last_xposn = -1; + Real last_stem_width = -1 ; + + Real gap_length = robust_scm2double (me->get_property ("gap"), 0.0); + + Stencil the_beam; + Real lt = me->get_paper ()->get_dimension (ly_symbol2scm ("linethickness")); + + for (int i = 0; i<= stems.size (); i++) + { + Grob * st = (i < stems.size ()) ? stems[i] : 0; + + SCM this_beaming = st ? st->get_property ("beaming") : SCM_EOL; + Real xposn = st ? st->relative_coordinate (xcommon, X_AXIS) : 0.0; + Real stem_width = st ? robust_scm2double (st->get_property ("thickness"), 1.0) *lt : 0 ; + Direction stem_dir = st ? to_dir (st->get_property ("direction")) : CENTER; + /* + We do the space left of ST, with lfliebertjes pointing to the + right from the left stem, and rfliebertjes pointing left from + right stem. + */ + SCM left = (i > 0) ? ly_cdr (last_beaming) : SCM_EOL; + SCM right = st ? ly_car (this_beaming) : SCM_EOL; + + Array full_beams; + Array lfliebertjes; + Array rfliebertjes; + + for (SCM s = left; + ly_c_pair_p (s); s =ly_cdr (s)) + { + int b = ly_scm2int (ly_car (s)); + if (scm_c_memq (ly_car (s), right) != SCM_BOOL_F) { - knee_y = (r_y + l_y) / 2; - knee_b = true; - break; + full_beams.push (b); + } + else + { + lfliebertjes.push (b); } } - } - if (knee_b) - { - for (int i=0; i < stems.size (); i++) - { - Item *s = stems[i]; - int y = (int)(Stem::head_positions(s)[d]) - + (int)calc_interstaff_dist (s, dynamic_cast (me)); + for (SCM s = right; + ly_c_pair_p (s); s =ly_cdr (s)) + { + int b = ly_scm2int (ly_car (s)); + if (scm_c_memq (ly_car (s), left) == SCM_BOOL_F) + { + rfliebertjes.push (b); + } + } + + /* + how much to stick out for beams across linebreaks + */ + Real break_overshoot = 3.0; + Real w = (i > 0 && st) ? (xposn - last_xposn) : break_overshoot; + + Real stem_offset =0.0; + if (i > 0) + { + w += last_stem_width / 2; + stem_offset = -last_stem_width / 2; + } + + if (st) + w += stem_width/ 2 ; + - Directional_element_interface::set (s,y < knee_y ? UP : DOWN); - s->set_elt_property ("dir-forced", SCM_BOOL_T); + Real blot = me->get_paper ()->get_dimension (ly_symbol2scm ("blotdiameter")); + Stencil whole = Lookup::beam (dydx, w, thick, blot); + Stencil gapped; + + int gap_count = 0; + if (ly_c_number_p (me->get_property ("gap-count"))) + { + gap_count = ly_scm2int (me->get_property ("gap-count")); + gapped = Lookup::beam (dydx, w - 2 * gap_length, thick, blot); + + full_beams.sort (default_compare); + if (stem_dir == UP) + full_beams.reverse (); + } + + int k = 0; + for (int j = full_beams.size (); j--;) + { + Stencil b (whole); + + if (k++ < gap_count) + { + b = gapped; + b.translate_axis (gap_length, X_AXIS); + } + b.translate_axis (last_xposn - x0 + stem_offset, X_AXIS); + b.translate_axis (dydx * (last_xposn - x0) + bdy * full_beams[j], Y_AXIS); + + the_beam.add_stencil (b); + } + + if (lfliebertjes.size () || rfliebertjes.size ()) + { + Real nw_f; + + if (st) + { + int t = Stem::duration_log (st); + + SCM proc = me->get_property ("flag-width-function"); + SCM result = scm_call_1 (proc, scm_int2num (t)); + nw_f = ly_scm2double (result); + } + else + nw_f = break_overshoot / 2; + + /* Half beam should be one note-width, + but let's make sure two half-beams never touch */ + Real lw = nw_f; + Real rw = nw_f; + if (i > 0) + rw = nw_f get_bound (LEFT)->extent (xcommon, X_AXIS)[RIGHT] + - 0.5; + + if (st) + lw = nw_f get_bound (RIGHT)->relative_coordinate (xcommon, X_AXIS) + - last_xposn; + + Stencil rhalf = Lookup::beam (dydx, rw, thick, blot); + Stencil lhalf = Lookup::beam (dydx, lw, thick, blot); + for (int j = lfliebertjes.size (); j--;) + { + Stencil b (lhalf); + b.translate_axis (last_xposn - x0, X_AXIS); + b.translate_axis (dydx * (last_xposn-x0) + bdy * lfliebertjes[j], Y_AXIS); + the_beam.add_stencil (b); + } + for (int j = rfliebertjes.size (); j--;) + { + Stencil b (rhalf); + b.translate_axis (xposn - x0 - rw , X_AXIS); + b.translate_axis (dydx * (xposn-x0 -rw) + bdy * rfliebertjes[j], Y_AXIS); + the_beam.add_stencil (b); + } } + + + last_xposn = xposn; + last_stem_width = stem_width; + last_beaming = this_beaming; } - return knee_b; + + the_beam.translate_axis (x0 - me->relative_coordinate (xcommon, X_AXIS), X_AXIS); + the_beam.translate_axis (pos[LEFT], Y_AXIS); + +#if (DEBUG_QUANTING) + SCM quant_score = me->get_property ("quant-score"); + if (to_boolean (me->get_paper ()->lookup_variable (ly_symbol2scm ("debug-beam-quanting"))) + && ly_c_string_p (quant_score)) + { + + /* + This code prints the demerits for each beam. Perhaps this + should be switchable for those who want to twiddle with the + parameters. + */ + String str; + SCM properties = Font_interface::text_font_alist_chain (me); + + Direction stem_dir = stems.size() ? to_dir (stems[0]->get_property ("direction")) : UP; + + Stencil tm = *unsmob_stencil (Text_item::interpret_markup + (me->get_paper ()->self_scm (), properties, quant_score)); + the_beam.add_at_edge (Y_AXIS, stem_dir, tm, 1.0, 0); + } +#endif + + return the_beam.smobbed_copy (); } + -/* - Set stem's shorten property if unset. - TODO: - take some y-position (chord/beam/nearest?) into account - scmify forced-fraction - */ -void -Beam::set_stem_shorten (Score_element*m) + + +Direction +Beam::get_default_dir (Grob *me) { - Spanner*me = dynamic_cast (m); - if (!visible_stem_count (me)) - return; + Drul_array total; + total[UP] = total[DOWN] = 0; + Drul_array count; + count[UP] = count[DOWN] = 0; + Direction d = DOWN; - Real forced_fraction = forced_stem_count (me) / visible_stem_count (me); - if (forced_fraction < 0.5) - return; + Link_array stems= + Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems"); - int multiplicity = get_multiplicity (me); + for (int i=0; i < stems.size (); i++) + do { + Grob *s = stems[i]; + Direction sd = get_grob_direction (s); - SCM shorten = me->get_elt_property ("beamed-stem-shorten"); - if (shorten == SCM_EOL) - return; + int center_distance = int (- d * Stem::head_positions (s) [-d]) >? 0; + int current = sd ? (1 + d * sd)/2 : center_distance; - int sz = scm_ilength (shorten); + if (current) + { + total[d] += current; + count[d] ++; + } + } while (flip (&d) != DOWN); - Real staff_space = Staff_symbol_referencer::staff_space (me); - SCM shorten_elt = scm_list_ref (shorten, gh_int2scm (multiplicity get_property ("dir-function"); + SCM s = scm_call_2 (func, + scm_cons (scm_int2num (count[UP]), + scm_int2num (count[DOWN])), + scm_cons (scm_int2num (total[UP]), + scm_int2num (total[DOWN]))); + + if (ly_c_number_p (s) && ly_scm2int (s)) + return to_dir (s); + + /* If dir is not determined: get default */ + return to_dir (me->get_property ("neutral-direction")); +} - Link_array stems= - Pointer_group_interface__extract_elements (me, (Item*)0, "stems"); - for (int i=0; i < stems.size (); i++) +/* 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, Direction d) +{ + Link_array stems + =Pointer_group_interface__extract_grobs (me, (Grob*) 0, "stems"); + + for (int i=0; i get_elt_property ("shorten"))) - s->set_elt_property ("shorten", gh_double2scm (shorten_f)); + Grob *s = stems[i]; + + SCM forcedir = s->get_property ("direction"); + if (!to_dir (forcedir)) + set_grob_direction (s, d); } } /* - Set elt properties height and y-position if not set. - Adjust stem lengths to reach beam. + A union of intervals in the real line. + + 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. */ -MAKE_SCHEME_CALLBACK(Beam,after_line_breaking,1); -SCM -Beam::after_line_breaking (SCM smob) +struct Int_set { - Score_element * me = unsmob_element (smob); + Array allowed_regions_; - /* first, calculate y, dy */ - Real y, dy; - calc_default_position_and_height (me, &y, &dy); - if (visible_stem_count (me)) - { - if (suspect_slope_b (me, y, dy)) - dy = 0; + Int_set () + { + set_full (); + } - Real damped_dy = calc_slope_damping_f (me, dy); - Real quantised_dy = quantise_dy_f (me, damped_dy); + void set_full () + { + allowed_regions_.clear (); + Interval s; + s.set_full (); + allowed_regions_.push (s); + } - y += (dy - quantised_dy) / 2; - dy = quantised_dy; - } - /* - until here, we used only stem_info, which acts as if dir=up - */ - y *= Directional_element_interface::get (me); - dy *= Directional_element_interface::get (me); + void remove_interval (Interval rm) + { + for (int i = 0; i < allowed_regions_.size (); ) + { + Interval s = rm; + + s.intersect (allowed_regions_[i]); + + if (!s.is_empty ()) + { + Interval before = allowed_regions_[i]; + Interval after = allowed_regions_[i]; + + before[RIGHT] = s[LEFT]; + after[LEFT] = s[RIGHT]; + + if (!before.is_empty () && before.length () > 0.0) + { + allowed_regions_.insert (before, i); + i++; + } + allowed_regions_.del (i); + if (!after.is_empty () && after.length () > 0.0) + { + allowed_regions_.insert (after, i); + i++; + } + } + else + i++; + } + } +}; - Real half_space = Staff_symbol_referencer::staff_space (me) / 2; +/* + 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) +{ + SCM scm = me->get_property ("auto-knee-gap"); + if (!ly_c_number_p (scm)) + return ; - /* weird: why do we do calc_position_and_height () ? regardless of - this setting? + Real threshold = ly_scm2double (scm); + + Int_set gaps; - */ - /* check for user-override of dy */ - SCM s = me->remove_elt_property ("height-hs"); - if (gh_number_p (s)) - { - dy = gh_scm2double (s) * half_space; - } - me->set_elt_property ("height", gh_double2scm (dy)); + gaps.set_full (); - /* check for user-override of y */ - s = me->remove_elt_property ("y-position-hs"); - if (gh_number_p (s)) + 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++) { - y = gh_scm2double (s) * half_space; - } - else - { - /* we can modify y, so we should quantise y */ - Real y_shift = check_stem_length_f (me, y, dy); - y += y_shift; - y = quantise_y_f (me,y, dy, 0); - set_stem_length (me, y, dy); - y_shift = check_stem_length_f (me, y, dy); - - if (y_shift > half_space / 4) + Grob* stem = stems[i]; + if (Stem::is_invisible (stem)) + continue; + + Interval hps = Stem::head_positions (stem); + if (!hps.is_empty ()) { - y += y_shift; + hps[LEFT] += -1; + hps[RIGHT] += 1; + hps *= staff_space * 0.5 ; /* - 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); + 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_property ("direction"))) + { + Direction stemdir = to_dir (stem->get_property ("direction")); + hps[-stemdir] = - stemdir * infinity_f; + } } + hps_array.push (hps); + + gaps.remove_interval (hps); } - // UGH. Y is not in staff position unit? - // Ik dacht datwe daar juist van weg wilden? - set_stem_length (me, y, dy); - me->set_elt_property ("y-position", gh_double2scm (y)); - return SCM_UNSPECIFIED; -} + Interval max_gap; + Real max_gap_len =0.0; -/* - See Documentation/tex/fonts.doc - */ -void -Beam::calc_default_position_and_height (Score_element*me,Real* y, Real* dy) -{ - *y = 0; - *dy = 0; - if (visible_stem_count (me) <= 1) - return; - - 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_) + for (int i = gaps.allowed_regions_.size () -1; i >= 0 ; i--) { - *dy = 0; - *y = first_ideal; - return; + Interval gap = gaps.allowed_regions_[i]; + + /* + the outer gaps are not knees. + */ + if (isinf (gap[LEFT]) || isinf (gap[RIGHT])) + continue; + + if (gap.length () >= max_gap_len) + { + max_gap_len = gap.length (); + max_gap = gap; + } } - Array ideals; + if (max_gap_len > threshold) + { + int j = 0; + for (int i = 0; i < stems.size (); i++) + { + Grob* stem = stems[i]; + if (Stem::is_invisible (stem)) + continue; + + Interval hps = hps_array[j++]; - // 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"); - 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_)); + Direction d = (hps.center () < max_gap.center ()) ? + UP : DOWN ; + + stem->set_property ("direction", scm_int2num (d)); + + hps.intersect (max_gap); + assert (hps.is_empty () || hps.length () < 1e-6 ); + } } - Real dydx; - minimise_least_squares (&dydx, y, ideals); // duh, takes references - - Real dx = last_visible_stem (me)->relative_coordinate (0, X_AXIS) - x0; - *dy = dydx * dx; } -bool -Beam::suspect_slope_b (Score_element*me, Real y, Real dy) -{ - /* first, calculate y, 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_elt_property ("outer-stem-length-limit")); - Real steep = gh_scm2double (me->get_elt_property ("slope-limit")); - // 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; - if (((y - first_ideal > lengthened) && (dydx > steep)) - || ((y + dy - last_ideal > lengthened) && (dydx < -steep))) - { - return true; - } - return false; -} +/* Set stem's shorten property if unset. + + TODO: + 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. -/* - This neat trick is by Werner Lemberg, - damped = tanh (slope) - corresponds with some tables in [Wanske] */ -Real -Beam::calc_slope_damping_f (Score_element*me,Real dy) +void +Beam::set_stem_shorten (Grob *me) { - SCM damp = me->get_elt_property ("damping"); - int damping = gh_scm2int (damp); + /* + shortening looks silly for x staff beams + */ + if (is_knee (me)) + return ; + + Real forced_fraction = 1.0 * forced_stem_count (me) + / visible_stem_count (me); - if (damping) - { - // 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; - return dydx * dx; - } - return dy; -} + int beam_count = get_beam_count (me); -Real -Beam::calc_stem_y_f (Score_element*me,Item* s, Real y, Real dy) -{ - int beam_multiplicity = get_multiplicity (me); - int stem_multiplicity = (Stem::flag_i (s) - 2) >? 0; + SCM shorten_list = me->get_property ("beamed-stem-shorten"); + if (shorten_list == SCM_EOL) + return; - SCM space_proc = me->get_elt_property ("space-function"); - SCM space = gh_call1 (space_proc, gh_int2scm (beam_multiplicity)); + Real staff_space = Staff_symbol_referencer::staff_space (me); + + SCM shorten_elt = + robust_list_ref (beam_count -1, shorten_list); + Real shorten_f = ly_scm2double (shorten_elt) * staff_space; - Real thick = gh_scm2double (me->get_elt_property ("thickness")) ; - Real interbeam_f = gh_scm2double (space) ; + /* your similar cute comment here */ + shorten_f *= forced_fraction; - // 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); + if (shorten_f) + me->set_property ("shorten", scm_make_real (shorten_f)); +} +/* Call list of y-dy-callbacks, that handle setting of + grob-properties - - // 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; - } +*/ +MAKE_SCHEME_CALLBACK (Beam, after_line_breaking, 1); +SCM +Beam::after_line_breaking (SCM smob) +{ + Grob *me = unsmob_grob (smob); - return stem_y; + position_beam (me); + return SCM_UNSPECIFIED; } -Real -Beam::check_stem_length_f (Score_element*me,Real y, Real dy) +void +Beam::position_beam (Grob *me) { - 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"); + if (to_boolean (me->get_property ("positioning-done"))) + return ; - for (int i=0; i < stems.size(); i++) - { - Item* s = stems[i]; - if (Stem::invisible_b (s)) - continue; + me->set_property ("positioning-done", SCM_BOOL_T); - Real stem_y = calc_stem_y_f (me, s, y, dy); - - stem_y *= dir; - Stem_info info = Stem::calc_stem_info (s); + /* Copy to mutable list. */ + SCM s = ly_deep_copy (me->get_property ("positions")); + me->set_property ("positions", s); - // if (0 > info.maxy_f_ - stem_y) - shorten = shorten ? info.miny_f_ - stem_y; + if (ly_car (s) == SCM_BOOL_F) + { + // one wonders if such genericity is necessary --hwn. + SCM callbacks = me->get_property ("position-callbacks"); + for (SCM i = callbacks; ly_c_pair_p (i); i = ly_cdr (i)) + scm_call_1 (ly_car (i), me->self_scm ()); } - if (lengthen && shorten) - warning (_ ("weird beam vertical offset")); - - /* when all stems are too short, normal stems win */ - return dir * ((shorten) ? shorten : lengthen); + set_stem_lengths (me); } + /* - Hmm. At this time, beam position and slope are determined. Maybe, - stem directions and length should set to relative to the chord's - position of the beam. */ -void -Beam::set_stem_length (Score_element*me,Real y, Real dy) + Compute a first approximation to the beam slope. + */ +MAKE_SCHEME_CALLBACK (Beam, least_squares, 1); +SCM +Beam::least_squares (SCM smob) { - Real half_space = Staff_symbol_referencer::staff_space (me)/2; - Link_array stems= - Pointer_group_interface__extract_elements (me, (Item*)0, "stems"); + Grob *me = unsmob_grob (smob); - - for (int i=0; i < stems.size (); i++) + int count = visible_stem_count (me); + Interval pos (0, 0); + + if (count < 1) { - Item* s = stems[i]; - if (Stem::invisible_b (s)) - continue; - - Real stem_y = calc_stem_y_f (me, s, y, dy); - - /* caution: stem measures in staff-positions */ - Stem::set_stemend (s,(stem_y + calc_interstaff_dist (s, dynamic_cast (me))) / half_space); + me->set_property ("positions", ly_interval2scm (pos)); + return SCM_UNSPECIFIED; } -} -/* - [Ross] (simplification of) - Set dy complying with: - - zero - - thick / 2 + staffline_f / 2 - - thick + staffline_f - + n * staff_space -*/ -Real -Beam::quantise_dy_f (Score_element*me,Real dy) -{ - Array a; - SCM proc = me->get_elt_property ("height-quants"); - SCM quants = gh_call2 (proc, me->self_scm (), - gh_double2scm (me->paper_l ()->get_var ("stafflinethickness") - / 1.0)); + 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); - for (SCM s = quants; gh_pair_p (s); s = gh_cdr (s)) - a.push (gh_scm2double (gh_car (s))); + 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); - if (a.size () <= 1) - return dy; + Real x0 = first_visible_stem (me)->relative_coordinate (commonx, X_AXIS); + for (int i=0; i < stems.size (); i++) + { + Grob* s = stems[i]; - Real staff_space = Staff_symbol_referencer::staff_space (me); + Real x = s->relative_coordinate (commonx, X_AXIS) - x0; + x_posns.push (x); + } + Real dx = last_visible_stem (me)->relative_coordinate (commonx, X_AXIS) - x0; + + + Real y =0; + Real dydx = 0; + Real dy = 0; - 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]; + if (!ideal.delta ()) + { + Interval chord (Stem::chord_start_y (first_visible_stem (me)), + Stem::chord_start_y (last_visible_stem (me))); + + /* 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] = get_thickness (me) / 2; + pos[-d] = - pos[d]; + } + else + { + pos = ideal; + } + + /* + For broken beams this doesn't work well. In this case, the + slope esp. of the first part of a broken beam should predict + where the second part goes. + */ + me->set_property ("least-squares-dy", + scm_make_real (pos[RIGHT] - pos[LEFT])); + } + else + { + Array ideals; + for (int i=0; i < stems.size (); i++) + { + Grob* s = stems[i]; + if (Stem::is_invisible (s)) + continue; + ideals.push (Offset (x_posns[i], + Stem::get_stem_info (s).ideal_y_ + + s->relative_coordinate (commony, Y_AXIS) + - my_y)); + } + + minimise_least_squares (&dydx, &y, ideals); + + dy = dydx * dx; + me->set_property ("least-squares-dy", scm_make_real (dy)); + pos = Interval (y, (y+dy)); + } + + /* + "position" is relative to the staff. + */ + scale_drul (&pos, 1/ Staff_symbol_referencer::staff_space (me)); - return q * sign (dy); + me->set_property ("positions", ly_interval2scm (pos)); + + return SCM_UNSPECIFIED; } + /* - Prevent interference from stafflines and beams. - See Documentation/tex/fonts.doc + We can't combine with previous function, since check concave and + slope damping comes first. - We only need to quantise the (left) y-position of the beam, - since dy is quantised too. - if extend_b then stems must *not* get shorter +TODO: we should use the concaveness to control the amount of damping +applied. + */ -Real -Beam::quantise_y_f (Score_element*me,Real y, Real dy, int quant_dir) +MAKE_SCHEME_CALLBACK (Beam, shift_region_to_valid, 1); +SCM +Beam::shift_region_to_valid (SCM grob) { - int multiplicity = get_multiplicity (me); + 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); - Real staff_space = Staff_symbol_referencer::staff_space (me); - Real thick = me->paper_l ()->get_var ("stafflinethickness"); + 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; + + Drul_array pos = ly_scm2interval ( me->get_property ("positions")); + scale_drul (&pos, Staff_symbol_referencer::staff_space (me)); + + Real dy = pos[RIGHT] - pos[LEFT]; + Real y = pos[LEFT]; + Real dydx =dy/dx; - SCM proc = me->get_elt_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; + /* + 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::is_invisible (s)) + continue; - for (; gh_pair_p (quants); quants = gh_cdr (quants)) - a.push (gh_scm2double (gh_car (quants))); + Direction d = Stem::get_direction (s); - if (a.size () <= 1) - return y; + Real left_y = + Stem::get_stem_info (s).shortest_y_ + - dydx * x_posns [i]; - Real up_y = Directional_element_interface::get (me) * y; - Interval iv = quantise_iv (a, up_y/staff_space) * staff_space; + /* + 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); - Real q = up_y - iv[SMALLER] <= iv[BIGGER] - up_y - ? iv[SMALLER] : iv[BIGGER]; - if (quant_dir) - q = iv[(Direction)quant_dir]; + Interval flp ; + flp.set_full (); + flp[-d] = left_y; - return q * Directional_element_interface::get (me); + feasible_left_point.intersect (flp); + } + + if (feasible_left_point.is_empty ()) + warning (_ ("no viable initial configuration found: may not find good beam slope")); + else if (!feasible_left_point.contains (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 = Drul_array (y, (y+dy)); + scale_drul (&pos, 1/ Staff_symbol_referencer::staff_space (me)); + + me->set_property ("positions", ly_interval2scm (pos)); + return SCM_UNSPECIFIED; } -void -Beam::set_beaming (Score_element*me,Beaming_info_list *beaming) +MAKE_SCHEME_CALLBACK (Beam, check_concave, 1); +SCM +Beam::check_concave (SCM smob) { - Link_array stems= - Pointer_group_interface__extract_elements (me, (Score_element*)0, "stems"); - - Direction d = LEFT; - for (int i=0; i < stems.size(); i++) + Grob *me = unsmob_grob (smob); + + Link_array stems = + Pointer_group_interface__extract_grobs (me, (Grob*) 0, "stems"); + + Direction beam_dir = CENTER; + for (int i = 0; i < stems.size ();) { - do + if (Stem::is_invisible (stems[i])) + stems.del (i); + else { - if (Stem::beam_count (stems[i], d) == 0) - Stem::set_beaming ( stems[i], beaming->infos_.elem (i).beams_i_drul_[d],d); + if (Direction sd = Stem::get_direction (stems[i])) + { + /* + Don't do knee beams. + */ + if (beam_dir && sd && sd != beam_dir) + return SCM_UNSPECIFIED; + + beam_dir = sd; + } + i++; } - while (flip (&d) != LEFT); } -} - + + if (stems.size () < 3) + return SCM_UNSPECIFIED; -/* - beams to go with one stem. + /* 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). - FIXME: clean me up. + 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 + */ -Molecule -Beam::stem_beams (Score_element*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); + bool is_concave1 = false; + SCM gap = me->get_property ("concaveness-gap"); + if (ly_c_number_p (gap)) + { + Real r1 = ly_scm2double (gap); + Real dy = Stem::chord_start_y (stems.top ()) + - Stem::chord_start_y (stems[0]); - SCM space_proc = me->get_elt_property ("space-function"); - SCM space = gh_call1 (space_proc, gh_int2scm (multiplicity)); + + 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 = + beam_dir *((Stem::chord_start_y (stems[i]) - y0) - i * slope); + if (c - r1 > 0) + { + is_concave1 = true; + break; + } + } + } - Real thick = gh_scm2double (me->get_elt_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_elt_property ("height")); - Real dydx = dy && dx ? dy/dx : 0; + /* Concaveness #2: Sum distances of inner noteheads that fall + outside the interval of the two outer noteheads. - Molecule leftbeams; - Molecule rightbeams; + We only do this for beams where first and last stem have the same + direction. --hwn. - Real nw_f; - if (!Stem::first_head (here)) - nw_f = 0; - else { - int t = Stem::type_i (here); - SCM proc = me->get_elt_property ("flag-width-function"); - SCM result = gh_call1 (proc, gh_int2scm (t)); - nw_f = gh_scm2double (result); - } - - - Direction dir = Directional_element_interface::get (me); + Note that "convex" stems compensate for "concave" stems. + (is that intentional?) --hwn. + */ - /* half beams extending to the left. */ - if (prev) + Real concaveness2 = 0; + SCM thresh = me->get_property ("concaveness-threshold"); + Real r2 = infinity_f; + if (!is_concave1 && ly_c_number_p (thresh)) { - 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 ? 0) + + ( (f - iv[MIN] ) plain horizontal */ + if (is_concave1 || concaveness2 > r2) + { + Drul_array pos = ly_scm2interval (me->get_property ("positions")); + Real r = linear_combination (pos, 0.0); + + r /= Staff_symbol_referencer::staff_space (me); + me->set_property ("positions", ly_interval2scm (Drul_array (r, r))); + me->set_property ("least-squares-dy", scm_make_real (0)); } - if (next) + return SCM_UNSPECIFIED; +} + +/* 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) +{ + Grob *me = unsmob_grob (smob); + + if (visible_stem_count (me) <= 1) + return SCM_UNSPECIFIED; + + SCM s = me->get_property ("damping"); + int damping = ly_scm2int (s); + + if (damping) { - int rhalfs = Stem::beam_count (here,RIGHT) - Stem::beam_count (next,LEFT); - int rwholebeams= Stem::beam_count (here,RIGHT) pos = ly_scm2interval (me->get_property ("positions")); + scale_drul (&pos, Staff_symbol_referencer::staff_space (me)); + + Real dy = pos[RIGHT] - pos[LEFT]; - 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); - int j = 0; - Real gap_f = 0; + Grob *fvs = first_visible_stem (me); + Grob *lvs = last_visible_stem (me); - SCM gap = me->get_elt_property ("gap"); - if (gh_number_p (gap)) - { - int gap_i = gh_scm2int ( (gap)); - int nogap = rwholebeams - gap_i; - - for (; j < nogap; j++) - { - Molecule b (a); - b.translate_axis (-dir * bdy * j, Y_AXIS); - rightbeams.add_molecule (b); - } - // TODO: notehead widths differ for different types - gap_f = nw_f / 2; - w -= 2 * gap_f; - a = Lookup::beam (dydx, w + stemdx, thick); - } + Grob *commonx = fvs->common_refpoint (lvs, X_AXIS); - 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 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; - for (; j < rwholebeams + rhalfs; j++) - { - Molecule b (a); - b.translate_axis (- dir * bdy * j, Y_AXIS); - rightbeams.add_molecule (b); - } + Real damped_dy = dydx * dx; + pos[LEFT] += (dy - damped_dy) / 2; + pos[RIGHT] -= (dy - damped_dy) / 2; + scale_drul (&pos, 1/Staff_symbol_referencer::staff_space (me)); + + me->set_property ("positions", ly_interval2scm (pos)); } - leftbeams.add_molecule (rightbeams); + return SCM_UNSPECIFIED; +} - /* - Does beam quanting think of the asymetry of beams? - Refpoint is on bottom of symbol. (FIXTHAT) --hwn. - */ - return leftbeams; +/* + Report slice containing the numbers that are both in (car BEAMING) + and (cdr BEAMING) + */ +Slice +where_are_the_whole_beams (SCM beaming) +{ + Slice l; + + for ( SCM s = ly_car (beaming); ly_c_pair_p (s) ; s = ly_cdr (s)) + { + if (scm_c_memq (ly_car (s), ly_cdr (beaming)) != SCM_BOOL_F) + + l.add_point (ly_scm2int (ly_car (s))); + } + + return l; } -MAKE_SCHEME_CALLBACK(Beam,brew_molecule,1); -SCM -Beam::brew_molecule (SCM smob) +/* 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::calc_stem_y (Grob *me, Grob* s, Grob ** common, + Real xl, Real xr, + Drul_array pos, bool french) { - Score_element * me =unsmob_element (smob); - - Molecule mol; - if (!gh_pair_p (me->get_elt_property ("stems"))) - return SCM_EOL; - Real x0,dx; - Link_arraystems = - Pointer_group_interface__extract_elements (me, (Item*) 0, "stems"); - if (visible_stem_count (me)) + Real beam_translation = get_beam_translation (me); + + + Real r = s->relative_coordinate (common[X_AXIS], X_AXIS) - xl; + Real dy = pos[RIGHT] - pos[LEFT]; + Real dx = xr - xl; + Real stem_y_beam0 = (dy && dx + ? r / dx + * dy + : 0) + pos[LEFT]; + + Direction my_dir = get_grob_direction (s); + SCM beaming = s->get_property ("beaming"); + + Real stem_y = stem_y_beam0; + if (french) { - // ugh -> use commonx - x0 = first_visible_stem (me)->relative_coordinate (0, X_AXIS); - dx = last_visible_stem (me)->relative_coordinate (0, X_AXIS) - x0; + Slice bm = where_are_the_whole_beams (beaming); + if (!bm.is_empty ()) + stem_y += beam_translation * bm[-my_dir]; } else { - x0 = stems[0]->relative_coordinate (0, X_AXIS); - dx = stems.top()->relative_coordinate (0, X_AXIS) - x0; + Slice bm = Stem::beam_multiplicity (s); + if (!bm.is_empty ()) + 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); - Real dy = gh_scm2double (me->get_elt_property ("height")); - Real dydx = dy && dx ? dy/dx : 0; - Real y = gh_scm2double (me->get_elt_property ("y-position")); + return stem_y + id; +} + +/* + Hmm. At this time, beam position and slope are determined. Maybe, + stem directions and length should set to relative to the chord's + position of the beam. */ +void +Beam::set_stem_lengths (Grob *me) +{ + Link_array stems= + Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems"); + if (!stems.size ()) + return; + + Grob *common[2]; + for (int a = 2; a--;) + common[a] = common_refpoint_of_array (stems, me, Axis (a)); + + Drul_array pos = ly_scm2realdrul (me->get_property ("positions")); + Real staff_space = Staff_symbol_referencer::staff_space (me); + scale_drul (&pos, staff_space); - for (int j=0; j get_property ("gap-count")) + &&ly_scm2int (me->get_property ("gap-count"))) + { + 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 *i = stems[j]; - Item * prev = (j > 0)? stems[j-1] : 0; - Item * next = (j < stems.size()-1) ? stems[j+1] :0; + Grob* s = stems[i]; + if (Stem::is_invisible (s)) + continue; + + bool french = to_boolean (s->get_property ("french-beaming")); + Real stem_y = calc_stem_y (me, s, common, + xl, xr, + pos, french && s != lvs && s!= fvs); + + /* + 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 * get_grob_direction (s); - 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); + Stem::set_stemend (s, 2* stem_y / staff_space); } - mol.translate_axis (x0 - - dynamic_cast (me)->get_bound (LEFT)->relative_coordinate (0, X_AXIS), X_AXIS); +} - return mol.create_scheme (); +void +Beam::set_beaming (Grob *me, Beaming_info_list *beaming) +{ + Link_array stems= + Pointer_group_interface__extract_grobs (me, (Grob *)0, "stems"); + + Direction d = LEFT; + for (int i=0; i < stems.size (); i++) + { + /* + Don't overwrite user settings. + */ + + do + { + /* Don't set beaming for outside of outer stems */ + if ( (d == LEFT && i == 0) + || (d == RIGHT && i == stems.size () -1)) + continue; + + Grob *st = stems[i]; + SCM beaming_prop = st->get_property ("beaming"); + if (beaming_prop == SCM_EOL || + index_get_cell (beaming_prop, d) == SCM_EOL) + { + int b = beaming->infos_.elem (i).beams_i_drul_[d]; + if (i>0 + && i < stems.size () -1 + && Stem::is_invisible (st)) + b = b infos_.elem (i).beams_i_drul_[-d]; + + Stem::set_beaming (st, b, d); + } + } + while (flip (&d) != LEFT); + } } int -Beam::forced_stem_count (Score_element*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)) + if (Stem::is_invisible (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; @@ -832,45 +1394,42 @@ Beam::forced_stem_count (Score_element*me) -/* TODO: - use filter and standard list functions. - */ int -Beam::visible_stem_count (Score_element*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--;) { - if (!Stem::invisible_b (stems[i])) + if (!Stem::is_invisible (stems[i])) c++; } return c; } -Item* -Beam::first_visible_stem(Score_element*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++) { - if (!Stem::invisible_b (stems[i])) + if (!Stem::is_invisible (stems[i])) return stems[i]; } return 0; } -Item* -Beam::last_visible_stem(Score_element*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])) + if (!Stem::is_invisible (stems[i])) return stems[i]; } return 0; @@ -879,6 +1438,7 @@ Beam::last_visible_stem(Score_element*me) /* [TODO] + handle rest under beam (do_post: beams are calculated now) what about combination of collisions and rest under beam. @@ -886,81 +1446,133 @@ Beam::last_visible_stem(Score_element*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) { - Score_element *rest = unsmob_element (element_smob); - Axis a = (Axis) gh_scm2int (axis); + Grob *rest = unsmob_grob (element_smob); + Axis a = (Axis) ly_scm2int (axis); + + if (ly_c_number_p (rest->get_property ("staff-position"))) + return scm_int2num (0); assert (a == Y_AXIS); - Score_element * st = unsmob_element (rest->get_elt_property ("stem")); - Score_element * stem = st; + Grob *st = unsmob_grob (rest->get_property ("stem")); + Grob *stem = st; if (!stem) - return gh_double2scm (0.0); - Score_element * beam = unsmob_element (stem->get_elt_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. - SCM s = beam->get_elt_property ("height"); - if (gh_number_p (s)) - beam_dy = gh_scm2double (s); + return scm_make_real (0.0); + Grob *beam = unsmob_grob (stem->get_property ("beam")); + if (!beam + || !Beam::has_interface (beam) + || !Beam::visible_stem_count (beam)) + return scm_make_real (0.0); + + Drul_array pos (0, 0); + SCM s = beam->get_property ("positions"); + if (ly_c_pair_p (s) && ly_c_number_p (ly_car (s))) + pos = ly_scm2interval (s); + Real staff_space = Staff_symbol_referencer::staff_space (rest); + + scale_drul (&pos, staff_space); - s = beam->get_elt_property ("y-position"); - if (gh_number_p (s)) - beam_y = gh_scm2double (s); + + Real dy = pos[RIGHT] - pos[LEFT]; // 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 stem_y = pos[LEFT] + (stem->relative_coordinate (0, X_AXIS) - x0) * dydx; + + Real beam_translation = get_beam_translation (beam); + Real beam_thickness = Beam::get_thickness (beam); + + int beam_count = get_direction_beam_count (beam, d); + Real height_of_my_beams = beam_thickness / 2 + + (beam_count - 1) * beam_translation; + Real beam_y = stem_y - d * height_of_my_beams; - Real staff_space = Staff_symbol_referencer::staff_space (rest); + Grob *common_y = rest->common_refpoint (beam, Y_AXIS); - - Real rest_dim = rest->extent (rest, Y_AXIS)[d]*2.0 / staff_space ; // refp?? + Real rest_dim = rest->extent (common_y, Y_AXIS)[d]; + Real minimum_distance = + staff_space * robust_scm2double (rest->get_property ("minimum-distance"), 0.0); - Real minimum_dist - = gh_scm2double (rest->get_elt_property ("minimum-beam-collision-distance")); - Real dist = - minimum_dist + -d * (beamy - rest_dim) >? 0; + Real shift = d * ( ((beam_y - d * minimum_distance) - rest_dim) * d extent (common_y, Y_AXIS)[d] + staff_space * shift) * d + < rad + || (rest->extent (common_y, Y_AXIS)[-d] + staff_space * shift) * -d + < rad) + shift = ceil (fabs (shift)) *sign (shift); - return gh_double2scm (-d * discrete_dist); + return scm_make_real (staff_space * shift); } - bool -Beam::has_interface (Score_element*me) +Beam::is_knee (Grob* me) { - return me->has_interface (ly_symbol2scm ("beam-interface")); + SCM k = me->get_property ("knee"); + if (ly_c_boolean_p (k)) + return ly_scm2bool (k); + + bool knee = false; + int d = 0; + for (SCM s = me->get_property ("stems"); ly_c_pair_p (s); s = ly_cdr (s)) + { + Direction dir = get_grob_direction (unsmob_grob (ly_car (s))); + if (d && d != dir) + { + knee = true; + break; + } + d = dir; + } + + me->set_property ("knee", ly_bool2scm (knee)); + + return knee; } -void -Beam::set_interface (Score_element*me) +int +Beam::get_direction_beam_count (Grob *me, Direction d ) { - /* - why the init? No way to tell difference between default and user - override. */ - me->set_elt_property ("height", gh_int2scm (0)); // ugh. - me->set_elt_property ("y-position" ,gh_int2scm (0)); - me->set_interface (ly_symbol2scm("beam-interface")); + 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. \n\n" + "The @code{thickness} property is the weight of beams, and is measured " + "in staffspace" + , + "knee positioning-done position-callbacks concaveness-gap " + "concaveness-threshold dir-function quant-score auto-knee-gap gap " + "gap-count chord-tremolo beamed-stem-shorten shorten least-squares-dy " + "damping inspect-quants flag-width-function neutral-direction positions space-function " + "thickness"); + +