X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem.cc;h=9332b6532d515b313947d1107719c438c44d69d2;hb=027f1aab2ec8fbbc8a20cf421510f8b9a259d6d2;hp=a2361b4fe8a295e77fb14e8b3d0ea11051b771d8;hpb=69b9cead5afe7164b9053d26eba582fec3825ef8;p=lilypond.git diff --git a/lily/stem.cc b/lily/stem.cc index a2361b4fe8..9332b6532d 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -3,337 +3,638 @@ source file of the GNU LilyPond music typesetter - (c) 1996, 1997--1998 Han-Wen Nienhuys + (c) 1996--2000 Han-Wen Nienhuys + Jan Nieuwenhuizen TODO: This is way too hairy */ +#include // m_pi +#include "directional-element-interface.hh" +#include "note-head.hh" #include "stem.hh" -#include "dimen.hh" #include "debug.hh" #include "paper-def.hh" -#include "note-head.hh" +#include "rhythmic-head.hh" #include "lookup.hh" #include "molecule.hh" -#include "p-col.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" -const int STEMLEN = 7; - -IMPLEMENT_IS_TYPE_B1 (Stem,Item); - -Stem::Stem () -{ - /* - TODO: staff-size - */ - beam_l_ = 0; - beams_left_i_ = 0; - beams_right_i_ = 0; - mult_i_ = 0; - - yextent_drul_[DOWN] = yextent_drul_[UP] = 0; - flag_i_ = 2; - dir_ = CENTER; - stem_xdir_ = LEFT; - staff_size_i_ = 8; - - beam_gap_i_ = 0; -} -Interval_t -Stem::head_positions () const +void +Stem::set_beaming (Score_element*me ,int i, Direction d ) { - Interval_t r; - for (int i =0; i < head_l_arr_.size (); i++) + SCM pair = me->get_elt_property ("beaming"); + + if (!gh_pair_p (pair)) { - int p = head_l_arr_[i]->position_i_; - r[BIGGER] = r[BIGGER] >? p; - r[SMALLER] = r[SMALLER] set_elt_property ("beaming", pair); } - return r; + index_set_cell (pair, d, gh_int2scm (i)); } -void -Stem::do_print () const +int +Stem::beam_count (Score_element*me,Direction d) { -#ifndef NPRINT - DOUT << "flag "<< flag_i_ ; - if (beam_l_) - DOUT << "beamed"; -#endif + SCM p=me->get_elt_property ("beaming"); + if (gh_pair_p (p)) + return gh_scm2int (index_cell (p,d)); + else + return 0; } -Real -Stem::stem_length_f () const +Interval +Stem::head_positions (Score_element*me) { - return yextent_drul_[UP]-yextent_drul_[DOWN] ; + if (!heads_i (me)) + { + Interval iv; + return iv; + } + + Drul_array e (extremal_heads (me)); + + return Interval (Staff_symbol_referencer::position_f (e[DOWN]), + Staff_symbol_referencer::position_f ( e[UP])); } + Real -Stem::stem_begin_f () const +Stem::chord_start_f (Score_element*me) { - return yextent_drul_[Direction(-dir_)]; + return head_positions(me)[get_direction (me)] + * Staff_symbol_referencer::staff_space (me)/2.0; } Real -Stem::chord_start_f () const +Stem::stem_end_position (Score_element*me) { - return head_positions()[dir_] * paper ()->internote_f (); + SCM p =me->get_elt_property ("stem-end-position"); + Real pos; + if (!gh_number_p (p)) + { + + pos = get_default_stem_end_position (me); + me->set_elt_property ("stem-end-position", gh_double2scm (pos)); + } + else + pos = gh_scm2double (p); + + return pos; } -Real -Stem::stem_end_f () const +Direction +Stem::get_direction (Score_element*me) { - return yextent_drul_[dir_]; + Direction d = Directional_element_interface (me).get (); + + if (!d) + { + d = get_default_dir (me); + // urg, AAARGH! + Directional_element_interface (me).set (d); + } + return d ; } + void -Stem::set_stemend (Real se) +Stem::set_stemend (Score_element*me, Real se) { // todo: margins - if (dir_ && dir_ * head_positions()[dir_] >= se*dir_) - warning (_("Weird stem size; check for narrow beams")); - + Direction d= get_direction (me); - yextent_drul_[dir_] = se; - yextent_drul_[Direction(-dir_)] = head_positions()[-dir_]; + if (d && d * head_positions(me)[get_direction (me)] >= se*d) + warning (_ ("Weird stem size; check for narrow beams")); + + me->set_elt_property ("stem-end-position", gh_double2scm (se)); +} + +int +Stem::type_i (Score_element*me) +{ + return first_head (me) ? Rhythmic_head::balltype_i (first_head (me)) : 2; } +/* + Note head that determines hshift for upstems + */ +Score_element* +Stem::support_head (Score_element*me) +{ + SCM h = me->get_elt_property ("support-head"); + Score_element * nh = unsmob_element (h); + if (nh) + return nh; + else if (heads_i (me) == 1) + { + /* + UGH. + */ + + return unsmob_element (gh_car (me->get_elt_property ("heads"))); + } + else + return first_head (me); +} + + int -Stem::type_i () const +Stem::heads_i (Score_element*me) +{ + Pointer_group_interface gi (me, "heads"); + return gi.count (); +} + +/* + The note head which forms one end of the stem. + */ +Score_element* +Stem::first_head (Score_element*me) { - return head_l_arr_[0]->balltype_i_; + return extremal_heads (me)[-get_direction (me)]; +} + +/* + START is part where stem reaches `last' head. + */ +Drul_array +Stem::extremal_heads (Score_element*me) +{ + const int inf = 1000000; + Drul_array extpos; + extpos[DOWN] = inf; + extpos[UP] = -inf; + + Drul_array exthead; + exthead[LEFT] = exthead[RIGHT] =0; + + for (SCM s = me->get_elt_property ("heads"); gh_pair_p (s); s = gh_cdr (s)) + { + Score_element * n = unsmob_element (gh_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; } void -Stem::add (Rhythmic_head *n) +Stem::add_head (Score_element*me, Score_element *n) { - n->add_dependency (this); // ? - if (n->is_type_b (Note_head::static_name ())) + n->set_elt_property ("stem", me->self_scm ()); + n->add_dependency (me); + + if (Note_head::has_interface (n)) { - head_l_arr_.push ((Note_head*)n); + Pointer_group_interface (me, "heads").add_element (n); } - else if (n->is_type_b (Rest::static_name ())) + else { - rest_l_arr_.push ((Rest*)n); + n->set_elt_property ("rest", n->self_scm ()); } } bool -Stem::invisible_b () const +Stem::invisible_b (Score_element*me) { - return (!head_l_arr_.size () || - head_l_arr_[0]->balltype_i_ <= 0); + return !(heads_i (me) && Rhythmic_head::balltype_i (support_head (me)) >= 1); } int -Stem::get_center_distance (Direction d) +Stem::get_center_distance (Score_element*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 () +Stem::get_default_dir (Score_element*me) { - return (get_center_distance (UP) > - get_center_distance (DOWN)) - ? DOWN - : UP; -} + int du = get_center_distance (me,UP); + int dd = get_center_distance (me,DOWN); -Direction -Stem::get_dir () -{ - return dir_; -} + if (sign (dd - du)) + return Direction (sign (dd -du)); -void -Stem::set_default_dir () -{ - dir_ = get_default_dir (); + return to_dir (me->get_elt_property ("default-neutral-direction")); } -void -Stem::set_default_stemlen () +/* + ugh. A is used for different purposes. This functionality should be + moved into scheme at some point to get rid of the silly + conversions. (but lets wait till we have namespaces in SCM) + */ +Real +Stem::get_default_stem_end_position (Score_element*me) { - Real len = STEMLEN; - Real dy = paper ()->interbeam_f (); - - if (!dir_) - set_default_dir (); - - /* If the stem points in the "wrong" direction, it should be - shortened, according to [Roush & Gourlay]. Their suggestion to knock off - a whole staffspace is a bit drastical though. - */ - else if (dir_ != get_default_dir ()) - len -= 1.0; - - if (flag_i_ >= 5) - len += 2.0; - if (flag_i_ >= 6) - len += 1.0; - - set_stemend ((dir_ > 0) ? head_positions()[BIGGER] + len : - head_positions()[SMALLER] - len); + bool grace_b = to_boolean (me->get_elt_property ("grace")); + String type_str = grace_b ? "grace-" : ""; + SCM s; + Array a; + + Real length_f = 0.; + SCM scm_len = me->get_elt_property("length"); + if (gh_number_p (scm_len)) + { + length_f = gh_scm2double (scm_len); + } + else + { + s = scm_eval (ly_symbol2scm ((type_str + "stem-length").ch_C())); + for (SCM q = s; q != SCM_EOL; q = gh_cdr (q)) + a.push (gh_scm2double (gh_car (q))); + + // stem uses half-spaces + length_f = a[((flag_i (me) - 2) >? 0) ? 0) get_elt_property ("no-stem-extend")); + if (!grace_b && !no_extend_b && dir * st < 0) + st = 0.0; - if (dir_ == UP) - stem_xdir_ = RIGHT; - if (invisible_b ()) - stem_xdir_ = CENTER; + return st; } /* - TODO - - move into note_column.cc + FIXME: wrong name + */ +int +Stem::flag_i (Score_element*me) +{ + SCM s = me->get_elt_property ("duration-log"); + return (gh_number_p (s)) ? gh_scm2int (s) : 2; +} - */ void -Stem::set_noteheads () +Stem::position_noteheads (Score_element*me) { - if (!head_l_arr_.size ()) + if (!heads_i (me)) return; - head_l_arr_.sort (Note_head::compare); - if (dir_ < 0) - head_l_arr_.reverse (); - - head_l_arr_[0]->extremal_i_ = -1; - head_l_arr_.top ()->extremal_i_ = 1; - int parity=1; - int lastpos = head_l_arr_[0]->position_i_; - for (int i=1; i < head_l_arr_.size (); i ++) + + Link_array heads = + Pointer_group_interface__extract_elements (me, (Score_element*)0, "heads"); + + heads.sort (compare_position); + Direction dir =get_direction (me); + + if (dir < 0) + heads.reverse (); + + + Real w = support_head (me)->extent (X_AXIS)[dir]; + for (int i=0; i < heads.size (); i++) { - int dy =abs (lastpos- head_l_arr_[i]->position_i_); + heads[i]->translate_axis (w - heads[i]->extent (X_AXIS)[dir], X_AXIS); + } + + 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 ++) + { + Real p = Staff_symbol_referencer::position_f (heads[i]); + int dy =abs (lastpos- (int)p); if (dy <= 1) { if (parity) - head_l_arr_[i]->x_dir_ = (stem_xdir_ == LEFT) ? LEFT : RIGHT; + { + Real l = heads[i]->extent (X_AXIS).length (); + heads[i]->translate_axis (l * get_direction (me), X_AXIS); + } parity = !parity; } else - parity = 1; - lastpos = head_l_arr_[i]->position_i_; + parity = true; + + lastpos = int (p); } } +MAKE_SCHEME_CALLBACK(Stem,before_line_breaking); +SCM +Stem::before_line_breaking (SCM smob) +{ + Score_element*me = unsmob_element (smob); + stem_end_position (me); // ugh. Trigger direction calc. + position_noteheads (me); + + if (invisible_b (me)) + { + me->remove_elt_property ("molecule-callback"); + // suicide(); + } + + set_spacing_hints (me); + return SCM_UNSPECIFIED; +} + + + +/** + set stem directions for hinting the optical spacing correction. + + Modifies DIR_LIST property of the Stem's Paper_column + + TODO: more advanced: supply height of noteheads as well, for more advanced spacing possibilities + */ void -Stem::do_pre_processing () +Stem::set_spacing_hints (Score_element*me) { - if (yextent_drul_[DOWN]== yextent_drul_[UP]) - set_default_extents (); - set_noteheads (); - flag_i_ = flag_i_; - transparent_b_ = invisible_b (); - set_empty (invisible_b ()); + if (!invisible_b (me)) + { + SCM scmdir = gh_int2scm (get_direction (me)); + + Item* item = dynamic_cast (me); + Item * col = item->column_l (); + SCM dirlist =col->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); + col->set_elt_property ("dir-list", dirlist); + } + } } +Molecule +Stem::flag (Score_element*me) +{ + String style; + SCM st = me->get_elt_property ("flag-style"); + if ( gh_string_p (st)) + { + style = ly_scm2string (st); + } + + char c = (get_direction (me) == UP) ? 'u' : 'd'; + Molecule m = me->lookup_l ()->afm_find (String ("flags-") + to_str (c) + + to_str (flag_i (me))); + if (!style.empty_b ()) + m.add_molecule(me->lookup_l ()->afm_find (String ("flags-") + to_str (c) + style)); + return m; +} Interval -Stem::do_width () const +Stem::dim_callback (Score_element *se, Axis ) { Interval r (0, 0); - if (beam_l_ || abs (flag_i_) <= 2) + if (unsmob_element (se->get_elt_property ("beam")) || abs (flag_i (se)) <= 2) ; // TODO! else { - Paper_def*p= paper (); - r = p->lookup_l ()->flag (flag_i_, dir_).dim_.x (); - r += note_delta_f (); + r = flag (se).extent (X_AXIS); } return r; } +const Real ANGLE = 20* (2.0*M_PI/360.0); // ugh! Should be settable. -const Real ANGLE = 20* (2.0*M_PI/360.0); // ugh! +MAKE_SCHEME_CALLBACK(Stem,brew_molecule); -Molecule* -Stem::brew_molecule_p () const +SCM +Stem::brew_molecule (SCM smob) { - Molecule *mol_p =new Molecule; - Paper_def *p =paper (); - Drul_array stem_y = yextent_drul_; - Real dy = p->internote_f (); + Score_element*me = unsmob_element (smob); + Molecule mol; + Direction d = get_direction (me); + + Real y1 = Staff_symbol_referencer::position_f (first_head (me)); + Real y2 = stem_end_position (me); + + Interval stem_y(y1,y2); + stem_y.unite (Interval (y2,y1)); + Real dy = Staff_symbol_referencer::staff_space (me)/2.0; Real head_wid = 0; - if (head_l_arr_.size ()) - head_wid = head_l_arr_[0]->width ().length (); - stem_y[Direction(-dir_)] += dir_ * head_wid * tan(ANGLE)/(2*dy); + if (support_head (me)) + head_wid = support_head (me)->extent (X_AXIS).length (); + stem_y[Direction(-d)] += d * head_wid * tan(ANGLE)/(2*dy); - if (!invisible_b ()) + if (!invisible_b (me)) { - Atom ss =p->lookup_l ()->stem (stem_y[DOWN]*dy, - stem_y[UP]*dy); - mol_p->add (Atom (ss)); + Real stem_width = me->paper_l ()->get_var ("stemthickness"); + Molecule ss =me->lookup_l ()->filledbox (Box (Interval (-stem_width/2, stem_width/2), + Interval (stem_y[DOWN]*dy, stem_y[UP]*dy))); + mol.add_molecule (ss); } - if (!beam_l_ &&abs (flag_i_) > 2) + if (!beam_l (me) && abs (flag_i (me)) > 2) { - Atom fl = p->lookup_l ()->flag (flag_i_, dir_); - fl.translate_axis(stem_y[dir_]*dy, Y_AXIS); - mol_p->add(fl); + Molecule fl = flag (me); + fl.translate_axis(stem_y[d]*dy, Y_AXIS); + mol.add_molecule (fl); } - if (head_l_arr_.size()) - { - mol_p->translate_axis (note_delta_f (), X_AXIS); - } - return mol_p; + return mol.create_scheme(); } Real -Stem::note_delta_f () const +Stem::off_callback (Score_element * me, Axis) { Real r=0; - if (head_l_arr_.size()) + if (Score_element * f = first_head (me)) { - Interval head_wid(0, head_l_arr_[0]->width ().length ()); - Real rule_thick(paper ()->rule_thickness ()); - Interval stem_wid(-rule_thick/2, rule_thick/2); - if (stem_xdir_ == CENTER) - r = head_wid.center (); - else - r = head_wid[stem_xdir_] - stem_wid[stem_xdir_]; + Interval head_wid(0, f->extent (X_AXIS).length ()); + + if (to_boolean (me->get_elt_property ("stem-centered"))) + return head_wid.center (); + + Real rule_thick = me->paper_l ()->get_var ("stemthickness"); + Direction d = get_direction (me); + r = head_wid[d] - d * rule_thick ; } return r; } -Real -Stem::hpos_f () const + + + +Score_element* +Stem::beam_l (Score_element*me) { - return note_delta_f () +Item::hpos_f (); + SCM b= me->get_elt_property ("beam"); + return unsmob_element (b); } -/* - TODO: head_l_arr_/rest_l_arr_ in do_substitute_dependent () - */ -void - Stem::do_substitute_dependency (Score_elem*o,Score_elem*n) + +// ugh still very long. +Stem_info +Stem::calc_stem_info (Score_element*me) +{ + Score_element * beam = beam_l (me); + + Direction beam_dir = Directional_element_interface (beam).get (); + if (!beam_dir) + { + 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 = me->paper_l ()->interbeam_f (Beam::get_multiplicity (beam)); + Real thick = gh_scm2double (beam->get_elt_property ("beam-thickness")); + int multiplicity = Beam::get_multiplicity (beam); + + Stem_info info; + info.idealy_f_ = chord_start_f (me); + + // for simplicity, we calculate as if dir == UP + info.idealy_f_ *= beam_dir; + SCM grace_prop = me->get_elt_property ("grace"); + + bool grace_b = to_boolean (grace_prop); + + Array a; + SCM s; + String type_str = grace_b ? "grace-" : ""; + + s = scm_eval (ly_symbol2scm ((type_str + "beamed-stem-minimum-length").ch_C())); + a.clear (); + for (SCM q = s; q != SCM_EOL; q = gh_cdr (q)) + a.push (gh_scm2double (gh_car (q))); + + + Real minimum_length = a[multiplicity get_elt_property ("no-stem-extend")); + if (!grace_b && !no_extend_b) + { + /* 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.miny_f_ = + info.miny_f_ >? 0 + >? (- 2 * half_space - thick + + (multiplicity > 0) * thick + + interbeam_f * (multiplicity - 1)); + } + } + else + /* knee */ + { + info.idealy_f_ -= thick; + info.maxy_f_ = info.idealy_f_; + info.miny_f_ = -INT_MAX; + + info.idealy_f_ -= stem_length; + info.maxy_f_ -= minimum_length; + } + + info.idealy_f_ = (info.maxy_f_ ? info.miny_f_; + + s = beam->get_elt_property ("shorten"); + if (gh_number_p (s)) + info.idealy_f_ -= gh_scm2double (s); + + Real interstaff_f = -beam_dir* calc_interstaff_dist (dynamic_cast (me), dynamic_cast (beam)); + + info.idealy_f_ += interstaff_f; + info.miny_f_ += interstaff_f; + info.maxy_f_ += interstaff_f ; + + return info; +} + +bool +Stem::has_interface (Score_element*m) { - Item * o_l = o->item (); - Item * n_l = n? n->item () : 0; - head_l_arr_.substitute ((Note_head*)o_l, (Note_head*)n_l); - rest_l_arr_.substitute ((Rest*)o_l, (Rest*)n_l); + return m && m->has_interface (ly_symbol2scm ("stem-interface")); +} + +void +Stem::set_interface (Score_element*me) +{ + me->set_elt_property ("heads", SCM_EOL); + me->add_offset_callback ( &Stem::off_callback, X_AXIS); + me->set_interface (ly_symbol2scm ("stem-interface")); }