X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem.cc;h=6c111feee18050b85a78676aee9ad67fdacc05cf;hb=b0064942493df77833e6e41e05d362850f4874b0;hp=f72d3068ef17438c945790b3a01232d5fb7bad52;hpb=2f558a5087e74382789fc16e34eff918a94987ae;p=lilypond.git diff --git a/lily/stem.cc b/lily/stem.cc index f72d3068ef..6c111feee1 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -3,85 +3,108 @@ source file of the GNU LilyPond music typesetter - (c) 1996,1997 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 "dimension-cache.hh" #include "stem.hh" -#include "dimen.hh" #include "debug.hh" #include "paper-def.hh" #include "note-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" -const int STEMLEN=7; -IMPLEMENT_IS_TYPE_B1 (Stem,Item); -Stem::Stem () +void +Stem::set_beaming (int i, Direction d ) { - /* - TODO: staff-size - */ - abbrev_flag_i_ = 0; - beam_l_ = 0; - beams_left_i_ = 0; - beams_right_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; + SCM pair = get_elt_property ("beaming"); + + if (!gh_pair_p (pair)) + { + pair = gh_cons (gh_int2scm (0),gh_int2scm (0)); + set_elt_property ("beaming", pair); + } + index_set_cell (pair, d, gh_int2scm (i)); } -Interval_t +int +Stem::beam_count (Direction d) const +{ + SCM p=get_elt_property ("beaming"); + if (gh_pair_p (p)) + return gh_scm2int (index_cell (p,d)); + else + return 0; +} + +Interval Stem::head_positions () const { - Interval_t r; - for (int i =0; i < head_l_arr_.size (); i++) + if (!heads_i ()) { - int p = head_l_arr_[i]->position_i_; - r[BIGGER] = r[BIGGER] >? p; - r[SMALLER] = r[SMALLER] e (extremal_heads ()); + + return Interval (staff_symbol_referencer (e[DOWN]).position_f (), + staff_symbol_referencer( e[UP]).position_f ()); } + Real -Stem::stem_length_f () const +Stem::chord_start_f () const { - return yextent_drul_[UP]-yextent_drul_[DOWN] ; + return head_positions()[get_direction ()] + * Staff_symbol_referencer_interface (this).staff_space ()/2.0; } Real -Stem::stem_start_f () const +Stem::stem_end_position () const { - return yextent_drul_[Direction(-dir_)]; + SCM p =get_elt_property ("stem-end-position"); + Real pos; + if (!gh_number_p (p)) + { + Stem * me = (Stem*) this; + pos = get_default_stem_end_position (); + 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 () const { - return yextent_drul_[dir_]; + Direction d = directional_element (this).get (); + + if (!d) + { + Stem * me = (Stem*) this; + d = get_default_dir (); + // urg, AAARGH! + directional_element (me).set (d); + } + return d ; } @@ -89,290 +112,525 @@ void Stem::set_stemend (Real se) { // todo: margins - if (dir_ && dir_ * head_positions()[dir_] >= se*dir_) - warning (_("Weird stem size; check for narrow beams")); - + Direction d= get_direction (); - yextent_drul_[dir_] = se; - yextent_drul_[Direction(-dir_)] = head_positions()[-dir_]; + if (d && d * head_positions()[get_direction ()] >= se*d) + warning (_ ("Weird stem size; check for narrow beams")); + + set_elt_property ("stem-end-position", gh_double2scm (se)); } int Stem::type_i () const { - return head_l_arr_[0]->balltype_i_; + return first_head () ? first_head ()->balltype_i () : 2; } -void -Stem::add (Rhythmic_head *n) +/* + Note head that determines hshift for upstems + */ +Score_element* +Stem::support_head ()const { - n->add_dependency (this); // ? - if (n->is_type_b (Note_head::static_name ())) + SCM h = get_elt_pointer ("support-head"); + Score_element * nh = unsmob_element (h); + if (nh) + return nh; + else if (heads_i () == 1) { - head_l_arr_.push ((Note_head*)n); + /* + UGH. + */ + + return unsmob_element (gh_car (get_elt_pointer ("heads"))); } - else if (n->is_type_b (Rest::static_name ())) + else + return first_head (); +} + + +int +Stem::heads_i ()const +{ + Pointer_group_interface gi (this, "heads"); + return gi.count (); +} + +/* + The note head which forms one end of the stem. + */ +Note_head* +Stem::first_head () const +{ + return extremal_heads ()[-get_direction ()]; +} + +/* + START is part where stem reaches `last' head. + */ +Drul_array +Stem::extremal_heads () const +{ + const int inf = 1000000; + Drul_array extpos; + extpos[DOWN] = inf; + extpos[UP] = -inf; + + Drul_array exthead; + exthead[LEFT] = exthead[RIGHT] =0; + + for (SCM s = get_elt_pointer ("heads"); gh_pair_p (s); s = gh_cdr (s)) { - rest_l_arr_.push ((Rest*)n); + Note_head * n = dynamic_cast (unsmob_element (gh_car (s))); + Staff_symbol_referencer_interface si (n); + + int p = int(si.position_f ()); + + 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_head (Rhythmic_head *n) +{ + n->set_elt_pointer ("stem", this->self_scm_); + n->add_dependency (this); + + Pointer_group_interface gi (this); + if (Note_head *nh = dynamic_cast (n)) + gi.name_ = "heads"; + else + gi.name_ = "rests"; + + gi.add_element (n); +} + +Stem::Stem (SCM s) + : Item (s) +{ + set_elt_pointer ("heads", SCM_EOL); + set_elt_pointer ("rests", SCM_EOL); + + add_offset_callback ( &Stem::off_callback, X_AXIS); } bool Stem::invisible_b () const { - return (!head_l_arr_.size () || - head_l_arr_[0]->balltype_i_ <= 0); + /* + UGH. Who determines balltype for stem? + */ + Note_head * nh = dynamic_cast (support_head ()); + return !(heads_i () && nh->balltype_i () >= 1); } int -Stem::get_center_distance (Direction d) +Stem::get_center_distance (Direction d) const { int staff_center = 0; - int distance = d*(head_positions()[d] - staff_center); + int distance = (int) (d*(head_positions()[d] - staff_center)); return distance >? 0; } Direction -Stem::get_default_dir () +Stem::get_default_dir () const { - return (get_center_distance (UP) >= - get_center_distance (DOWN)) - ? DOWN - : UP; -} + int du = get_center_distance (UP); + int dd = get_center_distance (DOWN); + if (sign (dd - du)) + return Direction (sign (dd -du)); -void -Stem::set_default_dir () -{ - dir_ = get_default_dir (); + return Direction (int(paper_l ()->get_var ("stem_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 () const { - Real len = STEMLEN; - Real dy = paper ()->interbeam_f (); - - // ugh, should get nice *rule* for this - if (abbrev_flag_i_ > 1) - len += (abbrev_flag_i_ - 1)* dy / 2; + bool grace_b = to_boolean (get_elt_property ("grace")); + String type_str = grace_b ? "grace-" : ""; + SCM s; + Array a; + + Real length_f = 0.; + SCM scm_len = 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 () - 2) >? 0) = 5) - len += 2.0; - if (flag_i_ >= 6) - len += 1.0; - - set_stemend ((dir_ > 0) ? head_positions()[BIGGER] + len : - head_positions()[SMALLER] - len); + // stem uses half-spaces + // fixme: use gh_list_ref () iso. array[] + Real shorten_f = a[((flag_i () - 2) >? 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 (this, (Score_element*)0, "heads"); + + heads.sort (compare_position); + Direction dir =get_direction (); + + if (dir < 0) + heads.reverse (); + + + Real w = support_head ()->extent (X_AXIS)[dir]; + for (int i=0; i < heads.size (); i++) + { + heads[i]->translate_axis (w - heads[i]->extent (X_AXIS)[dir], X_AXIS); + } + + bool parity= true; // todo: make this settable. + int lastpos = int (Staff_symbol_referencer_interface (heads[0]).position_f ()); + for (int i=1; i < heads.size (); i ++) { - int dy =abs (lastpos- head_l_arr_[i]->position_i_); + Real p = Staff_symbol_referencer_interface (heads[i]).position_f (); + 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 (), X_AXIS); + } parity = !parity; } else - parity = 0; - lastpos = head_l_arr_[i]->position_i_; + parity = true; + + lastpos = int (p); } } void -Stem::do_pre_processing () +Stem::before_line_breaking () { - if (yextent_drul_[DOWN]== yextent_drul_[UP]) - set_default_extents (); - set_noteheads (); - flag_i_ = flag_i_; - transparent_b_ = invisible_b (); - set_empty (invisible_b ()); + stem_end_position (); // ugh. Trigger direction calc. + position_noteheads (); + + if (invisible_b ()) + { + remove_elt_property ("molecule-callback"); + // suicide(); + } + + set_spacing_hints (); } -Interval -Stem::do_width () const + +/** + 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::set_spacing_hints () { - Interval r (0, 0); - if (abbrev_flag_i_) - { - r = abbrev_mol ().extent ().x (); - } - else if (beam_l_ || abs (flag_i_) <= 2) - ; // TODO! - else + if (!invisible_b ()) { - Paper_def*p= paper (); - r = p->lookup_l ()->flag (flag_i_, dir_).dim_.x (); - r += note_delta_f (); + 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); + } } - return r; } +Molecule +Stem::flag () const +{ + String style; + SCM st = get_elt_property ("flag-style"); + if ( gh_string_p (st)) + { + style = ly_scm2string (st); + } + 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)); + return m; +} -Molecule -Stem::abbrev_mol () const +Interval +Stem::dim_callback (Score_element const *se, Axis ) { - Real dy = paper ()->interbeam_f (); - Real w = 1.5 * paper ()->lookup_l ()->ball (2).dim_.x ().length (); - Real beamdy = paper ()->interline_f () / 2; - - int beams_i = 0; - Real slope = paper ()->internote_f () / 4; - - if (beam_l_) { - // huh? - slope = 2 * beam_l_->slope; - // ugh, rather calc from Abbreviation_req - beams_i = beams_right_i_ >? beams_left_i_; - } - paper ()->lookup_l ()->beam (slope, 20 PT); - - Molecule beams; - Atom a (paper ()->lookup_l ()->beam (slope, w)); - a.translate (Offset(- w / 2, stem_end_f () - (w / 2 * slope))); - // ugh - if (!beams_i) - a.translate_axis (dy + beamdy - dir_ * dy, Y_AXIS); + Stem * s = dynamic_cast ((Score_element*)se); + + Interval r (0, 0); + if (unsmob_element (s->get_elt_pointer ("beam")) || abs (s->flag_i ()) <= 2) + ; // TODO! else - a.translate_axis (2 * beamdy - dir_ * (beamdy - dy), Y_AXIS); - - for (int i = 0; i < abbrev_flag_i_; i++) { - Atom b (a); - b.translate_axis (-dir_ * dy * (beams_i + i), Y_AXIS); - beams.add (b); + r = s->flag ().extent (X_AXIS); } - - return beams; + return r; } -const Real ANGLE = 20* (2.0*M_PI/360.0); -Molecule* -Stem::brew_molecule_p () const +const Real ANGLE = 20* (2.0*M_PI/360.0); // ugh! Should be settable. + +MAKE_SCHEME_SCORE_ELEMENT_CALLBACKS(Stem) +Molecule +Stem::do_brew_molecule () const { - Molecule *mol_p =new Molecule; - Paper_def *p =paper (); - Drul_array stem_y = yextent_drul_; - Real dy = p->internote_f (); + Molecule mol; + + Staff_symbol_referencer_interface si (first_head ()); + + Real y1 = si.position_f(); + Real y2 = stem_end_position (); + Interval stem_y(y1,y2); + stem_y.unite (Interval (y2,y1)); + Real dy = staff_symbol_referencer (this).staff_space ()/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 ()) + head_wid = support_head ()->extent (X_AXIS).length (); + stem_y[Direction(-get_direction ())] += get_direction () * head_wid * tan(ANGLE)/(2*dy); if (!invisible_b ()) { - Atom ss =p->lookup_l ()->stem (stem_y[DOWN]*dy, - stem_y[UP]*dy); - mol_p->add (Atom (ss)); + 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.add_molecule (ss); } - if (!beam_l_ &&abs (flag_i_) > 2) + if (!beam_l () && abs (flag_i ()) > 2) { - Atom fl = p->lookup_l ()->flag (flag_i_, dir_); - fl.translate_axis(stem_y[dir_]*dy, Y_AXIS); - mol_p->add(fl); - assert (!abbrev_flag_i_); + Molecule fl = flag (); + fl.translate_axis(stem_y[get_direction ()]*dy, Y_AXIS); + mol.add_molecule (fl); } - if (abbrev_flag_i_) - mol_p->add (abbrev_mol ()); - - if (head_l_arr_.size()) - { - mol_p->translate_axis (note_delta_f (), X_AXIS); - } - return mol_p; + return mol; } Real -Stem::note_delta_f () const +Stem::off_callback (Score_element const* se, Axis) { + Stem *st = dynamic_cast ((Score_element*)se); + Real r=0; - if (head_l_arr_.size()) + if (Note_head * f = st->first_head ()) { - 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); - r = head_wid[stem_xdir_] - stem_wid[stem_xdir_]; + Interval head_wid(0, f->extent (X_AXIS).length ()); + + if (to_boolean (st->get_elt_property ("stem-centered"))) + return head_wid.center (); + + Real rule_thick = st->paper_l ()->get_var ("stemthickness"); + Direction d = st->get_direction (); + r = head_wid[d] - d * rule_thick ; } return r; } -Real -Stem::hpos_f () const + + + +Beam* +Stem::beam_l ()const { - return note_delta_f () +Item::hpos_f (); + SCM b= get_elt_pointer ("beam"); + return dynamic_cast (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 () const { - 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); + assert (beam_l ()); + + Direction beam_dir = directional_element (beam_l ()).get (); + if (!beam_dir) + { + programming_error ("Beam dir not set."); + beam_dir = UP; + } + + Staff_symbol_referencer_interface st (this); + Real staff_space = st.staff_space (); + Real half_space = staff_space / 2; + Real interbeam_f = paper_l ()->interbeam_f (beam_l ()->get_multiplicity ()); + Real thick = gh_scm2double (beam_l ()->get_elt_property ("beam-thickness")); + int multiplicity = beam_l ()->get_multiplicity (); + + Stem_info info; + info.idealy_f_ = chord_start_f (); + + // for simplicity, we calculate as if dir == UP + info.idealy_f_ *= beam_dir; + SCM grace_prop = 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 ? 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_l ()->get_elt_property ("shorten"); + if (gh_number_p (s)) + info.idealy_f_ -= gh_double2scm (s); + + Real interstaff_f = -beam_dir* calc_interstaff_dist (this, beam_l ()); + + info.idealy_f_ += interstaff_f; + info.miny_f_ += interstaff_f; + info.maxy_f_ += interstaff_f ; + + return info; } +