X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam.cc;h=d47efc5a7875b80ec12506bd67d721e8871be60f;hb=8ee72795e81c227359ae720d8fac7fc3e68d170f;hp=c0e2ff28e98e8cc1ba085d623f85653df48e7461;hpb=84128b2439833721f06e544972736a43d3f20101;p=lilypond.git diff --git a/lily/beam.cc b/lily/beam.cc index c0e2ff28e9..d47efc5a78 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 */ @@ -25,18 +25,20 @@ */ #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 "misc.hh" +#include "output-def.hh" #include "pointer-group-interface.hh" -#include "staff-symbol-referencer.hh" -#include "item.hh" #include "spanner.hh" +#include "staff-symbol-referencer.hh" +#include "stem.hh" #include "warn.hh" #if DEBUG_QUANTING @@ -89,7 +91,7 @@ Beam::get_beam_count (Grob *me) int m = 0; extract_grob_set (me, "stems", stems); - for (int i = 0; i < stems.size (); i++) + for (vsize i = 0; i < stems.size (); i++) { Grob *stem = stems[i]; m = max (m, (Stem::beam_multiplicity (stem).length () + 1)); @@ -98,12 +100,6 @@ Beam::get_beam_count (Grob *me) } -/* After pre-processing all directions should be set. - Several post-processing routines (stem, slur, script) need stem/beam - direction. - Currenly, this means that beam has set all stem's directions. - [Alternatively, stems could set its own directions, according to - their beam, during 'final-pre-processing'.] */ MAKE_SCHEME_CALLBACK (Beam, calc_direction, 1); SCM Beam::calc_direction (SCM smob) @@ -118,6 +114,8 @@ Beam::calc_direction (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) { @@ -136,24 +134,35 @@ Beam::calc_direction (SCM smob) 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")); + } } - Direction d = CENTER; - if (count >= 1) { - 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); } + 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 @@ -196,18 +205,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) { + 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"); @@ -257,6 +268,8 @@ Beam::connect_beams (Grob *me) last_dir = this_dir; } } + + return SCM_EOL; } /* @@ -287,10 +300,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)) { @@ -315,9 +328,9 @@ 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 ("line-thickness")); - for (int i = 0; i <= stems.size (); i++) + for (vsize i = 0; i <= stems.size (); i++) { Grob *stem = (i < stems.size ()) ? stems[i] : 0; @@ -333,25 +346,25 @@ Beam::print (SCM grob) SCM left = (i > 0) ? scm_cdr (last_beaming) : SCM_EOL; SCM right = stem ? scm_car (this_beaming) : SCM_EOL; - Array full_beams; - Array lfliebertjes; - Array rfliebertjes; + vector full_beams; + vector lfliebertjes; + 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); } Drul_array break_overshoot @@ -372,7 +385,7 @@ Beam::print (SCM grob) if (stem) w += stem_width / 2; - Real blot = me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter")); + Real blot = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter")); Stencil whole = Lookup::beam (slope, w, thick, blot); Stencil gapped; @@ -382,13 +395,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 (); + reverse (full_beams); } int k = 0; - for (int j = full_beams.size (); j--;) + for (vsize j = full_beams.size (); j--;) { Stencil b (whole); @@ -447,7 +460,7 @@ Beam::print (SCM grob) 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 - last_stem_width /2, @@ -457,7 +470,7 @@ Beam::print (SCM grob) 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 + stem_width / 2, X_AXIS); @@ -478,7 +491,7 @@ Beam::print (SCM grob) #if (DEBUG_QUANTING) SCM quant_score = me->get_property ("quant-score"); - SCM debug = me->get_layout ()->lookup_variable (ly_symbol2scm ("debug-beam-quanting")); + SCM debug = me->layout ()->lookup_variable (ly_symbol2scm ("debug-beam-quanting")); if (to_boolean (debug) && scm_is_string (quant_score)) { @@ -487,31 +500,51 @@ Beam::print (SCM grob) should be switchable for those who want to twiddle with the parameters. */ - String str; + 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 return the_beam.smobbed_copy (); } +#define iterof(i,s) typeof((s).begin()) i((s).begin()) + Direction Beam::get_default_dir (Grob *me) { - Drul_array total; - total[UP] = total[DOWN] = 0; - Drul_array count; - count[UP] = count[DOWN] = 0; - extract_grob_set (me, "stems", stems); - for (int i = 0; i < stems.size (); i++) + Drul_array extremes (0.0, 0.0); + for (iterof (s, stems); s != stems.end (); s++) + { + Interval positions = Stem::head_positions (*s); + Direction d = DOWN; + do + { + if (sign (positions[d]) == d) + extremes[d] = d * max (d * positions[d], d * extremes[d]); + } + while (flip (&d) != DOWN); + } + + if (extremes[UP] > extremes[DOWN]) + return DOWN; + else if (extremes[UP] < extremes[DOWN]) + return UP; + + Drul_array total (0, 0); + Drul_array count (0, 0); + + for (vsize i = 0; i < stems.size (); i++) { Grob *s = stems[i]; Direction stem_dir = CENTER; @@ -519,7 +552,10 @@ Beam::get_default_dir (Grob *me) if (is_direction (stem_dir_scm)) stem_dir = to_dir (stem_dir_scm); else - stem_dir = Stem::get_default_dir (s); + stem_dir = to_dir (s->get_property ("default-direction")); + + if (!stem_dir) + stem_dir = to_dir (s->get_property ("neutral-direction")); if (stem_dir) { @@ -529,12 +565,14 @@ Beam::get_default_dir (Grob *me) } Direction dir = CENTER; - - if (Direction d = (Direction) sign (count[UP] - count[DOWN])) + Direction d = CENTER; + if ((d = (Direction) sign (count[UP] - count[DOWN]))) dir = d; - else if (Direction d = (Direction) sign (total[UP] / count[UP] - total[DOWN]/count[DOWN])) + else if (count[UP] + && count[DOWN] + && (d = (Direction) sign (total[UP] / count[UP] - total[DOWN]/count[DOWN]))) dir = d; - else if (Direction d = (Direction) sign (total[UP] - total[DOWN])) + else if ((d = (Direction) sign (total[UP] - total[DOWN]))) dir = d; else dir = to_dir (me->get_property ("neutral-direction")); @@ -550,7 +588,7 @@ Beam::set_stem_directions (Grob *me, Direction d) { 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]; @@ -588,8 +626,8 @@ Beam::consider_auto_knees (Grob *me) 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++) + vector head_extents_array; + for (vsize i = 0; i < stems.size (); i++) { Grob *stem = stems[i]; if (Stem::is_invisible (stem)) @@ -615,7 +653,7 @@ Beam::consider_auto_knees (Grob *me) head_extents[-stemdir] = -stemdir * infinity_f; } } - head_extents_array.push (head_extents); + head_extents_array.push_back (head_extents); gaps.remove_interval (head_extents); } @@ -623,7 +661,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]; @@ -650,7 +688,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)) @@ -678,14 +716,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); @@ -694,7 +762,7 @@ 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); @@ -704,76 +772,32 @@ Beam::set_stem_shorten (Grob *me) shorten *= forced_fraction; - if (shorten) - me->set_property ("shorten", scm_from_double (shorten)); -} - -MAKE_SCHEME_CALLBACK (Beam, calc_positions, 1); -SCM -Beam::calc_positions (SCM smob) -{ - Grob *me = unsmob_grob (smob); - if (!me->is_live ()) - return SCM_EOL; - - (void) me->get_property ("direction"); - SCM posns = scm_cons (SCM_BOOL_F, SCM_BOOL_F); - me->set_property ("positions", posns); - - 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 ()); + if (shorten) + return scm_from_double (shorten); - /* - TODO: move this in separate calc function. - */ - set_stem_lengths (me); - return SCM_UNSPECIFIED; + return scm_from_double (0.0); } -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) * max (fabs (*dy), - min (min (sit, inter), hang)); - } -} /* - Compute a first approximation to the beam slope. + Compute a first approximation to the beam slope. */ -MAKE_SCHEME_CALLBACK (Beam, least_squares, 1); +MAKE_SCHEME_CALLBACK (Beam, calc_least_squares_positions, 2); SCM -Beam::least_squares (SCM smob) +Beam::calc_least_squares_positions (SCM smob, SCM posns) { + (void) posns; + Grob *me = unsmob_grob (smob); int count = visible_stem_count (me); - Interval pos (0, 0); - + Interval pos (0,0); if (count < 1) - { - me->set_property ("positions", ly_interval2scm (pos)); - return SCM_UNSPECIFIED; - } - - Array x_posns; + return ly_interval2scm (pos); + + 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); @@ -789,19 +813,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)), @@ -829,18 +853,17 @@ Beam::least_squares (SCM smob) slope esp. of the first part of a broken beam should predict where the second part goes. */ - me->set_property ("least-squares-dy", - scm_from_double (pos[RIGHT] - pos[LEFT])); + ldy = pos[RIGHT] - pos[LEFT]; } else { - Array ideals; - for (int i = 0; i < stems.size (); i++) + 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)); @@ -851,7 +874,8 @@ Beam::least_squares (SCM smob) dy = slope * dx; set_minimum_dy (me, &dy); - me->set_property ("least-squares-dy", scm_from_double (dy)); + + ldy = dy; pos = Interval (y, (y + dy)); } @@ -860,9 +884,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); } /* @@ -872,15 +895,15 @@ 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; + 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); @@ -888,24 +911,25 @@ Beam::shift_region_to_valid (SCM grob) 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)); @@ -919,7 +943,7 @@ 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)) @@ -962,28 +986,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]; @@ -998,8 +1029,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; @@ -1010,10 +1039,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); } /* @@ -1079,38 +1107,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) { + 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)) @@ -1130,6 +1165,8 @@ Beam::set_stem_lengths (Grob *me) Stem::set_stemend (s, 2 * stem_y / staff_space); } + + return posns; } void @@ -1138,12 +1175,11 @@ Beam::set_beaming (Grob *me, Beaming_info_list const *beaming) 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 { Grob *stem = stems[i]; @@ -1151,11 +1187,11 @@ Beam::set_beaming (Grob *me, Beaming_info_list const *beaming) if (beaming_prop == SCM_EOL || index_get_cell (beaming_prop, d) == SCM_EOL) { - int b = beaming->infos_.elem (i).beams_i_drul_[d]; + int b = beaming->infos_.at (i).beams_i_drul_[d]; if (i > 0 && i < stems.size () -1 && Stem::is_invisible (stem)) - b = min (b, beaming->infos_.elem (i).beams_i_drul_[-d]); + b = min (b, beaming->infos_.at (i).beams_i_drul_[-d]); Stem::set_beaming (stem, b, d); } @@ -1170,7 +1206,7 @@ Beam::forced_stem_count (Grob *me) 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]; @@ -1179,8 +1215,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 - && (get_grob_direction (s) != Stem::get_default_dir (s))) + && defdir + && get_grob_direction (s) != defdir) f++; } return f; @@ -1191,7 +1230,7 @@ Beam::visible_stem_count (Grob *me) { 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++; @@ -1204,7 +1243,7 @@ Beam::first_visible_stem (Grob *me) { 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]; @@ -1217,7 +1256,7 @@ Beam::last_visible_stem (Grob *me) { extract_grob_set (me, "stems", stems); - for (int i = stems.size (); i--;) + for (vsize i = stems.size (); i--;) { if (!Stem::is_invisible (stems[i])) return stems[i]; @@ -1237,16 +1276,14 @@ 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); - (void) axis; - + Grob *rest = unsmob_grob (smob); if (scm_is_number (rest->get_property ("staff-position"))) return scm_from_int (0); - assert (scm_to_int (axis) == Y_AXIS); - + Real offset = robust_scm2double (prev_offset, 0.0); + Grob *st = unsmob_grob (rest->get_object ("stem")); Grob *stem = st; if (!stem) @@ -1270,13 +1307,19 @@ Beam::rest_collision_callback (SCM element_smob, SCM axis) 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 = get_grob_direction (stem); - Real stem_y = pos[LEFT] + (stem->relative_coordinate (0, X_AXIS) - x0) * slope; + 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); @@ -1292,11 +1335,13 @@ 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 * min (((beam_y - d * minimum_distance) - rest_dim) * d, 0.0); @@ -1307,9 +1352,9 @@ Beam::rest_collision_callback (SCM element_smob, SCM axis) shift = ceil (fabs (shift * 2.0)) / 2.0 * sign (shift); /* Inside staff, move by whole spaces*/ - if ((rest->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); @@ -1326,7 +1371,7 @@ Beam::is_knee (Grob *me) bool knee = false; int d = 0; extract_grob_set (me, "stems", stems); - for (int i = stems.size (); i--;) + for (vsize i = stems.size (); i--;) { Direction dir = get_grob_direction (stems[i]); if (d && d != dir) @@ -1348,7 +1393,7 @@ Beam::get_direction_beam_count (Grob *me, Direction d) 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? @@ -1365,7 +1410,8 @@ ADD_INTERFACE (Beam, "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 " + "measured in staffspace. The @code{direction} " + "property is not user-serviceable. Use " "the @code{direction} property of @code{Stem} instead. " , @@ -1373,6 +1419,7 @@ ADD_INTERFACE (Beam, /* properties */ "auto-knee-gap " "beamed-stem-shorten " + "beaming " "break-overshoot " "chord-tremolo " "concaveness " @@ -1386,9 +1433,10 @@ ADD_INTERFACE (Beam, "length-fraction " "least-squares-dy " "neutral-direction " - "position-callbacks " "positions " "quant-score " + "quantized-positions " "shorten " + "stems " "thickness " );