X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam.cc;h=f54726950f64b2cb02a92be7736db0db341ac6a5;hb=32b02b2642bd132a548afc163c28667aff074829;hp=2e223aaecc0a235052567044b9351b83b93c93fc;hpb=e10092f994cb34537e4cfb1f4848c1f610cd58ff;p=lilypond.git diff --git a/lily/beam.cc b/lily/beam.cc index 2e223aaecc..f54726950f 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -1,41 +1,39 @@ /* beam.cc -- implement Beam - + source file of the GNU LilyPond music typesetter - - (c) 1997--2002 Han-Wen Nienhuys + + (c) 1997--2005 Han-Wen Nienhuys Jan Nieuwenhuizen - */ /* - [TODO] + TODO: - * Fix TODO - - * Junk stem_info. - - * Remove #'direction from beam. A beam has no direction per se. - It may only set directions for stems. + - Determine auto knees based on positions if it's set by the user. - * Rewrite stem_beams. + - the code is littered with * and / staff_space calls for + #'positions. Consider moving to real-world coordinates? - * Use Number_pair i.s.o Interval to represent (yl, yr). + 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. +*/ #include // tanh. -#include "molecule.hh" +#include "beam.hh" +#include "interval-set.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" @@ -43,89 +41,80 @@ #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. +#include "text-item.hh" // debug output. +#include "font-interface.hh" // debug output. #endif - -const int INTER_QUANT_PENALTY = 1000; -const int SECONDARY_BEAM_DEMERIT = 15; -const int STEM_LENGTH_DEMERIT_FACTOR = 5; -// possibly ridiculous, but too short stems just won't do -const int STEM_LENGTH_LIMIT_PENALTY = 5000; -const int DAMPING_DIRECTIION_PENALTY = 800; -const int MUSICAL_DIRECTION_FACTOR = 400; -const int IDEAL_SLOPE_FACTOR = 10; -const int REGION_SIZE = 2; - - -static Real -shrink_extra_weight (Real x) -{ - return fabs (x) * ((x < 0) ? 1.5 : 1.0); -} - void Beam::add_stem (Grob *me, Grob *s) { Pointer_group_interface::add_grob (me, ly_symbol2scm ("stems"), s); - + s->add_dependency (me); - assert (!Stem::beam_l (s)); - s->set_grob_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)); + add_bound_item (dynamic_cast (me), dynamic_cast (s)); } Real -Beam::get_interbeam (Grob *me) +Beam::get_thickness (Grob *me) { - SCM func = me->get_grob_property ("space-function"); - SCM s = gh_call2 (func, me->self_scm (), gh_int2scm (get_multiplicity (me))); - return gh_scm2double (s); + return robust_scm2double (me->get_property ("thickness"), 0) + * Staff_symbol_referencer::staff_space (me); } -/* - Maximum multiplicity. - */ +/* 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 scm_to_double (s); + } + else + { + return 0.81; + } +} + +/* 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 = ly_cdr (s)) + for (SCM s = me->get_property ("stems"); scm_is_pair (s); s = scm_cdr (s)) { - Grob *sc = unsmob_grob (ly_car (s)); - - if (Stem::has_interface (sc)) - m = m >? Stem::beam_count (sc, LEFT) >? Stem::beam_count (sc, RIGHT); + Grob *stem = unsmob_grob (scm_car (s)); + m = m >? (Stem::beam_multiplicity (stem).length () + 1); } return m; } +/* + Space return space between beams. +*/ MAKE_SCHEME_CALLBACK (Beam, space_function, 2); SCM -Beam::space_function (SCM smob, SCM multiplicity) +Beam::space_function (SCM smob, SCM beam_count) { Grob *me = unsmob_grob (smob); - + Real staff_space = Staff_symbol_referencer::staff_space (me); - Real line = me->paper_l ()->get_var ("linethickness"); - Real thickness = gh_scm2double (me->get_grob_property ("thickness")) - * staff_space; - - Real interbeam = gh_scm2int (multiplicity) < 4 - ? (2*staff_space + line - thickness) / 2.0 - : (3*staff_space + line - thickness) / 3.0; - - return gh_double2scm (interbeam); -} + Real line = Staff_symbol_referencer::line_thickness (me); + Real thickness = get_thickness (me); + + Real beam_translation = scm_to_int (beam_count) < 4 + ? (2 * staff_space + line - thickness) / 2.0 + : (3 * staff_space + line - thickness) / 3.0; + return scm_make_real (beam_translation); +} /* After pre-processing all directions should be set. Several post-processing routines (stem, slur, script) need stem/beam @@ -137,27 +126,27 @@ MAKE_SCHEME_CALLBACK (Beam, before_line_breaking, 1); SCM Beam::before_line_breaking (SCM smob) { - Grob *me = unsmob_grob (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. */ + + 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) { me->warning (_ ("beam has less than two visible stems")); - SCM stems = me->get_grob_property ("stems"); + SCM stems = me->get_property ("stems"); if (scm_ilength (stems) == 1) { - me->warning (_ ("Beam has less than two stems. Removing beam.")); + me->warning (_ ("removing beam with less than two stems")); - unsmob_grob (gh_car (stems))->remove_grob_property ("beam"); + unsmob_grob (scm_car (stems))->set_property ("beam", SCM_EOL); me->suicide (); return SCM_UNSPECIFIED; @@ -165,559 +154,644 @@ Beam::before_line_breaking (SCM smob) else if (scm_ilength (stems) == 0) { me->suicide (); - return SCM_UNSPECIFIED; + return SCM_UNSPECIFIED; } } if (count >= 1) { Direction d = get_default_dir (me); - consider_auto_knees (me, d); + consider_auto_knees (me); set_stem_directions (me, d); + + connect_beams (me); + set_stem_shorten (me); } return SCM_EOL; } -Direction -Beam::get_default_dir (Grob *me) +/* 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) { - 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_grobs (me, (Item*)0, "stems"); + Slice lslice = int_list_to_slice (scm_cdr (left_beaming)); - for (int i=0; i ? 0; - int current = sd ? (1 + d * sd)/2 : center_distance; - - if (current) + 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 = scm_car (right_beaming); scm_is_pair (s); s = scm_cdr (s)) { - total[d] += current; - count[d] ++; + int k = -right_dir * scm_to_int (scm_car (s)) + i; + if (scm_c_memq (scm_int2num (k), left_beaming) != SCM_BOOL_F) + count++; } - } 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]))); - - 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 ("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. */ -void -Beam::set_stem_directions (Grob *me, Direction d) -{ - Link_array stems - =Pointer_group_interface__extract_grobs (me, (Item*) 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); + if (count >= best_count) + { + best_count = count; + best_start = i; + } } -} -/* Simplistic auto-knees; only consider vertical gap between two - adjacent chords. + return best_start; +} - `Forced' stem directions are ignored. If you don't want auto-knees, - don't set, or unset auto-knee-gap. */ void -Beam::consider_auto_knees (Grob *me, Direction d) +Beam::connect_beams (Grob *me) { - SCM scm = me->get_grob_property ("auto-knee-gap"); + Link_array stems + = extract_grob_array (me, ly_symbol2scm ("stems")); - if (gh_number_p (scm)) + Slice last_int; + last_int.set_empty (); + SCM last_beaming = SCM_EOL; + Direction last_dir = CENTER; + for (int i = 0; i < stems.size (); i++) { - bool knee_b = false; - Real knee_y = 0; - Real staff_space = Staff_symbol_referencer::staff_space (me); - Real gap = gh_scm2double (scm) / staff_space; - - - Link_array stems= - Pointer_group_interface__extract_grobs (me, (Item*)0, "stems"); - - Grob *common = me->common_refpoint (stems[0], Y_AXIS); - for (int i=1; i < stems.size (); i++) - if (!Stem::invisible_b (stems[i])) - common = common->common_refpoint (stems[i], Y_AXIS); - - int l = 0; - for (int i=1; i < stems.size (); i++) - { - 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); + Grob *this_stem = stems[i]; + SCM this_beaming = this_stem->get_property ("beaming"); - Real dy = right - left; + Direction this_dir = get_grob_direction (this_stem); + if (scm_is_pair (last_beaming) && scm_is_pair (this_beaming)) + { + int start_point = position_with_maximal_common_beams + (last_beaming, this_beaming, + last_dir, this_dir); - if (abs (dy) >= gap) + Direction d = LEFT; + Slice new_slice; + do { - knee_y = (right + left) / 2; - knee_b = true; - break; + if (d == RIGHT && i == stems.size () - 1) + continue; + + new_slice.set_empty (); + SCM s = index_get_cell (this_beaming, d); + for (; scm_is_pair (s); s = scm_cdr (s)) + { + int new_beam_pos + = start_point - this_dir * scm_to_int (scm_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; } - - if (knee_b) + else { - for (int i=0; i < stems.size (); i++) + scm_set_car_x (this_beaming, SCM_EOL); + SCM s = scm_cdr (this_beaming); + for (; scm_is_pair (s); s = scm_cdr (s)) { - if (Stem::invisible_b (stems[i])) - continue; - Item *s = stems[i]; - Real y = Stem::extremal_heads (stems[i])[d] - ->relative_coordinate (common, Y_AXIS); - - Directional_element_interface::set (s, y < knee_y ? UP : DOWN); - s->set_grob_property ("dir-forced", SCM_BOOL_T); + int np = -this_dir * scm_to_int (scm_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 (scm_cdr (this_beaming)) > 0) + { + last_beaming = this_beaming; + last_dir = this_dir; + } } } -/* Set stem's shorten property if unset. +/* + TODO: should not make beams per stem, but per Y-level. +*/ +MAKE_SCHEME_CALLBACK (Beam, print, 1); +SCM +Beam::print (SCM grob) +{ + Spanner *me = unsmob_spanner (grob); + position_beam (me); - TODO: - take some y-position (chord/beam/nearest?) into account - scmify forced-fraction + Link_array stems + = extract_grob_array (me, ly_symbol2scm ("stems")); + Grob *xcommon = common_refpoint_of_array (stems, me, X_AXIS); - TODO: - - why is shorten stored in beam, and not directly in stem? + xcommon = me->get_bound (LEFT)->common_refpoint (xcommon, X_AXIS); + xcommon = me->get_bound (RIGHT)->common_refpoint (xcommon, X_AXIS); -*/ -void -Beam::set_stem_shorten (Grob *m) -{ - Spanner*me = dynamic_cast (m); + 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; + } - Real forced_fraction = forced_stem_count (me) / visible_stem_count (me); + 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); - int multiplicity = get_multiplicity (me); + scale_drul (&pos, Staff_symbol_referencer::staff_space (me)); - SCM shorten = me->get_grob_property ("beamed-stem-shorten"); - if (shorten == SCM_EOL) - return; + Real dy = pos[RIGHT] - pos[LEFT]; + Real slope = (dy && dx) ? dy / dx : 0; - int sz = scm_ilength (shorten); - - Real staff_space = Staff_symbol_referencer::staff_space (me); - SCM shorten_elt = scm_list_ref (shorten, - gh_int2scm (multiplicity set_grob_property ("shorten", gh_double2scm (shorten_f)); -} + Real gap_length = robust_scm2double (me->get_property ("gap"), 0.0); -/* Call list of y-dy-callbacks, that handle setting of - grob-properties + Stencil the_beam; + Real lt = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness")); -*/ -MAKE_SCHEME_CALLBACK (Beam, after_line_breaking, 1); -SCM -Beam::after_line_breaking (SCM smob) -{ - Grob *me = unsmob_grob (smob); - - /* Copy to mutable list. */ - SCM s = ly_deep_copy (me->get_grob_property ("positions")); - me->set_grob_property ("positions", s); + for (int i = 0; i <= stems.size (); i++) + { + Grob *st = (i < stems.size ()) ? stems[i] : 0; - if (ly_car (s) != SCM_BOOL_F) - return SCM_UNSPECIFIED; + 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) ? scm_cdr (last_beaming) : SCM_EOL; + SCM right = st ? scm_car (this_beaming) : SCM_EOL; - // 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); + Array full_beams; + Array lfliebertjes; + Array rfliebertjes; - set_stem_lengths (me); - return SCM_UNSPECIFIED; -} + for (SCM s = left; + scm_is_pair (s); s = scm_cdr (s)) + { + int b = scm_to_int (scm_car (s)); + if (scm_c_memq (scm_car (s), right) != SCM_BOOL_F) + { + full_beams.push (b); + } + else + { + lfliebertjes.push (b); + } + } + for (SCM s = right; + scm_is_pair (s); s = scm_cdr (s)) + { + int b = scm_to_int (scm_car (s)); + if (scm_c_memq (scm_car (s), left) == SCM_BOOL_F) + { + rfliebertjes.push (b); + } + } -struct Quant_score -{ - Real yl; - Real yr; - Real demerits; -}; + /* + 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; + } -/* - TODO: - - - Make all demerits customisable + if (st) + w += stem_width / 2; - - One sensible check per demerit (what's this --hwn) + Real blot = me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter")); + Stencil whole = Lookup::beam (slope, w, thick, blot); + Stencil gapped; - - Add demerits for quants per se, as to forbid a specific quant - entirely + int gap_count = 0; + if (scm_is_number (me->get_property ("gap-count"))) + { + gap_count = scm_to_int (me->get_property ("gap-count")); + gapped = Lookup::beam (slope, w - 2 * gap_length, thick, blot); -*/ -MAKE_SCHEME_CALLBACK (Beam, quanting, 1); -SCM -Beam::quanting (SCM smob) -{ - Grob *me = unsmob_grob (smob); + full_beams.sort (default_compare); + if (stem_dir == UP) + full_beams.reverse (); + } - SCM s = me->get_grob_property ("positions"); - Real yl = gh_scm2double (gh_car (s)); - Real yr = gh_scm2double (gh_cdr (s)); + int k = 0; + for (int j = full_beams.size (); j--;) + { + Stencil b (whole); - Real ss = Staff_symbol_referencer::staff_space (me); - Real thickness = gh_scm2double (me->get_grob_property ("thickness")) / ss; - Real slt = me->paper_l ()->get_var ("linethickness") / ss; + 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 (slope * (last_xposn - x0) + bdy * full_beams[j], Y_AXIS); + the_beam.add_stencil (b); + } - SCM sdy = me->get_grob_property ("least-squares-dy"); - Real dy_mus = gh_number_p (sdy) ? gh_scm2double (sdy) : 0.0; - - Real straddle = 0.0; - Real sit = (thickness - slt) / 2; - Real inter = 0.5; - Real hang = 1.0 - (thickness - slt) / 2; - Real quants [] = {straddle, sit, inter, hang }; - - int num_quants = int (sizeof (quants)/sizeof (Real)); - Array quantsl; - Array quantsr; + if (lfliebertjes.size () || rfliebertjes.size ()) + { + Real nw_f; - /* - going to REGION_SIZE == 2, yields another 0.6 second with - wtk1-fugue2. + 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 = scm_to_double (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; - (result indexes between 70 and 575) ? --hwn. + Stencil rhalf = Lookup::beam (slope, rw, thick, blot); + Stencil lhalf = Lookup::beam (slope, lw, thick, blot); + for (int j = lfliebertjes.size (); j--;) + { + Stencil b (lhalf); + b.translate_axis (last_xposn - x0, X_AXIS); + b.translate_axis (slope * (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 (slope * (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; + } + the_beam.translate_axis (x0 - me->relative_coordinate (xcommon, X_AXIS), X_AXIS); + the_beam.translate_axis (pos[LEFT], Y_AXIS); - - /* - Do stem computations. These depend on YL and YR linearly, so we can - precompute for every stem 2 factors. - */ - Link_array stems= - Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems"); - Array stem_infos; - Array lbase_lengths; - Array rbase_lengths; - - Drul_array dirs_found(0,0); - for (int i= 0; i < stems.size(); i++) +#if (DEBUG_QUANTING) + SCM quant_score = me->get_property ("quant-score"); + if (to_boolean (me->get_layout ()->lookup_variable (ly_symbol2scm ("debug-beam-quanting"))) + && scm_is_string (quant_score)) { - Grob*s = stems[i]; - stem_infos.push (Stem::calc_stem_info (s)); - dirs_found[stem_infos.top ().dir_] = true; - Real b = calc_stem_y (me, s, Interval (1,0), false); - lbase_lengths.push (b); + /* + 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); - Real a = calc_stem_y (me, s, Interval (0,1), false); - rbase_lengths.push (a); + Direction stem_dir = stems.size () ? to_dir (stems[0]->get_property ("direction")) : UP; + + Stencil tm = *unsmob_stencil (Text_interface::interpret_markup + (me->get_layout ()->self_scm (), properties, quant_score)); + the_beam.add_at_edge (Y_AXIS, stem_dir, tm, 1.0, 0); } +#endif - Direction ldir = Direction (stem_infos[0].dir_); - Direction rdir = Direction (stem_infos.top ().dir_); - bool knee_b = dirs_found[LEFT] && dirs_found[RIGHT]; + return the_beam.smobbed_copy (); +} +Direction +Beam::get_default_dir (Grob *me) +{ + Drul_array total; + total[UP] = total[DOWN] = 0; + Drul_array count; + count[UP] = count[DOWN] = 0; + Direction d = DOWN; - int region_size = REGION_SIZE; - /* - Knees are harder, lets try some more possibilities for knees. - */ - if (knee_b) - region_size += 2; - - for (int i = -region_size ; i < region_size; i++) - for (int j = 0; j < num_quants; j++) - { - quantsl.push (i + quants[j] + int (yl)); - quantsr.push (i + quants[j] + int (yr)); - } + Link_array stems + = extract_grob_array (me, ly_symbol2scm ("stems")); - Array qscores; - - for (int l =0; l < quantsl.size (); l++) - for (int r =0; r < quantsr.size (); r++) + for (int i = 0; i < stems.size (); i++) + do { - Quant_score qs; - qs.yl = quantsl[l]; - qs.yr = quantsr[r]; - qs.demerits = 0.0; - - qscores.push (qs); + Grob *s = stems[i]; + Direction sd = get_grob_direction (s); + + int center_distance = int (- d * Stem::head_positions (s) [-d]) >? 0; + int current = sd ? (1 + d * sd) / 2 : center_distance; + + if (current) + { + total[d] += current; + count[d]++; + } } + while (flip (&d) != DOWN); + SCM func = me->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]))); - /* - This is a longish function, but we don't separate this out into - neat modular separate subfunctions, as the subfunctions would be - called for many values of YL, YR. By precomputing various - parameters outside of the loop, we can save a lot of time. + if (scm_is_number (s) && scm_to_int (s)) + return to_dir (s); - */ - for (int i = qscores.size (); i--;) - if (qscores[i].demerits < 100) - { - qscores[i].demerits - += score_slopes_dy (me, qscores[i].yl, qscores[i].yr, - dy_mus, yr- yl); - } + /* If dir is not determined: get default */ + return to_dir (me->get_property ("neutral-direction")); +} - Real rad = Staff_symbol_referencer::staff_radius (me); - int multiplicity = get_multiplicity (me); - Real interbeam = multiplicity < 4 - ? (2*ss + slt - thickness) / 2.0 - : (3*ss + slt - thickness) / 3.0; +/* 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 + = extract_grob_array (me, ly_symbol2scm ("stems")); - for (int i = qscores.size (); i--;) - if (qscores[i].demerits < 100) - { - qscores[i].demerits - += score_forbidden_quants (me, qscores[i].yl, qscores[i].yr, - rad, slt, thickness, interbeam, - multiplicity, ldir, rdir); - } + for (int i = 0; i < stems.size (); i++) + { + Grob *s = stems[i]; + SCM forcedir = s->get_property ("direction"); + if (!to_dir (forcedir)) + set_grob_direction (s, d); + } +} - for (int i = qscores.size (); i--;) - if (qscores[i].demerits < 100) - { - qscores[i].demerits - += score_stem_lengths (stems, stem_infos, - lbase_lengths, rbase_lengths, - knee_b, - me, qscores[i].yl, qscores[i].yr); - } +/* + 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. - Real best = 1e6; - int best_idx = -1; - for (int i = qscores.size (); i--;) + TODO: + + this routine should take into account the stemlength scoring + of a possible knee/nonknee beam. +*/ +void +Beam::consider_auto_knees (Grob *me) +{ + SCM scm = me->get_property ("auto-knee-gap"); + if (!scm_is_number (scm)) + return; + + Interval_set gaps; + + gaps.set_full (); + + Link_array stems + = extract_grob_array (me, ly_symbol2scm ("stems")); + + Grob *common = common_refpoint_of_array (stems, me, Y_AXIS); + Real staff_space = Staff_symbol_referencer::staff_space (me); + + Array head_extents_array; + for (int i = 0; i < stems.size (); i++) { - if (qscores[i].demerits < best) + Grob *stem = stems[i]; + if (Stem::is_invisible (stem)) + continue; + + Interval head_extents = Stem::head_positions (stem); + if (!head_extents.is_empty ()) { - best = qscores [i].demerits ; - best_idx = i; + head_extents[LEFT] += -1; + head_extents[RIGHT] += 1; + head_extents *= 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. + */ + head_extents += stem->relative_coordinate (common, Y_AXIS); + + if (to_dir (stem->get_property ("direction"))) + { + Direction stemdir = to_dir (stem->get_property ("direction")); + head_extents[-stemdir] = -stemdir * infinity_f; + } } + head_extents_array.push (head_extents); + + gaps.remove_interval (head_extents); } - - me->set_grob_property ("positions", - gh_cons (gh_double2scm (qscores[best_idx].yl), - gh_double2scm (qscores[best_idx].yr)) - ); + Interval max_gap; + Real max_gap_len = 0.0; -#if DEBUG_QUANTING + for (int i = gaps.allowed_regions_.size () -1; i >= 0; i--) + { + Interval gap = gaps.allowed_regions_[i]; - // debug quanting - me->set_grob_property ("quant-score", - gh_double2scm (qscores[best_idx].demerits)); - me->set_grob_property ("best-idx", gh_int2scm (best_idx)); -#endif + /* + the outer gaps are not knees. + */ + if (isinf (gap[LEFT]) || isinf (gap[RIGHT])) + continue; - return SCM_UNSPECIFIED; -} + if (gap.length () >= max_gap_len) + { + max_gap_len = gap.length (); + max_gap = gap; + } + } -Real -Beam::score_stem_lengths (Link_arraystems, - Array stem_infos, - Array left_factor, - Array right_factor, - bool knee, - Grob*me, - Real yl, Real yr) -{ - Real demerit_score = 0.0 ; - Real pen = STEM_LENGTH_LIMIT_PENALTY; - - for (int i=0; i < stems.size (); i++) + Real beam_translation = get_beam_translation (me); + Real beam_thickness = Beam::get_thickness (me); + int beam_count = Beam::get_beam_count (me); + Real height_of_beams = beam_thickness / 2 + + (beam_count - 1) * beam_translation; + Real threshold = scm_to_double (scm) + height_of_beams; + + if (max_gap_len > threshold) { - Grob* s = stems[i]; - if (Stem::invisible_b (s)) - continue; + int j = 0; + for (int i = 0; i < stems.size (); i++) + { + Grob *stem = stems[i]; + if (Stem::is_invisible (stem)) + continue; - Real current_y = - yl * left_factor[i] + right_factor[i]* yr; + Interval head_extents = head_extents_array[j++]; - Stem_info info = stem_infos[i]; - Direction d = info.dir_; + Direction d = (head_extents.center () < max_gap.center ()) + ? UP : DOWN; - demerit_score += pen - * ( 0 >? (info.dir_ * (info.shortest_y_ - current_y))); - - demerit_score += STEM_LENGTH_DEMERIT_FACTOR - * shrink_extra_weight (d * current_y - info.dir_ * info.ideal_y_); + stem->set_property ("direction", scm_int2num (d)); + + head_extents.intersect (max_gap); + assert (head_extents.is_empty () || head_extents.length () < 1e-6); + } } +} - demerit_score *= 2.0 / stems.size (); +/* Set stem's shorten property if unset. - return demerit_score; -} +TODO: +take some y-position (chord/beam/nearest?) into account +scmify forced-fraction -Real -Beam::score_slopes_dy (Grob *me, - Real yl, Real yr, - Real dy_mus, Real dy_damp) +This is done in beam because the shorten has to be uniform over the +entire beam. +*/ +void +Beam::set_stem_shorten (Grob *me) { - Real dy = yr - yl; + /* + shortening looks silly for x staff beams + */ + if (is_knee (me)) + return; - Real dem = 0.0; - if (sign (dy_damp) != sign (dy)) - { - dem += DAMPING_DIRECTIION_PENALTY; - } + Real forced_fraction = 1.0 * forced_stem_count (me) + / visible_stem_count (me); + + int beam_count = get_beam_count (me); - dem += MUSICAL_DIRECTION_FACTOR * (0 >? (fabs (dy) - fabs (dy_mus))); - dem += shrink_extra_weight (fabs (dy_damp) - fabs (dy))* IDEAL_SLOPE_FACTOR; + SCM shorten_list = me->get_property ("beamed-stem-shorten"); + if (shorten_list == SCM_EOL) + return; + + Real staff_space = Staff_symbol_referencer::staff_space (me); + + SCM shorten_elt + = robust_list_ref (beam_count -1, shorten_list); + Real shorten_f = scm_to_double (shorten_elt) * staff_space; + + /* your similar cute comment here */ + shorten_f *= forced_fraction; - return dem; + if (shorten_f) + me->set_property ("shorten", scm_make_real (shorten_f)); } -static Real -my_modf (Real x) +/* Call list of y-dy-callbacks, that handle setting of + grob-properties +*/ +MAKE_SCHEME_CALLBACK (Beam, after_line_breaking, 1); +SCM +Beam::after_line_breaking (SCM smob) { - return x - floor (x); + Grob *me = unsmob_grob (smob); + + position_beam (me); + return SCM_UNSPECIFIED; } -Real -Beam::score_forbidden_quants (Grob*me, - Real yl, Real yr, - Real rad, - Real slt, - Real thickness, Real interbeam, - int multiplicity, - Direction ldir, Direction rdir) +void +Beam::position_beam (Grob *me) { - Real dy = yr - yl; + if (!me->is_live ()) + return; + if (to_boolean (me->get_property ("positioning-done"))) + return; - Real dem = 0.0; - if (fabs (yl) < rad && fabs ( my_modf (yl) - 0.5) < 1e-3) - dem += INTER_QUANT_PENALTY; - if (fabs (yr) < rad && fabs ( my_modf (yr) - 0.5) < 1e-3) - dem += INTER_QUANT_PENALTY; + me->set_property ("positioning-done", SCM_BOOL_T); - // todo: use multiplicity of outer stems. - if (multiplicity >= 2) - { - - Real straddle = 0.0; - Real sit = (thickness - slt) / 2; - Real inter = 0.5; - Real hang = 1.0 - (thickness - slt) / 2; - + /* Copy to mutable list. */ + SCM s = ly_deep_copy (me->get_property ("positions")); + me->set_property ("positions", s); - if (fabs (yl - ldir * interbeam) < rad - && fabs (my_modf (yl) - inter) < 1e-3) - dem += SECONDARY_BEAM_DEMERIT; - if (fabs (yr - rdir * interbeam) < rad - && fabs (my_modf (yr) - inter) < 1e-3) - dem += SECONDARY_BEAM_DEMERIT; + if (scm_car (s) == SCM_BOOL_F) + { + // one wonders if such genericity is necessary --hwn. + SCM callbacks = me->get_property ("position-callbacks"); + for (SCM i = callbacks; scm_is_pair (i); i = scm_cdr (i)) + scm_call_1 (scm_car (i), me->self_scm ()); + } - Real eps = 1e-3; + set_stem_lengths (me); +} +void +set_minimum_dy (Grob *me, Real *dy) +{ + if (*dy) + { /* - Can't we simply compute the distance between the nearest - staffline and the secondary beam? That would get rid of the - silly case analysis here (which is probably not when we have - different beam-thicknesses.) - - --hwn - */ - - - // hmm, without Interval/Drul_array, you get ~ 4x same code... - if (fabs (yl - ldir * interbeam) < rad + inter) - { - if (ldir == UP && dy <= eps - && fabs (my_modf (yl) - sit) < eps) - dem += SECONDARY_BEAM_DEMERIT; - - if (ldir == DOWN && dy >= eps - && fabs (my_modf (yl) - hang) < eps) - dem += SECONDARY_BEAM_DEMERIT; - } + If dy is smaller than the smallest quant, we + get absurd direction-sign penalties. + */ - if (fabs (yr - rdir * interbeam) < rad + inter) - { - if (rdir == UP && dy >= eps - && fabs (my_modf (yr) - sit) < eps) - dem += SECONDARY_BEAM_DEMERIT; - - if (rdir == DOWN && dy <= eps - && fabs (my_modf (yr) - hang) < eps) - dem += SECONDARY_BEAM_DEMERIT; - } - - if (multiplicity >= 3) - { - if (fabs (yl - 2 * ldir * interbeam) < rad + inter) - { - if (ldir == UP && dy <= eps - && fabs (my_modf (yl) - straddle) < eps) - dem += SECONDARY_BEAM_DEMERIT; - - if (ldir == DOWN && dy >= eps - && fabs (my_modf (yl) - straddle) < eps) - dem += SECONDARY_BEAM_DEMERIT; - } - - if (fabs (yr - 2 * rdir * interbeam) < rad + inter) - { - if (rdir == UP && dy >= eps - && fabs (my_modf (yr) - straddle) < eps) - dem += SECONDARY_BEAM_DEMERIT; - - if (rdir == DOWN && dy <= eps - && fabs (my_modf (yr) - straddle) < eps) - dem += SECONDARY_BEAM_DEMERIT; - } - } + Real ss = Staff_symbol_referencer::staff_space (me); + Real thickness = Beam::get_thickness (me) / ss; + Real slt = Staff_symbol_referencer::line_thickness (me) / ss; + Real sit = (thickness - slt) / 2; + Real inter = 0.5; + Real hang = 1.0 - (thickness - slt) / 2; + + *dy = sign (*dy) * (fabs (*dy) + >? + (sit set_grob_property ("positions", ly_interval2scm (pos)); + me->set_property ("positions", ly_interval2scm (pos)); return SCM_UNSPECIFIED; } - Interval ideal (Stem::calc_stem_info (first_visible_stem (me)).ideal_y_, - Stem::calc_stem_info (last_visible_stem (me)).ideal_y_); + Array x_posns; + Link_array stems + = extract_grob_array (me, ly_symbol2scm ("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); - Array x_posns ; - Link_array stems= - Pointer_group_interface__extract_grobs (me, (Item*)0, "stems"); - Grob *common = stems[0]; - for (int i=1; i < stems.size (); i++) - common = stems[i]->common_refpoint (common, X_AXIS); + 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 (common, X_AXIS); - for (int i=0; i < stems.size (); i++) + Real x0 = first_visible_stem (me)->relative_coordinate (commonx, X_AXIS); + for (int i = 0; i < stems.size (); i++) { - Item* s = stems[i]; + Grob *s = stems[i]; - Real x = s->relative_coordinate (common, X_AXIS) - x0; + Real x = s->relative_coordinate (commonx, X_AXIS) - x0; x_posns.push (x); } - Real dx = last_visible_stem (me)->relative_coordinate (common, X_AXIS) - x0; + Real dx = last_visible_stem (me)->relative_coordinate (commonx, X_AXIS) - x0; - Real y =0; - Real dydx = 0; + Real y = 0; + Real slope = 0; Real dy = 0; - + 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. - /* - TODO -- use scoring for this. + However, if both stems reach middle line, + ideal[LEFT] == ideal[RIGHT] and ideal.delta () == 0. - complicated, because we take stem-info.ideal for determining - beam slopes. - */ - /* Make simple beam on middle line have small tilt */ + For that case, we apply artificial slope */ if (!ideal[LEFT] && chord.delta () && count == 2) { - - /* - FIXME. -> UP - */ + /* FIXME. -> UP */ Direction d = (Direction) (sign (chord.delta ()) * UP); - pos[d] = gh_scm2double (me->get_grob_property ("thickness")) / 2; - // * dir; - pos[-d] = - pos[d]; + pos[d] = get_thickness (me) / 2; + pos[-d] = -pos[d]; } else { pos = ideal; } - y = pos[LEFT]; - dy = pos[RIGHT]- y; - dydx = dy/dx; + /* + 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++) + for (int i = 0; i < stems.size (); i++) { - Item* s = stems[i]; - if (Stem::invisible_b (s)) + Grob *s = stems[i]; + if (Stem::is_invisible (s)) continue; ideals.push (Offset (x_posns[i], - Stem::calc_stem_info (s).ideal_y_)); + 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_grob_property ("least-squares-dy", gh_double2scm (dy)); - pos = Interval (y, (y+dy)); + minimise_least_squares (&slope, &y, ideals); + + dy = slope * dx; + + set_minimum_dy (me, &dy); + me->set_property ("least-squares-dy", scm_make_real (dy)); + pos = Interval (y, (y + dy)); } - me->set_grob_property ("positions", ly_interval2scm (pos)); - + /* + "position" is relative to the staff. + */ + scale_drul (&pos, 1 / Staff_symbol_referencer::staff_space (me)); + + me->set_property ("positions", ly_interval2scm (pos)); + return SCM_UNSPECIFIED; } - /* We can't combine with previous function, since check concave and slope damping comes first. - */ + + TODO: we should use the concaveness to control the amount of damping + applied. +*/ MAKE_SCHEME_CALLBACK (Beam, shift_region_to_valid, 1); SCM Beam::shift_region_to_valid (SCM grob) @@ -827,71 +916,77 @@ 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, (Item*)0, "stems"); - Grob *common = stems[0]; - for (int i=1; i < stems.size (); i++) - common = stems[i]->common_refpoint (common, X_AXIS); + */ + Array x_posns; + Link_array stems + = extract_grob_array (me, ly_symbol2scm ("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 (common, X_AXIS); - for (int i=0; i < stems.size (); i++) + + Real x0 = fvs->relative_coordinate (commonx, X_AXIS); + for (int i = 0; i < stems.size (); i++) { - Item* s = stems[i]; + Grob *s = stems[i]; - Real x = s->relative_coordinate (common, X_AXIS) - x0; + 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 (common, X_AXIS) - x0; - Interval pos = ly_scm2interval ( me->get_grob_property ("positions")); - Real dy = pos.delta(); + 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; + Real slope = 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++) + for (int i = 0; i < stems.size (); i++) { - Item* s = stems[i]; - if (Stem::invisible_b (s)) + Grob *s = stems[i]; + if (Stem::is_invisible (s)) continue; - Direction d = Stem::get_direction (s); + Real left_y + = Stem::get_stem_info (s).shortest_y_ + - slope * x_posns [i]; - Real left_y = Stem::calc_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 ; + 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 (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; @@ -900,130 +995,11 @@ Beam::shift_region_to_valid (SCM grob) 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, (Item*) 0, "stems"); - - for (int i = 0; i < stems.size ();) - { - if (Stem::invisible_b (stems[i])) - stems.del (i); - else - i++; - } - - if (stems.size () < 3) - return SCM_UNSPECIFIED; - - - /* Concaveness #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. - - - Note that "convex" stems compensate for "concave" stems. - (is that intentional?) --hwn. - */ - - 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); - - 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] ) plain horizontal */ - if (concaveness1 || concaveness2 > r2) - { - 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)); - } + 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; } @@ -1039,576 +1015,402 @@ Beam::slope_damping (SCM smob) if (visible_stem_count (me) <= 1) return SCM_UNSPECIFIED; - SCM s = me->get_grob_property ("damping"); - int damping = gh_scm2int (s); + SCM s = me->get_property ("damping"); + Real damping = scm_to_double (s); if (damping) { - Interval pos = ly_scm2interval (me->get_grob_property ("positions")); - Real dy = pos.delta (); - - // ugh -> use commonx - Real dx = last_visible_stem (me)->relative_coordinate (0, X_AXIS) - - first_visible_stem (me)->relative_coordinate (0, X_AXIS); - Real dydx = dy && dx ? dy/dx : 0; - dydx = 0.6 * tanh (dydx) / damping; - - Real damped_dy = dydx * dx; - pos[LEFT] += (dy - damped_dy) / 2; - pos[RIGHT] -= (dy - damped_dy) / 2; - - me->set_grob_property ("positions", ly_interval2scm (pos)); - } - return SCM_UNSPECIFIED; -} + Drul_array pos = ly_scm2interval (me->get_property ("positions")); + scale_drul (&pos, Staff_symbol_referencer::staff_space (me)); -/* - Calculate the Y position of the stem-end, given the Y-left, Y-right - in POS, and for stem S. + Real dy = pos[RIGHT] - pos[LEFT]; - If CORRECT, correct for multiplicity of beam in case of knees. + Grob *fvs = first_visible_stem (me); + Grob *lvs = last_visible_stem (me); + Grob *commonx = fvs->common_refpoint (lvs, X_AXIS); - TODO: junk CORRECT from this. - */ -Real -Beam::calc_stem_y (Grob *me, Grob* s, Interval pos, bool correct) -{ - int beam_multiplicity = get_multiplicity (me); - int stem_multiplicity = (Stem::duration_log (s) - 2) >? 0; - + Real dx = last_visible_stem (me)->relative_coordinate (commonx, X_AXIS) + - first_visible_stem (me)->relative_coordinate (commonx, X_AXIS); - Real thick = gh_scm2double (me->get_grob_property ("thickness")); - Real interbeam = get_interbeam (me); + Real slope = dy && dx ? dy / dx : 0; - // ugh -> use commonx - Grob * fvs = first_visible_stem (me); - Grob *lvs = last_visible_stem (me); - - Real x0 = fvs ? fvs->relative_coordinate (0, X_AXIS) : 0.0; - Real dx = fvs ? lvs->relative_coordinate (0, X_AXIS) - x0 : 0.0; - Real r = s->relative_coordinate (0, X_AXIS) - x0; - Real dy = pos.delta (); - Real stem_y = (dy && dx - ? r / dx - * dy - : 0) + pos[LEFT]; - - Direction my_dir = Directional_element_interface::get (s); - Direction first_dir = fvs? Directional_element_interface::get (fvs) : my_dir; - - if (correct && my_dir != first_dir) - { - /* - WTF is happening here ? + Real concaveness = robust_scm2double (me->get_property ("concaveness"), 0.0); - It looks as if this is some kind of fixup for multiple kneed - beams to get a piece of stem at the #. - + slope = 0.6 * tanh (slope) / (damping + concaveness); - x - | - =======| - |======# - | - | - x + Real damped_dy = slope * dx; - Rules for this kind of stuff are hairy. In any event, the - current stem should look at the multiplicity of its - predecessor. + set_minimum_dy (me, &damped_dy); - --hwn. - - */ - - // FIXME, hairy stuff - stem_y += my_dir * (thick / 2 + (beam_multiplicity - 1) * interbeam); + pos[LEFT] += (dy - damped_dy) / 2; + pos[RIGHT] -= (dy - damped_dy) / 2; - // huh, why not for first visible? + scale_drul (&pos, 1 / Staff_symbol_referencer::staff_space (me)); - /* - What the heck is happening here?? - */ - Grob *last_visible = last_visible_stem (me); - if (last_visible) - { - if ( Staff_symbol_referencer::staff_symbol_l (s) - != Staff_symbol_referencer::staff_symbol_l (last_visible)) - stem_y += Directional_element_interface::get (me) - * (beam_multiplicity - stem_multiplicity) * interbeam; - } - else - programming_error ("No last visible stem"); + me->set_property ("positions", ly_interval2scm (pos)); } - return stem_y; + return SCM_UNSPECIFIED; } /* - Hmm. At this time, beam position and slope are determined. Maybe, - stem directions and length should set to relative to the chord's - position of the beam. */ -void -Beam::set_stem_lengths (Grob *me) + Report slice containing the numbers that are both in (car BEAMING) + and (cdr BEAMING) +*/ +Slice +where_are_the_whole_beams (SCM beaming) { - Link_array stems= - Pointer_group_interface__extract_grobs (me, (Item*)0, "stems"); - - if (stems.size () <= 1) - return; - - Grob *common = me->common_refpoint (stems[0], Y_AXIS); - for (int i=1; i < stems.size (); i++) - if (!Stem::invisible_b (stems[i])) - common = common->common_refpoint (stems[i], Y_AXIS); - - Interval pos = ly_scm2interval (me->get_grob_property ("positions")); - Real staff_space = Staff_symbol_referencer::staff_space (me); + Slice l; - /* - DOCUMENT THIS. - */ -#if 0 - Real thick = gh_scm2double (me->get_grob_property ("thickness")); - Direction dir = Directional_element_interface::get (me); - bool ps_testing = to_boolean (ly_symbol2scm ("ps-testing")); -#endif - - for (int i=0; i < stems.size (); i++) + for (SCM s = scm_car (beaming); scm_is_pair (s); s = scm_cdr (s)) { - Item* s = stems[i]; - if (Stem::invisible_b (s)) - continue; - - Real stem_y = calc_stem_y (me, s, pos, true); + if (scm_c_memq (scm_car (s), scm_cdr (beaming)) != SCM_BOOL_F) -#if 0 - // doesn't play well with dvips - if (ps_testing) - if (Stem::get_direction (s) == dir) - stem_y += Stem::get_direction (s) * thick / 2; -#endif - - /* caution: stem measures in staff-positions */ - Real id = me->relative_coordinate (common, Y_AXIS) - - stems[i]->relative_coordinate (common, Y_AXIS); - Stem::set_stemend (s, (stem_y + id) / staff_space * 2); + l.add_point (scm_to_int (scm_car (s))); } -} -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++) - { - do - { - /* Don't overwrite user override (?) */ - if (Stem::beam_count (stems[i], d) == -1 - /* Don't set beaming for outside of outer stems */ - && ! (d == LEFT && i == 0) - && ! (d == RIGHT && i == stems.size () -1)) - { - int b = beaming->infos_.elem (i).beams_i_drul_[d]; - Stem::set_beaming (stems[i], b, d); - } - } - while (flip (&d) != LEFT); - } + return l; } - - -/* - beams to go with one stem. - - FIXME: clean me up: - - The beam should be constructed by one function that knows where the - X and Y points are, and only inspects the stems to obtain - multiplicity and stem directions. - - */ -Molecule -Beam::stem_beams (Grob *me, Item *here, Item *next, Item *prev, Real dydx) +/* 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) { - // ugh -> use commonx - if ((next - && ! (next->relative_coordinate (0, X_AXIS) - > here->relative_coordinate (0, X_AXIS))) - || (prev - && ! (prev->relative_coordinate (0, X_AXIS) - < here->relative_coordinate (0, X_AXIS)))) - programming_error ("Beams are not left-to-right"); - - Real thick = gh_scm2double (me->get_grob_property ("thickness")); - Real bdy = get_interbeam (me); - - Molecule leftbeams; - Molecule rightbeams; - - Real nw_f; - if (!Stem::first_head (here)) - nw_f = 0; - else - { - int t = Stem::duration_log (here); - - SCM proc = me->get_grob_property ("flag-width-function"); - SCM result = gh_call1 (proc, gh_int2scm (t)); - nw_f = gh_scm2double (result); - } + 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]; - /* [Tremolo] beams on whole notes may not have direction set? */ - Direction dir = Directional_element_interface::get (here); + Direction my_dir = get_grob_direction (s); + SCM beaming = s->get_property ("beaming"); - /* half beams extending to the left. */ - if (prev) + Real stem_y = stem_y_beam0; + if (french) { - int lhalfs= lhalfs = Stem::beam_count (here, LEFT) - - Stem::beam_count (prev, RIGHT); - int lwholebeams= Stem::beam_count (here, LEFT) - relative_coordinate (0, X_AXIS) - - prev->relative_coordinate (0, X_AXIS); - Real stem_w = gh_scm2double (prev->get_grob_property ("thickness")) - // URG - * me->paper_l ()->get_var ("linethickness"); - - w = w/2 relative_coordinate (0, X_AXIS) - - here->relative_coordinate (0, X_AXIS); - - Real stem_w = gh_scm2double (next->get_grob_property ("thickness")) - // URG - * me->paper_l ()->get_var ("linethickness"); - - Molecule a = Lookup::beam (dydx, w + stem_w, thick); - a.translate_axis (- stem_w/2, X_AXIS); - int j = 0; - Real gap_f = 0; - - SCM gap = me->get_grob_property ("gap"); - if (gh_number_p (gap)) - { - int gap_i = gh_scm2int ((gap)); - int nogap = rwholebeams - gap_i; - - for (; j < nogap; j++) - { - Molecule b (a); - b.translate_axis (-dir * bdy * j, Y_AXIS); - rightbeams.add_molecule (b); - } - if (Stem::invisible_b (here)) - gap_f = nw_f; - else - gap_f = nw_f / 2; - w -= 2 * gap_f; - a = Lookup::beam (dydx, w + stem_w, thick); - } - - for (; j < rwholebeams; j++) - { - Molecule b (a); - Real tx = 0; - if (Stem::invisible_b (here)) - // ugh, see chord-tremolo.ly - tx = (-dir + 1) / 2 * nw_f * 1.5 + gap_f/4; - else - tx = gap_f; - b.translate (Offset (tx, -dir * bdy * j)); - rightbeams.add_molecule (b); - } + Slice bm = Stem::beam_multiplicity (s); + if (!bm.is_empty ()) + stem_y += bm[my_dir] * beam_translation; + } - w = w/2 relative_coordinate (common[Y_AXIS], Y_AXIS) + - s->relative_coordinate (common[Y_AXIS], Y_AXIS); - for (; j < rwholebeams + rhalfs; j++) - { - Molecule b (a); - b.translate_axis (- dir * bdy * j, Y_AXIS); - rightbeams.add_molecule (b); - } + return stem_y + id; +} - } - leftbeams.add_molecule (rightbeams); +/* + 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 + = extract_grob_array (me, ly_symbol2scm ("stems")); - return leftbeams; -} + if (!stems.size ()) + return; + Grob *common[2]; + for (int a = 2; a--;) + common[a] = common_refpoint_of_array (stems, me, Axis (a)); -MAKE_SCHEME_CALLBACK (Beam, brew_molecule, 1); -SCM -Beam::brew_molecule (SCM smob) -{ - Grob *me =unsmob_grob (smob); + Drul_array pos = ly_scm2realdrul (me->get_property ("positions")); + Real staff_space = Staff_symbol_referencer::staff_space (me); + scale_drul (&pos, staff_space); - Molecule mol; - if (!gh_pair_p (me->get_grob_property ("stems"))) - return SCM_EOL; - Real x0, dx; - Link_arraystems = - Pointer_group_interface__extract_grobs (me, (Item*) 0, "stems"); - if (visible_stem_count (me)) - { - // 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 + bool gap = false; + Real thick = 0.0; + if (scm_is_number (me->get_property ("gap-count")) + &&scm_to_int (me->get_property ("gap-count"))) { - x0 = stems[0]->relative_coordinate (0, X_AXIS); - dx = stems.top ()->relative_coordinate (0, X_AXIS) - x0; + gap = true; + thick = get_thickness (me); } - 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; + // 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++) + for (int i = 0; i < stems.size (); i++) { - Item *item = stems[i]; - Item *prev = (i > 0)? stems[i-1] : 0; - Item *next = (i < stems.size ()-1) ? stems[i+1] :0; - + Grob *s = stems[i]; + if (Stem::is_invisible (s)) + continue; - - Molecule sb = stem_beams (me, item, next, prev, dydx); - Real x = item->relative_coordinate (0, X_AXIS) - x0; - sb.translate (Offset (x, x * dydx + pos[LEFT])); + 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); - 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); +} -#if (DEBUG_QUANTING) +void +Beam::set_beaming (Grob *me, Beaming_info_list *beaming) +{ + Link_array stems + = extract_grob_array (me, ly_symbol2scm ("stems")); + + Direction d = LEFT; + for (int i = 0; i < stems.size (); i++) { /* - This code prints the demerits for each beam. Perhaps this - should be switchable for those who want to twiddle with the - parameters. + Don't overwrite user settings. */ - String str; - if (1) + + do { - str += to_str (gh_scm2int (me->get_grob_property ("best-idx"))); - str += ":"; - } - str += to_str (gh_scm2double (me->get_grob_property ("quant-score")), - "%.2f"); + /* Don't set beaming for outside of outer stems */ + if ((d == LEFT && i == 0) + || (d == RIGHT && i == stems.size () -1)) + continue; - SCM properties = Font_interface::font_alist_chain (me); + 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]; - - Molecule tm = Text_item::text2molecule (me, ly_str02scm (str.ch_C ()), properties); - mol.add_at_edge (Y_AXIS, UP, tm, 5.0); + Stem::set_beaming (st, b, d); + } + } + while (flip (&d) != LEFT); } -#endif - - return mol.smobbed_copy (); } int -Beam::forced_stem_count (Grob *me) +Beam::forced_stem_count (Grob *me) { - Link_arraystems = - Pointer_group_interface__extract_grobs (me, (Item*) 0, "stems"); + Link_array stems + = extract_grob_array (me, ly_symbol2scm ("stems")); int f = 0; - for (int i=0; i < stems.size (); i++) + 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_y (s)) - && (Stem::get_direction (s) != Stem::get_default_dir (s))) - f++; + /* 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; } - - - int -Beam::visible_stem_count (Grob *me) +Beam::visible_stem_count (Grob *me) { - Link_arraystems = - Pointer_group_interface__extract_grobs (me, (Item*) 0, "stems"); + Link_array stems + = extract_grob_array (me, ly_symbol2scm ("stems")); int c = 0; for (int i = stems.size (); i--;) { - if (!Stem::invisible_b (stems[i])) - c++; + if (!Stem::is_invisible (stems[i])) + c++; } return c; } -Item* -Beam::first_visible_stem (Grob *me) +Grob * +Beam::first_visible_stem (Grob *me) { - Link_arraystems = - Pointer_group_interface__extract_grobs (me, (Item*) 0, "stems"); - + Link_array stems + = extract_grob_array (me, ly_symbol2scm ("stems")); + for (int i = 0; i < stems.size (); i++) { - if (!Stem::invisible_b (stems[i])) - return stems[i]; + if (!Stem::is_invisible (stems[i])) + return stems[i]; } return 0; } -Item* -Beam::last_visible_stem (Grob *me) +Grob * +Beam::last_visible_stem (Grob *me) { - Link_arraystems = - Pointer_group_interface__extract_grobs (me, (Item*) 0, "stems"); + Link_array stems + = extract_grob_array (me, ly_symbol2scm ("stems")); for (int i = stems.size (); i--;) { - if (!Stem::invisible_b (stems[i])) - return stems[i]; + if (!Stem::is_invisible (stems[i])) + return stems[i]; } return 0; } - /* [TODO] - + handle rest under beam (do_post: beams are calculated now) what about combination of collisions and rest under beam. Should lookup - - rest -> stem -> beam -> interpolate_y_position () + + rest -> stem -> beam -> interpolate_y_position () */ MAKE_SCHEME_CALLBACK (Beam, rest_collision_callback, 2); SCM Beam::rest_collision_callback (SCM element_smob, SCM axis) { Grob *rest = unsmob_grob (element_smob); - Axis a = (Axis) gh_scm2int (axis); - + Axis a = (Axis) scm_to_int (axis); + + if (scm_is_number (rest->get_property ("staff-position"))) + return scm_int2num (0); + assert (a == Y_AXIS); - Grob *st = unsmob_grob (rest->get_grob_property ("stem")); + Grob *st = unsmob_grob (rest->get_property ("stem")); Grob *stem = st; if (!stem) - return gh_double2scm (0.0); - Grob *beam = unsmob_grob (stem->get_grob_property ("beam")); + 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 gh_double2scm (0.0); - - // make callback for rest from this. - // todo: make sure this calced already. + return scm_make_real (0.0); - // 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))) + Drul_array pos (0, 0); + SCM s = beam->get_property ("positions"); + if (scm_is_pair (s) && scm_is_number (scm_car (s))) pos = ly_scm2interval (s); + Real staff_space = Staff_symbol_referencer::staff_space (rest); + + scale_drul (&pos, staff_space); + + Real dy = pos[RIGHT] - pos[LEFT]; - Real dy = pos.delta (); // ugh -> use commonx Real x0 = first_visible_stem (beam)->relative_coordinate (0, X_AXIS); Real dx = last_visible_stem (beam)->relative_coordinate (0, X_AXIS) - x0; - Real dydx = dy && dx ? dy/dx : 0; - + Real slope = dy && dx ? dy / dx : 0; + Direction d = Stem::get_direction (stem); - Real beamy = (stem->relative_coordinate (0, X_AXIS) - x0) * dydx + pos[LEFT]; + Real stem_y = pos[LEFT] + (stem->relative_coordinate (0, X_AXIS) - x0) * slope; - Real staff_space = Staff_symbol_referencer::staff_space (rest); + Real beam_translation = get_beam_translation (beam); + Real beam_thickness = Beam::get_thickness (beam); - - Real rest_dim = rest->extent (rest, Y_AXIS)[d]*2.0 / staff_space; // refp?? + /* + TODO: this is not strictly correct for 16th knee beams. + */ + int beam_count + = Stem::beam_multiplicity (stem).length () + 1; - Real minimum_dist - = gh_scm2double (rest->get_grob_property ("minimum-beam-collision-distance")); - Real dist = - minimum_dist + -d * (beamy - rest_dim) >? 0; + Real height_of_my_beams = beam_thickness / 2 + + (beam_count - 1) * beam_translation; + Real beam_y = stem_y - d * height_of_my_beams; - int stafflines = Staff_symbol_referencer::line_count (rest); + Grob *common_y = rest->common_refpoint (beam, Y_AXIS); - // move discretely by half spaces. - int discrete_dist = int (ceil (dist)); + Real rest_dim = rest->extent (common_y, Y_AXIS)[d]; + Real minimum_distance + = + staff_space * (robust_scm2double (stem->get_property ("stemlet-length"), 0.0) + + robust_scm2double (rest->get_property ("minimum-distance"), 0.0)); - // move by whole spaces inside the staff. - if (discrete_dist < stafflines+1) - discrete_dist = int (ceil (discrete_dist / 2.0)* 2.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 scm_make_real (staff_space * shift); +} -ADD_INTERFACE (Beam, "beam-interface", - "A beam. +bool +Beam::is_knee (Grob *me) +{ + SCM k = me->get_property ("knee"); + if (scm_is_bool (k)) + return ly_scm2bool (k); -#'thickness= weight of beams, in staffspace + bool knee = false; + int d = 0; + for (SCM s = me->get_property ("stems"); scm_is_pair (s); s = scm_cdr (s)) + { + Direction dir = get_grob_direction (unsmob_grob (scm_car (s))); + if (d && d != dir) + { + knee = true; + break; + } + d = dir; + } + me->set_property ("knee", ly_bool2scm (knee)); -We take the least squares line through the ideal-length stems, and -then damp that using + return knee; +} - damped = tanh (slope) +int +Beam::get_direction_beam_count (Grob *me, Direction d) +{ + Link_array stems + = extract_grob_array (me, ly_symbol2scm ("stems")); + int bc = 0; -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. + 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); + } -", - "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"); + 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 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");