X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam.cc;h=9d5d5aa212560f6c133cd4b8e03d40f282312ed0;hb=767e42120b317f7ab2ca3e7a079bc4c2a0f7a776;hp=d8b2a37887bd64ee329b4eee672f0d019bbf7773;hpb=57be7394ffa2e7d7ba6d60548dba563f3409d472;p=lilypond.git diff --git a/lily/beam.cc b/lily/beam.cc index d8b2a37887..9d5d5aa212 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2005 Han-Wen Nienhuys + (c) 1997--2006 Han-Wen Nienhuys Jan Nieuwenhuizen */ @@ -24,38 +24,39 @@ - beam_translation is the offset between Y centers of the beam. */ -#include // tanh. - #include "beam.hh" -#include "interval-set.hh" -#include "directional-element-interface.hh" + #include "beaming.hh" -#include "misc.hh" +#include "directional-element-interface.hh" +#include "international.hh" +#include "interval-set.hh" +#include "item.hh" #include "least-squares.hh" -#include "stem.hh" -#include "output-def.hh" #include "lookup.hh" -#include "group-interface.hh" -#include "staff-symbol-referencer.hh" -#include "item.hh" +#include "misc.hh" +#include "output-def.hh" +#include "pointer-group-interface.hh" #include "spanner.hh" +#include "staff-symbol-referencer.hh" +#include "stem.hh" #include "warn.hh" #if DEBUG_QUANTING -#include "text-item.hh" // debug output. +#include "text-interface.hh" // debug output. #include "font-interface.hh" // debug output. #endif void Beam::add_stem (Grob *me, Grob *s) { - Pointer_group_interface::add_grob (me, ly_symbol2scm ("stems"), s); - - s->add_dependency (me); - - assert (!Stem::get_beam (s)); - s->set_property ("beam", me->self_scm ()); + if (Stem::get_beam (s)) + { + programming_error ("Stem already has beam"); + return ; + } + Pointer_group_interface::add_grob (me, ly_symbol2scm ("stems"), s); + s->set_object ("beam", me->self_scm ()); add_bound_item (dynamic_cast (me), dynamic_cast (s)); } @@ -70,17 +71,17 @@ Beam::get_thickness (Grob *me) Real Beam::get_beam_translation (Grob *me) { - SCM func = me->get_property ("space-function"); + int beam_count = get_beam_count (me); + Real staff_space = Staff_symbol_referencer::staff_space (me); + Real line = Staff_symbol_referencer::line_thickness (me); + Real thickness = get_thickness (me); + Real fract = robust_scm2double (me->get_property ("length-fraction"), 1.0); + + Real beam_translation = beam_count < 4 + ? (2 * staff_space + line - thickness) / 2.0 + : (3 * staff_space + line - thickness) / 3.0; - 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; - } + return fract * beam_translation; } /* Maximum beam_count. */ @@ -88,33 +89,16 @@ int Beam::get_beam_count (Grob *me) { int m = 0; - for (SCM s = me->get_property ("stems"); scm_is_pair (s); s = scm_cdr (s)) + + extract_grob_set (me, "stems", stems); + for (vsize i = 0; i < stems.size (); i++) { - Grob *stem = unsmob_grob (scm_car (s)); - m = m >? (Stem::beam_multiplicity (stem).length () + 1); + Grob *stem = stems[i]; + m = max (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 = 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 @@ -122,9 +106,9 @@ Beam::space_function (SCM smob, SCM beam_count) Currenly, this means that beam has set all stem's directions. [Alternatively, stems could set its own directions, according to their beam, during 'final-pre-processing'.] */ -MAKE_SCHEME_CALLBACK (Beam, before_line_breaking, 1); +MAKE_SCHEME_CALLBACK (Beam, calc_direction, 1); SCM -Beam::before_line_breaking (SCM smob) +Beam::calc_direction (SCM smob) { Grob *me = unsmob_grob (smob); @@ -136,42 +120,55 @@ Beam::before_line_breaking (SCM smob) 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. */ + Direction d = CENTER; + int count = visible_stem_count (me); if (count < 2) { - me->warning (_ ("beam has less than two visible stems")); - - SCM stems = me->get_property ("stems"); - if (scm_ilength (stems) == 1) + extract_grob_set (me, "stems", stems); + if (stems.size () == 1) { me->warning (_ ("removing beam with less than two stems")); - unsmob_grob (scm_car (stems))->set_property ("beam", SCM_EOL); + stems[0]->set_object ("beam", SCM_EOL); me->suicide (); return SCM_UNSPECIFIED; } - else if (scm_ilength (stems) == 0) + else if (stems.size () == 0) { me->suicide (); return SCM_UNSPECIFIED; } + else + { + Grob *stem = first_visible_stem (me); + + /* + ugh: stems[0] case happens for chord tremolo. + */ + d = to_dir ((stem ? stem : stems[0])->get_property ("default-direction")); + } } + if (count >= 1) { - Direction d = get_default_dir (me); - + if (!d) + d = get_default_dir (me); + consider_auto_knees (me); - set_stem_directions (me, d); - - connect_beams (me); - - set_stem_shorten (me); } - return SCM_EOL; + if (d) + { + set_stem_directions (me, d); + } + + return scm_from_int (d); } + + /* 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 @@ -200,7 +197,7 @@ position_with_maximal_common_beams (SCM left_beaming, SCM right_beaming, for (SCM s = scm_car (right_beaming); scm_is_pair (s); s = scm_cdr (s)) { int k = -right_dir * scm_to_int (scm_car (s)) + i; - if (scm_c_memq (scm_int2num (k), left_beaming) != SCM_BOOL_F) + if (scm_c_memq (scm_from_int (k), left_beaming) != SCM_BOOL_F) count++; } @@ -214,17 +211,20 @@ position_with_maximal_common_beams (SCM left_beaming, SCM right_beaming, return best_start; } -void -Beam::connect_beams (Grob *me) +MAKE_SCHEME_CALLBACK(Beam, calc_beaming, 1) +SCM +Beam::calc_beaming (SCM smob) { - Link_array stems - = extract_grob_array (me, ly_symbol2scm ("stems")); + Grob *me = unsmob_grob (smob); + + extract_grob_set (me, "stems", stems); Slice last_int; last_int.set_empty (); - SCM last_beaming = SCM_EOL; + + SCM last_beaming = scm_cons (SCM_EOL, scm_list_1 (scm_from_int (0))); Direction last_dir = CENTER; - for (int i = 0; i < stems.size (); i++) + for (vsize i = 0; i < stems.size (); i++) { Grob *this_stem = stems[i]; SCM this_beaming = this_stem->get_property ("beaming"); @@ -234,15 +234,13 @@ Beam::connect_beams (Grob *me) { int start_point = position_with_maximal_common_beams (last_beaming, this_beaming, - last_dir, this_dir); + last_dir ? last_dir : this_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 (; scm_is_pair (s); s = scm_cdr (s)) @@ -251,7 +249,7 @@ Beam::connect_beams (Grob *me) = 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)); + scm_set_car_x (s, scm_from_int (new_beam_pos)); } } while (flip (&d) != LEFT); @@ -261,41 +259,38 @@ Beam::connect_beams (Grob *me) } else { - scm_set_car_x (this_beaming, SCM_EOL); SCM s = scm_cdr (this_beaming); for (; scm_is_pair (s); s = scm_cdr (s)) { int np = -this_dir * scm_to_int (scm_car (s)); - scm_set_car_x (s, scm_int2num (np)); + scm_set_car_x (s, scm_from_int (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; } } + + return SCM_EOL; } /* - TODO: should not make beams per stem, but per Y-level. + I really enjoy spaghetti, but spaghetti should be kept on a plate + with a little garlic and olive oil. This is too much. + + rewrite-me */ MAKE_SCHEME_CALLBACK (Beam, print, 1); SCM Beam::print (SCM grob) { Spanner *me = unsmob_spanner (grob); - position_beam (me); - Link_array stems - = extract_grob_array (me, ly_symbol2scm ("stems")); + extract_grob_set (me, "stems", stems); Grob *xcommon = common_refpoint_of_array (stems, me, X_AXIS); xcommon = me->get_bound (LEFT)->common_refpoint (xcommon, X_AXIS); @@ -311,10 +306,10 @@ Beam::print (SCM grob) else { x0 = stems[0]->relative_coordinate (xcommon, X_AXIS); - dx = stems.top ()->relative_coordinate (xcommon, X_AXIS) - x0; + dx = stems.back ()->relative_coordinate (xcommon, X_AXIS) - x0; } - SCM posns = me->get_property ("positions"); + SCM posns = me->get_property ("quantized-positions"); Drul_array pos; if (!is_number_pair (posns)) { @@ -339,56 +334,52 @@ Beam::print (SCM grob) Real gap_length = robust_scm2double (me->get_property ("gap"), 0.0); Stencil the_beam; - Real lt = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness")); + Real lt = me->layout ()->get_dimension (ly_symbol2scm ("linethickness")); - for (int i = 0; i <= stems.size (); i++) + for (vsize i = 0; i <= stems.size (); i++) { - Grob *st = (i < stems.size ()) ? stems[i] : 0; + Grob *stem = (i < stems.size ()) ? stems[i] : 0; - SCM this_beaming = st ? st->get_property ("beaming") : SCM_EOL; - Real xposn = st ? st->relative_coordinate (xcommon, X_AXIS) : 0.0; - Real stem_width = st ? robust_scm2double (st->get_property ("thickness"), 1.0) * lt : 0; - Direction stem_dir = st ? to_dir (st->get_property ("direction")) : CENTER; + SCM this_beaming = stem ? stem->get_property ("beaming") : SCM_EOL; + Real xposn = stem ? stem->relative_coordinate (xcommon, X_AXIS) : 0.0; + Real stem_width = stem ? robust_scm2double (stem->get_property ("thickness"), 1.0) * lt : 0; + Direction stem_dir = stem ? to_dir (stem->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; + SCM right = stem ? scm_car (this_beaming) : SCM_EOL; - Array full_beams; - Array lfliebertjes; - Array rfliebertjes; + std::vector full_beams; + std::vector lfliebertjes; + std::vector rfliebertjes; 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); - } + full_beams.push_back (b); else - { - lfliebertjes.push (b); - } + lfliebertjes.push_back (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); - } + rfliebertjes.push_back (b); } - /* - how much to stick out for beams across linebreaks - */ - Real break_overshoot = 3.0; - Real w = (i > 0 && st) ? (xposn - last_xposn) : break_overshoot; + Drul_array break_overshoot + = robust_scm2drul (me->get_property ("break-overshoot"), + Drul_array (-0.5, 0.0)); + + Real w = (i > 0 && stem) + ? (xposn - last_xposn) + : break_overshoot[ (i == 0) ? LEFT : RIGHT]; Real stem_offset = 0.0; if (i > 0) @@ -397,10 +388,10 @@ Beam::print (SCM grob) stem_offset = -last_stem_width / 2; } - if (st) + if (stem) w += stem_width / 2; - Real blot = me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter")); + Real blot = me->layout ()->get_dimension (ly_symbol2scm ("blotdiameter")); Stencil whole = Lookup::beam (slope, w, thick, blot); Stencil gapped; @@ -410,13 +401,13 @@ Beam::print (SCM grob) gap_count = scm_to_int (me->get_property ("gap-count")); gapped = Lookup::beam (slope, w - 2 * gap_length, thick, blot); - full_beams.sort (default_compare); + vector_sort (full_beams, default_compare); if (stem_dir == UP) full_beams.reverse (); } int k = 0; - for (int j = full_beams.size (); j--;) + for (vsize j = full_beams.size (); j--;) { Stencil b (whole); @@ -435,50 +426,62 @@ Beam::print (SCM grob) { Real nw_f; - if (st) + if (stem) { - 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); + int t = Stem::duration_log (stem); + // ugh. hardcoded. + if (t == 1) + nw_f = 1.98; + else + nw_f = 1.32; } else - nw_f = break_overshoot / 2; + nw_f = break_overshoot[RIGHT] / 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 (LEFT)->break_status_dir ()) + rw = xposn - me->get_bound (LEFT)->extent (xcommon, X_AXIS)[RIGHT] + + break_overshoot[LEFT]; + else + rw = 1.0; // ugh. + } + + if (stem) + lw = min (nw_f, ((xposn - last_xposn) / 2)); else - lw = me->get_bound (RIGHT)->relative_coordinate (xcommon, X_AXIS) - - last_xposn; + { + lw = me->get_bound (RIGHT)->relative_coordinate (xcommon, X_AXIS) + - last_xposn + + break_overshoot[RIGHT]; + } + rw += stem_width / 2; + lw += last_stem_width / 2; Stencil rhalf = Lookup::beam (slope, rw, thick, blot); Stencil lhalf = Lookup::beam (slope, lw, thick, blot); - for (int j = lfliebertjes.size (); j--;) + for (vsize 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); + b.translate_axis (last_xposn - x0 - last_stem_width /2, + 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--;) + for (vsize 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); + b.translate_axis (xposn - x0 - rw + stem_width / 2, X_AXIS); + b.translate_axis (slope * (xposn - x0 - rw) + + bdy * rfliebertjes[j], Y_AXIS); the_beam.add_stencil (b); } } @@ -488,13 +491,14 @@ Beam::print (SCM grob) last_beaming = this_beaming; } - the_beam.translate_axis (x0 - me->relative_coordinate (xcommon, X_AXIS), X_AXIS); + the_beam.translate_axis (x0 - me->relative_coordinate (xcommon, X_AXIS), + X_AXIS); the_beam.translate_axis (pos[LEFT], Y_AXIS); #if (DEBUG_QUANTING) SCM quant_score = me->get_property ("quant-score"); - if (to_boolean (me->get_layout ()->lookup_variable (ly_symbol2scm ("debug-beam-quanting"))) - && scm_is_string (quant_score)) + SCM debug = me->layout ()->lookup_variable (ly_symbol2scm ("debug-beam-quanting")); + if (to_boolean (debug) && scm_is_string (quant_score)) { /* @@ -502,14 +506,16 @@ Beam::print (SCM grob) should be switchable for those who want to twiddle with the parameters. */ - String str; + std::string str; SCM properties = Font_interface::text_font_alist_chain (me); Direction stem_dir = stems.size () ? to_dir (stems[0]->get_property ("direction")) : UP; - Stencil tm = *unsmob_stencil (Text_interface::interpret_markup - (me->get_layout ()->self_scm (), properties, quant_score)); - the_beam.add_at_edge (Y_AXIS, stem_dir, tm, 1.0, 0); + Stencil score = *unsmob_stencil (Text_interface::interpret_markup + (me->layout ()->self_scm (), properties, quant_score)); + + if (!score.is_empty ()) + the_beam.add_at_edge (Y_AXIS, stem_dir, score, 1.0, 0); } #endif @@ -523,40 +529,43 @@ Beam::get_default_dir (Grob *me) total[UP] = total[DOWN] = 0; Drul_array count; count[UP] = count[DOWN] = 0; - Direction d = DOWN; - - Link_array stems - = extract_grob_array (me, ly_symbol2scm ("stems")); - - for (int i = 0; i < stems.size (); i++) - do - { - 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]))); - - if (scm_is_number (s) && scm_to_int (s)) - return to_dir (s); - - /* If dir is not determined: get default */ - return to_dir (me->get_property ("neutral-direction")); + + extract_grob_set (me, "stems", stems); + + for (vsize i = 0; i < stems.size (); i++) + { + Grob *s = stems[i]; + Direction stem_dir = CENTER; + SCM stem_dir_scm = s->get_property_data (ly_symbol2scm ("direction")); + if (is_direction (stem_dir_scm)) + stem_dir = to_dir (stem_dir_scm); + else + stem_dir = to_dir (s->get_property ("default-direction")); + + if (!stem_dir) + stem_dir = to_dir (s->get_property ("neutral-direction")); + + if (stem_dir) + { + count[stem_dir] ++; + total[stem_dir] += max (int (- stem_dir * Stem::head_positions (s) [-stem_dir]), 0); + } + } + + Direction dir = CENTER; + Direction d = CENTER; + if ((d = (Direction) sign (count[UP] - count[DOWN]))) + dir = d; + else if (count[UP] + && count[DOWN] + && (d = (Direction) sign (total[UP] / count[UP] - total[DOWN]/count[DOWN]))) + dir = d; + else if ((d = (Direction) sign (total[UP] - total[DOWN]))) + dir = d; + else + dir = to_dir (me->get_property ("neutral-direction")); + + return dir; } /* Set all stems with non-forced direction to beam direction. @@ -565,14 +574,13 @@ Beam::get_default_dir (Grob *me) void Beam::set_stem_directions (Grob *me, Direction d) { - Link_array stems - = extract_grob_array (me, ly_symbol2scm ("stems")); + extract_grob_set (me, "stems", stems); - for (int i = 0; i < stems.size (); i++) + for (vsize i = 0; i < stems.size (); i++) { Grob *s = stems[i]; - SCM forcedir = s->get_property ("direction"); + SCM forcedir = s->get_property_data (ly_symbol2scm ("direction")); if (!to_dir (forcedir)) set_grob_direction (s, d); } @@ -601,14 +609,13 @@ Beam::consider_auto_knees (Grob *me) gaps.set_full (); - Link_array stems - = extract_grob_array (me, ly_symbol2scm ("stems")); + extract_grob_set (me, "stems", 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++) + std::vector head_extents_array; + for (vsize i = 0; i < stems.size (); i++) { Grob *stem = stems[i]; if (Stem::is_invisible (stem)) @@ -628,13 +635,13 @@ Beam::consider_auto_knees (Grob *me) */ head_extents += stem->relative_coordinate (common, Y_AXIS); - if (to_dir (stem->get_property ("direction"))) + if (to_dir (stem->get_property_data (ly_symbol2scm ("direction")))) { Direction stemdir = to_dir (stem->get_property ("direction")); head_extents[-stemdir] = -stemdir * infinity_f; } } - head_extents_array.push (head_extents); + head_extents_array.push_back (head_extents); gaps.remove_interval (head_extents); } @@ -642,7 +649,7 @@ Beam::consider_auto_knees (Grob *me) Interval max_gap; Real max_gap_len = 0.0; - for (int i = gaps.allowed_regions_.size () -1; i >= 0; i--) + for (vsize i = gaps.allowed_regions_.size () -1; i != VPOS ;i--) { Interval gap = gaps.allowed_regions_[i]; @@ -669,7 +676,7 @@ Beam::consider_auto_knees (Grob *me) if (max_gap_len > threshold) { int j = 0; - for (int i = 0; i < stems.size (); i++) + for (vsize i = 0; i < stems.size (); i++) { Grob *stem = stems[i]; if (Stem::is_invisible (stem)) @@ -680,7 +687,7 @@ Beam::consider_auto_knees (Grob *me) Direction d = (head_extents.center () < max_gap.center ()) ? UP : DOWN; - stem->set_property ("direction", scm_int2num (d)); + stem->set_property ("direction", scm_from_int (d)); head_extents.intersect (max_gap); assert (head_extents.is_empty () || head_extents.length () < 1e-6); @@ -697,14 +704,44 @@ scmify forced-fraction This is done in beam because the shorten has to be uniform over the entire beam. */ + + + void -Beam::set_stem_shorten (Grob *me) +set_minimum_dy (Grob *me, Real *dy) { + if (*dy) + { + /* + If dy is smaller than the smallest quant, we + get absurd direction-sign penalties. + */ + + 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) * max (fabs (*dy), + min (min (sit, inter), hang)); + } +} + + + +MAKE_SCHEME_CALLBACK(Beam, calc_stem_shorten, 1) +SCM +Beam::calc_stem_shorten (SCM smob) +{ + Grob *me = unsmob_grob (smob); + /* shortening looks silly for x staff beams */ if (is_knee (me)) - return; + return scm_from_int (0); Real forced_fraction = 1.0 * forced_stem_count (me) / visible_stem_count (me); @@ -713,103 +750,43 @@ Beam::set_stem_shorten (Grob *me) SCM shorten_list = me->get_property ("beamed-stem-shorten"); if (shorten_list == SCM_EOL) - return; + return scm_from_int (0); 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; + Real shorten = scm_to_double (shorten_elt) * staff_space; - /* your similar cute comment here */ - shorten_f *= forced_fraction; + shorten *= forced_fraction; - if (shorten_f) - me->set_property ("shorten", scm_make_real (shorten_f)); -} + + if (shorten) + return scm_from_double (shorten); -/* 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) -{ - Grob *me = unsmob_grob (smob); - - position_beam (me); - return SCM_UNSPECIFIED; + return scm_from_double (0.0); } -void -Beam::position_beam (Grob *me) -{ - if (!me->is_live ()) - return; - if (to_boolean (me->get_property ("positioning-done"))) - return; - - me->set_property ("positioning-done", SCM_BOOL_T); - - /* Copy to mutable list. */ - SCM s = ly_deep_copy (me->get_property ("positions")); - me->set_property ("positions", s); - - 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 ()); - } - - set_stem_lengths (me); -} - -void -set_minimum_dy (Grob *me, Real *dy) -{ - if (*dy) - { - /* - If dy is smaller than the smallest quant, we - get absurd direction-sign penalties. - */ - - 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_property ("positions", ly_interval2scm (pos)); - return SCM_UNSPECIFIED; - } - - Array x_posns; - Link_array stems - = extract_grob_array (me, ly_symbol2scm ("stems")); + return ly_interval2scm (pos); + + std::vector x_posns; + extract_grob_set (me, "stems", stems); Grob *commonx = common_refpoint_of_array (stems, me, X_AXIS); Grob *commony = common_refpoint_of_array (stems, me, Y_AXIS); @@ -824,19 +801,19 @@ Beam::least_squares (SCM smob) + 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++) + for (vsize i = 0; i < stems.size (); i++) { Grob *s = stems[i]; Real x = s->relative_coordinate (commonx, X_AXIS) - x0; - x_posns.push (x); + x_posns.push_back (x); } Real dx = last_visible_stem (me)->relative_coordinate (commonx, X_AXIS) - x0; Real y = 0; Real slope = 0; Real dy = 0; - + Real ldy = 0.0; if (!ideal.delta ()) { Interval chord (Stem::chord_start_y (first_visible_stem (me)), @@ -857,27 +834,24 @@ Beam::least_squares (SCM smob) pos[-d] = -pos[d]; } else - { - pos = ideal; - } + pos = ideal; /* For broken beams this doesn't work well. In this case, the slope esp. of the first part of a broken beam should predict where the second part goes. */ - me->set_property ("least-squares-dy", - scm_make_real (pos[RIGHT] - pos[LEFT])); + ldy = pos[RIGHT] - pos[LEFT]; } else { - Array ideals; - for (int i = 0; i < stems.size (); i++) + std::vector ideals; + for (vsize i = 0; i < stems.size (); i++) { Grob *s = stems[i]; if (Stem::is_invisible (s)) continue; - ideals.push (Offset (x_posns[i], + ideals.push_back (Offset (x_posns[i], Stem::get_stem_info (s).ideal_y_ + s->relative_coordinate (commony, Y_AXIS) - my_y)); @@ -888,7 +862,8 @@ Beam::least_squares (SCM smob) dy = slope * dx; set_minimum_dy (me, &dy); - me->set_property ("least-squares-dy", scm_make_real (dy)); + + ldy = dy; pos = Interval (y, (y + dy)); } @@ -897,9 +872,8 @@ Beam::least_squares (SCM smob) */ scale_drul (&pos, 1 / Staff_symbol_referencer::staff_space (me)); - me->set_property ("positions", ly_interval2scm (pos)); - - return SCM_UNSPECIFIED; + me->set_property ("least-squares-dy", scm_from_double (ldy)); + return ly_interval2scm (pos); } /* @@ -909,47 +883,47 @@ Beam::least_squares (SCM smob) TODO: we should use the concaveness to control the amount of damping applied. */ -MAKE_SCHEME_CALLBACK (Beam, shift_region_to_valid, 1); +MAKE_SCHEME_CALLBACK (Beam, shift_region_to_valid, 2); SCM -Beam::shift_region_to_valid (SCM grob) +Beam::shift_region_to_valid (SCM grob, SCM posns) { Grob *me = unsmob_grob (grob); /* Code dup. */ - Array x_posns; - Link_array stems - = extract_grob_array (me, ly_symbol2scm ("stems")); + std::vector x_posns; + extract_grob_set (me, "stems", 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; + return posns; Real x0 = fvs->relative_coordinate (commonx, X_AXIS); - for (int i = 0; i < stems.size (); i++) + for (vsize i = 0; i < stems.size (); i++) { Grob *s = stems[i]; Real x = s->relative_coordinate (commonx, X_AXIS) - x0; - x_posns.push (x); + x_posns.push_back (x); } Grob *lvs = last_visible_stem (me); if (!lvs) - return SCM_UNSPECIFIED; + return posns; Real dx = lvs->relative_coordinate (commonx, X_AXIS) - x0; - Drul_array pos = ly_scm2interval (me->get_property ("positions")); + Drul_array pos = ly_scm2interval (posns); + scale_drul (&pos, Staff_symbol_referencer::staff_space (me)); Real dy = pos[RIGHT] - pos[LEFT]; Real y = pos[LEFT]; - Real slope = dy / dx; + Real slope = dx ? (dy / dx) : 0.0; /* Shift the positions so that we have a chance of finding good @@ -957,13 +931,13 @@ Beam::shift_region_to_valid (SCM grob) */ Interval feasible_left_point; feasible_left_point.set_full (); - for (int i = 0; i < stems.size (); i++) + for (vsize i = 0; i < stems.size (); i++) { Grob *s = stems[i]; if (Stem::is_invisible (s)) continue; - Direction d = Stem::get_direction (s); + Direction d = get_grob_direction (s); Real left_y = Stem::get_stem_info (s).shortest_y_ @@ -988,6 +962,7 @@ Beam::shift_region_to_valid (SCM grob) warning (_ ("no viable initial configuration found: may not find good beam slope")); else if (!feasible_left_point.contains (y)) { + const int REGION_SIZE = 2; // UGH UGH if (isinf (feasible_left_point[DOWN])) y = feasible_left_point[UP] - REGION_SIZE; else if (isinf (feasible_left_point[UP])) @@ -999,28 +974,35 @@ Beam::shift_region_to_valid (SCM grob) 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; + return ly_interval2scm (pos); } /* This neat trick is by Werner Lemberg, damped = tanh (slope) corresponds with some tables in [Wanske] CHECKME */ -MAKE_SCHEME_CALLBACK (Beam, slope_damping, 1); +MAKE_SCHEME_CALLBACK (Beam, slope_damping, 2); SCM -Beam::slope_damping (SCM smob) +Beam::slope_damping (SCM smob, SCM posns) { Grob *me = unsmob_grob (smob); + Drul_array pos = ly_scm2interval (posns); if (visible_stem_count (me) <= 1) - return SCM_UNSPECIFIED; + return posns; + SCM s = me->get_property ("damping"); Real damping = scm_to_double (s); - + Real concaveness = robust_scm2double (me->get_property ("concaveness"), 0.0); + if (concaveness >= 10000) + { + pos[LEFT] = pos[RIGHT]; + me->set_property ("least-squares-dy", scm_from_double (0)); + damping = 0; + } + if (damping) { - Drul_array pos = ly_scm2interval (me->get_property ("positions")); scale_drul (&pos, Staff_symbol_referencer::staff_space (me)); Real dy = pos[RIGHT] - pos[LEFT]; @@ -1035,8 +1017,6 @@ Beam::slope_damping (SCM smob) Real slope = dy && dx ? dy / dx : 0; - Real concaveness = robust_scm2double (me->get_property ("concaveness"), 0.0); - slope = 0.6 * tanh (slope) / (damping + concaveness); Real damped_dy = slope * dx; @@ -1047,10 +1027,9 @@ Beam::slope_damping (SCM smob) pos[RIGHT] -= (dy - damped_dy) / 2; scale_drul (&pos, 1 / Staff_symbol_referencer::staff_space (me)); - - me->set_property ("positions", ly_interval2scm (pos)); } - return SCM_UNSPECIFIED; + + return ly_interval2scm (pos); } /* @@ -1116,40 +1095,45 @@ Beam::calc_stem_y (Grob *me, Grob *s, Grob ** common, 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) +MAKE_SCHEME_CALLBACK(Beam, set_stem_lengths, 1); +SCM +Beam::set_stem_lengths (SCM smob) { - Link_array stems - = extract_grob_array (me, ly_symbol2scm ("stems")); + Grob *me = unsmob_grob (smob); + + /* trigger callback. */ + (void) me->get_property ("direction"); + SCM posns = me->get_property ("positions"); + + extract_grob_set (me, "stems", stems); if (!stems.size ()) - return; + return posns; Grob *common[2]; for (int a = 2; a--;) common[a] = common_refpoint_of_array (stems, me, Axis (a)); - Drul_array pos = ly_scm2realdrul (me->get_property ("positions")); + Drul_array pos = ly_scm2realdrul (posns); Real staff_space = Staff_symbol_referencer::staff_space (me); scale_drul (&pos, staff_space); bool gap = false; Real thick = 0.0; if (scm_is_number (me->get_property ("gap-count")) - &&scm_to_int (me->get_property ("gap-count"))) + && scm_to_int (me->get_property ("gap-count"))) { gap = true; thick = get_thickness (me); } - // ugh -> use commonx Grob *fvs = first_visible_stem (me); Grob *lvs = last_visible_stem (me); Real xl = fvs ? fvs->relative_coordinate (common[X_AXIS], X_AXIS) : 0.0; Real xr = lvs ? lvs->relative_coordinate (common[X_AXIS], X_AXIS) : 0.0; - for (int i = 0; i < stems.size (); i++) + for (vsize i = 0; i < stems.size (); i++) { Grob *s = stems[i]; if (Stem::is_invisible (s)) @@ -1169,40 +1153,35 @@ Beam::set_stem_lengths (Grob *me) Stem::set_stemend (s, 2 * stem_y / staff_space); } + + return posns; } void -Beam::set_beaming (Grob *me, Beaming_info_list *beaming) +Beam::set_beaming (Grob *me, Beaming_info_list const *beaming) { - Link_array stems - = extract_grob_array (me, ly_symbol2scm ("stems")); + extract_grob_set (me, "stems", stems); Direction d = LEFT; - for (int i = 0; i < stems.size (); i++) + for (vsize i = 0; i < stems.size (); i++) { /* Don't overwrite user settings. */ - do { - /* Don't set beaming for outside of outer stems */ - if ((d == LEFT && i == 0) - || (d == RIGHT && i == stems.size () -1)) - continue; - - Grob *st = stems[i]; - SCM beaming_prop = st->get_property ("beaming"); + Grob *stem = stems[i]; + SCM beaming_prop = stem->get_property ("beaming"); if (beaming_prop == SCM_EOL || index_get_cell (beaming_prop, d) == SCM_EOL) { int b = beaming->infos_.elem (i).beams_i_drul_[d]; if (i > 0 && i < stems.size () -1 - && Stem::is_invisible (st)) - b = b infos_.elem (i).beams_i_drul_[-d]; + && Stem::is_invisible (stem)) + b = min (b, beaming->infos_.elem (i).beams_i_drul_[-d]); - Stem::set_beaming (st, b, d); + Stem::set_beaming (stem, b, d); } } while (flip (&d) != LEFT); @@ -1212,10 +1191,10 @@ Beam::set_beaming (Grob *me, Beaming_info_list *beaming) int Beam::forced_stem_count (Grob *me) { - Link_array stems - = extract_grob_array (me, ly_symbol2scm ("stems")); + extract_grob_set (me, "stems", stems); + int f = 0; - for (int i = 0; i < stems.size (); i++) + for (vsize i = 0; i < stems.size (); i++) { Grob *s = stems[i]; @@ -1224,8 +1203,11 @@ Beam::forced_stem_count (Grob *me) /* I can imagine counting those boundaries as a half forced stem, but let's count them full for now. */ + Direction defdir = to_dir (s->get_property ("default-direction")); + if (abs (Stem::chord_start_y (s)) > 0.1 - && (Stem::get_direction (s) != Stem::get_default_dir (s))) + && defdir + && get_grob_direction (s) != defdir) f++; } return f; @@ -1234,10 +1216,9 @@ Beam::forced_stem_count (Grob *me) int Beam::visible_stem_count (Grob *me) { - Link_array stems - = extract_grob_array (me, ly_symbol2scm ("stems")); + extract_grob_set (me, "stems", stems); int c = 0; - for (int i = stems.size (); i--;) + for (vsize i = stems.size (); i--;) { if (!Stem::is_invisible (stems[i])) c++; @@ -1248,10 +1229,9 @@ Beam::visible_stem_count (Grob *me) Grob * Beam::first_visible_stem (Grob *me) { - Link_array stems - = extract_grob_array (me, ly_symbol2scm ("stems")); + extract_grob_set (me, "stems", stems); - for (int i = 0; i < stems.size (); i++) + for (vsize i = 0; i < stems.size (); i++) { if (!Stem::is_invisible (stems[i])) return stems[i]; @@ -1262,9 +1242,9 @@ Beam::first_visible_stem (Grob *me) Grob * Beam::last_visible_stem (Grob *me) { - Link_array stems - = extract_grob_array (me, ly_symbol2scm ("stems")); - for (int i = stems.size (); i--;) + extract_grob_set (me, "stems", stems); + + for (vsize i = stems.size (); i--;) { if (!Stem::is_invisible (stems[i])) return stems[i]; @@ -1284,43 +1264,50 @@ Beam::last_visible_stem (Grob *me) */ MAKE_SCHEME_CALLBACK (Beam, rest_collision_callback, 2); SCM -Beam::rest_collision_callback (SCM element_smob, SCM axis) +Beam::rest_collision_callback (SCM smob, SCM prev_offset) { - Grob *rest = unsmob_grob (element_smob); - Axis a = (Axis) scm_to_int (axis); - + Grob *rest = unsmob_grob (smob); if (scm_is_number (rest->get_property ("staff-position"))) - return scm_int2num (0); + return scm_from_int (0); - assert (a == Y_AXIS); - - Grob *st = unsmob_grob (rest->get_property ("stem")); + Real offset = robust_scm2double (prev_offset, 0.0); + + Grob *st = unsmob_grob (rest->get_object ("stem")); Grob *stem = st; if (!stem) - return scm_make_real (0.0); - Grob *beam = unsmob_grob (stem->get_property ("beam")); + return scm_from_double (0.0); + Grob *beam = unsmob_grob (stem->get_object ("beam")); if (!beam || !Beam::has_interface (beam) || !Beam::visible_stem_count (beam)) - return scm_make_real (0.0); + return scm_from_double (0.0); 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); + else + programming_error ("positions property should always be pair of numbers."); + Real staff_space = Staff_symbol_referencer::staff_space (rest); scale_drul (&pos, staff_space); Real dy = pos[RIGHT] - pos[LEFT]; - // ugh -> use commonx - Real x0 = first_visible_stem (beam)->relative_coordinate (0, X_AXIS); - Real dx = last_visible_stem (beam)->relative_coordinate (0, X_AXIS) - x0; + Drul_array visible_stems (first_visible_stem (beam), + last_visible_stem (beam)); + extract_grob_set (beam, "stems", stems); + + Grob *common = common_refpoint_of_array (stems, beam, X_AXIS); + + Real x0 = visible_stems[LEFT]->relative_coordinate (common, X_AXIS); + Real dx = visible_stems[RIGHT]->relative_coordinate (common, X_AXIS) - x0; Real slope = dy && dx ? dy / dx : 0; - Direction d = Stem::get_direction (stem); - Real stem_y = pos[LEFT] + (stem->relative_coordinate (0, X_AXIS) - x0) * slope; + Direction d = get_grob_direction (stem); + Real stem_y = pos[LEFT] + + (stem->relative_coordinate (common, X_AXIS) - x0) * slope; Real beam_translation = get_beam_translation (beam); Real beam_thickness = Beam::get_thickness (beam); @@ -1336,13 +1323,15 @@ Beam::rest_collision_callback (SCM element_smob, SCM axis) Real beam_y = stem_y - d * height_of_my_beams; Grob *common_y = rest->common_refpoint (beam, Y_AXIS); - - Real rest_dim = rest->extent (common_y, Y_AXIS)[d]; + Interval rest_extent = rest->extent (common_y, Y_AXIS); + rest_extent.translate (offset); + + Real rest_dim = rest_extent[d]; Real minimum_distance - = + staff_space * (robust_scm2double (stem->get_property ("stemlet-length"), 0.0) - + robust_scm2double (rest->get_property ("minimum-distance"), 0.0)); + = staff_space * (robust_scm2double (stem->get_property ("stemlet-length"), 0.0) + + robust_scm2double (rest->get_property ("minimum-distance"), 0.0)); - Real shift = d * (((beam_y - d * minimum_distance) - rest_dim) * d extent (common_y, Y_AXIS)[d] + staff_space * shift) * d + if ((rest_extent[d] + staff_space * shift) * d < rad - || (rest->extent (common_y, Y_AXIS)[-d] + staff_space * shift) * -d + || (rest_extent[-d] + staff_space * shift) * -d < rad) shift = ceil (fabs (shift)) * sign (shift); - return scm_make_real (staff_space * shift); + return scm_from_double (staff_space * shift); } bool @@ -1369,9 +1358,10 @@ Beam::is_knee (Grob *me) bool knee = false; int d = 0; - for (SCM s = me->get_property ("stems"); scm_is_pair (s); s = scm_cdr (s)) + extract_grob_set (me, "stems", stems); + for (vsize i = stems.size (); i--;) { - Direction dir = get_grob_direction (unsmob_grob (scm_car (s))); + Direction dir = get_grob_direction (stems[i]); if (d && d != dir) { knee = true; @@ -1388,29 +1378,53 @@ Beam::is_knee (Grob *me) int Beam::get_direction_beam_count (Grob *me, Direction d) { - Link_array stems - = extract_grob_array (me, ly_symbol2scm ("stems")); + extract_grob_set (me, "stems", stems); int bc = 0; - for (int i = stems.size (); i--;) + for (vsize 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); + if (get_grob_direction (stems[i]) == d) + bc = max (bc, (Stem::beam_multiplicity (stems[i]).length () + 1)); } return bc; } -ADD_INTERFACE (Beam, "beam-interface", - "A beam. \n\n" - "The @code{thickness} property is the weight of beams, and is measured " - "in staffspace", - "knee positioning-done position-callbacks " - "concaveness 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"); +ADD_INTERFACE (Beam, + "beam-interface", + "A beam. \n\n" + "The @code{thickness} property is the weight of beams, " + "measured in staffspace. The @code{direction} " + "property is not user-serviceable. Use " + "the @code{direction} property of @code{Stem} instead. " + + , + + /* properties */ + "auto-knee-gap " + "beamed-stem-shorten " + "beaming " + "break-overshoot " + "chord-tremolo " + "concaveness " + "damping " + "details " + "direction " + "gap " + "gap-count " + "inspect-quants " + "knee " + "length-fraction " + "least-squares-dy " + "neutral-direction " + "positions " + "quant-score " + "quantized-positions " + "shorten " + "stems " + "thickness " + );