X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam.cc;h=44e6da1dbdda491ea0bb74c83776da725314eb66;hb=8f3edf3cc6aab40cd2aedde70c75ad01f6a34d5e;hp=69de9292315ab38349ca5ea41697619fe2fe31dd;hpb=685452c8675e89a84692420fb9891756d318e771;p=lilypond.git diff --git a/lily/beam.cc b/lily/beam.cc index 69de929231..44e6da1dbd 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -3,802 +3,762 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1999 Han-Wen Nienhuys + (c) 1997--2000 Han-Wen Nienhuys Jan Nieuwenhuizen */ - /* [TODO] - * center beam symbol + * shorter! (now +- 1000 lines) * less hairy code - * redo grouping - -TODO: + * move paper vars to scm -The relationship Stem <-> Beam is way too hairy. Let's figure who -needs what, and what information should be available when. + remove *-hs variables, and do all y-position stuff in staff-space. +*/ - */ -#include +#include // tanh. -#include "chord-tremolo.hh" +#include "molecule.hh" +#include "directional-element-interface.hh" #include "beaming.hh" -#include "proto.hh" -#include "dimensions.hh" #include "beam.hh" #include "misc.hh" -#include "debug.hh" -#include "molecule.hh" -#include "leastsquares.hh" +#include "least-squares.hh" #include "stem.hh" #include "paper-def.hh" #include "lookup.hh" +#include "group-interface.hh" +#include "staff-symbol-referencer.hh" +#include "cross-staff.hh" +#include "item.hh" +#include "spanner.hh" +#include "warn.hh" -Beam::Beam () +void +Beam::add_stem (Grob*me, Grob*s) { - slope_f_ = 0; - left_y_ = 0; - multiple_i_ = 0; + Pointer_group_interface:: add_element(me, "stems", s); + + s->add_dependency (me); + + assert (!Stem::beam_l (s)); + s->set_grob_property ("beam", me->self_scm ()); + + add_bound_item (dynamic_cast (me), dynamic_cast (s)); } -void -Beam::add_stem (Stem*s) +int +Beam::get_multiplicity (Grob*me) { -#if 0 - /* - should figure out why this didn't work. + int m = 0; + for (SCM s = me->get_grob_property ("stems"); gh_pair_p (s); s = gh_cdr (s)) + { + Grob * sc = unsmob_grob (gh_car (s)); - --hwn. - */ - if (!stems_.size ()) + if (Stem::has_interface (sc)) + m = m >? Stem::beam_count (sc,LEFT) >? Stem::beam_count (sc,RIGHT); + } + return m; +} + +/* + 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,before_line_breaking,1); +SCM +Beam::before_line_breaking (SCM smob) +{ + Grob * me = unsmob_grob (smob); + + // Why? + if (visible_stem_count (me) < 2) { - set_parent (s, Y_AXIS); + warning (_ ("beam has less than two stems")); } -#endif - stems_.push (s); - s->add_dependency (this); - assert (!s->beam_l_); - s->beam_l_ = this; + if (!Directional_element_interface::get (me)) + Directional_element_interface::set (me, get_default_dir (me)); - if (!spanned_drul_[LEFT]) - set_bounds (LEFT,s); - else - set_bounds (RIGHT,s); + auto_knees (me); + set_stem_directions (me); + set_stem_shorten (me); + + return SCM_EOL; } -Stem_info -Beam::get_stem_info (Stem *s) +Direction +Beam::get_default_dir (Grob*me) { - Stem_info i; - for (int i=0; i < sinfo_.size (); i++) - { - if (sinfo_[i].stem_l_ == s) - return sinfo_[i]; - } - assert (false); - return i; + Drul_array total; + total[UP] = total[DOWN] = 0; + Drul_array count; + count[UP] = count[DOWN] = 0; + Direction d = DOWN; + + Link_array stems= + Pointer_group_interface__extract_elements (me, (Item*)0, "stems"); + + for (int i=0; i get_grob_property ("dir-function"); + SCM s = gh_call2 (func, + gh_cons (gh_int2scm (count[UP]), + gh_int2scm (count[DOWN])), + gh_cons (gh_int2scm (total[UP]), + gh_int2scm (total[DOWN]))); + + if (gh_number_p (s) && gh_scm2int (s)) + return to_dir (s); + + /* + If dir is not determined: get default + */ + return to_dir (me->get_grob_property ("default-neutral-direction")); } -Molecule* -Beam::do_brew_molecule_p () const + +/* + Set all stems with non-forced direction to beam direction. + Urg: non-forced should become `without/with unforced' direction, + once stem gets cleaned-up. + */ +void +Beam::set_stem_directions (Grob*me) { - Molecule *mol_p = new Molecule; - if (!sinfo_.size ()) - return mol_p; + Link_array stems + =Pointer_group_interface__extract_elements (me, (Item*) 0, "stems"); + Direction d = Directional_element_interface::get (me); - Real x0 = stems_[0]->hpos_f (); - for (int j=0; j 0)? stems_[j-1] : 0; - Stem * next = (j < stems_.size ()-1) ? stems_[j+1] :0; - - Molecule sb = stem_beams (i, next, prev); - Real x = i->hpos_f ()-x0; - sb.translate (Offset (x, (x * slope_f_ + left_y_) * - i->staff_line_leading_f ()/2 )); - mol_p->add_molecule (sb); + Grob *s = stems[i]; + SCM force = s->remove_grob_property ("dir-forced"); + if (!gh_boolean_p (force) || !gh_scm2bool (force)) + Directional_element_interface ::set (s,d); } - mol_p->translate_axis (x0 - - spanned_drul_[LEFT]->relative_coordinate (0, X_AXIS), X_AXIS); - - return mol_p; -} +} -Offset -Beam::center () const +void +Beam::auto_knees (Grob*me) { - Stem_info si = sinfo_[0]; - - Real w= (si.stem_l_->note_delta_f () + extent (X_AXIS).length ())/2.0; - return Offset (w, ( w* slope_f_) * - si.stem_l_->staff_line_leading_f ()/2); + if (!auto_knee (me,"auto-interstaff-knee-gap", true)) + auto_knee (me, "auto-knee-gap", false); } /* Simplistic auto-knees; only consider vertical gap between two - adjacent chords + adjacent chords. + + `Forced' stem directions are ignored. If you don't want auto-knees, + don't set, or unset autoKneeGap/autoInterstaffKneeGap. */ bool -Beam::auto_knee (SCM gap, bool interstaff_b) +Beam::auto_knee (Grob*me, String gap_str, bool interstaff_b) { - bool knee = false; + bool knee_b = false; int knee_y = 0; - Real internote_f = stems_[0]->staff_line_leading_f ()/2; - if (gap != SCM_BOOL_F) + SCM gap = me->get_grob_property (gap_str.ch_C()); + + Direction d = Directional_element_interface::get (me); + Link_array stems= + Pointer_group_interface__extract_elements (me, (Item*)0, "stems"); + + if (gh_number_p (gap)) { - int auto_gap_i = gh_scm2int (SCM_CDR (gap)); - for (int i=1; i < stems_.size (); i++) + Spanner*sp = dynamic_cast (me); + int auto_gap_i = gh_scm2int (gap); + for (int i=1; i < stems.size (); i++) { - bool is_b = (bool)(sinfo_[i].interstaff_f_ - sinfo_[i-1].interstaff_f_); - int l_y = (int)(stems_[i-1]->chord_start_f () / internote_f) - + (int)sinfo_[i-1].interstaff_f_; - int r_y = (int)(stems_[i]->chord_start_f () / internote_f) - + (int)sinfo_[i].interstaff_f_; + bool is_b = (bool)(calc_interstaff_dist (stems[i], sp) + - calc_interstaff_dist (stems[i-1], sp)); + int l_y = (int)(Stem::head_positions(stems[i-1])[d]); + int l_i = (int)calc_interstaff_dist (stems[i-1], sp); + l_y -= l_i; + int r_y = (int)(Stem::head_positions(stems[i])[d]); + int r_i = (int)calc_interstaff_dist (stems[i], sp); + r_y -= r_i; int gap_i = r_y - l_y; - /* - Forced stem directions are ignored. If you don't want auto-knees, - don't set, or unset autoKneeGap/autoInterstaffKneeGap. - */ if ((abs (gap_i) >= auto_gap_i) && (!interstaff_b || is_b)) { knee_y = (r_y + l_y) / 2; - knee = true; + knee_b = true; break; } } } - if (knee) + if (knee_b) { - for (int i=0; i < stems_.size (); i++) + for (int i=0; i < stems.size (); i++) { - int y = (int)(stems_[i]->chord_start_f () / internote_f) - + (int)sinfo_[i].interstaff_f_; - stems_[i]->dir_ = y < knee_y ? UP : DOWN; - stems_[i]->set_elt_property (dir_forced_scm_sym, SCM_BOOL_T); + Item *s = stems[i]; + int y = (int)(Stem::head_positions(s)[d]); + int y_i = (int)calc_interstaff_dist (s, dynamic_cast (me)); + y -= y_i; + + Directional_element_interface::set (s,y < knee_y ? UP : DOWN); + s->set_grob_property ("dir-forced", SCM_BOOL_T); } } - return knee; + return knee_b; } -bool -Beam::auto_knees () +/* + Set stem's shorten property if unset. + TODO: + take some y-position (chord/beam/nearest?) into account + scmify forced-fraction + */ +void +Beam::set_stem_shorten (Grob*m) { - if (auto_knee (get_elt_property (auto_interstaff_knee_gap_scm_sym), true)) - return true; - - return auto_knee (get_elt_property (auto_knee_gap_scm_sym), false); -} + Spanner*me = dynamic_cast (m); + if (!visible_stem_count (me)) + return; + Real forced_fraction = forced_stem_count (me) / visible_stem_count (me); + if (forced_fraction < 0.5) + return; -void -Beam::do_pre_processing () -{ - /* - urg: it seems that info on whether beam (voice) dir was forced - is being junked here? - */ - if (!dir_) - dir_ = get_default_dir (); - - set_direction (dir_); -} + int multiplicity = get_multiplicity (me); -void -Beam::do_print () const -{ -#ifndef NPRINT - DEBUG_OUT << "slope_f_ " << slope_f_ << "left ypos " << left_y_; - Spanner::do_print (); -#endif -} + SCM shorten = me->get_grob_property ("beamed-stem-shorten"); + if (shorten == SCM_EOL) + return; -void -Beam::do_post_processing () -{ - if (stems_.size () < 2) - { - warning (_ ("beam with less than two stems")); - set_elt_property (transparent_scm_sym, SCM_BOOL_T); - return; - } - set_steminfo (); - if (auto_knees ()) - { - /* - if auto-knee did its work, most probably stem directions - have changed, so we must recalculate all. - */ - dir_ = get_default_dir (); - set_direction (dir_); + int sz = scm_ilength (shorten); + + Real staff_space = Staff_symbol_referencer::staff_space (me); + SCM shorten_elt = scm_list_ref (shorten, gh_int2scm (multiplicity stems= + Pointer_group_interface__extract_elements (me, (Item*)0, "stems"); -void -Beam::do_substitute_element_pointer (Score_element*o,Score_element*n) -{ - if (Stem * os = dynamic_cast (o)) - stems_.substitute (os, - dynamic_cast (n)); + for (int i=0; i < stems.size (); i++) + { + Item* s = stems[i]; + if (Stem::invisible_b (s)) + continue; + if (gh_number_p (s->get_grob_property ("shorten"))) + s->set_grob_property ("shorten", gh_double2scm (shorten_f)); + } } -Interval -Beam::do_width () const +/* + Set elt properties height and y-position if not set. + Adjust stem lengths to reach beam. + */ +MAKE_SCHEME_CALLBACK(Beam,after_line_breaking,1); +SCM +Beam::after_line_breaking (SCM smob) { - return Interval (stems_[0]->hpos_f (), - stems_.top ()->hpos_f ()); -} + Grob * me = unsmob_grob (smob); -Direction -Beam::get_default_dir () const -{ - Drul_array total; - total[UP] = total[DOWN] = 0; - Drul_array count; - count[UP] = count[DOWN] = 0; - Direction d = DOWN; + /* first, calculate y, dy */ + Real y, dy; + calc_default_position_and_height (me, &y, &dy); + if (visible_stem_count (me)) + { + if (suspect_slope_b (me, y, dy)) + dy = 0; - for (int i=0; i dir_ - ? (1 + d * s->dir_)/2 - : s->get_center_distance ((Direction)-d); + Real damped_dy = calc_slope_damping_f (me, dy); + Real quantised_dy = quantise_dy_f (me, damped_dy); - if (current) - { - total[d] += current; - count[d] ++; - } + y += (dy - quantised_dy) / 2; + dy = quantised_dy; + } + /* + until here, we used only stem_info, which acts as if dir=up + */ + y *= Directional_element_interface::get (me); + dy *= Directional_element_interface::get (me); - } while (flip(&d) != DOWN); - - /* - [Ross] states that the majority of the notes dictates the - direction (and not the mean of "center distance") - But is that because it really looks better, or because he wants - to provide some real simple hands-on rules? - - We have our doubts, so we simply provide all sensible alternatives. + Real half_space = Staff_symbol_referencer::staff_space (me) / 2; - If dir is not determined: up (see stem::get_default_dir ()) */ + /* weird: why do we do calc_position_and_height () ? regardless of + this setting? - Direction beam_dir; - Direction neutral_dir = (Direction)(int)paper_l ()->get_var ("stem_default_neutral_direction"); + */ + /* check for user-override of dy */ + SCM s = me->remove_grob_property ("height-hs"); + if (gh_number_p (s)) + { + dy = gh_scm2double (s) * half_space; + } + me->set_grob_property ("height", gh_double2scm (dy)); - SCM a = get_elt_property (gh_symbol2scm ("beam_dir_algorithm")); - a= gh_cdr (a); - - if (a == gh_symbol2scm ("majority")) // should get default from paper. - beam_dir = (count[UP] == count[DOWN]) ? neutral_dir - : (count[UP] > count[DOWN]) ? UP : DOWN; - else if (a == gh_symbol2scm ("mean")) - // mean center distance - beam_dir = (total[UP] == total[DOWN]) ? neutral_dir - : (total[UP] > total[DOWN]) ? UP : DOWN; - else if (a == gh_symbol2scm ("median")) + /* check for user-override of y */ + s = me->remove_grob_property ("y-position-hs"); + if (gh_number_p (s)) { - // median center distance - if (count[DOWN] && count[UP]) - { - beam_dir = (total[UP] / count[UP] == total[DOWN] / count[DOWN]) - ? neutral_dir - : (total[UP] / count[UP] > total[DOWN] / count[DOWN]) ? UP : DOWN; - } - else + y = gh_scm2double (s) * half_space; + } + else + { + /* we can modify y, so we should quantise y */ + Real y_shift = check_stem_length_f (me, y, dy); + y += y_shift; + y = quantise_y_f (me,y, dy, 0); + set_stem_length (me, y, dy); + y_shift = check_stem_length_f (me, y, dy); + + if (y_shift > half_space / 4) { - beam_dir = (count[UP] == count[DOWN]) ? neutral_dir - : (count[UP] > count[DOWN]) ? UP : DOWN; + y += y_shift; + + /* + for significantly lengthened or shortened stems, + request quanting the other way. + */ + int quant_dir = 0; + if (abs (y_shift) > half_space / 2) + quant_dir = sign (y_shift) * Directional_element_interface::get (me); + y = quantise_y_f (me, y, dy, quant_dir); } } - - return beam_dir; + // UGH. Y is not in staff position unit? + // Ik dacht datwe daar juist van weg wilden? + set_stem_length (me, y, dy); + me->set_grob_property ("y-position", gh_double2scm (y)); + + return SCM_UNSPECIFIED; } +/* + See Documentation/tex/fonts.doc + */ void -Beam::set_direction (Direction d) +Beam::calc_default_position_and_height (Grob*me,Real* y, Real* dy) { - dir_ = d; - for (int i=0; i set_elt_property (beam_dir_scm_sym, gh_int2scm (d)); + *dy = 0; + *y = first_ideal; + return; + } - SCM force = s->remove_elt_property (dir_forced_scm_sym); - if (force == SCM_BOOL_F) - s->dir_ = d; + Array ideals; + + // ugh -> use commonx + Real x0 = first_visible_stem (me)->relative_coordinate (0, X_AXIS); + Link_array stems= + Pointer_group_interface__extract_elements (me, (Item*)0, "stems"); + + for (int i=0; i < stems.size (); i++) + { + Item* s = stems[i]; + if (Stem::invisible_b (s)) + continue; + ideals.push (Offset (s->relative_coordinate (0, X_AXIS) - x0, + Stem::calc_stem_info (s).idealy_f_)); } -} + Real dydx; + minimise_least_squares (&dydx, y, ideals); // duh, takes references -/* - See Documentation/tex/fonts.doc - */ + Real dx = last_visible_stem (me)->relative_coordinate (0, X_AXIS) - x0; + *dy = dydx * dx; +} -void -Beam::solve_slope () +bool +Beam::suspect_slope_b (Grob*me, Real y, Real dy) { - assert (sinfo_.size () > 1); + /* first, calculate y, dy */ + /* + steep slope running against lengthened stem is suspect + */ + Real first_ideal = Stem::calc_stem_info (first_visible_stem (me)).idealy_f_; + Real last_ideal = Stem::calc_stem_info (last_visible_stem (me)).idealy_f_; + Real lengthened = gh_scm2double (me->get_grob_property ("outer-stem-length-limit")); + Real steep = gh_scm2double (me->get_grob_property ("slope-limit")); + + // ugh -> use commonx + Real dx = last_visible_stem (me)->relative_coordinate (0, X_AXIS) - first_visible_stem (me)->relative_coordinate (0, X_AXIS); + Real dydx = dy && dx ? dy/dx : 0; - Least_squares l; - for (int i=0; i < sinfo_.size (); i++) + if (((y - first_ideal > lengthened) && (dydx > steep)) + || ((y + dy - last_ideal > lengthened) && (dydx < -steep))) { - l.input.push (Offset (sinfo_[i].x_, sinfo_[i].idealy_f_)); + return true; } - l.minimise (slope_f_, left_y_); + return false; } /* - ugh. Naming: this doesn't check, but sets as well. - */ - + This neat trick is by Werner Lemberg, + damped = tanh (slope) + corresponds with some tables in [Wanske] +*/ Real -Beam::check_stemlengths_f (bool set_b) +Beam::calc_slope_damping_f (Grob*me,Real dy) { - Real interbeam_f = paper_l ()->interbeam_f (multiple_i_); + SCM damp = me->get_grob_property ("damping"); + int damping = gh_scm2int (damp); - Real beam_f = paper_l ()->get_realvar (beam_thickness_scm_sym);; - Real staffline_f = paper_l ()-> get_var ("stafflinethickness"); - Real epsilon_f = staffline_f / 8; - Real dy_f = 0.0; - for (int i=0; i < sinfo_.size (); i++) + if (damping) { - Real y = sinfo_[i].x_ * slope_f_ + left_y_; - - // correct for knee - if (dir_ != sinfo_[i].dir_) - { - Real internote_f = sinfo_[i].stem_l_->staff_line_leading_f ()/2; - y -= dir_ * (beam_f / 2 - + (sinfo_[i].mult_i_ - 1) * interbeam_f) / internote_f; - if (!i && sinfo_[i].stem_l_->staff_symbol_l () != - sinfo_.top ().stem_l_->staff_symbol_l ()) - y += dir_ * (multiple_i_ - (sinfo_[i].stem_l_->flag_i_ - 2) >? 0) - * interbeam_f / internote_f; - } - - if (set_b) - sinfo_[i].stem_l_->set_stemend (y - sinfo_[i].interstaff_f_); - - y *= dir_; - if (y > sinfo_[i].maxy_f_) - dy_f = dy_f ? sinfo_[i].miny_f_ - y; - } + // ugh -> use commonx + Real dx = last_visible_stem (me)->relative_coordinate (0, X_AXIS) + - first_visible_stem (me)->relative_coordinate (0, X_AXIS); + Real dydx = dy && dx ? dy/dx : 0; + dydx = 0.6 * tanh (dydx) / damping; + return dydx * dx; } - return dy_f; + return dy; } -void -Beam::set_steminfo () +Real +Beam::calc_stem_y_f (Grob*me,Item* s, Real y, Real dy) { - if(!stems_.size ()) - return; - - assert (multiple_i_); + int beam_multiplicity = get_multiplicity (me); + int stem_multiplicity = (Stem::flag_i (s) - 2) >? 0; - int total_count_i = 0; - int forced_count_i = 0; - for (int i=0; i < stems_.size (); i++) - { - Stem *s = stems_[i]; + SCM space_proc = me->get_grob_property ("space-function"); + SCM space = gh_call1 (space_proc, gh_int2scm (beam_multiplicity)); - s->set_default_extents (); - if (s->invisible_b ()) - continue; - if (((int)s->chord_start_f ()) && (s->dir_ != s->get_default_dir ())) - forced_count_i++; - total_count_i++; - } + Real thick = gh_scm2double (me->get_grob_property ("thickness")) ; + Real interbeam_f = gh_scm2double (space) ; - bool grace_b = get_elt_property (grace_scm_sym) != SCM_BOOL_F; - String type_str = grace_b ? "grace_" : ""; - int stem_max = (int)rint(paper_l ()->get_var ("stem_max")); - Real shorten_f = paper_l ()->get_var (type_str + "forced_stem_shorten" - + to_str (multiple_i_ (this)) - { - if (s->invisible_b ()) - continue; - } + // ugh -> use commonx + Real x0 = first_visible_stem (me)->relative_coordinate (0, X_AXIS); + Real dx = last_visible_stem (me)->relative_coordinate (0, X_AXIS) - x0; + Real stem_y = (dy && dx ? (s->relative_coordinate (0, X_AXIS) - x0) / dx * dy : 0) + y; - Stem_info info (s, multiple_i_); - if (leftx == 0) - leftx = info.x_; - info.x_ -= leftx; - if (info.dir_ == dir_) - { - if (forced_count_i == total_count_i) - info.idealy_f_ -= shorten_f; - else if (forced_count_i > total_count_i / 2) - info.idealy_f_ -= shorten_f / 2; - } - sinfo_.push (info); - } + /* knee */ + Direction dir = Directional_element_interface::get (me); + Direction sdir = Directional_element_interface::get (s); + + /* knee */ + if (dir!= sdir) + { + stem_y -= dir + * (thick / 2 + (beam_multiplicity - 1) * interbeam_f); + + + + // huh, why not for first visible? + if (Staff_symbol_referencer::staff_symbol_l (s) + != Staff_symbol_referencer::staff_symbol_l (last_visible_stem (me))) + stem_y += Directional_element_interface::get (me) + * (beam_multiplicity - stem_multiplicity) * interbeam_f; + } + + return stem_y; } -void -Beam::calculate_slope () +Real +Beam::check_stem_length_f (Grob*me,Real y, Real dy) { - if (!sinfo_.size ()) - slope_f_ = left_y_ = 0; - else if (sinfo_[0].idealy_f_ == sinfo_.top ().idealy_f_) - { - slope_f_ = 0; - left_y_ = sinfo_[0].idealy_f_; - left_y_ *= dir_; - } - else - { - solve_slope (); - Real solved_slope_f = slope_f_; + Real shorten = 0; + Real lengthen = 0; + Direction dir = Directional_element_interface::get (me); - /* - steep slope running against lengthened stem is suspect - */ - Real dx_f = stems_.top ()->hpos_f () - stems_[0]->hpos_f (); - - // urg, these y internote-y-dimensions - Real internote_f = stems_[0]->staff_line_leading_f ()/2; - - Real lengthened = paper_l ()->get_var ("beam_lengthened") / internote_f; - Real steep = paper_l ()->get_var ("beam_steep_slope") / internote_f; - if (((left_y_ - sinfo_[0].idealy_f_ > lengthened) - && (slope_f_ > steep)) - || ((left_y_ + slope_f_ * dx_f - sinfo_.top ().idealy_f_ > lengthened) - && (slope_f_ < -steep))) - { - slope_f_ = 0; - } + Link_array stems= + Pointer_group_interface__extract_elements (me, (Item*)0, "stems"); - /* - This neat trick is by Werner Lemberg, - damped = tanh (slope_f_) - corresponds with some tables in [Wanske] - */ - SCM damp = remove_elt_property (damping_scm_sym); - int damping = 1; // ugh. - if (damp!= SCM_BOOL_F) - damping = gh_int2scm (SCM_CDR(damp)); - - if (damping) - slope_f_ = 0.6 * tanh (slope_f_) / damping; - - quantise_dy (); + for (int i=0; i < stems.size(); i++) + { + Item* s = stems[i]; + if (Stem::invisible_b (s)) + continue; - Real damped_slope_dy_f = (solved_slope_f - slope_f_) * dx_f / 2; - left_y_ += damped_slope_dy_f; + Real stem_y = calc_stem_y_f (me, s, y, dy); + + stem_y *= dir; + Stem_info info = Stem::calc_stem_info (s); - left_y_ *= dir_; - slope_f_ *= dir_; + // if (0 > info.maxy_f_ - stem_y) + shorten = shorten ? info.miny_f_ - stem_y; } + + if (lengthen && shorten) + warning (_ ("weird beam vertical offset")); + + /* when all stems are too short, normal stems win */ + return dir * ((shorten) ? shorten : lengthen); } +/* + 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::quantise_dy () +Beam::set_stem_length (Grob*me,Real y, Real dy) { - /* - [Ross] (simplification of) - Try to set slope_f_ complying with y-span of: - - zero - - beam_f / 2 + staffline_f / 2 - - beam_f + staffline_f - + n * interline - */ - - SCM q = get_elt_property (gh_symbol2scm ("slope_quantisation")); - q = gh_cdr (q); - - if (q == gh_symbol2scm ("none")) - return; + Real half_space = Staff_symbol_referencer::staff_space (me)/2; + Link_array stems= + Pointer_group_interface__extract_elements (me, (Item*)0, "stems"); - Real interline_f = stems_[0]->staff_line_leading_f (); - Real internote_f = interline_f / 2; - Real staffline_f = paper_l ()->get_var ("stafflinethickness"); - Real beam_f = paper_l ()->get_realvar (beam_thickness_scm_sym);; - Real dx_f = stems_.top ()->hpos_f () - stems_[0]->hpos_f (); + for (int i=0; i < stems.size (); i++) + { + Item* s = stems[i]; + if (Stem::invisible_b (s)) + continue; - // dim(y) = internote; so slope = (y/internote)/x - Real dy_f = dx_f * abs (slope_f_ * internote_f); - - Real quanty_f = 0.0; + Real stem_y = calc_stem_y_f (me, s, y, dy); - Array allowed_fraction (3); - allowed_fraction[0] = 0; - allowed_fraction[1] = (beam_f / 2 + staffline_f / 2); - allowed_fraction[2] = (beam_f + staffline_f); + /* caution: stem measures in staff-positions */ + Stem::set_stemend (s,(stem_y + calc_interstaff_dist (s, dynamic_cast (me))) / half_space); + } +} +/* + [Ross] (simplification of) + Set dy complying with: + - zero + - thick / 2 + staffline_f / 2 + - thick + staffline_f + + n * staff_space +*/ +Real +Beam::quantise_dy_f (Grob*me,Real dy) +{ + Array a; - Interval iv = quantise_iv (allowed_fraction, interline_f, dy_f); - quanty_f = (dy_f - iv[SMALLER] <= iv[BIGGER] - dy_f) + SCM proc = me->get_grob_property ("height-quants"); + SCM quants = gh_call2 (proc, me->self_scm (), + gh_double2scm (me->paper_l ()->get_var ("stafflinethickness") + / 1.0)); + + + for (SCM s = quants; gh_pair_p (s); s = gh_cdr (s)) + a.push (gh_scm2double (gh_car (s))); + + if (a.size () <= 1) + return dy; + + Real staff_space = Staff_symbol_referencer::staff_space (me); + + Interval iv = quantise_iv (a, abs (dy)/staff_space) * staff_space; + Real q = (abs (dy) - iv[SMALLER] <= iv[BIGGER] - abs (dy)) ? iv[SMALLER] : iv[BIGGER]; - - - slope_f_ = (quanty_f / dx_f) / internote_f * sign (slope_f_); + + return q * sign (dy); } /* - - Prevent interference from stafflines and beams. See Documentation/tex/fonts.doc - + Prevent interference from stafflines and beams. + See Documentation/tex/fonts.doc + + We only need to quantise the (left) y-position of the beam, + since dy is quantised too. + if extend_b then stems must *not* get shorter */ -void -Beam::quantise_left_y (bool extend_b) +Real +Beam::quantise_y_f (Grob*me,Real y, Real dy, int quant_dir) { - /* - we only need to quantise the start of the beam as dy is quantised too - if extend_b then stems must *not* get shorter - */ - SCM q = get_elt_property (gh_symbol2scm ("slope_quantisation")); - q = gh_cdr (q); - - /* - ---------------------------------------------------------- - ######## - ######## - ######## - --------------########------------------------------------ - ######## - - hang straddle sit inter hang - */ + int multiplicity = get_multiplicity (me); - Real space = stems_[0]->staff_line_leading_f (); - Real internote_f = space /2; - Real staffline_f = paper_l ()->get_var ("stafflinethickness"); - Real beam_f = paper_l ()->get_realvar (beam_thickness_scm_sym);; + Real staff_space = Staff_symbol_referencer::staff_space (me); + Real thick = me->paper_l ()->get_var ("stafflinethickness"); - /* - [TODO] - it would be nice to have all allowed positions in a runtime matrix: - (multiplicity, minimum_beam_dy, maximum_beam_dy) - */ - - Real straddle = 0; - Real sit = beam_f / 2 - staffline_f / 2; - Real hang = space - beam_f / 2 + staffline_f / 2; - - /* - Put all allowed positions into an array. - Whether a position is allowed or not depends on - strictness of quantisation, multiplicity and direction. - For simplicity, we'll assume dir = UP and correct if - dir = DOWN afterwards. - */ - // isn't this asymmetric ? --hwn + SCM proc = me->get_grob_property ("vertical-position-quant-function"); + SCM quants = scm_apply (proc, + me->self_scm (), + gh_list (gh_int2scm (multiplicity), + gh_double2scm (dy/staff_space), + gh_double2scm (thick/staff_space), + SCM_EOL, SCM_UNDEFINED)); - // dim(left_y_) = internote - Real dy_f = dir_ * left_y_ * internote_f; - - Real beamdx_f = stems_.top ()->hpos_f () - stems_[0]->hpos_f (); - Real beamdy_f = beamdx_f * slope_f_ * internote_f; - - Array allowed_position; - if (q == gh_symbol2scm ("normal")) - { - if ((multiple_i_ <= 2) || (abs (beamdy_f) >= staffline_f / 2)) - allowed_position.push (straddle); - if ((multiple_i_ <= 1) || (abs (beamdy_f) >= staffline_f / 2)) - allowed_position.push (sit); - allowed_position.push (hang); - } - else if (q == gh_symbol2scm ("traditional")) - { - // TODO: check and fix TRADITIONAL - if ((multiple_i_ <= 2) || (abs (beamdy_f) >= staffline_f / 2)) - allowed_position.push (straddle); - if ((multiple_i_ <= 1) && (beamdy_f <= staffline_f / 2)) - allowed_position.push (sit); - if (beamdy_f >= -staffline_f / 2) - allowed_position.push (hang); - } - + Array a; - Interval iv = quantise_iv (allowed_position, space, dy_f); + for (; gh_pair_p (quants); quants = gh_cdr (quants)) + a.push (gh_scm2double (gh_car (quants))); - Real quanty_f = dy_f - iv[SMALLER] <= iv[BIGGER] - dy_f ? iv[SMALLER] : iv[BIGGER]; - if (extend_b) - quanty_f = iv[BIGGER]; - - // dim(left_y_) = internote - left_y_ = dir_ * quanty_f / internote_f; -} + if (a.size () <= 1) + return y; -void -Beam::set_stemlens () -{ - Real staffline_f = paper_l ()->get_var ("stafflinethickness"); - // enge floots - Real epsilon_f = staffline_f / 8; + Real up_y = Directional_element_interface::get (me) * y; + Interval iv = quantise_iv (a, up_y/staff_space) * staff_space; + Real q = up_y - iv[SMALLER] <= iv[BIGGER] - up_y + ? iv[SMALLER] : iv[BIGGER]; + if (quant_dir) + q = iv[(Direction)quant_dir]; - // je bent zelf eng --hwn. - Real dy_f = check_stemlengths_f (false); - for (int i = 0; i < 2; i++) // 2 ? - { - left_y_ += dy_f * dir_; - quantise_left_y (dy_f); - dy_f = check_stemlengths_f (true); - if (abs (dy_f) <= epsilon_f) - { - break; - } - } + return q * Directional_element_interface::get (me); } void -Beam::set_beaming (Beaming_info_list *beaming) +Beam::set_beaming (Grob*me,Beaming_info_list *beaming) { + Link_array stems= + Pointer_group_interface__extract_elements (me, (Grob*)0, "stems"); + Direction d = LEFT; - for (int i=0; i < stems_.size (); i++) + for (int i=0; i < stems.size(); i++) { do { - if (stems_[i]->beams_i_drul_[d] < 0) - stems_[i]->beams_i_drul_[d] = beaming->infos_.elem (i).beams_i_drul_[d]; + /* Don't overwrite user override (?) */ + if (Stem::beam_count (stems[i], d) == 0 + /* Don't set beaming for outside of outer stems */ + && ! (d == LEFT && i == 0) + && ! (d == RIGHT && i == stems.size () -1)) + { + int b = beaming->infos_.elem (i).beams_i_drul_[d]; + Stem::set_beaming (stems[i], b, d); + } } while (flip (&d) != LEFT); } } -void -Beam::do_add_processing () -{ - for (int i=0; i < stems_.size () ; i++) - { - Direction d = LEFT; - do { - multiple_i_ = multiple_i_ >? stems_[i]->beams_i_drul_[d]; - } while ((flip (&d)) != LEFT); - } - - if (stems_.size ()) - { - stems_[0]->beams_i_drul_[LEFT] =0; - stems_.top()->beams_i_drul_[RIGHT] =0; - } -} - - /* beams to go with one stem. - clean me up. + FIXME: clean me up. */ Molecule -Beam::stem_beams (Stem *here, Stem *next, Stem *prev) const +Beam::stem_beams (Grob*me,Item *here, Item *next, Item *prev) { - if ((next && !(next->hpos_f () > here->hpos_f ())) || - (prev && !(prev->hpos_f () < here->hpos_f ()))) + // ugh -> use commonx + if ((next && !(next->relative_coordinate (0, X_AXIS) > here->relative_coordinate (0, X_AXIS))) || + (prev && !(prev->relative_coordinate (0, X_AXIS) < here->relative_coordinate (0, X_AXIS)))) programming_error ("Beams are not left-to-right"); - Real staffline_f = paper_l ()->get_var ("stafflinethickness"); - Real interbeam_f = paper_l ()->interbeam_f (multiple_i_); + Real staffline_f = me->paper_l ()->get_var ("stafflinethickness"); + int multiplicity = get_multiplicity (me); - Real internote_f = here->staff_line_leading_f ()/2; - Real beam_f = paper_l ()->get_realvar (beam_thickness_scm_sym);; + SCM space_proc = me->get_grob_property ("space-function"); + SCM space = gh_call1 (space_proc, gh_int2scm (multiplicity)); - Real dy = interbeam_f; + Real thick = gh_scm2double (me->get_grob_property ("thickness")) ; + Real interbeam_f = gh_scm2double (space) ; + + Real bdy = interbeam_f; Real stemdx = staffline_f; - Real sl = slope_f_* internote_f; + + // ugh -> use commonx + Real dx = visible_stem_count (me) ? + last_visible_stem (me)->relative_coordinate (0, X_AXIS) - first_visible_stem (me)->relative_coordinate (0, X_AXIS) + : 0.0; + Real dy = gh_scm2double (me->get_grob_property ("height")); + Real dydx = dy && dx ? dy/dx : 0; Molecule leftbeams; Molecule rightbeams; - // UGH Real nw_f; - if (!here->head_l_arr_.size ()) + if (!Stem::first_head (here)) nw_f = 0; - else if (here->type_i ()== 1) - nw_f = paper_l ()->get_var ("wholewidth"); - else if (here->type_i () == 2) - nw_f = paper_l ()->get_var ("notewidth") * 0.8; - else - nw_f = paper_l ()->get_var ("quartwidth"); + else { + int t = Stem::type_i (here); + + SCM proc = me->get_grob_property ("flag-width-function"); + SCM result = gh_call1 (proc, gh_int2scm (t)); + nw_f = gh_scm2double (result); + } + + Direction dir = Directional_element_interface::get (me); + /* half beams extending to the left. */ if (prev) { - int lhalfs= lhalfs = here->beams_i_drul_[LEFT] - prev->beams_i_drul_[RIGHT] ; - int lwholebeams= here->beams_i_drul_[LEFT] beams_i_drul_[RIGHT] ; + int lhalfs= lhalfs = Stem::beam_count (here,LEFT) - Stem::beam_count (prev,RIGHT); + int lwholebeams= Stem::beam_count (here,LEFT) hpos_f () - prev->hpos_f (); + Real w = here->relative_coordinate (0, X_AXIS) - prev->relative_coordinate (0, X_AXIS); w = w/2 beam (sl, w, beam_f); - a.translate (Offset (-w, -w * sl)); + a = Lookup::beam (dydx, w, thick); + a.translate (Offset (-w, -w * dydx)); for (int j = 0; j < lhalfs; j++) { Molecule b (a); - b.translate_axis (-dir_ * dy * (lwholebeams+j), Y_AXIS); + b.translate_axis (-dir * bdy * (lwholebeams+j), Y_AXIS); leftbeams.add_molecule (b); } } if (next) { - int rhalfs = here->beams_i_drul_[RIGHT] - next->beams_i_drul_[LEFT]; - int rwholebeams = here->beams_i_drul_[RIGHT] beams_i_drul_[LEFT]; + int rhalfs = Stem::beam_count (here,RIGHT) - Stem::beam_count (next,LEFT); + int rwholebeams= Stem::beam_count (here,RIGHT) hpos_f () - here->hpos_f (); - Molecule a = lookup_l ()->beam (sl, w + stemdx, beam_f); + Real w = next->relative_coordinate (0, X_AXIS) - here->relative_coordinate (0, X_AXIS); + Molecule a = Lookup::beam (dydx, w + stemdx, thick); a.translate_axis( - stemdx/2, X_AXIS); int j = 0; Real gap_f = 0; - SCM gap = get_elt_property (beam_gap_scm_sym); - if (gap != SCM_BOOL_F) + SCM gap = me->get_grob_property ("gap"); + if (gh_number_p (gap)) { - int gap_i = gh_scm2int (SCM_CDR (gap)); + int gap_i = gh_scm2int ( (gap)); int nogap = rwholebeams - gap_i; for (; j < nogap; j++) { Molecule b (a); - b.translate_axis (-dir_ * dy * j, Y_AXIS); + b.translate_axis (-dir * bdy * j, Y_AXIS); rightbeams.add_molecule (b); } // TODO: notehead widths differ for different types gap_f = nw_f / 2; w -= 2 * gap_f; - a = lookup_l ()->beam (sl, w + stemdx, beam_f); + a = Lookup::beam (dydx, w + stemdx, thick); } for (; j < rwholebeams; j++) { Molecule b (a); - if (!here->invisible_b ()) - b.translate (Offset (gap_f, -dir_ * dy * j)); - else - b.translate (Offset (0, -dir_ * dy * j)); + b.translate (Offset (Stem::invisible_b (here) ? 0 : gap_f, -dir * bdy * j)); rightbeams.add_molecule (b); } w = w/2 beam (sl, w, beam_f); + a = Lookup::beam (dydx, w, thick); for (; j < rwholebeams + rhalfs; j++) { Molecule b (a); - b.translate_axis (-dir_ * dy * j, Y_AXIS); + b.translate_axis (- dir * bdy * j, Y_AXIS); rightbeams.add_molecule (b); } @@ -812,3 +772,209 @@ Beam::stem_beams (Stem *here, Stem *next, Stem *prev) const return leftbeams; } +/* + TODO: it would be nice to introduce y-position via callbacks. + */ + +MAKE_SCHEME_CALLBACK(Beam,brew_molecule,1); +SCM +Beam::brew_molecule (SCM smob) +{ + Grob * me =unsmob_grob (smob); + + Molecule mol; + if (!gh_pair_p (me->get_grob_property ("stems"))) + return SCM_EOL; + Real x0,dx; + Link_arraystems = + Pointer_group_interface__extract_elements (me, (Item*) 0, "stems"); + if (visible_stem_count (me)) + { + // ugh -> use commonx + x0 = first_visible_stem (me)->relative_coordinate (0, X_AXIS); + dx = last_visible_stem (me)->relative_coordinate (0, X_AXIS) - x0; + } + else + { + x0 = stems[0]->relative_coordinate (0, X_AXIS); + dx = stems.top()->relative_coordinate (0, X_AXIS) - x0; + } + + + Real dy = gh_scm2double (me->get_grob_property ("height")); + Real dydx = dy && dx ? dy/dx : 0; + Real y = gh_scm2double (me->get_grob_property ("y-position")); + + + for (int j=0; j 0)? stems[j-1] : 0; + Item * next = (j < stems.size()-1) ? stems[j+1] :0; + + Molecule sb = stem_beams (me, i, next, prev); + Real x = i->relative_coordinate (0, X_AXIS)-x0; + sb.translate (Offset (x, x * dydx + y)); + mol.add_molecule (sb); + } + mol.translate_axis (x0 + - dynamic_cast (me)->get_bound (LEFT)->relative_coordinate (0, X_AXIS), X_AXIS); + + return mol.smobbed_copy (); +} + +int +Beam::forced_stem_count (Grob*me) +{ + Link_arraystems = + Pointer_group_interface__extract_elements ( me, (Item*) 0, "stems"); + int f = 0; + for (int i=0; i < stems.size (); i++) + { + Item *s = stems[i]; + + if (Stem::invisible_b (s)) + continue; + + if (((int)Stem::chord_start_f (s)) + && (Stem::get_direction (s ) != Stem::get_default_dir (s ))) + f++; + } + return f; +} + + + + +/* TODO: + use filter and standard list functions. + */ +int +Beam::visible_stem_count (Grob*me) +{ + Link_arraystems = + Pointer_group_interface__extract_elements (me, (Item*) 0, "stems"); + int c = 0; + for (int i = stems.size (); i--;) + { + if (!Stem::invisible_b (stems[i])) + c++; + } + return c; +} + +Item* +Beam::first_visible_stem(Grob*me) +{ + Link_arraystems = + Pointer_group_interface__extract_elements ( me, (Item*) 0, "stems"); + + for (int i = 0; i < stems.size (); i++) + { + if (!Stem::invisible_b (stems[i])) + return stems[i]; + } + return 0; +} + +Item* +Beam::last_visible_stem(Grob*me) +{ + Link_arraystems = + Pointer_group_interface__extract_elements ( me, (Item*) 0, "stems"); + for (int i = stems.size (); i--;) + { + if (!Stem::invisible_b (stems[i])) + return stems[i]; + } + return 0; +} + + +/* + [TODO] + handle rest under beam (do_post: beams are calculated now) + what about combination of collisions and rest under beam. + + Should lookup + + rest -> stem -> beam -> interpolate_y_position () +*/ +MAKE_SCHEME_CALLBACK(Beam,rest_collision_callback,2); +SCM +Beam::rest_collision_callback (SCM element_smob, SCM axis) +{ + Grob *rest = unsmob_grob (element_smob); + Axis a = (Axis) gh_scm2int (axis); + + assert (a == Y_AXIS); + + Grob * st = unsmob_grob (rest->get_grob_property ("stem")); + Grob * stem = st; + if (!stem) + return gh_double2scm (0.0); + Grob * beam = unsmob_grob (stem->get_grob_property ("beam")); + if (!beam || !Beam::has_interface (beam) || !Beam::visible_stem_count (beam)) + return gh_double2scm (0.0); + + // make callback for rest from this. + Real beam_dy = 0; + Real beam_y = 0; + + + // todo: make sure this calced already. + SCM s = beam->get_grob_property ("height"); + if (gh_number_p (s)) + beam_dy = gh_scm2double (s); + + s = beam->get_grob_property ("y-position"); + if (gh_number_p (s)) + beam_y = gh_scm2double (s); + + // ugh -> use commonx + Real x0 = first_visible_stem(beam)->relative_coordinate (0, X_AXIS); + Real dx = last_visible_stem(beam)->relative_coordinate (0, X_AXIS) - x0; + Real dydx = beam_dy && dx ? beam_dy/dx : 0; + + Direction d = Stem::get_direction (stem); + Real beamy = (stem->relative_coordinate (0, X_AXIS) - x0) * dydx + beam_y; + + Real staff_space = Staff_symbol_referencer::staff_space (rest); + + + Real rest_dim = rest->extent (rest, Y_AXIS)[d]*2.0 / staff_space ; // refp?? + + Real minimum_dist + = gh_scm2double (rest->get_grob_property ("minimum-beam-collision-distance")); + Real dist = + minimum_dist + -d * (beamy - rest_dim) >? 0; + + int stafflines = Staff_symbol_referencer::line_count (rest); + + // move discretely by half spaces. + int discrete_dist = int (ceil (dist)); + + // move by whole spaces inside the staff. + if (discrete_dist < stafflines+1) + discrete_dist = int (ceil (discrete_dist / 2.0)* 2.0); + + return gh_double2scm (-d * discrete_dist); +} + + +bool +Beam::has_interface (Grob*me) +{ + return me->has_interface (ly_symbol2scm ("beam-interface")); +} + +void +Beam::set_interface (Grob*me) +{ + /* + why the init? No way to tell difference between default and user + override. */ + me->set_grob_property ("height", gh_int2scm (0)); // ugh. + me->set_grob_property ("y-position" ,gh_int2scm (0)); + me->set_interface (ly_symbol2scm("beam-interface")); +}