X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam.cc;h=2f403f306722ad21b4996447596c04cfe99f8752;hb=7aabfb20c46e0a1de41698ddc6859ccd3a6dea85;hp=98b674ce8439e6a40449925138347d2ab4ab3e46;hpb=c380a7abde14a60ebd6d8a6eab91ae4e13677a23;p=lilypond.git diff --git a/lily/beam.cc b/lily/beam.cc index 98b674ce84..2f403f3067 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -3,26 +3,26 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2002 Han-Wen Nienhuys + (c) 1997--2003 Han-Wen Nienhuys Jan Nieuwenhuizen - */ /* - [TODO] +TODO: - * Fix TODO - - * Junk stem_info. + * Use Number_pair i.s.o Interval to represent (yl, yr). - * 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. - * Use Number_pair i.s.o Interval to represent (yl, yr). +Notes: + + + - Stems run to the Y-center of the beam. - */ + - beam_translation is the offset between Y centers of the beam. + +*/ #include // tanh. @@ -41,18 +41,16 @@ #include "item.hh" #include "spanner.hh" #include "warn.hh" -#include "text-item.hh" // debug output. -#include "font-interface.hh" // debug output. #define DEBUG_QUANTING 0 -static Real -shrink_extra_weight (Real x) -{ - return fabs (x) * ((x < 0) ? 1.5 : 1.0); -} +#if DEBUG_QUANTING +#include "text-item.hh" // debug output. +#include "font-interface.hh" // debug output. +#endif + void Beam::add_stem (Grob *me, Grob *s) @@ -61,46 +59,67 @@ Beam::add_stem (Grob *me, Grob *s) s->add_dependency (me); - assert (!Stem::beam_l (s)); + assert (!Stem::get_beam (s)); s->set_grob_property ("beam", me->self_scm ()); add_bound_item (dynamic_cast (me), dynamic_cast (s)); } -/* - TODO: fix this for grace notes. - */ Real -Beam::get_interbeam (Grob *me) +Beam::get_thickness (Grob * me) { - Real slt = me->paper_l ()->get_var ("stafflinethickness"); - Real ss = Staff_symbol_referencer::staff_space (me); - Real thickness = gh_scm2double (me->get_grob_property ("thickness")) - * ss; - - int multiplicity = get_multiplicity (me); - Real interbeam = multiplicity < 4 - ? (2*ss + slt - thickness) / 2.0 - : (3*ss + slt - thickness) / 3.0; - - return interbeam; + SCM th = me->get_grob_property ("thickness"); + if (gh_number_p (th)) + return gh_scm2double (th)* Staff_symbol_referencer::staff_space (me); + else + return 0.0; +} + +/* Return the translation between 2 adjoining beams. */ +Real +Beam::get_beam_translation (Grob *me) +{ + SCM func = me->get_grob_property ("space-function"); + SCM s = gh_call2 (func, me->self_scm (), scm_int2num (get_beam_count (me))); + return gh_scm2double (s); } +/* Maximum beam_count. */ int -Beam::get_multiplicity (Grob *me) +Beam::get_beam_count (Grob *me) { int m = 0; for (SCM s = me->get_grob_property ("stems"); gh_pair_p (s); s = ly_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 (ly_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 beam_count) +{ + Grob *me = unsmob_grob (smob); + + Real staff_space = Staff_symbol_referencer::staff_space (me); + Real line = me->get_paper ()->get_var ("linethickness"); + Real thickness = get_thickness (me); + + Real beam_translation = gh_scm2int (beam_count) < 4 + ? (2*staff_space + line - thickness) / 2.0 + : (3*staff_space + line - thickness) / 3.0; + + return gh_double2scm (beam_translation); +} + + /* After pre-processing all directions should be set. Several post-processing routines (stem, slur, script) need stem/beam direction. @@ -131,7 +150,7 @@ Beam::before_line_breaking (SCM smob) { me->warning (_ ("Beam has less than two stems. Removing beam.")); - unsmob_grob (gh_car (stems))->remove_grob_property ("beam"); + unsmob_grob (gh_car (stems))->set_grob_property ("beam", SCM_EOL); me->suicide (); return SCM_UNSPECIFIED; @@ -144,16 +163,334 @@ Beam::before_line_breaking (SCM smob) } if (count >= 1) { - if (!Directional_element_interface::get (me)) - Directional_element_interface::set (me, get_default_dir (me)); - + Direction d = get_default_dir (me); + consider_auto_knees (me); - set_stem_directions (me); + set_stem_directions (me, d); + + connect_beams (me); + set_stem_shorten (me); } + return SCM_EOL; } + +/* + We want a maximal number of shared beams, but if there is choice, we + take the one that is closest to the end of the stem. This is for situations like + + x + | + | + |===| + |= + | + x + + + */ +int +position_with_maximal_common_beams (SCM left_beaming, SCM right_beaming, + Direction left_dir, + Direction right_dir) +{ + Slice lslice = int_list_to_slice (gh_cdr (left_beaming)); + + int best_count = 0; + int best_start = 0; + for (int i = lslice[-left_dir]; + (i - lslice[left_dir])* left_dir <= 0 ; i+= left_dir) + { + int count =0; + for ( SCM s = gh_car (right_beaming); gh_pair_p (s); s = gh_cdr (s)) + { + int k = - right_dir * gh_scm2int (gh_car (s)) + i; + if (scm_memq (scm_int2num (k), left_beaming) != SCM_BOOL_F) + count ++; + } + + if (count >= best_count) + { + best_count = count; + best_start = i; + } + } + + return best_start; +} + +void +Beam::connect_beams (Grob *me) +{ + Link_array stems= + Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems"); + + Slice last_int; + last_int.set_empty(); + SCM last_beaming = SCM_EOL; + Direction last_dir = CENTER; + for (int i = 0; i< stems.size(); i++) + { + Grob *this_stem = stems[i]; + SCM this_beaming = this_stem->get_grob_property ("beaming"); + + Direction this_dir = Directional_element_interface::get(this_stem); + if (gh_pair_p (last_beaming) && gh_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 (; gh_pair_p (s); s = gh_cdr (s)) + { + int new_beam_pos = + start_point - this_dir * gh_scm2int (gh_car (s)); + + new_slice.add_point (new_beam_pos); + gh_set_car_x (s, scm_int2num (new_beam_pos)); + } + + + } + while (flip (&d) != LEFT); + + if (!new_slice.empty_b()) + last_int = new_slice; + } + else + { + gh_set_car_x ( this_beaming, SCM_EOL); + SCM s = gh_cdr (this_beaming); + for (; gh_pair_p (s); s = gh_cdr (s)) + { + int np = - this_dir * gh_scm2int (gh_car(s)); + gh_set_car_x (s, scm_int2num (np)); + last_int.add_point (np); + } + } + + if (i == stems.size () -1) + { + gh_set_cdr_x (this_beaming, SCM_EOL); + } + + if (scm_ilength (gh_cdr (this_beaming)) > 0) + { + last_beaming = this_beaming; + last_dir = this_dir; + } + } + } + +MAKE_SCHEME_CALLBACK (Beam, brew_molecule, 1); +SCM +Beam::brew_molecule (SCM grob) +{ + Grob *me = unsmob_grob (grob); + Link_array stems= + Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems"); + Grob* xcommon = common_refpoint_of_array (stems, me, X_AXIS); + + Real x0, dx; + if (visible_stem_count (me)) + { + // ugh -> use commonx + x0 = first_visible_stem (me)->relative_coordinate (xcommon, X_AXIS); + dx = last_visible_stem (me)->relative_coordinate (xcommon, X_AXIS) - x0; + } + else + { + x0 = stems[0]->relative_coordinate (xcommon, X_AXIS); + dx = stems.top ()->relative_coordinate (xcommon, X_AXIS) - x0; + } + + SCM posns = me->get_grob_property ("positions"); + Interval pos; + if (!ly_number_pair_p (posns)) + { + programming_error ("No beam posns"); + pos = Interval (0,0); + } + else + pos= ly_scm2interval (posns); + + Real dy = pos.delta (); + Real dydx = dy && dx ? dy/dx : 0; + + Real thick = get_thickness (me); + Real bdy = get_beam_translation (me); + + SCM last_beaming = SCM_EOL;; + Real last_xposn = -1; + Real last_width = -1 ; + + + SCM gap = me->get_grob_property ("gap"); + Molecule the_beam; + Real lt = me->get_paper ()->get_var ("linethickness"); + + for (int i = 0; i< stems.size(); i++) + { + Grob * st =stems[i]; + + SCM this_beaming = st->get_grob_property ("beaming"); + Real xposn = st->relative_coordinate (xcommon, X_AXIS); + Real stem_width = gh_scm2double (st->get_grob_property ("thickness")) *lt; + + /* + We do the space left of ST, with lfliebertjes pointing to the + right from the left stem, and rfliebertjes pointing left from + right stem. + */ + if (i > 0) + { + SCM left = gh_cdr (last_beaming); + SCM right = gh_car (this_beaming); + + Array fullbeams; + Array lfliebertjes; + Array rfliebertjes; + + for (SCM s = left; + gh_pair_p (s); s =gh_cdr (s)) + { + int b = gh_scm2int (gh_car (s)); + if (scm_memq (gh_car(s), right) != SCM_BOOL_F) + { + fullbeams.push (b); + } + else + { + lfliebertjes.push (b); + } + } + for (SCM s = right; + gh_pair_p (s); s =gh_cdr (s)) + { + int b = gh_scm2int (gh_car (s)); + if (scm_memq (gh_car(s), left) == SCM_BOOL_F) + { + rfliebertjes.push (b); + } + } + + + Real w = xposn - last_xposn; + Real stem_offset = 0.0; + Real width_corr = 0.0; + if (i == 1) + { + stem_offset -= last_width/2; + width_corr += last_width/2; + } + + if (i == stems.size() -1) + { + width_corr += stem_width/2; + } + + if (gh_number_p (gap)) + { + Real g = gh_scm2double (gap); + stem_offset += g; + width_corr -= 2*g; + } + + Molecule whole = Lookup::beam (dydx, w + width_corr, thick); + for (int j = fullbeams.size(); j--;) + { + Molecule b (whole); + b.translate_axis (last_xposn - x0 + stem_offset, X_AXIS); + b.translate_axis (dydx * (last_xposn - x0) + bdy * fullbeams[j], Y_AXIS); + the_beam.add_molecule (b); + } + + if (lfliebertjes.size() || rfliebertjes.size()) + { + Real nw_f; + + int t = Stem::duration_log (st); + + SCM proc = me->get_grob_property ("flag-width-function"); + SCM result = gh_call1 (proc, scm_int2num (t)); + nw_f = gh_scm2double (result); + + + /* Half beam should be one note-width, + but let's make sure two half-beams never touch */ + + Real w = xposn - last_xposn; + w = w/2 relative_coordinate (xcommon, X_AXIS), X_AXIS); + the_beam.translate_axis (pos[LEFT], Y_AXIS); + +#if (DEBUG_QUANTING) + { + /* + This code prints the demerits for each beam. Perhaps this + should be switchable for those who want to twiddle with the + parameters. + */ + String str; + if (1) + { + str += to_string (gh_scm2int (me->get_grob_property ("best-idx"))); + str += ":"; + } + str += to_string (gh_scm2double (me->get_grob_property ("quant-score")), + "%.2f"); + + SCM properties = Font_interface::font_alist_chain (me); + + + Molecule tm = Text_item::text2molecule (me, scm_makfrom0str (str.to_str0 ()), properties); + the_beam.add_at_edge (Y_AXIS, UP, tm, 5.0, 0); + } +#endif + + + + return the_beam.smobbed_copy(); +} + + + + Direction Beam::get_default_dir (Grob *me) { @@ -163,15 +500,16 @@ Beam::get_default_dir (Grob *me) count[UP] = count[DOWN] = 0; Direction d = DOWN; - Link_array stems= - Pointer_group_interface__extract_grobs (me, (Item*)0, "stems"); + Link_array stems= + Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems"); for (int i=0; i ? 0; + int current = sd ? (1 + d * sd)/2 : center_distance; if (current) { @@ -182,10 +520,10 @@ Beam::get_default_dir (Grob *me) SCM func = me->get_grob_property ("dir-function"); SCM s = gh_call2 (func, - gh_cons (gh_int2scm (count[UP]), - gh_int2scm (count[DOWN])), - gh_cons (gh_int2scm (total[UP]), - gh_int2scm (total[DOWN]))); + gh_cons (scm_int2num (count[UP]), + scm_int2num (count[DOWN])), + gh_cons (scm_int2num (total[UP]), + scm_int2num (total[DOWN]))); if (gh_number_p (s) && gh_scm2int (s)) return to_dir (s); @@ -199,134 +537,228 @@ Beam::get_default_dir (Grob *me) Urg: non-forced should become `without/with unforced' direction, once stem gets cleaned-up. */ void -Beam::set_stem_directions (Grob *me) +Beam::set_stem_directions (Grob *me, Direction d) { - Link_array stems - =Pointer_group_interface__extract_grobs (me, (Item*) 0, "stems"); - Direction d = Directional_element_interface::get (me); + Link_array stems + =Pointer_group_interface__extract_grobs (me, (Grob*) 0, "stems"); for (int i=0; i remove_grob_property ("dir-forced"); - if (!gh_boolean_p (force) || !gh_scm2bool (force)) + + SCM forcedir = s->get_grob_property ("direction"); + if (!to_dir (forcedir)) Directional_element_interface::set (s, d); } -} +} -/* Simplistic auto-knees; only consider vertical gap between two - adjacent chords. +/* + A union of intervals in the real line. + + Abysmal performance (quadratic) for large N, hopefully we don't have + that large N. In any case, this should probably be rewritten to use + a balanced tree. + */ +struct Int_set +{ + Array allowed_regions_; + + Int_set() + { + set_full(); + } + + void set_full() + { + allowed_regions_.clear(); + Interval s; + s.set_full (); + allowed_regions_.push (s); + } - `Forced' stem directions are ignored. If you don't want auto-knees, - don't set, or unset auto-knee-gap. */ + void remove_interval (Interval rm) + { + for (int i = 0; i < allowed_regions_.size(); ) + { + Interval s = rm; + + s.intersect (allowed_regions_[i]); + + if (!s.empty_b ()) + { + Interval before = allowed_regions_[i]; + Interval after = allowed_regions_[i]; + + before[RIGHT] = s[LEFT]; + after[LEFT] = s[RIGHT]; + + if (!before.empty_b() && before.length () > 0.0) + { + allowed_regions_.insert (before, i); + i++; + } + allowed_regions_.del (i); + if (!after.empty_b () && after.length () > 0.0) + { + allowed_regions_.insert (after, i); + i++; + } + } + else + i++; + } + } +}; + + +/* + Only try horizontal beams for knees. No reliable detection of + anything else is possible here, since we don't know funky-beaming + settings, or X-distances (slopes!) People that want sloped + knee-beams, should set the directions manually. + */ void -Beam::consider_auto_knees (Grob *me) +Beam::consider_auto_knees (Grob* me) { SCM scm = me->get_grob_property ("auto-knee-gap"); + if (!gh_number_p (scm)) + return ; - if (gh_number_p (scm)) - { - bool knee_b = false; - Real knee_y = 0; - Real staff_space = Staff_symbol_referencer::staff_space (me); - Real gap = gh_scm2double (scm) / staff_space; - - Direction d = Directional_element_interface::get (me); - Link_array stems= - Pointer_group_interface__extract_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); + Real threshold = gh_scm2double (scm); + + Int_set gaps; - Real dy = right - left; + gaps.set_full (); - if (abs (dy) >= gap) + Link_array stems= + Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems"); + + Grob *common = common_refpoint_of_array (stems, me, Y_AXIS); + Real staff_space = Staff_symbol_referencer::staff_space (me); + + Array hps_array; + for (int i=0; i < stems.size (); i++) + { + Grob* stem = stems[i]; + if (Stem::invisible_b (stem)) + continue; + + Interval hps = Stem::head_positions (stem); + if(!hps.empty_b()) + { + hps[LEFT] += -1; + hps[RIGHT] += 1; + hps *= staff_space * 0.5 ; + + /* + We could subtract beam Y position, but this routine only + sets stem directions, a constant shift does not have an + influence. + + */ + hps += stem->relative_coordinate (common, Y_AXIS); + + if (to_dir (stem->get_grob_property ("direction"))) { - knee_y = (right + left) / 2; - knee_b = true; - break; + Direction stemdir = to_dir (stem->get_grob_property ("direction")); + hps[-stemdir] = - stemdir * infinity_f; } } + hps_array.push (hps); + + gaps.remove_interval (hps); + } + + Interval max_gap; + Real max_gap_len =0.0; + + for (int i = gaps.allowed_regions_.size() -1; i >= 0 ; i--) + { + Interval gap = gaps.allowed_regions_[i]; + + /* + the outer gaps are not knees. + */ + if (isinf (gap[LEFT]) || isinf(gap[RIGHT])) + continue; - if (knee_b) + if (gap.length () >= max_gap_len) { - for (int i=0; i < stems.size (); i++) - { - if (Stem::invisible_b (stems[i])) - continue; - Item *s = stems[i]; - Real y = Stem::extremal_heads (stems[i])[d] - ->relative_coordinate (common, Y_AXIS); + max_gap_len = gap.length(); + max_gap = gap; + } + } - Directional_element_interface::set (s, y < knee_y ? UP : DOWN); - s->set_grob_property ("dir-forced", SCM_BOOL_T); - } + if (max_gap_len > threshold) + { + int j = 0; + for (int i = 0; i < stems.size(); i++) + { + Grob* stem = stems[i]; + if (Stem::invisible_b (stem)) + continue; + + Interval hps = hps_array[j++]; + + + Direction d = (hps.center () < max_gap.center()) ? + UP : DOWN ; + + stem->set_grob_property ("direction", scm_int2num (d)); + + hps.intersect (max_gap); + assert (hps.empty_b () || hps.length () < 1e-6 ); } } } + + /* Set stem's shorten property if unset. TODO: take some y-position (chord/beam/nearest?) into account scmify forced-fraction - - TODO: - - why is shorten stored in beam, and not directly in stem? + + This is done in beam because the shorten has to be uniform over the + entire beam. */ void -Beam::set_stem_shorten (Grob *m) +Beam::set_stem_shorten (Grob *me) { - Spanner*me = dynamic_cast (m); - - Real forced_fraction = forced_stem_count (me) / visible_stem_count (me); + /* + shortening looks silly for x staff beams + */ + if (knee_b(me)) + return ; + + Real forced_fraction = 1.0 * forced_stem_count (me) + / visible_stem_count (me); - int multiplicity = get_multiplicity (me); + int beam_count = get_beam_count (me); - SCM shorten = me->get_grob_property ("beamed-stem-shorten"); - if (shorten == SCM_EOL) + SCM shorten_list = me->get_grob_property ("beamed-stem-shorten"); + if (shorten_list == SCM_EOL) return; - int sz = scm_ilength (shorten); - Real staff_space = Staff_symbol_referencer::staff_space (me); - SCM shorten_elt = scm_list_ref (shorten, - gh_int2scm (multiplicity set_grob_property ("shorten", gh_double2scm (shorten_f)); + + if (shorten_f) + me->set_grob_property ("shorten", gh_double2scm (shorten_f)); } /* Call list of y-dy-callbacks, that handle setting of - grob-properties y, dy. - - User may set grob-properties: y-position-hs and height-hs - (to be fixed) that override the calculated y and dy. - - Because y and dy cannot be calculated and quanted separately, we - always calculate both, then check for user override. */ + grob-properties + +*/ MAKE_SCHEME_CALLBACK (Beam, after_line_breaking, 1); SCM Beam::after_line_breaking (SCM smob) @@ -337,432 +769,227 @@ Beam::after_line_breaking (SCM smob) SCM s = ly_deep_copy (me->get_grob_property ("positions")); me->set_grob_property ("positions", s); - if (ly_car (s) != SCM_BOOL_F) - return SCM_UNSPECIFIED; + if (ly_car (s) == SCM_BOOL_F) + { - 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); + // one wonders if such genericity is necessary --hwn. + SCM callbacks = me->get_grob_property ("position-callbacks"); + for (SCM i = callbacks; gh_pair_p (i); i = ly_cdr (i)) + gh_call1 (ly_car (i), smob); + } + set_stem_lengths (me); return SCM_UNSPECIFIED; } -struct Quant_score -{ - Real yl; - Real yr; - Real demerits; -}; - /* - TODO: - - - Make all demerits customisable - - - One sensible check per demerit (what's this --hwn) - - - Add demerits for quants per se, as to forbid a specific quant - entirely - -*/ -MAKE_SCHEME_CALLBACK (Beam, quanting, 1); + Compute a first approximation to the beam slope. + */ +MAKE_SCHEME_CALLBACK (Beam, least_squares, 1); SCM -Beam::quanting (SCM smob) +Beam::least_squares (SCM smob) { Grob *me = unsmob_grob (smob); - SCM s = me->get_grob_property ("positions"); - Real yl = gh_scm2double (gh_car (s)); - Real yr = gh_scm2double (gh_cdr (s)); - - Real ss = Staff_symbol_referencer::staff_space (me); - Real thickness = gh_scm2double (me->get_grob_property ("thickness")) / ss; - Real slt = me->paper_l ()->get_var ("stafflinethickness") / ss; - - - 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; - - /* - going to REGION_SIZE == 2, yields another 0.6 second with - wtk1-fugue2. - - - (result indexes between 70 and 575) ? --hwn. - - */ - - const int REGION_SIZE = 3; - for (int i = -REGION_SIZE ; i < REGION_SIZE; i++) - for (int j = 0; j < num_quants; j++) - { - quantsl.push (i + quants[j] + int (yl)); - quantsr.push (i + quants[j] + int (yr)); - } - - Array qscores; + int count = visible_stem_count (me); + Interval pos (0, 0); - for (int l =0; l < quantsl.size (); l++) - for (int r =0; r < quantsr.size (); r++) - { - Quant_score qs; - qs.yl = quantsl[l]; - qs.yr = quantsr[r]; - qs.demerits = 0.0; - - qscores.push (qs); - } - - - /* - This is a longish function, but we don't separate this out into - neat modular separate subfunctions, as the subfunctions would be - called for many values of YL, YR. By precomputing various - parameters outside of the loop, we can save a lot of time. - - */ - for (int i = qscores.size (); i--;) - if (qscores[i].demerits < 100) - { - qscores[i].demerits - += score_slopes_dy (me, qscores[i].yl, qscores[i].yr, - dy_mus, yr- yl); - } - - Real rad = Staff_symbol_referencer::staff_radius (me); - int multiplicity = get_multiplicity (me); - Real interbeam = multiplicity < 4 - ? (2*ss + slt - thickness) / 2.0 - : (3*ss + slt - thickness) / 3.0; - - for (int i = qscores.size (); i--;) - if (qscores[i].demerits < 100) - { - qscores[i].demerits - += score_forbidden_quants (me, qscores[i].yl, qscores[i].yr, - rad, slt, thickness, interbeam, - multiplicity); - } - - - /* - Do stem lengths. These depend on YL and YR linearly, so we can - precompute for every stem 2 factors. - */ - Link_array stems= - Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems"); - Array stem_infos; - Array lbase_lengths; - Array rbase_lengths; - - Array directions; - for (int i= 0; i < stems.size(); i++) + if (count <= 1) { - Grob*s = stems[i]; - stem_infos.push( Stem::calc_stem_info (s)); - - Real b = calc_stem_y (me, s, Interval (1,0)); - lbase_lengths.push (b); - - b = calc_stem_y (me, s, Interval (0,1)); - rbase_lengths.push (b); - directions.push( Directional_element_interface::get( s)); + me->set_grob_property ("positions", ly_interval2scm (pos)); + return SCM_UNSPECIFIED; } - for (int i = qscores.size (); i--;) - if (qscores[i].demerits < 100) - { - qscores[i].demerits - += score_stem_lengths (stems, stem_infos, - lbase_lengths, rbase_lengths, - directions, - me, qscores[i].yl, qscores[i].yr); - } - - Real best = 1e6; - int best_idx = -1; - for (int i = qscores.size (); i--;) - { - if (qscores[i].demerits < best) - { - best = qscores [i].demerits ; - best_idx = i; - } - } + 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); - me->set_grob_property ("positions", - gh_cons (gh_double2scm (qscores[best_idx].yl), - gh_double2scm (qscores[best_idx].yr)) - ); - - if (DEBUG_QUANTING) - { - // debug quanting - me->set_grob_property ("quant-score", - gh_double2scm (qscores[best_idx].demerits)); - me->set_grob_property ("best-idx", gh_int2scm (best_idx)); - } - - return SCM_UNSPECIFIED; -} - -Real -Beam::score_stem_lengths (Link_arraystems, - Array stem_infos, - Array left_factor, - Array right_factor, - Array directions, - Grob*me, Real yl, Real yr) -{ - Real demerit_score = 0.0 ; + Grob *fvs = first_visible_stem (me); + Grob *lvs = last_visible_stem (me); + + Interval ideal (Stem::get_stem_info (fvs).ideal_y_ + + fvs->relative_coordinate (commony, Y_AXIS) -my_y, + Stem::get_stem_info (lvs).ideal_y_ + + lvs->relative_coordinate (commony, Y_AXIS) - my_y); + Real x0 = first_visible_stem (me)->relative_coordinate (commonx, X_AXIS); for (int i=0; i < stems.size (); i++) { Grob* s = stems[i]; - if (Stem::invisible_b (s)) - continue; - - Real current_y = - yl * left_factor[i] + right_factor[i]* yr; - - Stem_info info = stem_infos[i]; - Direction d = Direction (directions[i]); - - demerit_score += 500 * ( 0 >? (info.min_y - d * current_y)); - demerit_score += 500 * ( 0 >? (d * current_y - info.max_y)); - demerit_score += 5 * shrink_extra_weight (d * current_y - info.ideal_y); + 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; - demerit_score *= 2.0 /stems.size (); - - return demerit_score; -} - -Real -Beam::score_slopes_dy (Grob *me, Real yl, Real yr, - Real dy_mus, Real dy_damp) -{ - Real dy = yr - yl; - - Real dem = 0.0; - if (sign (dy_damp) != sign (dy)) - { - dem += 800; - } - - dem += 400* (0 >? (fabs (dy) - fabs (dy_mus))); - - - dem += shrink_extra_weight (fabs (dy_damp) - fabs (dy))* 10; - return dem; -} - -static Real -my_modf (Real x) -{ - return x - floor (x); -} - -Real -Beam::score_forbidden_quants (Grob*me, - Real yl, Real yr, - Real rad, - Real slt, - Real thickness, Real interbeam, - int multiplicity) -{ - Real dy = yr - yl; - - Real dem = 0.0; - if (fabs (yl) < rad && fabs ( my_modf (yl) - 0.5) < 1e-3) - dem += 1000; - if (fabs (yr) < rad && fabs ( my_modf (yr) - 0.5) < 1e-3) - dem += 1000; - - // todo: use multiplicity of outer stems. - if (multiplicity >= 2) - { - - Real straddle = 0.0; - Real sit = (thickness - slt) / 2; - Real inter = 0.5; - Real hang = 1.0 - (thickness - slt) / 2; - - Direction dir = Directional_element_interface::get (me); - if (fabs (yl - dir * interbeam) < rad - && fabs (my_modf (yl) - inter) < 1e-3) - dem += 15; - if (fabs (yr - dir * interbeam) < rad - && fabs (my_modf (yr) - inter) < 1e-3) - dem += 15; - - Real eps = 1e-3; - - /* - Can't we simply compute the distance between the nearest - staffline and the secondary beam? That would get rid of the - silly case analysis here (which is probably not when we have - different beam-thicknesses.) - - --hwn - */ - - // hmm, without Interval/Drul_array, you get ~ 4x same code... - if (fabs (yl - dir * interbeam) < rad + inter) - { - if (dir == UP && dy <= eps - && fabs (my_modf (yl) - sit) < eps) - dem += 15; - - if (dir == DOWN && dy >= eps - && fabs (my_modf (yl) - hang) < eps) - dem += 15; - } - - if (fabs (yr - dir * interbeam) < rad + inter) - { - if (dir == UP && dy >= eps - && fabs (my_modf (yr) - sit) < eps) - dem += 15; - - if (dir == DOWN && dy <= eps - && fabs (my_modf (yr) - hang) < eps) - dem += 15; - } - - if (multiplicity >= 3) - { - if (fabs (yl - 2 * dir * interbeam) < rad + inter) - { - if (dir == UP && dy <= eps - && fabs (my_modf (yl) - straddle) < eps) - dem += 15; - - if (dir == DOWN && dy >= eps - && fabs (my_modf (yl) - straddle) < eps) - dem += 15; - } - - if (fabs (yr - 2 * dir * interbeam) < rad + inter) - { - if (dir == UP && dy >= eps - && fabs (my_modf (yr) - straddle) < eps) - dem += 15; - - if (dir == DOWN && dy <= eps - && fabs (my_modf (yr) - straddle) < eps) - dem += 15; - } - } - } - - return dem; -} - - - -MAKE_SCHEME_CALLBACK (Beam, least_squares, 1); -SCM -Beam::least_squares (SCM smob) -{ - Grob *me = unsmob_grob (smob); - - int count = visible_stem_count (me); - Interval pos (0, 0); - - if (count <= 1) - { - me->set_grob_property ("positions", ly_interval2scm (pos)); - return SCM_UNSPECIFIED; - } - - Direction dir = Directional_element_interface::get (me); - - Interval ideal (Stem::calc_stem_info (first_visible_stem (me)).ideal_y, - Stem::calc_stem_info (last_visible_stem (me)).ideal_y); + Real y =0; + Real dydx = 0; + Real dy = 0; if (!ideal.delta ()) { - Interval chord (Stem::chord_start_f (first_visible_stem (me)), - Stem::chord_start_f (last_visible_stem (me))); - - - /* - TODO : use scoring for this. + Interval chord (Stem::chord_start_y (first_visible_stem (me)), + Stem::chord_start_y (last_visible_stem (me))); - complicated, because we take stem-info.ideal for determining - beam slopes. - - */ - /* Make simple beam on middle line have small tilt */ + /* 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) { - Direction d = (Direction) (sign (chord.delta ()) * dir); - pos[d] = gh_scm2double (me->get_grob_property ("thickness")) / 2 - * dir; + /* FIXME. -> UP */ + Direction d = (Direction) (sign (chord.delta ()) * UP); + pos[d] = gh_scm2double (me->get_grob_property ("thickness")) / 2; pos[-d] = - pos[d]; } else { pos = ideal; - pos[LEFT] *= dir ; - pos[RIGHT] *= dir ; } + + y = pos[LEFT]; + dy = pos[RIGHT]- y; + dydx = dy/dx; } else { Array ideals; - - // ugh -> use commonx - Real x0 = first_visible_stem (me)->relative_coordinate (0, X_AXIS); - Link_array stems= - Pointer_group_interface__extract_grobs (me, (Item*)0, "stems"); - for (int i=0; i < stems.size (); i++) { - Item* s = stems[i]; + Grob* s = stems[i]; if (Stem::invisible_b (s)) continue; - ideals.push (Offset (s->relative_coordinate (0, X_AXIS) - x0, - Stem::calc_stem_info (s).ideal_y)); + ideals.push (Offset (x_posns[i], + Stem::get_stem_info (s).ideal_y_ + + s->relative_coordinate (commony, Y_AXIS) + - my_y)); } - Real y; - Real dydx; minimise_least_squares (&dydx, &y, ideals); - Real dx = last_visible_stem (me)->relative_coordinate (0, X_AXIS) - x0; - Real dy = dydx * dx; - me->set_grob_property ("least-squares-dy", gh_double2scm (dy * dir)); + dy = dydx * dx; + me->set_grob_property ("least-squares-dy", gh_double2scm (dy)); + pos = Interval (y, (y+dy)); + } + + me->set_grob_property ("positions", ly_interval2scm (pos)); + + return SCM_UNSPECIFIED; +} + + +/* + We can't combine with previous function, since check concave and + slope damping comes first. + */ +MAKE_SCHEME_CALLBACK (Beam, shift_region_to_valid, 1); +SCM +Beam::shift_region_to_valid (SCM grob) +{ + Grob *me = unsmob_grob (grob); + /* + Code dup. + */ + Array x_posns ; + Link_array stems= + Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems"); + Grob *commonx = common_refpoint_of_array (stems, me, X_AXIS); + Grob *commony = common_refpoint_of_array (stems, me, Y_AXIS); + + Grob *fvs = first_visible_stem (me); + + if (!fvs) + return SCM_UNSPECIFIED; + + Real x0 =fvs->relative_coordinate (commonx, X_AXIS); + for (int i=0; i < stems.size (); i++) + { + Grob* s = stems[i]; - pos = Interval (y*dir, (y+dy) * dir); + Real x = s->relative_coordinate (commonx, X_AXIS) - x0; + x_posns.push (x); } + Grob *lvs = last_visible_stem (me); + if (!lvs) + return SCM_UNSPECIFIED; + + Real dx = lvs->relative_coordinate (commonx, X_AXIS) - x0; + + Interval pos = ly_scm2interval ( me->get_grob_property ("positions")); + Real dy = pos.delta(); + Real y = pos[LEFT]; + Real dydx =dy/dx; + + + /* + Shift the positions so that we have a chance of finding good + quants (i.e. no short stem failures.) + */ + Interval feasible_left_point; + feasible_left_point.set_full (); + for (int i=0; i < stems.size (); i++) + { + Grob* s = stems[i]; + if (Stem::invisible_b (s)) + continue; + + Direction d = Stem::get_direction (s); + + Real left_y = + Stem::get_stem_info (s).shortest_y_ + - dydx * x_posns [i]; + + /* + left_y is now relative to the stem S. We want relative to + ourselves, so translate: + */ + left_y += + + s->relative_coordinate (commony, Y_AXIS) + - me->relative_coordinate (commony, Y_AXIS); + + Interval flp ; + flp.set_full (); + flp[-d] = left_y; + + feasible_left_point.intersect (flp); + } + + if (feasible_left_point.empty_b()) + { + warning (_("Not sure that we can find a nice beam slope (no viable initial configuration found).")); + } + else if (!feasible_left_point.elem_b(y)) + { + if (isinf (feasible_left_point[DOWN])) + y = feasible_left_point[UP] - REGION_SIZE; + else if (isinf (feasible_left_point[UP])) + y = feasible_left_point[DOWN]+ REGION_SIZE; + else + y = feasible_left_point.center (); + } + pos = Interval (y, (y+dy)); me->set_grob_property ("positions", ly_interval2scm (pos)); return SCM_UNSPECIFIED; } + MAKE_SCHEME_CALLBACK (Beam, check_concave, 1); SCM Beam::check_concave (SCM smob) { Grob *me = unsmob_grob (smob); - Link_array stems = - Pointer_group_interface__extract_grobs (me, (Item*) 0, "stems"); + Link_array stems = + Pointer_group_interface__extract_grobs (me, (Grob*) 0, "stems"); for (int i = 0; i < stems.size ();) { @@ -775,37 +1002,101 @@ Beam::check_concave (SCM smob) if (stems.size () < 3) return SCM_UNSPECIFIED; - /* Concaveness try #2: Sum distances of inner noteheads that - fall outside the interval of the two outer noteheads */ - Real concave = 0; - Interval iv (Stem::chord_start_f (stems[0]), - Stem::chord_start_f (stems.top ())); - - if (iv[MAX] < iv[MIN]) - iv.swap (); - - for (int i = 1; i < stems.size () - 1; i++) + + /* 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 c = 0; - Real f = Stem::chord_start_f (stems[i]); - if ((c = f - iv[MAX]) > 0) - concave += c; - else if ((c = f - iv[MIN]) < 0) - concave += c; - } + Real r1 = gh_scm2double (gap); + Real dy = Stem::chord_start_y (stems.top ()) + - Stem::chord_start_y (stems[0]); - Direction dir = Directional_element_interface::get (me); - concave *= dir; - Real concaveness = concave / (stems.size () - 2); - /* ugh: this is the a kludge to get input/regression/beam-concave.ly - to behave as baerenreiter. */ - concaveness /= (stems.size () - 2); + Real 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 r = gh_scm2double (me->get_grob_property ("concaveness-threshold")); + 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 (concaveness > r) + if (concaveness1 || concaveness2 > r2) { Interval pos = ly_scm2interval (me->get_grob_property ("positions")); Real r = pos.linear_combination (0); @@ -835,10 +1126,15 @@ Beam::slope_damping (SCM smob) { 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); + + Grob *fvs = first_visible_stem (me); + Grob *lvs = last_visible_stem (me); + + Grob *commonx = fvs->common_refpoint (lvs, X_AXIS); + + + Real dx = last_visible_stem (me)->relative_coordinate (commonx, X_AXIS) + - first_visible_stem (me)->relative_coordinate (commonx, X_AXIS); Real dydx = dy && dx ? dy/dx : 0; dydx = 0.6 * tanh (dydx) / damping; @@ -848,65 +1144,67 @@ Beam::slope_damping (SCM smob) me->set_grob_property ("positions", ly_interval2scm (pos)); } - return SCM_UNSPECIFIED; + return SCM_UNSPECIFIED; } -MAKE_SCHEME_CALLBACK (Beam, end_after_line_breaking, 1); -SCM -Beam::end_after_line_breaking (SCM smob) +/* + Report slice containing the numbers that are both in (car BEAMING) + and (cdr BEAMING) + */ +Slice +where_are_the_whole_beams(SCM beaming) { - Grob *me = unsmob_grob (smob); - set_stem_lengths (me); + Slice l; - return SCM_UNSPECIFIED; + for( SCM s = gh_car (beaming); gh_pair_p (s) ; s = gh_cdr (s)) + { + if (scm_memq (gh_car (s), gh_cdr (beaming)) != SCM_BOOL_F) + + l.add_point (gh_scm2int (gh_car (s))); + } + + return l; } -/* - Calculate the Y position of the stem-end, given the Y-left, Y-right - in POS, and for stem S. - */ +/* 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, Interval pos) +Beam::calc_stem_y (Grob *me, Grob* s, Grob ** common, + Real xl, Real xr, + Interval pos, bool french) { - int beam_multiplicity = get_multiplicity (me); - int stem_multiplicity = (Stem::flag_i (s) - 2) >? 0; + Real beam_translation = get_beam_translation (me); - Real thick = gh_scm2double (me->get_grob_property ("thickness")); - Real interbeam = get_interbeam (me); - - // ugh -> use commonx - Real x0 = first_visible_stem (me)->relative_coordinate (0, X_AXIS); - Real dx = last_visible_stem (me)->relative_coordinate (0, X_AXIS) - x0; + + Real r = s->relative_coordinate (common[X_AXIS], X_AXIS) - xl; Real dy = pos.delta (); - Real stem_y = (dy && dx - ? (s->relative_coordinate (0, X_AXIS) - x0) / dx - * dy - : 0) + pos[LEFT]; - - /* knee */ - Direction dir = Directional_element_interface::get (me); - Direction sdir = Directional_element_interface::get (s); + Real dx = xr - xl; + Real stem_y_beam0 = (dy && dx + ? r / dx + * dy + : 0) + pos[LEFT]; - /* knee */ - if (dir!= sdir) + Direction my_dir = Directional_element_interface::get (s); + SCM beaming = s->get_grob_property ("beaming"); + + Real stem_y = stem_y_beam0; + if (french) { - stem_y -= dir * (thick / 2 + (beam_multiplicity - 1) * interbeam); - - // huh, why not for first visible? - - 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"); + Slice bm = where_are_the_whole_beams (beaming); + if (!bm.empty_b()) + stem_y += beam_translation * bm[-my_dir]; } - - return stem_y; + else + { + Slice bm = Stem::beam_multiplicity(s); + if (!bm.empty_b()) + stem_y +=bm[my_dir] * beam_translation; + } + + Real id = me->relative_coordinate (common[Y_AXIS], Y_AXIS) + - s->relative_coordinate (common[Y_AXIS], Y_AXIS); + + return stem_y + id; } /* @@ -916,39 +1214,56 @@ Beam::calc_stem_y (Grob *me, Grob* s, Interval pos) void Beam::set_stem_lengths (Grob *me) { - Link_array stems= - Pointer_group_interface__extract_grobs (me, (Item*)0, "stems"); + Link_array stems= + Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems"); if (stems.size () <= 1) return; - Grob *common = me->common_refpoint (stems[0], Y_AXIS); - for (int i=1; i < stems.size (); i++) - if (!Stem::invisible_b (stems[i])) - common = common->common_refpoint (stems[i], Y_AXIS); - - Direction dir = Directional_element_interface::get (me); + Grob *common[2]; + for (int a = 2; a--;) + common[a] = common_refpoint_of_array (stems, me, Axis(a)); + Interval pos = ly_scm2interval (me->get_grob_property ("positions")); Real staff_space = Staff_symbol_referencer::staff_space (me); - Real thick = gh_scm2double (me->get_grob_property ("thickness")); - bool ps_testing = to_boolean (ly_symbol2scm ("ps-testing")); + + bool french = to_boolean (me->get_grob_property ("french-beaming")); + + + bool gap = false; + Real thick =0.0; + if (gh_number_p (me->get_grob_property ("gap")) + &&gh_scm2double (me->get_grob_property ("gap"))) + { + gap = true; + thick = get_thickness(me); + } + + // ugh -> use commonx + Grob * fvs = first_visible_stem (me); + Grob *lvs = last_visible_stem (me); + + Real xl = fvs ? fvs->relative_coordinate (common[X_AXIS], X_AXIS) : 0.0; + Real xr = lvs ? lvs->relative_coordinate (common[X_AXIS], X_AXIS) : 0.0; + for (int i=0; i < stems.size (); i++) { - Item* s = stems[i]; + Grob* s = stems[i]; if (Stem::invisible_b (s)) continue; - Real stem_y = calc_stem_y (me, s, pos); + Real stem_y = calc_stem_y (me, s, common, + xl, xr, + pos, french && i > 0&& (i < stems.size () -1)); - // doesn't play well with dvips - if (ps_testing) - if (Stem::get_direction (s) == dir) - stem_y += Stem::get_direction (s) * thick / 2; + /* + Make the stems go up to the end of the beam. This doesn't matter + for normal beams, but for tremolo beams it looks silly otherwise. + */ + if (gap) + stem_y += thick * 0.5 * Directional_element_interface::get(s); - /* 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); + Stem::set_stemend (s, 2* stem_y / staff_space); } } @@ -961,254 +1276,51 @@ Beam::set_beaming (Grob *me, Beaming_info_list *beaming) Direction d = LEFT; for (int i=0; i < stems.size (); i++) { + /* + Don't overwrite user settings. + */ + 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)) + /* 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_grob_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]; - Stem::set_beaming (stems[i], b, d); + if (i>0 + && i < stems.size() -1 + && Stem::invisible_b (st)) + b = b infos_.elem(i).beams_i_drul_[-d]; + + Stem::set_beaming (st, b, d); } } while (flip (&d) != LEFT); } } - - -/* - beams to go with one stem. - - FIXME: clean me up. - */ -Molecule -Beam::stem_beams (Grob *me, Item *here, Item *next, Item *prev, Real dydx) -{ - // ugh -> use commonx - if ((next - && ! (next->relative_coordinate (0, X_AXIS) - > here->relative_coordinate (0, X_AXIS))) - || (prev - && ! (prev->relative_coordinate (0, X_AXIS) - < here->relative_coordinate (0, X_AXIS)))) - programming_error ("Beams are not left-to-right"); - - Real 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::type_i (here); - - SCM proc = me->get_grob_property ("flag-width-function"); - SCM result = gh_call1 (proc, gh_int2scm (t)); - nw_f = gh_scm2double (result); - } - - - Direction dir = Directional_element_interface::get (me); - - /* [Tremolo] beams on whole notes may not have direction set? */ - if (dir == CENTER) - dir = Directional_element_interface::get (here); - - - /* half beams extending to the left. */ - if (prev) - { - int lhalfs= lhalfs = Stem::beam_count (here, LEFT) - - Stem::beam_count (prev, RIGHT); - int lwholebeams= Stem::beam_count (here, LEFT) - relative_coordinate (0, X_AXIS) - - prev->relative_coordinate (0, X_AXIS); - Real stem_w = gh_scm2double (prev->get_grob_property ("thickness")) - // URG - * me->paper_l ()->get_var ("stafflinethickness"); - - 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 ("stafflinethickness"); - - Molecule a = Lookup::beam (dydx, w + stem_w, thick); - a.translate_axis (- stem_w/2, X_AXIS); - int j = 0; - Real gap_f = 0; - - SCM gap = 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); - } - - w = w/2 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 - { - x0 = stems[0]->relative_coordinate (0, X_AXIS); - dx = stems.top ()->relative_coordinate (0, X_AXIS) - x0; - } - - Interval pos = ly_scm2interval (me->get_grob_property ("positions")); - Real dy = pos.delta (); - Real dydx = dy && dx ? dy/dx : 0; - - 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; - - Molecule sb = stem_beams (me, item, next, prev, dydx); - Real x = item->relative_coordinate (0, X_AXIS) - x0; - sb.translate (Offset (x, x * dydx + pos[LEFT])); - mol.add_molecule (sb); - } - - mol.translate_axis (x0 - - dynamic_cast (me) - ->get_bound (LEFT)->relative_coordinate (0, X_AXIS), - X_AXIS); - - if (DEBUG_QUANTING) - { - /* - This code prints the demerits for each beam. Perhaps this - should be switchable for those who want to twiddle with the - parameters. - */ - String str; - if (1) - { - str += to_str (gh_scm2int (me->get_grob_property ("best-idx"))); - str += ":"; - } - str += to_str (gh_scm2double (me->get_grob_property ("quant-score")), - "%.2f"); - - SCM properties = Font_interface::font_alist_chain (me); - - Molecule tm = Text_item::text2molecule (me, gh_str02scm (str.ch_C ()), properties); - mol.add_at_edge (Y_AXIS, UP, tm, 5.0); - } - - return mol.smobbed_copy (); -} - int Beam::forced_stem_count (Grob *me) { - Link_arraystems = - Pointer_group_interface__extract_grobs (me, (Item*) 0, "stems"); + Link_arraystems = + Pointer_group_interface__extract_grobs (me, (Grob*) 0, "stems"); int f = 0; for (int i=0; i < stems.size (); i++) { - Item *s = stems[i]; + Grob *s = stems[i]; if (Stem::invisible_b (s)) continue; - if (((int)Stem::chord_start_f (s)) + /* 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++; } @@ -1221,8 +1333,8 @@ Beam::forced_stem_count (Grob *me) int Beam::visible_stem_count (Grob *me) { - Link_arraystems = - Pointer_group_interface__extract_grobs (me, (Item*) 0, "stems"); + Link_arraystems = + Pointer_group_interface__extract_grobs (me, (Grob*) 0, "stems"); int c = 0; for (int i = stems.size (); i--;) { @@ -1232,11 +1344,11 @@ Beam::visible_stem_count (Grob *me) return c; } -Item* +Grob* Beam::first_visible_stem (Grob *me) { - Link_arraystems = - Pointer_group_interface__extract_grobs (me, (Item*) 0, "stems"); + Link_arraystems = + Pointer_group_interface__extract_grobs (me, (Grob*) 0, "stems"); for (int i = 0; i < stems.size (); i++) { @@ -1246,11 +1358,11 @@ Beam::first_visible_stem (Grob *me) return 0; } -Item* +Grob* Beam::last_visible_stem (Grob *me) { - Link_arraystems = - Pointer_group_interface__extract_grobs (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])) @@ -1289,10 +1401,6 @@ Beam::rest_collision_callback (SCM element_smob, SCM axis) || !Beam::visible_stem_count (beam)) return gh_double2scm (0.0); - // make callback for rest from this. - // todo: make sure this calced already. - - // Interval pos = ly_scm2interval (beam->get_grob_property ("positions")); Interval pos (0, 0); SCM s = beam->get_grob_property ("positions"); if (gh_pair_p (s) && gh_number_p (ly_car (s))) @@ -1305,42 +1413,112 @@ Beam::rest_collision_callback (SCM element_smob, SCM axis) Real dydx = dy && dx ? dy/dx : 0; Direction d = Stem::get_direction (stem); - Real beamy = (stem->relative_coordinate (0, X_AXIS) - x0) * dydx + pos[LEFT]; + Real stem_y = (pos[LEFT] + + (stem->relative_coordinate (0, X_AXIS) - x0) * dydx) + * d; + + Real beam_translation = get_beam_translation (beam); + Real beam_thickness = gh_scm2double (beam->get_grob_property ("thickness")); + int beam_count = get_direction_beam_count (beam, d); + Real height_of_my_beams = beam_thickness + + (beam_count - 1) * beam_translation; + Real beam_y = stem_y - height_of_my_beams + beam_thickness / 2.0; Real staff_space = Staff_symbol_referencer::staff_space (rest); - - Real rest_dim = rest->extent (rest, Y_AXIS)[d]*2.0 / staff_space; // refp?? + /* Better calculate relative-distance directly, rather than using + rest_dim? */ + Grob *common_x = rest->common_refpoint (beam, Y_AXIS); + Real rest_dim = rest->extent (common_x, Y_AXIS)[d] / staff_space * d; - Real minimum_dist - = gh_scm2double (rest->get_grob_property ("minimum-beam-collision-distance")); - Real dist = - minimum_dist + -d * (beamy - rest_dim) >? 0; + Real minimum_distance = gh_scm2double + (rest->get_grob_property ("minimum-beam-collision-distance")); + Real distance = beam_y - rest_dim; + Real shift = 0; + if (distance < 0) + shift = minimum_distance - distance; + else if (minimum_distance > distance) + shift = minimum_distance - distance; + int stafflines = Staff_symbol_referencer::line_count (rest); - // move discretely by half spaces. - int discrete_dist = int (ceil (dist)); + /* Always move discretely by half spaces */ + Real discrete_shift = ceil (shift * 2.0) / 2.0; - // move by whole spaces inside the staff. - if (discrete_dist < stafflines+1) - discrete_dist = int (ceil (discrete_dist / 2.0)* 2.0); + /* Inside staff, move by whole spaces*/ + if ((rest->extent (common_x, Y_AXIS)[d] + discrete_shift) * d + < stafflines / 2.0 + ||(rest->extent (common_x, Y_AXIS)[-d] + discrete_shift) * -d + < stafflines / 2.0) + discrete_shift = ceil (discrete_shift); - return gh_double2scm (-d * discrete_dist); + return gh_double2scm (-d * discrete_shift); } - bool -Beam::has_interface (Grob *me) +Beam::knee_b (Grob* me) +{ + SCM k = me->get_grob_property ("knee"); + if (gh_boolean_p (k)) + return gh_scm2bool (k); + + bool knee = false; + int d = 0; + for (SCM s = me->get_grob_property ("stems"); gh_pair_p (s); s = ly_cdr (s)) + { + Direction dir = Directional_element_interface::get + (unsmob_grob (ly_car (s))); + if (d && d != dir) + { + knee = true; + break; + } + d = dir; + } + + me->set_grob_property ("knee", gh_bool2scm (knee)); + + return knee; +} + +int +Beam::get_direction_beam_count (Grob *me, Direction d ) { - return me->has_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. + "A beam. \n\n" +" " +"#'thickness= weight of beams, in staffspace " +" " +" " +"We take the least squares line through the ideal-length stems, and " +"then damp that using " +" \n" +" damped = tanh (slope) \n" +" \n" +"this gives an unquantized left and right position for the beam end. " +"Then we take all combinations of quantings near these left and right " +"positions, and give them a score (according to how close they are to " +"the ideal slope, how close the result is to the ideal stems, etc.). We " +"take the best scoring combination. " +, + "knee french-beaming position-callbacks concaveness-gap concaveness-threshold dir-function quant-score auto-knee-gap gap chord-tremolo beamed-stem-shorten shorten least-squares-dy damping flag-width-function neutral-direction positions space-function thickness"); -#'thickness= weight of beams, in staffspace - ", - "concaveness-threshold dir-function quant-score auto-knee-gap gap chord-tremolo beamed-stem-shorten shorten least-squares-dy direction damping flag-width-function neutral-direction positions thickness");