X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem.cc;h=79823a10923942f0212c7e8c62b50cac4a369883;hb=f05cfd7757b31723fe6af2f5c0e2fdbaebea3b85;hp=74b92dd89d2f7c7fd16594571617e25b09e6bb36;hpb=f9eafe65e3d281e6cd07a25d8b6b19cc1eada1de;p=lilypond.git diff --git a/lily/stem.cc b/lily/stem.cc index 74b92dd89d..79823a1092 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -3,464 +3,728 @@ source file of the GNU LilyPond music typesetter - (c) 1996, 1997--1999 Han-Wen Nienhuys + (c) 1996--2002 Han-Wen Nienhuys Jan Nieuwenhuizen TODO: This is way too hairy */ -#include "dimension-cache.hh" + +#include // m_pi + +#include "lookup.hh" +#include "directional-element-interface.hh" +#include "note-head.hh" #include "stem.hh" #include "debug.hh" #include "paper-def.hh" -#include "note-head.hh" -#include "lookup.hh" +#include "rhythmic-head.hh" +#include "font-interface.hh" #include "molecule.hh" #include "paper-column.hh" #include "misc.hh" #include "beam.hh" #include "rest.hh" #include "group-interface.hh" -#include "cross-staff.hh" +#include "staff-symbol-referencer.hh" +#include "spanner.hh" +#include "side-position-interface.hh" -Stem::Stem () +void +Stem::set_beaming (Grob*me ,int i, Direction d) { - beams_i_drul_[LEFT] = beams_i_drul_[RIGHT] = -1; - yextent_drul_[DOWN] = yextent_drul_[UP] = 0; - flag_i_ = 2; + SCM pair = me->get_grob_property ("beaming"); + + if (!gh_pair_p (pair)) + { + pair = gh_cons (gh_int2scm (-1),gh_int2scm (-1)); + me-> set_grob_property ("beaming", pair); + } + index_set_cell (pair, d, gh_int2scm (i)); } -Interval_t -Stem::head_positions () const +int +Stem::beam_count (Grob*me,Direction d) { - /* - Mysterious FreeBSD fix by John Galbraith. Somehow, the empty intervals - trigger FP exceptions on FreeBSD. Fix: do not return infinity + SCM p=me->get_grob_property ("beaming"); + if (gh_pair_p (p)) + return gh_scm2int (index_cell (p,d)); + else + return -1; +} - */ - if (!first_head ()) +Interval +Stem::head_positions (Grob*me) +{ + if (!heads_i (me)) { - return Interval_t (100,-100); + Interval iv; + return iv; } - Link_array head_l_arr = - Group_interface__extract_elements (this, (Note_head*)0, "heads"); - - Interval_t r; - for (int i =0; i < head_l_arr.size (); i++) + Drul_array e (extremal_heads (me)); + + return Interval (Staff_symbol_referencer::position_f (e[DOWN]), + Staff_symbol_referencer::position_f (e[UP])); +} + + +Real +Stem::chord_start_f (Grob*me) +{ + return head_positions (me)[get_direction (me)] + * Staff_symbol_referencer::staff_space (me)/2.0; +} + +Real +Stem::stem_end_position (Grob*me) +{ + SCM p =me->get_grob_property ("stem-end-position"); + Real pos; + if (!gh_number_p (p)) { - int p = (int)head_l_arr[i]->position_f (); - r[BIGGER] = r[BIGGER] >? p; - r[SMALLER] = r[SMALLER] set_grob_property ("stem-end-position", gh_double2scm (pos)); } - return r; + else + pos = gh_scm2double (p); + + return pos; } -void -Stem::do_print () const +Direction +Stem::get_direction (Grob*me) { -#ifndef NPRINT - DEBUG_OUT << "flag "<< flag_i_; -#endif + Direction d = Directional_element_interface::get (me); + + if (!d) + { + d = get_default_dir (me); + // urg, AAARGH! + Directional_element_interface::set (me, d); + } + return d ; } -Real -Stem::stem_length_f () const + +void +Stem::set_stemend (Grob*me, Real se) { - return yextent_drul_[UP]-yextent_drul_[DOWN] ; + // todo: margins + Direction d= get_direction (me); + + if (d && d * head_positions (me)[get_direction (me)] >= se*d) + me->warning (_ ("Weird stem size; check for narrow beams")); + + me->set_grob_property ("stem-end-position", gh_double2scm (se)); } -Real -Stem::stem_begin_f () const +int +Stem::type_i (Grob*me) { - return yextent_drul_[Direction(-get_direction ())]; + return first_head (me) ? Rhythmic_head::balltype_i (first_head (me)) : 2; } -Real -Stem::chord_start_f () const +/* + Note head that determines hshift for upstems + */ +Grob* +Stem::support_head (Grob*me) { - return head_positions()[get_direction ()] * staff_line_leading_f ()/2.0; + SCM h = me->get_grob_property ("support-head"); + Grob * nh = unsmob_grob (h); + if (nh) + return nh; + else if (heads_i (me) == 1) + { + /* + UGH. + */ + + return unsmob_grob (ly_car (me->get_grob_property ("heads"))); + } + else + return first_head (me); } -Real -Stem::stem_end_f () const + +int +Stem::heads_i (Grob*me) { - return yextent_drul_[get_direction ()]; + return Pointer_group_interface::count (me, "heads"); } -void -Stem::set_stemend (Real se) +/* + The note head which forms one end of the stem. + */ +Grob* +Stem::first_head (Grob*me) { - // todo: margins - if (get_direction () && get_direction () * head_positions()[get_direction ()] >= se*get_direction ()) - warning (_ ("Weird stem size; check for narrow beams")); + return extremal_heads (me)[-get_direction (me)]; +} +/* + START is part where stem reaches `last' head. + */ +Drul_array +Stem::extremal_heads (Grob*me) +{ + const int inf = 1000000; + Drul_array extpos; + extpos[DOWN] = inf; + extpos[UP] = -inf; - yextent_drul_[get_direction ()] = se; - yextent_drul_[Direction(-get_direction ())] = head_positions()[-get_direction ()]; + Drul_array exthead; + exthead[LEFT] = exthead[RIGHT] =0; + + for (SCM s = me->get_grob_property ("heads"); gh_pair_p (s); s = ly_cdr (s)) + { + Grob * n = unsmob_grob (ly_car (s)); + + + int p = int (Staff_symbol_referencer::position_f (n)); + + Direction d = LEFT; + do { + if (d* p > d* extpos[d]) + { + exthead[d] = n; + extpos[d] = p; + } + } while (flip (&d) != DOWN); + } + + return exthead; } -int -Stem::type_i () const +static int +icmp (int const &a, int const &b) { - - return first_head ()->balltype_i_; + return a-b; } -Note_head* -Stem::first_head () const +Array +Stem::note_head_positions (Grob *me) { - SCM h =get_elt_property ("heads"); - if (!gh_pair_p (h)) - return 0; + Array ps ; + for (SCM s = me->get_grob_property ("heads"); gh_pair_p (s); s = ly_cdr (s)) + { + Grob * n = unsmob_grob (ly_car (s)); + int p = int (Staff_symbol_referencer::position_f (n)); - Score_element * sc = unsmob_element (gh_car (h)); + ps.push (p); + } - return dynamic_cast (sc); + ps.sort (icmp); + return ps; } + void -Stem::add_head (Rhythmic_head *n) +Stem::add_head (Grob*me, Grob *n) { - n->set_elt_property ("stem", this->self_scm_); - n->add_dependency (this); // ? - + n->set_grob_property ("stem", me->self_scm ()); + n->add_dependency (me); - Group_interface gi (this); - if (Note_head *nh = dynamic_cast (n)) - gi.name_ = "heads"; - else - gi.name_ = "rests"; - - gi.add_element (n); + if (Note_head::has_interface (n)) + { + Pointer_group_interface::add_grob (me, ly_symbol2scm ("heads"), n); + } } bool -Stem::invisible_b () const +Stem::invisible_b (Grob*me) { - return !(first_head () && first_head()->balltype_i_ >= 1); + return ! (heads_i (me) && Rhythmic_head::balltype_i (support_head (me)) >= 1); } int -Stem::get_center_distance (Direction d) const +Stem::get_center_distance (Grob*me, Direction d) { int staff_center = 0; - int distance = d*(head_positions()[d] - staff_center); + int distance = (int) (d* (head_positions (me)[d] - staff_center)); return distance >? 0; } Direction -Stem::get_default_dir () const +Stem::get_default_dir (Grob*me) { - int du = get_center_distance (UP); - int dd = get_center_distance (DOWN); + int du = get_center_distance (me,UP); + int dd = get_center_distance (me,DOWN); if (sign (dd - du)) return Direction (sign (dd -du)); - return Direction (int(paper_l ()->get_var ("stem_default_neutral_direction"))); + return to_dir (me->get_grob_property ("neutral-direction")); } - - -void -Stem::set_default_stemlen () +Real +Stem::get_default_stem_end_position (Grob*me) { + bool grace_b = to_boolean (me->get_grob_property ("grace")); + SCM s; + Array a; + Real length_f = 0.; - SCM scm_len = get_elt_property("length"); - if (scm_len != SCM_UNDEFINED) + SCM scm_len = me->get_grob_property ("length"); + if (gh_number_p (scm_len)) { length_f = gh_scm2double (scm_len); } else - length_f = paper_l ()->get_var ("stem_length0"); + { + s = me->get_grob_property ("lengths"); + for (SCM q = s; q != SCM_EOL; q = ly_cdr (q)) + a.push (gh_scm2double (ly_car (q))); + + // stem uses half-spaces + length_f = a[ ((flag_i (me) - 2) >? 0) get_grob_property ("stem-shorten"); + for (SCM q = s; gh_pair_p (q); q = ly_cdr (q)) + a.push (gh_scm2double (ly_car (q))); - bool grace_b = get_elt_property ("grace") != SCM_UNDEFINED; - String type_str = grace_b ? "grace_" : ""; - Real shorten_f = paper_l ()->get_var (type_str + "forced_stem_shorten0"); + // stem uses half-spaces - if (!get_direction ()) - set_direction (get_default_dir ()); + // fixme: use scm_list_n_ref () iso. array[] + Real shorten_f = a[ ((flag_i (me) - 2) >? 0) = 5) - length_f += 2.0; - if (flag_i_ >= 6) - length_f += 1.0; + Interval hp = head_positions (me); + Real st = hp[dir] + dir * length_f; + + - set_stemend ((get_direction () > 0) ? head_positions()[BIGGER] + length_f: - head_positions()[SMALLER] - length_f); - bool no_extend_b = get_elt_property ("no-stem-extend") != SCM_UNDEFINED; - if (!grace_b && !no_extend_b && (get_direction () * stem_end_f () < 0)) - set_stemend (0); + /* + Make a little room if we have a flag and there is a dot. + + TODO: + + maybe we should consider moving the dot to the right? + */ + if (!beam_l (me) + && flag_i (me)) + { + Grob * closest_to_flag = extremal_heads (me)[dir]; + Grob * dots = closest_to_flag + ? Rhythmic_head::dots_l (closest_to_flag ) : 0; + + if (dots) + { + Real dp = Staff_symbol_referencer::position_f (dots); + Real flagy = flag (me).extent (Y_AXIS)[-dir] * 2; // should divide by staffspace + + /* + Very gory: add myself to the X-support of the parent, + which should be a dot-column. + */ + if (dir * (st + flagy - dp) < 0.5) + Side_position_interface::add_support (dots->get_parent (X_AXIS), me); + + /* + previous approach was to lengthen the stem. This is not + good typesetting practice. */ + } + } + + + bool no_extend_b = to_boolean (me->get_grob_property ("no-stem-extend")); + if (!grace_b && !no_extend_b && dir * st < 0) // junkme? + st = 0.0; + + return st; } -//xxx -void -Stem::set_default_extents () -{ - if (!stem_length_f ()) - set_default_stemlen (); + +/* + Number of hooks on the flag, ie. the log of the duration. + */ +int +Stem::flag_i (Grob*me) +{ + SCM s = me->get_grob_property ("duration-log"); + return (gh_number_p (s)) ? gh_scm2int (s) : 2; } void -Stem::set_noteheads () +Stem::position_noteheads (Grob*me) { - if (!first_head ()) + if (!heads_i (me)) return; + + Link_array heads = + Pointer_group_interface__extract_grobs (me, (Grob*)0, "heads"); + heads.sort (compare_position); + Direction dir =get_direction (me); - Link_array head_l_arr = - Group_interface__extract_elements (this, (Note_head*)0, "heads"); + if (dir < 0) + heads.reverse (); - head_l_arr.sort (Note_head::compare); - if (get_direction () < 0) - head_l_arr.reverse (); - Note_head * beginhead = first_head (); - beginhead->set_elt_property ("extremal", SCM_BOOL_T); - if (beginhead != head_l_arr.top ()) - head_l_arr.top ()->set_elt_property ("extremal", SCM_BOOL_T); + Grob *hed = support_head (me); + Real w = Note_head::head_extent (hed,X_AXIS)[dir]; + for (int i=0; i < heads.size (); i++) + { + heads[i]->translate_axis (w - Note_head::head_extent (heads[i],X_AXIS)[dir], + X_AXIS); + } - int parity=1; - int lastpos = int (beginhead->position_f ()); - for (int i=1; i < head_l_arr.size (); i ++) + bool parity= true; // todo: make me settable. + int lastpos = int (Staff_symbol_referencer::position_f (heads[0])); + for (int i=1; i < heads.size (); i ++) { - int dy =abs (lastpos- (int)head_l_arr[i]->position_f ()); + Real p = Staff_symbol_referencer::position_f (heads[i]); + int dy =abs (lastpos- (int)p); if (dy <= 1) { if (parity) - head_l_arr[i]->flip_around_stem (get_direction ()); + { + Real l = Note_head::head_extent (heads[i], X_AXIS).length (); + + heads[i]->translate_axis (l * get_direction (me), X_AXIS); + } parity = !parity; } else - parity = 1; - lastpos = int (head_l_arr[i]->position_f ()); + parity = true; + + lastpos = int (p); } } -void -Stem::do_pre_processing () +MAKE_SCHEME_CALLBACK (Stem,before_line_breaking,1); +SCM +Stem::before_line_breaking (SCM smob) { - if (yextent_drul_[DOWN]== yextent_drul_[UP]) - set_default_extents (); - set_noteheads (); + Grob*me = unsmob_grob (smob); + stem_end_position (me); // ugh. Trigger direction calc. + position_noteheads (me); - if (invisible_b ()) + if (invisible_b (me)) { - set_elt_property ("transparent", SCM_BOOL_T); - set_empty (Y_AXIS); - set_empty (X_AXIS); + me->remove_grob_property ("molecule-callback"); + // suicide (); } - - - set_spacing_hints (); + + return SCM_UNSPECIFIED; } - - -/** - set stem directions for hinting the optical spacing correction. - - Modifies DIR_LIST property of the Stem's Score_column - - TODO: more advanced: supply height of noteheads as well, for more advanced spacing possibilities +/* + ugh. + When in a beam with tuplet brackets, brew_mol is called early, + caching a wrong value. */ - -void -Stem::set_spacing_hints () +MAKE_SCHEME_CALLBACK (Stem, height, 2); +SCM +Stem::height (SCM smob, SCM ax) { - if (!invisible_b ()) - { - SCM scmdir = gh_int2scm (get_direction ()); - SCM dirlist = column_l ()->get_elt_property ("dir-list"); - if (dirlist == SCM_UNDEFINED) - dirlist = SCM_EOL; - - if (scm_sloppy_memq (scmdir, dirlist) == SCM_EOL) - { - dirlist = gh_cons (scmdir, dirlist); - column_l ()->set_elt_property ("dir-list", dirlist); - } - } + Axis a = (Axis)gh_scm2int (ax); + Grob * me = unsmob_grob (smob); + assert (a == Y_AXIS); + + SCM mol = me->get_uncached_molecule (); + Interval iv; + if (mol != SCM_EOL) + iv = unsmob_molecule (mol)->extent (a); + return ly_interval2scm (iv); } + Molecule -Stem::flag () const +Stem::flag (Grob*me) { - String style; - SCM st = get_elt_property ("style"); - if ( st != SCM_UNDEFINED) + /* TODO: rename flag-style into something more appropriate, + e.g. "stroke-style", maybe with values "" (i.e. no stroke), + "single" and "double". Needs more discussion. + */ + String style, fstyle, staffline_offs; + SCM fst = me->get_grob_property ("flag-style"); + if (gh_string_p (fst)) { - style = ly_scm2string (st); + fstyle = ly_scm2string (fst); } - char c = (get_direction () == UP) ? 'u' : 'd'; - Molecule m = lookup_l ()->afm_find (String ("flags-") + to_str (c) + - to_str (flag_i_)); - if (!style.empty_b ()) - m.add_molecule(lookup_l ()->afm_find (String ("flags-") + to_str (c) + style)); + SCM st = me->get_grob_property ("style"); + if (gh_symbol_p (st)) + { + style = (ly_scm2string (scm_symbol_to_string (st))); + } + else + { + style = ""; + } + bool adjust = to_boolean (me->get_grob_property ("adjust-if-on-staffline")); + + if (String::compare_i (style, "mensural") == 0) + /* Mensural notation: For notes on staff lines, use different + flags than for notes between staff lines. The idea is that + flags are always vertically aligned with the staff lines, + regardless if the note head is on a staff line or between two + staff lines. In other words, the inner end of a flag always + touches a staff line. + */ + { + if (adjust) + { + /* Urrgh! We have to detect wether this stem ends on a staff + line or between two staff lines. But we can not call + stem_end_position(me) or get_default_stem_end_position(me), + since this encounters the flag and hence results in an + infinite recursion. However, in pure mensural notation, + there are no multiple note heads attached to a single stem, + neither is there usually need for using the stem_shorten + property (except for 32th and 64th notes, but that is not a + problem since the stem length in this case is augmented by + an integral multiple of staff_space). Hence, it should be + sufficient to just take the first note head, assume it's + the only one, look if it's on a staff line, and select the + flag's shape accordingly. In the worst case, the shape + looks slightly misplaced, but that will usually be the + programmer's fault (e.g. when trying to attach multiple + note heads to a single stem in mensural notation). */ + Grob *first = first_head(me); + int sz = Staff_symbol_referencer::line_count (me)-1; + int p = (int)rint (Staff_symbol_referencer::position_f (first)); + staffline_offs = (((p ^ sz) & 0x1) == 0) ? "1" : "0"; + } + else + { + staffline_offs = "2"; + } + } + else + { + staffline_offs = ""; + } + char c = (get_direction (me) == UP) ? 'u' : 'd'; + String index_str + = String ("flags-") + style + to_str (c) + staffline_offs + to_str (flag_i (me)); + Molecule m + = Font_interface::get_default_font (me)->find_by_name (index_str); + if (!fstyle.empty_b ()) + m.add_molecule (Font_interface::get_default_font (me)->find_by_name (String ("flags-") + to_str (c) + fstyle)); return m; } -Interval -Stem::dim_callback (Dimension_cache const* c) +MAKE_SCHEME_CALLBACK (Stem,dim_callback,2); +SCM +Stem::dim_callback (SCM e, SCM ax) { - Stem * s = dynamic_cast (c->element_l ()); - + Axis a = (Axis) gh_scm2int (ax); + assert (a == X_AXIS); + Grob *se = unsmob_grob (e); Interval r (0, 0); - if (s->get_elt_property ("beam") != SCM_UNDEFINED || abs (s->flag_i_) <= 2) + if (unsmob_grob (se->get_grob_property ("beam")) || abs (flag_i (se)) <= 2) ; // TODO! else { - r = s->flag ().dim_.x (); - r += s->note_delta_f (); + r = flag (se).extent (X_AXIS); } - return r; + return ly_interval2scm (r); } + +MAKE_SCHEME_CALLBACK (Stem,brew_molecule,1); - -const Real ANGLE = 20* (2.0*M_PI/360.0); // ugh! - -Molecule* -Stem::do_brew_molecule_p () const +SCM +Stem::brew_molecule (SCM smob) { - Molecule *mol_p =new Molecule; - Drul_array stem_y = yextent_drul_; - Real dy = staff_line_leading_f ()/2.0; - - Real head_wid = 0; - if (first_head ()) - head_wid = first_head ()->extent (X_AXIS).length (); - stem_y[Direction(-get_direction ())] += get_direction () * head_wid * tan(ANGLE)/(2*dy); + Grob*me = unsmob_grob (smob); + Molecule mol; + Direction d = get_direction (me); - if (!invisible_b ()) + + Real y1 = Staff_symbol_referencer::position_f (first_head (me)); + Real y2 = stem_end_position (me); + + Interval stem_y (y1 ? y1); + + + // dy? + Real dy = Staff_symbol_referencer::staff_space (me) * 0.5; + + if (Grob *hed = support_head (me)) { - Real stem_width = paper_l ()->get_var ("stemthickness"); - Molecule ss =lookup_l ()->filledbox (Box (Interval (-stem_width/2, stem_width/2), - Interval (stem_y[DOWN]*dy, stem_y[UP]*dy))); - mol_p->add_molecule (ss); - } + /* + must not take ledgers into account. + */ + Interval head_height = Note_head::head_extent (hed,Y_AXIS); + Real y_attach = Note_head::stem_attachment_coordinate ( hed, Y_AXIS); - if (get_elt_property ("beam") == SCM_UNDEFINED - && abs (flag_i_) > 2) + y_attach = head_height.linear_combination (y_attach); + stem_y[Direction (-d)] += d * y_attach/dy; + } + + if (!invisible_b (me)) { - Molecule fl = flag (); - fl.translate_axis(stem_y[get_direction ()]*dy, Y_AXIS); - mol_p->add_molecule (fl); + Real stem_width = gh_scm2double (me->get_grob_property ("thickness")) + // URG + * me->paper_l ()->get_var ("stafflinethickness"); + + Molecule ss =Lookup::filledbox (Box (Interval (-stem_width/2, stem_width/2), + Interval (stem_y[DOWN]*dy, stem_y[UP]*dy))); + mol.add_molecule (ss); } - if (first_head ()) + if (!beam_l (me) && abs (flag_i (me)) > 2) { - mol_p->translate_axis (note_delta_f (), X_AXIS); + Molecule fl = flag (me); + fl.translate_axis (stem_y[d]*dy, Y_AXIS); + mol.add_molecule (fl); } - return mol_p; + + return mol.smobbed_copy (); } -Real -Stem::note_delta_f () const +/* + move the stem to right of the notehead if it is up. + */ +MAKE_SCHEME_CALLBACK (Stem,off_callback,2); +SCM +Stem::off_callback (SCM element_smob, SCM) { + Grob *me = unsmob_grob (element_smob); + Real r=0; - if (first_head ()) + if (Grob * f = first_head (me)) { - Interval head_wid(0, first_head()->extent (X_AXIS).length ()); - Real rule_thick = paper_l ()->get_var ("stemthickness"); + Interval head_wid = Note_head::head_extent(f, X_AXIS); - Interval stem_wid(-rule_thick/2, rule_thick/2); - if (get_direction () == CENTER) - r = head_wid.center (); - else - r = head_wid[get_direction ()] - stem_wid[get_direction ()]; + Real attach = + Note_head::stem_attachment_coordinate(f, X_AXIS); + + Direction d = get_direction (me); + + Real real_attach = head_wid.linear_combination (d * attach); + + r = real_attach; + + /* + If not centered: correct for stem thickness. + */ + if (attach) + { + Real rule_thick + = gh_scm2double (me->get_grob_property ("thickness")) + * me->paper_l ()->get_var ("stafflinethickness"); + + + r += - d * rule_thick * 0.5; + } } - return r; + return gh_double2scm (r); } -Real -Stem::hpos_f () const -{ - return note_delta_f () + Item::hpos_f (); -} -Beam* -Stem::beam_l ()const +Grob* +Stem::beam_l (Grob*me) { - SCM b= get_elt_property ("beam"); - return dynamic_cast (unsmob_element (b)); + SCM b= me->get_grob_property ("beam"); + return unsmob_grob (b); } -/* - stupid name: we're calculating and setting (caching??) - some stem length parameters for beamed stem -*/ -void -Stem::beamify () +// ugh still very long. +Stem_info +Stem::calc_stem_info (Grob*me) { - assert (beam_l ()); - - SCM bd = remove_elt_property ("beam-dir"); - Real internote_f = staff_line_leading_f ()/2; - - Direction beam_dir; - Real idealy_f; - Real interstaff_f; - Real maxy_f; - Real miny_f; + SCM scm_info = me->get_grob_property ("stem-info"); - if (gh_number_p (bd)) + if (gh_pair_p (scm_info )) { - beam_dir = (Direction)gh_scm2int (bd); + Stem_info si ; + + si.ideal_y = gh_scm2double (gh_car (scm_info)); + si.max_y = gh_scm2double (gh_cadr (scm_info)); + si.min_y = gh_scm2double (gh_caddr (scm_info)); + + return si; } - else + + Grob * beam = beam_l (me); + + Direction beam_dir = Directional_element_interface::get (beam); + if (!beam_dir) { - programming_error ("Beam direction not set."); - beam_dir = UP; // GURAUGRNAGURAGU! urg ! + programming_error ("Beam dir not set."); + beam_dir = UP; } + + + Real staff_space = Staff_symbol_referencer::staff_space (me); + Real half_space = staff_space / 2; - Real interbeam_f = paper_l ()->interbeam_f (beam_l ()->multiplicity_i_); - Real beam_f = gh_scm2double (beam_l ()->get_elt_property ("beam-thickness")); - - idealy_f = chord_start_f (); + int multiplicity = Beam::get_multiplicity (beam); + Real interbeam_f = Beam::get_interbeam (beam); + + Real thick = gh_scm2double (beam->get_grob_property ("thickness")); + Stem_info info; + info.ideal_y = chord_start_f (me); // for simplicity, we calculate as if dir == UP - idealy_f *= beam_dir; + info.ideal_y *= beam_dir; + SCM grace_prop = me->get_grob_property ("grace"); + + bool grace_b = to_boolean (grace_prop); + + Array a; + SCM s; + + s = me->get_grob_property ("beamed-minimum-lengths"); + a.clear (); + for (SCM q = s; q != SCM_EOL; q = ly_cdr (q)) + a.push (gh_scm2double (ly_car (q))); - bool grace_b = get_elt_property ("grace") != SCM_UNDEFINED; - bool no_extend_b = get_elt_property ("no-stem-extend") != SCM_UNDEFINED; - int stem_max = (int)rint(paper_l ()->get_var ("stem_max")); - String type_str = grace_b ? "grace_" : ""; - Real min_stem_f = paper_l ()->get_var (type_str + "minimum_stem_length" - + to_str (beam_l ()->multiplicity_i_ get_var (type_str + "stem_length" - + to_str (beam_l ()->multiplicity_i_ get_grob_property ("beamed-lengths"); - if (!beam_dir || (beam_dir == get_direction ())) + a.clear (); + for (SCM q = s; q != SCM_EOL; q = ly_cdr (q)) + a.push (gh_scm2double (ly_car (q))); + + Real stem_length = a[multiplicity multiplicity_i_) + if (multiplicity) { - idealy_f += beam_f; - idealy_f += (beam_l ()->multiplicity_i_ - 1) * interbeam_f; + info.ideal_y += thick + (multiplicity - 1) * interbeam_f; } - miny_f = idealy_f; - maxy_f = INT_MAX; + info.min_y = info.ideal_y; + info.max_y = 1000; // INT_MAX; - idealy_f += stem_f; - miny_f += min_stem_f; + info.ideal_y += stem_length; + info.min_y += minimum_length; /* lowest beam of (UP) beam must never be lower than second staffline @@ -472,37 +736,62 @@ Stem::beamify () than middle staffline, just as normal stems. */ + bool no_extend_b = to_boolean (me->get_grob_property ("no-stem-extend")); if (!grace_b && !no_extend_b) { - //highest beam of (UP) beam must never be lower than middle staffline - miny_f = miny_f >? 0; - //lowest beam of (UP) beam must never be lower than second staffline - miny_f = miny_f >? (- 2 * internote_f - beam_f - + (beam_l ()->multiplicity_i_ > 0) * beam_f + interbeam_f * (beam_l ()->multiplicity_i_ - 1)); + /* highest beam of (UP) beam must never be lower than middle + staffline + lowest beam of (UP) beam must never be lower than second staffline + */ + info.min_y = + info.min_y >? 0 + >? (- 2 * half_space - thick + + (multiplicity > 0) * thick + + interbeam_f * (multiplicity - 1)); } } else /* knee */ { - idealy_f -= beam_f; - maxy_f = idealy_f; - miny_f = -INT_MAX; + info.ideal_y -= thick; + info.max_y = info.ideal_y; + info.min_y = - 1000 ; // INT_MAX; - idealy_f -= stem_f; - maxy_f -= min_stem_f; + info.ideal_y -= stem_length; + info.max_y -= minimum_length; } + + info.ideal_y = (info.max_y ? info.min_y; - idealy_f = maxy_f ? idealy_f; + s = beam->get_grob_property ("shorten"); + if (gh_number_p (s)) + info.ideal_y -= gh_scm2double (s); - interstaff_f = calc_interstaff_dist (this, beam_l ()); - idealy_f += interstaff_f * beam_dir; - miny_f += interstaff_f * beam_dir; - maxy_f += interstaff_f * beam_dir; + Grob *common = me->common_refpoint (beam, Y_AXIS); + Real interstaff_f = beam_dir * + (me->relative_coordinate (common, Y_AXIS) + - beam->relative_coordinate (common, Y_AXIS)); + + info.ideal_y += interstaff_f; + info.min_y += interstaff_f; + info.max_y += interstaff_f ; + + me->set_grob_property ("stem-info", + scm_list_n (gh_double2scm (info.ideal_y), + gh_double2scm (info.max_y), + gh_double2scm (info.min_y), + SCM_UNDEFINED)); + + return info; +} - set_elt_property ("interstaff-f", gh_double2scm (interstaff_f)); - set_elt_property ("idealy-f", gh_double2scm (idealy_f)); - set_elt_property ("miny-f", gh_double2scm (miny_f)); - set_real ("maxy-f", gh_double2scm (maxy_f)); +bool +Stem::has_interface (Grob*m) +{ + return m && m->has_interface (ly_symbol2scm ("stem-interface")); } +ADD_INTERFACE (Stem,"stem-interface", + "A stem", + "thickness stem-info beamed-lengths beamed-minimum-lengths lengths beam stem-shorten duration-log beaming neutral-direction stem-end-position support-head heads direction length style no-stem-extend flag-style dir-forced"); +