X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam.cc;h=47c5b7fa485b7675de9c7287e718cf95f210a5fa;hb=a276a19dc6bd57832db3107f2f2cbb04cb4677b6;hp=c0e2ff28e98e8cc1ba085d623f85653df48e7461;hpb=84128b2439833721f06e544972736a43d3f20101;p=lilypond.git diff --git a/lily/beam.cc b/lily/beam.cc index c0e2ff28e9..47c5b7fa48 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--2007 Han-Wen Nienhuys Jan Nieuwenhuizen */ @@ -25,25 +25,48 @@ */ #include "beam.hh" -#include "interval-set.hh" + +#include "beaming-pattern.hh" #include "directional-element-interface.hh" -#include "beaming.hh" -#include "misc.hh" +#include "main.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" +#include "grob-array.hh" -#if DEBUG_QUANTING +#if DEBUG_BEAM_SCORING #include "text-interface.hh" // debug output. #include "font-interface.hh" // debug output. #endif +#include + + +Beam_stem_segment::Beam_stem_segment () +{ + max_connect_ = 1000; // infinity + stem_ = 0; + width_ = 0.0; + stem_x_ = 0.0; + rank_ = 0; + stem_index_ = 0; + dir_ = CENTER; +} + +Beam_segment::Beam_segment () +{ + vertical_count_ = 0; +} + void Beam::add_stem (Grob *me, Grob *s) { @@ -89,7 +112,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)); @@ -97,13 +120,22 @@ Beam::get_beam_count (Grob *me) return m; } +MAKE_SCHEME_CALLBACK (Beam, calc_normal_stems, 1); +SCM +Beam::calc_normal_stems (SCM smob) +{ + Grob *me = unsmob_grob (smob); + + extract_grob_set (me, "stems", stems); + SCM val = Grob_array::make_array (); + Grob_array *ga = unsmob_grob_array (val); + for (vsize i = 0; i < stems.size (); i++) + if (Stem::is_normal_stem (stems[i])) + ga->add (stems[i]); + + return val; +} -/* 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) @@ -113,47 +145,52 @@ Beam::calc_direction (SCM smob) /* Beams with less than 2 two stems don't make much sense, but could happen when you do - [r8 c8 r8]. + r8[ c8 r8] - For a beam that only has one stem, we try to do some disappearance magic: - we revert the flag, and move on to The Eternal Engraving Fields. */ + */ - int count = visible_stem_count (me); + Direction dir = CENTER; + + int count = normal_stem_count (me); if (count < 2) { extract_grob_set (me, "stems", stems); - if (stems.size () == 1) + if (stems.size () == 0) { - me->warning (_ ("removing beam with less than two stems")); - - stems[0]->set_object ("beam", SCM_EOL); + me->warning (_ ("removing beam with no stems")); me->suicide (); return SCM_UNSPECIFIED; } - else if (stems.size () == 0) + else { - me->suicide (); - return SCM_UNSPECIFIED; + Grob *stem = first_normal_stem (me); + + /* + ugh: stems[0] case happens for chord tremolo. + */ + dir = to_dir ((stem ? stem : stems[0])->get_property ("default-direction")); } } - Direction d = CENTER; - if (count >= 1) { - d = get_default_dir (me); + if (!dir) + dir = get_default_dir (me); + consider_auto_knees (me); - set_stem_directions (me, d); - - connect_beams (me); - - set_stem_shorten (me); } - return scm_from_int (d); + if (dir) + { + set_stem_directions (me, dir); + } + + return scm_from_int (dir); } + + /* 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 +233,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"); @@ -242,6 +281,9 @@ Beam::connect_beams (Grob *me) } else { + /* + FIXME: what's this for? + */ SCM s = scm_cdr (this_beaming); for (; scm_is_pair (s); s = scm_cdr (s)) { @@ -257,41 +299,202 @@ Beam::connect_beams (Grob *me) last_dir = this_dir; } } + + return SCM_EOL; } -/* - I really enjoy spaghetti, but spaghetti should be kept on a plate - with a little garlic and olive oil. This is too much. +bool +operator <(Beam_stem_segment const &a, + Beam_stem_segment const &b) +{ + return a.rank_ < b.rank_; +} - rewrite-me -*/ -MAKE_SCHEME_CALLBACK (Beam, print, 1); -SCM -Beam::print (SCM grob) +typedef map > Position_stem_segments_map; + +vector +Beam::get_beam_segments (Grob *me_grob, Grob **common) { - Spanner *me = unsmob_spanner (grob); + /* ugh, this has a side-effect that we need to ensure that + Stem #'beaming is correct */ + (void) me_grob->get_property ("quantized-positions"); + + Spanner *me = dynamic_cast (me_grob); extract_grob_set (me, "stems", stems); - Grob *xcommon = common_refpoint_of_array (stems, me, X_AXIS); + Grob *commonx = common_refpoint_of_array (stems, me, X_AXIS); + + commonx = me->get_bound (LEFT)->common_refpoint (commonx, X_AXIS); + commonx = me->get_bound (RIGHT)->common_refpoint (commonx, X_AXIS); + + *common = commonx; + + int gap_count = robust_scm2int (me->get_property ("gap-count"), 0); + Real gap_length = robust_scm2double (me->get_property ("gap"), 0.0); + + Position_stem_segments_map stem_segments; + Real lt = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness")); + + Slice ranks; + + for (vsize i = 0; i < stems.size (); i++) + { + Grob *stem = stems[i]; + Real stem_width = robust_scm2double (stem->get_property ("thickness"), 1.0) * lt; + Real stem_x = stem->relative_coordinate (commonx, X_AXIS); + SCM beaming = stem->get_property ("beaming"); + Direction d = LEFT; + do + { + for (SCM s = index_get_cell (beaming, d); + scm_is_pair (s); s = scm_cdr (s)) + { + if (!scm_is_integer (scm_car (s))) + continue; + + int beam_rank = scm_to_int (scm_car (s)); + ranks.add_point (beam_rank); + } + + for (SCM s = index_get_cell (beaming, d); + scm_is_pair (s); s = scm_cdr (s)) + { + if (!scm_is_integer (scm_car (s))) + continue; + + int beam_rank = scm_to_int (scm_car (s)); + Beam_stem_segment seg; + seg.stem_ = stem; + seg.stem_x_ = stem_x; + seg.rank_ = 2 * i + (d+1)/2; + seg.width_ = stem_width; + seg.stem_index_ = i; + seg.dir_ = d; + seg.max_connect_ = robust_scm2int (stem->get_property ("max-beam-connect"), 1000); + + Direction stem_dir = get_grob_direction (stem); + + seg.gapped_ + = (stem_dir * beam_rank < (stem_dir * ranks[-stem_dir] + gap_count)); + stem_segments[beam_rank].push_back (seg); + } + } + while (flip (&d) != LEFT); + } - xcommon = me->get_bound (LEFT)->common_refpoint (xcommon, X_AXIS); - xcommon = me->get_bound (RIGHT)->common_refpoint (xcommon, X_AXIS); + Drul_array break_overshoot + = robust_scm2drul (me->get_property ("break-overshoot"), + Drul_array (-0.5, 0.0)); - Real x0, dx; - if (visible_stem_count (me)) + vector segments; + for (Position_stem_segments_map::const_iterator i (stem_segments.begin ()); + i != stem_segments.end (); i++) { - // ugh -> use commonx - x0 = first_visible_stem (me)->relative_coordinate (xcommon, X_AXIS); - dx = last_visible_stem (me)->relative_coordinate (xcommon, X_AXIS) - x0; + vector segs = (*i).second; + vector_sort (segs, less ()); + + Beam_segment current; + + int vertical_count = (*i).first; + for (vsize j = 0; j < segs.size (); j++) + { + /* + event_dir == LEFT: left edge of a beamsegment. + */ + Direction event_dir = LEFT; + do + { + bool on_bound = (event_dir == LEFT) ? j == 0 : + j == segs.size() - 1; + + bool inside_stem = (event_dir == LEFT) + ? segs[j].stem_index_ > 0 + : segs[j].stem_index_ < stems.size () - 1; + + bool event = on_bound + || abs (segs[j].rank_ - segs[j+event_dir].rank_) > 1 + || (abs (vertical_count) >= segs[j].max_connect_ + || abs (vertical_count) >= segs[j + event_dir].max_connect_); + + if (!event) + continue; + + current.vertical_count_ = vertical_count; + current.horizontal_[event_dir] = segs[j].stem_x_; + if (segs[j].dir_ == event_dir) + { + if (on_bound + && me->get_bound (event_dir)->break_status_dir ()) + { + current.horizontal_[event_dir] + = (me->get_bound (event_dir)->extent (commonx, X_AXIS)[RIGHT] + + event_dir * break_overshoot[event_dir]); + } + else + { + Real notehead_width = + Stem::duration_log (segs[j].stem_) == 1 + ? 1.98 + : 1.32; // URG. + + + if (inside_stem) + { + Grob *neighbor_stem = stems[segs[j].stem_index_ + event_dir]; + Real neighbor_stem_x = neighbor_stem->relative_coordinate (commonx, X_AXIS); + + notehead_width = min (notehead_width, + fabs (neighbor_stem_x - segs[j].stem_x_)/2); + } + current.horizontal_[event_dir] += event_dir * notehead_width; + } + } + else + { + current.horizontal_[event_dir] += event_dir * segs[j].width_/2; + if (segs[j].gapped_) + current.horizontal_[event_dir] -= event_dir * gap_length; + } + + if (event_dir == RIGHT) + { + segments.push_back (current); + current = Beam_segment(); + } + } + while (flip (&event_dir) != LEFT); + } + + } + + return segments; +} + +MAKE_SCHEME_CALLBACK(Beam, print, 1); +SCM +Beam::print (SCM grob) +{ + Spanner *me = unsmob_spanner (grob); + Grob *commonx = 0; + vector segments = get_beam_segments (me, &commonx); + + Interval span; + if (normal_stem_count (me)) + { + span[LEFT] = first_normal_stem (me)->relative_coordinate (commonx, X_AXIS); + span[RIGHT] = last_normal_stem (me)->relative_coordinate (commonx, X_AXIS); } else { - x0 = stems[0]->relative_coordinate (xcommon, X_AXIS); - dx = stems.top ()->relative_coordinate (xcommon, X_AXIS) - x0; + extract_grob_set (me, "stems", stems); + span[LEFT] = stems[0]->relative_coordinate (commonx, X_AXIS); + span[RIGHT] = stems.back ()->relative_coordinate (commonx, X_AXIS); } - SCM posns = me->get_property ("positions"); - Drul_array pos; + Real blot = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter")); + + SCM posns = me->get_property ("quantized-positions"); + Interval pos; if (!is_number_pair (posns)) { programming_error ("no beam positions?"); @@ -303,223 +506,99 @@ Beam::print (SCM grob) scale_drul (&pos, Staff_symbol_referencer::staff_space (me)); Real dy = pos[RIGHT] - pos[LEFT]; - Real slope = (dy && dx) ? dy / dx : 0; + Real slope = (dy && span.length ()) ? dy / span.length () : 0; Real thick = get_thickness (me); - Real bdy = get_beam_translation (me); - - SCM last_beaming = SCM_EOL; - Real last_xposn = -1; - Real last_stem_width = -1; - - Real gap_length = robust_scm2double (me->get_property ("gap"), 0.0); + Real beam_dy = get_beam_translation (me); + Direction feather_dir = to_dir (me->get_property ("grow-direction")); + Stencil the_beam; - Real lt = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness")); - - for (int i = 0; i <= stems.size (); i++) + for (vsize i = 0; i < segments.size (); i ++) { - Grob *stem = (i < stems.size ()) ? stems[i] : 0; - - 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 = stem ? scm_car (this_beaming) : SCM_EOL; - - Array full_beams; - Array lfliebertjes; - Array 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); - else - lfliebertjes.push (b); - } - for (SCM s = right; - scm_is_pair (s); s = scm_cdr (s)) - { - int b = scm_to_int (scm_car (s)); - if (scm_c_memq (scm_car (s), left) == SCM_BOOL_F) - rfliebertjes.push (b); - } - - 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) - { - w += last_stem_width / 2; - stem_offset = -last_stem_width / 2; - } - - if (stem) - w += stem_width / 2; - - Real blot = me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter")); - Stencil whole = Lookup::beam (slope, w, thick, blot); - Stencil gapped; - - int gap_count = 0; - if (scm_is_number (me->get_property ("gap-count"))) + Real local_slope = slope; + if (feather_dir) { - 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); - if (stem_dir == UP) - full_beams.reverse (); - } - - int k = 0; - for (int j = full_beams.size (); j--;) - { - Stencil b (whole); - - if (k++ < gap_count) - { - b = gapped; - b.translate_axis (gap_length, X_AXIS); - } - b.translate_axis (last_xposn - x0 + stem_offset, X_AXIS); - b.translate_axis (slope * (last_xposn - x0) + bdy * full_beams[j], Y_AXIS); - - the_beam.add_stencil (b); - } - - if (lfliebertjes.size () || rfliebertjes.size ()) - { - Real nw_f; - - if (stem) - { - 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[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 = min (nw_f, ((xposn - last_xposn) / 2)); - else - { - if (me->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 - + 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--;) - { - Stencil b (lhalf); - 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--;) - { - Stencil b (rhalf); - 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); - } + local_slope += feather_dir * segments[i].vertical_count_ * beam_dy / span.length (); } + + Stencil b = Lookup::beam (local_slope, segments[i].horizontal_.length (), thick, blot); - last_xposn = xposn; - last_stem_width = stem_width; - last_beaming = this_beaming; + b.translate_axis (segments[i].horizontal_[LEFT], X_AXIS); + + b.translate_axis (local_slope + * (segments[i].horizontal_[LEFT] - span.linear_combination (feather_dir)) + + pos.linear_combination (feather_dir) + + beam_dy * segments[i].vertical_count_, Y_AXIS); + the_beam.add_stencil (b); } - - the_beam.translate_axis (x0 - me->relative_coordinate (xcommon, X_AXIS), - X_AXIS); - the_beam.translate_axis (pos[LEFT], Y_AXIS); - -#if (DEBUG_QUANTING) + +#if (DEBUG_BEAM_SCORING) 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-scoring")); if (to_boolean (debug) && scm_is_string (quant_score)) { + extract_grob_set (me, "stems", stems); /* This code prints the demerits for each beam. Perhaps this 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 + the_beam.translate_axis (-me->relative_coordinate (commonx, X_AXIS), X_AXIS); return the_beam.smobbed_copy (); } - + Direction Beam::get_default_dir (Grob *me) { - Drul_array total; - total[UP] = total[DOWN] = 0; - Drul_array count; - count[UP] = count[DOWN] = 0; - 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); + } + + Drul_array total (0, 0); + Drul_array count (0, 0); + + bool force_dir = false; + 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")); + SCM stem_dir_scm = s->get_property_data ("direction"); if (is_direction (stem_dir_scm)) - stem_dir = to_dir (stem_dir_scm); + { + stem_dir = to_dir (stem_dir_scm); + force_dir = true; + } 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) { @@ -528,13 +607,24 @@ Beam::get_default_dir (Grob *me) } } - Direction dir = CENTER; + + if (!force_dir) + { + if (abs (extremes[UP]) > -extremes[DOWN]) + return DOWN; + else if (extremes[UP] < -extremes[DOWN]) + return UP; + } - if (Direction d = (Direction) sign (count[UP] - count[DOWN])) + Direction dir = CENTER; + 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,11 +640,11 @@ 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]; - SCM forcedir = s->get_property_data (ly_symbol2scm ("direction")); + SCM forcedir = s->get_property_data ("direction"); if (!to_dir (forcedir)) set_grob_direction (s, d); } @@ -583,17 +673,15 @@ Beam::consider_auto_knees (Grob *me) gaps.set_full (); - extract_grob_set (me, "stems", stems); + extract_grob_set (me, "normal-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++) + vector head_extents_array; + for (vsize i = 0; i < stems.size (); i++) { Grob *stem = stems[i]; - if (Stem::is_invisible (stem)) - continue; Interval head_extents = Stem::head_positions (stem); if (!head_extents.is_empty ()) @@ -609,13 +697,13 @@ Beam::consider_auto_knees (Grob *me) */ head_extents += stem->relative_coordinate (common, Y_AXIS); - if (to_dir (stem->get_property_data (ly_symbol2scm ("direction")))) + if (to_dir (stem->get_property_data ("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); } @@ -623,7 +711,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,12 +738,9 @@ 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)) - continue; - Interval head_extents = head_extents_array[j++]; Direction d = (head_extents.center () < max_gap.center ()) @@ -678,23 +763,53 @@ 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); + / normal_stem_count (me); int beam_count = get_beam_count (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,108 +819,64 @@ 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); - + int count = normal_stem_count (me); + Interval pos (0,0); if (count < 1) - { - me->set_property ("positions", ly_interval2scm (pos)); - return SCM_UNSPECIFIED; - } + return ly_interval2scm (pos); - Array x_posns; - extract_grob_set (me, "stems", stems); + vector x_posns; + extract_grob_set (me, "normal-stems", stems); Grob *commonx = common_refpoint_of_array (stems, me, X_AXIS); Grob *commony = common_refpoint_of_array (stems, me, Y_AXIS); Real my_y = me->relative_coordinate (commony, Y_AXIS); - Grob *fvs = first_visible_stem (me); - Grob *lvs = last_visible_stem (me); + Grob *fvs = first_normal_stem (me); + Grob *lvs = last_normal_stem (me); Interval ideal (Stem::get_stem_info (fvs).ideal_y_ - + fvs->relative_coordinate (commony, Y_AXIS) -my_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++) + Real x0 = first_normal_stem (me)->relative_coordinate (commonx, X_AXIS); + 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 dx = last_normal_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)), - Stem::chord_start_y (last_visible_stem (me))); + Interval chord (Stem::chord_start_y (stems[0]), + Stem::chord_start_y (stems.back ())); /* Simple beams (2 stems) on middle line should be allowed to be slightly sloped. @@ -829,18 +900,15 @@ 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 +919,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 +929,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,40 +940,41 @@ 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); - Grob *fvs = first_visible_stem (me); + Grob *fvs = first_normal_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); + Grob *lvs = last_normal_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 +988,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,44 +1031,49 @@ 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; + if (normal_stem_count (me) <= 1) + 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]; - Grob *fvs = first_visible_stem (me); - Grob *lvs = last_visible_stem (me); + Grob *fvs = first_normal_stem (me); + Grob *lvs = last_normal_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 dx = last_normal_stem (me)->relative_coordinate (commonx, X_AXIS) + - first_normal_stem (me)->relative_coordinate (commonx, X_AXIS); 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 +1084,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); } /* @@ -1038,13 +1111,13 @@ where_are_the_whole_beams (SCM beaming) /* Return the Y position of the stem-end, given the Y-left, Y-right in POS for stem S. This Y position is relative to S. */ Real -Beam::calc_stem_y (Grob *me, Grob *s, Grob ** common, +Beam::calc_stem_y (Grob *me, Grob *stem, Grob **common, Real xl, Real xr, Drul_array pos, bool french) { Real beam_translation = get_beam_translation (me); - Real r = s->relative_coordinate (common[X_AXIS], X_AXIS) - xl; + Real r = stem->relative_coordinate (common[X_AXIS], X_AXIS) - xl; Real dy = pos[RIGHT] - pos[LEFT]; Real dx = xr - xl; Real stem_y_beam0 = (dy && dx @@ -1052,8 +1125,8 @@ Beam::calc_stem_y (Grob *me, Grob *s, Grob ** common, * dy : 0) + pos[LEFT]; - Direction my_dir = get_grob_direction (s); - SCM beaming = s->get_property ("beaming"); + Direction my_dir = get_grob_direction (stem); + SCM beaming = stem->get_property ("beaming"); Real stem_y = stem_y_beam0; if (french) @@ -1064,13 +1137,13 @@ Beam::calc_stem_y (Grob *me, Grob *s, Grob ** common, } else { - Slice bm = Stem::beam_multiplicity (s); + Slice bm = Stem::beam_multiplicity (stem); if (!bm.is_empty ()) stem_y += bm[my_dir] * beam_translation; } Real id = me->relative_coordinate (common[Y_AXIS], Y_AXIS) - - s->relative_coordinate (common[Y_AXIS], Y_AXIS); + - stem->relative_coordinate (common[Y_AXIS], Y_AXIS); return stem_y + id; } @@ -1079,42 +1152,47 @@ 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 callbacks. */ + (void) me->get_property ("direction"); + (void) me->get_property ("beaming"); + + 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"))) + if (robust_scm2int (me->get_property ("gap-count"), 0)) { gap = true; thick = get_thickness (me); } - // ugh -> use commonx - Grob *fvs = first_visible_stem (me); - Grob *lvs = last_visible_stem (me); + Grob *fvs = first_normal_stem (me); + Grob *lvs = last_normal_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)) - continue; bool french = to_boolean (s->get_property ("french-beaming")); Real stem_y = calc_stem_y (me, s, common, @@ -1125,25 +1203,31 @@ Beam::set_stem_lengths (Grob *me) 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) + if (gap + && !Stem::is_invisible (s)) stem_y += thick * 0.5 * get_grob_direction (s); + /* + Do set_stemend for invisible stems too, so tuplet brackets + have a reference point for sloping + */ Stem::set_stemend (s, 2 * stem_y / staff_space); } + + return posns; } void -Beam::set_beaming (Grob *me, Beaming_info_list const *beaming) +Beam::set_beaming (Grob *me, Beaming_pattern 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,13 +1235,19 @@ 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 count = beaming->beamlet_count (i, d); if (i > 0 && i < stems.size () -1 && Stem::is_invisible (stem)) - b = min (b, beaming->infos_.elem (i).beams_i_drul_[-d]); + count = min (count, beaming->beamlet_count (i,-d)); + + if ( ((i == 0 && d == LEFT) + || (i == stems.size ()-1 && d == RIGHT)) + && stems.size () > 1 + && to_boolean (me->get_property ("clip-edges"))) + count = 0; - Stem::set_beaming (stem, b, d); + Stem::set_beaming (stem, count, d); } } while (flip (&d) != LEFT); @@ -1167,62 +1257,44 @@ Beam::set_beaming (Grob *me, Beaming_info_list const *beaming) int Beam::forced_stem_count (Grob *me) { - extract_grob_set (me, "stems", stems); + extract_grob_set (me, "normal-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]; - if (Stem::is_invisible (s)) - continue; - /* 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; } int -Beam::visible_stem_count (Grob *me) +Beam::normal_stem_count (Grob *me) { - extract_grob_set (me, "stems", stems); - int c = 0; - for (int i = stems.size (); i--;) - { - if (!Stem::is_invisible (stems[i])) - c++; - } - return c; + extract_grob_set (me, "normal-stems", stems); + return stems.size (); } Grob * -Beam::first_visible_stem (Grob *me) +Beam::first_normal_stem (Grob *me) { - extract_grob_set (me, "stems", stems); - - for (int i = 0; i < stems.size (); i++) - { - if (!Stem::is_invisible (stems[i])) - return stems[i]; - } - return 0; + extract_grob_set (me, "normal-stems", stems); + return stems.size () ? stems[0] : 0; } Grob * -Beam::last_visible_stem (Grob *me) +Beam::last_normal_stem (Grob *me) { - extract_grob_set (me, "stems", stems); - - for (int i = stems.size (); i--;) - { - if (!Stem::is_invisible (stems[i])) - return stems[i]; - } - return 0; + extract_grob_set (me, "normal-stems", stems); + return stems.size () ? stems.back () : 0; } /* @@ -1235,18 +1307,16 @@ Beam::last_visible_stem (Grob *me) rest -> stem -> beam -> interpolate_y_position () */ -MAKE_SCHEME_CALLBACK (Beam, rest_collision_callback, 2); +MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Beam, rest_collision_callback, 2, 1); 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) @@ -1254,15 +1324,11 @@ Beam::rest_collision_callback (SCM element_smob, SCM axis) Grob *beam = unsmob_grob (stem->get_object ("beam")); if (!beam || !Beam::has_interface (beam) - || !Beam::visible_stem_count (beam)) + || !Beam::normal_stem_count (beam)) 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."); + Drul_array pos (robust_scm2drul (beam->get_property ("positions"), + Drul_array (0,0))); Real staff_space = Staff_symbol_referencer::staff_space (rest); @@ -1270,13 +1336,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_normal_stem (beam), + last_normal_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); @@ -1293,12 +1365,19 @@ Beam::rest_collision_callback (SCM element_smob, SCM axis) Grob *common_y = rest->common_refpoint (beam, Y_AXIS); - Real rest_dim = rest->extent (common_y, Y_AXIS)[d]; + /* + TODO: this is dubious, because this call needs the info we're + computing right now. + */ + 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); + Real shift = d * min (d * (beam_y - d * minimum_distance - rest_dim), 0.0); shift /= staff_space; Real rad = Staff_symbol_referencer::line_count (rest) * staff_space / 2; @@ -1307,13 +1386,13 @@ 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); - return scm_from_double (staff_space * shift); + return scm_from_double (offset + staff_space * shift); } bool @@ -1326,7 +1405,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 +1427,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? @@ -1361,11 +1440,11 @@ Beam::get_direction_beam_count (Grob *me, Direction d) } 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 " + "measured in staffspace. The @code{direction} " + "property is not user-serviceable. Use " "the @code{direction} property of @code{Stem} instead. " , @@ -1373,22 +1452,26 @@ ADD_INTERFACE (Beam, /* properties */ "auto-knee-gap " "beamed-stem-shorten " + "beaming " "break-overshoot " - "chord-tremolo " + "clip-edges " "concaveness " "damping " "details " "direction " "gap " "gap-count " + "grow-direction " "inspect-quants " "knee " "length-fraction " "least-squares-dy " "neutral-direction " - "position-callbacks " + "normal-stems " "positions " "quant-score " + "quantized-positions " "shorten " + "stems " "thickness " );