X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem.cc;h=e640d0a7d0fc31642fd97cf54b56bee2ec8c97e4;hb=005035fec14e578c6824a87517574888d655596a;hp=e1b53608c82bf03420f1756dc4bc643e4319a36c;hpb=c21d49df60cb97801ab33ab8a1bad6f2c81cd820;p=lilypond.git diff --git a/lily/stem.cc b/lily/stem.cc index e1b53608c8..e640d0a7d0 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -10,41 +10,42 @@ */ #include // m_pi +#include "lookup.hh" #include "directional-element-interface.hh" -#include "dimension-cache.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 "cross-staff.hh" #include "staff-symbol-referencer.hh" - +#include "spanner.hh" void -Stem::set_beaming (int i, Direction d ) +Stem::set_beaming (Grob*me ,int i, Direction d ) { - SCM pair = get_elt_property ("beaming"); + SCM pair = me->get_grob_property ("beaming"); if (!gh_pair_p (pair)) { pair = gh_cons (gh_int2scm (0),gh_int2scm (0)); - set_elt_property ("beaming", pair); + me-> set_grob_property ("beaming", pair); } index_set_cell (pair, d, gh_int2scm (i)); } int -Stem::beam_count (Direction d) const +Stem::beam_count (Grob*me,Direction d) { - SCM p=get_elt_property ("beaming"); + SCM p=me->get_grob_property ("beaming"); if (gh_pair_p (p)) return gh_scm2int (index_cell (p,d)); else @@ -52,39 +53,38 @@ Stem::beam_count (Direction d) const } Interval -Stem::head_positions () const +Stem::head_positions (Grob*me) { - if (!heads_i ()) + if (!heads_i (me)) { Interval iv; return iv; } - - Drul_array e (extremal_heads ()); + Drul_array e (extremal_heads (me)); - return Interval (staff_symbol_referencer (e[DOWN]).position_f (), - staff_symbol_referencer( e[UP]).position_f ()); + return Interval (Staff_symbol_referencer::position_f (e[DOWN]), + Staff_symbol_referencer::position_f ( e[UP])); } Real -Stem::chord_start_f () const +Stem::chord_start_f (Grob*me) { - return head_positions()[get_direction ()] - * Staff_symbol_referencer_interface (this).staff_space ()/2.0; + return head_positions(me)[get_direction (me)] + * Staff_symbol_referencer::staff_space (me)/2.0; } Real -Stem::stem_end_position () const +Stem::stem_end_position (Grob*me) { - SCM p =get_elt_property ("stem-end-position"); + SCM p =me->get_grob_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)); + + pos = get_default_stem_end_position (me); + me->set_grob_property ("stem-end-position", gh_double2scm (pos)); } else pos = gh_scm2double (p); @@ -93,98 +93,96 @@ Stem::stem_end_position () const } Direction -Stem::get_direction () const +Stem::get_direction (Grob*me) { - Direction d = directional_element (this).get (); + Direction d = Directional_element_interface::get (me); if (!d) { - Stem * me = (Stem*) this; - d = get_default_dir (); + d = get_default_dir (me); // urg, AAARGH! - directional_element (me).set (d); + Directional_element_interface::set (me, d); } return d ; } void -Stem::set_stemend (Real se) +Stem::set_stemend (Grob*me, Real se) { // todo: margins - Direction d= get_direction (); + Direction d= get_direction (me); - if (d && d * head_positions()[get_direction ()] >= se*d) + if (d && d * head_positions(me)[get_direction (me)] >= se*d) warning (_ ("Weird stem size; check for narrow beams")); - set_elt_property ("stem-end-position", gh_double2scm (se)); + me->set_grob_property ("stem-end-position", gh_double2scm (se)); } int -Stem::type_i () const +Stem::type_i (Grob*me) { - return first_head () ? first_head ()->balltype_i () : 2; + return first_head (me) ? Rhythmic_head::balltype_i (first_head (me)) : 2; } /* Note head that determines hshift for upstems */ -Score_element* -Stem::support_head ()const +Grob* +Stem::support_head (Grob*me) { - SCM h = get_elt_pointer ("support-head"); - Score_element * nh = unsmob_element (h); + SCM h = me->get_grob_property ("support-head"); + Grob * nh = unsmob_grob (h); if (nh) return nh; - else if (heads_i () == 1) + else if (heads_i (me) == 1) { /* UGH. */ - return unsmob_element (gh_car (get_elt_pointer ("heads"))); + return unsmob_grob (gh_car (me->get_grob_property ("heads"))); } else - return first_head (); + return first_head (me); } int -Stem::heads_i ()const +Stem::heads_i (Grob*me) { - Pointer_group_interface gi (this, "heads"); - return gi.count (); + return Pointer_group_interface::count (me, "heads"); } /* The note head which forms one end of the stem. */ -Note_head* -Stem::first_head () const +Grob* +Stem::first_head (Grob*me) { - return extremal_heads ()[-get_direction ()]; + return extremal_heads (me)[-get_direction (me)]; } /* START is part where stem reaches `last' head. */ -Drul_array -Stem::extremal_heads () const +Drul_array +Stem::extremal_heads (Grob*me) { const int inf = 1000000; Drul_array extpos; extpos[DOWN] = inf; extpos[UP] = -inf; - Drul_array exthead; + Drul_array exthead; exthead[LEFT] = exthead[RIGHT] =0; - for (SCM s = get_elt_pointer ("heads"); gh_pair_p (s); s = gh_cdr (s)) + for (SCM s = me->get_grob_property ("heads"); gh_pair_p (s); s = gh_cdr (s)) { - Note_head * n = dynamic_cast (unsmob_element (gh_car (s))); - Staff_symbol_referencer_interface si (n); + Grob * n = unsmob_grob (gh_car (s)); + - int p = int(si.position_f ()); + int p = int(Staff_symbol_referencer::position_f (n)); Direction d = LEFT; do { @@ -200,173 +198,156 @@ Stem::extremal_heads () const } void -Stem::add_head (Rhythmic_head *n) +Stem::add_head (Grob*me, Grob *n) { - n->set_elt_pointer ("stem", this->self_scm_); - n->add_dependency (this); + n->set_grob_property ("stem", me->self_scm ()); + n->add_dependency (me); - Pointer_group_interface gi (this); - if (Note_head *nh = dynamic_cast (n)) - gi.name_ = "heads"; + if (Note_head::has_interface (n)) + { + Pointer_group_interface::add_element (me, "heads",n); + } 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); + { + n->set_grob_property ("rest", n->self_scm ()); + } } bool -Stem::invisible_b () const +Stem::invisible_b (Grob*me) { - /* - UGH. Who determines balltype for stem? - */ - Note_head * nh = dynamic_cast (support_head ()); - return !(heads_i () && nh->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 = (int) (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 ("default-neutral-direction")); } -/* - 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 +Stem::get_default_stem_end_position (Grob*me) { - bool grace_b = to_boolean (get_elt_property ("grace")); - String type_str = grace_b ? "grace-" : ""; + 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"); + SCM scm_len = me->get_grob_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())); + s = me->get_grob_property("lengths"); 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) ? 0) get_grob_property ("stem-shorten"); + for (SCM q = s; gh_pair_p (q); q = gh_cdr (q)) a.push (gh_scm2double (gh_car (q))); // stem uses half-spaces // fixme: use gh_list_ref () iso. array[] - Real shorten_f = a[((flag_i () - 2) >? 0) ? 0) get_grob_property ("no-stem-extend")); + if (!grace_b && !no_extend_b && dir * st < 0) // junkme? st = 0.0; return st; } /* - FIXME: wrong name + Number of hooks on the flag, ie. the log of the duration. */ int -Stem::flag_i () const +Stem::flag_i (Grob*me) { - SCM s = get_elt_property ("duration-log"); + SCM s = me->get_grob_property ("duration-log"); return (gh_number_p (s)) ? gh_scm2int (s) : 2; } void -Stem::position_noteheads () +Stem::position_noteheads (Grob*me) { - if (!heads_i ()) + if (!heads_i (me)) return; - Link_array heads = - Pointer_group_interface__extract_elements (this, (Score_element*)0, "heads"); + Link_array heads = + Pointer_group_interface__extract_elements (me, (Grob*)0, "heads"); heads.sort (compare_position); - Direction dir =get_direction (); + Direction dir =get_direction (me); if (dir < 0) heads.reverse (); - Real w = support_head ()->extent (X_AXIS)[dir]; + Grob *hed = support_head (me); + Real w = hed->extent (hed, X_AXIS)[dir]; for (int i=0; i < heads.size (); i++) { - heads[i]->translate_axis (w - heads[i]->extent (X_AXIS)[dir], X_AXIS); + heads[i]->translate_axis (w - heads[i]->extent (heads[i], X_AXIS)[dir], X_AXIS); } - bool parity= true; // todo: make this settable. - int lastpos = int (Staff_symbol_referencer_interface (heads[0]).position_f ()); + 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_interface (heads[i]).position_f (); + Real p = Staff_symbol_referencer::position_f (heads[i]); int dy =abs (lastpos- (int)p); if (dy <= 1) { if (parity) { - Real l = heads[i]->extent (X_AXIS).length (); - heads[i]->translate_axis (l * get_direction (), X_AXIS); + Real l = heads[i]->extent (heads[i], X_AXIS).length (); + heads[i]->translate_axis (l * get_direction (me), X_AXIS); } parity = !parity; } @@ -377,24 +358,45 @@ Stem::position_noteheads () } } -GLUE_SCORE_ELEMENT(Stem,before_line_breaking); +MAKE_SCHEME_CALLBACK(Stem,before_line_breaking,1); SCM -Stem::member_before_line_breaking () +Stem::before_line_breaking (SCM smob) { - stem_end_position (); // ugh. Trigger direction calc. - position_noteheads (); + Grob*me = unsmob_grob (smob); + stem_end_position (me); // ugh. Trigger direction calc. + position_noteheads (me); - if (invisible_b ()) + if (invisible_b (me)) { - remove_elt_property ("molecule-callback"); + me->remove_grob_property ("molecule-callback"); // suicide(); } - set_spacing_hints (); - return SCM_UNDEFINED; + set_spacing_hints (me); + return SCM_UNSPECIFIED; } +/* + ugh. + When in a beam with tuplet brackets, brew_mol is called early, + caching a wrong value. + */ +MAKE_SCHEME_CALLBACK (Stem, height, 2); +SCM +Stem::height (SCM smob, SCM ax) +{ + 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); +} + /** set stem directions for hinting the optical spacing correction. @@ -404,170 +406,178 @@ Stem::member_before_line_breaking () TODO: more advanced: supply height of noteheads as well, for more advanced spacing possibilities */ void -Stem::set_spacing_hints () +Stem::set_spacing_hints (Grob*me) { - if (!invisible_b ()) + if (!invisible_b (me)) { - SCM scmdir = gh_int2scm (get_direction ()); - SCM dirlist = column_l ()->get_elt_property ("dir-list"); - if (dirlist == SCM_UNDEFINED) - dirlist = SCM_EOL; + SCM scmdir = gh_int2scm (get_direction (me)); - if (scm_sloppy_memq (scmdir, dirlist) == SCM_EOL) + Item* item = dynamic_cast (me); + Item * col = item->column_l (); + SCM dirlist =col->get_grob_property ("dir-list"); + if (scm_sloppy_memq (scmdir, dirlist) == SCM_BOOL_F) { dirlist = gh_cons (scmdir, dirlist); - column_l ()->set_elt_property ("dir-list", dirlist); + col->set_grob_property ("dir-list", dirlist); } } } Molecule -Stem::flag () const +Stem::flag (Grob*me) { String style; - SCM st = get_elt_property ("flag-style"); + SCM st = me->get_grob_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 ())); + char c = (get_direction (me) == UP) ? 'u' : 'd'; + Molecule m = Font_interface::get_default_font (me)->find_by_name (String ("flags-") + to_str (c) + + to_str (flag_i (me))); if (!style.empty_b ()) - m.add_molecule(lookup_l ()->afm_find (String ("flags-") + to_str (c) + style)); + m.add_molecule(Font_interface::get_default_font (me)->find_by_name (String ("flags-") + to_str (c) + style)); return m; } -Interval -Stem::dim_callback (Score_element const *se, Axis ) +MAKE_SCHEME_CALLBACK(Stem,dim_callback,2); +SCM +Stem::dim_callback (SCM e, SCM ax) { - Stem * s = dynamic_cast ((Score_element*)se); - + Axis a = (Axis) gh_scm2int (ax); + assert (a == X_AXIS); + Grob *se = unsmob_grob (e); Interval r (0, 0); - if (unsmob_element (s->get_elt_pointer ("beam")) || abs (s->flag_i ()) <= 2) + if (unsmob_grob (se->get_grob_property ("beam")) || abs (flag_i (se)) <= 2) ; // TODO! else { - r = s->flag ().extent (X_AXIS); + r = flag (se).extent (X_AXIS); } - return r; + return ly_interval2scm ( r); } const Real ANGLE = 20* (2.0*M_PI/360.0); // ugh! Should be settable. -GLUE_SCORE_ELEMENT(Stem,brew_molecule); +MAKE_SCHEME_CALLBACK(Stem,brew_molecule,1); SCM -Stem::member_brew_molecule () const +Stem::brew_molecule (SCM smob) { + Grob*me = unsmob_grob (smob); Molecule mol; - - Staff_symbol_referencer_interface si (first_head ()); + Direction d = get_direction (me); + - Real y1 = si.position_f(); - Real y2 = stem_end_position (); + 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 (this).staff_space ()/2.0; + Real dy = Staff_symbol_referencer::staff_space (me)/2.0; Real head_wid = 0; - 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 ()) + if (Grob *hed = support_head (me)) + head_wid = hed->extent (hed,X_AXIS).length (); + stem_y[Direction(-d)] += d * head_wid * tan(ANGLE)/(2*dy); + + if (!invisible_b (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))); + Real stem_width = gh_scm2double (me->get_grob_property ("thickness")) * 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 (!beam_l () && abs (flag_i ()) > 2) + if (!beam_l (me) && abs (flag_i (me)) > 2) { - Molecule fl = flag (); - fl.translate_axis(stem_y[get_direction ()]*dy, Y_AXIS); + Molecule fl = flag (me); + fl.translate_axis(stem_y[d]*dy, Y_AXIS); mol.add_molecule (fl); } - return mol.create_scheme(); + return mol.smobbed_copy (); } -Real -Stem::off_callback (Score_element const* se, Axis) +MAKE_SCHEME_CALLBACK(Stem,off_callback,2); +SCM +Stem::off_callback (SCM element_smob, SCM ) { - Stem *st = dynamic_cast ((Score_element*)se); - + Grob *me = unsmob_grob (element_smob); + Real r=0; - if (Note_head * f = st->first_head ()) + if (Grob * f = first_head (me)) { - Interval head_wid(0, f->extent (X_AXIS).length ()); + Interval head_wid(0, f->extent (f,X_AXIS).length ()); - if (to_boolean (st->get_elt_property ("stem-centered"))) - return head_wid.center (); + if (to_boolean (me->get_grob_property ("stem-centered"))) + return gh_double2scm ( head_wid.center ()); - Real rule_thick = st->paper_l ()->get_var ("stemthickness"); - Direction d = st->get_direction (); + Real rule_thick = gh_scm2double (me->get_grob_property ("thickness")) * me->paper_l ()->get_var ("stafflinethickness"); + Direction d = get_direction (me); r = head_wid[d] - d * rule_thick ; } - return r; + return gh_double2scm (r); } -Beam* -Stem::beam_l ()const +Grob* +Stem::beam_l (Grob*me) { - SCM b= get_elt_pointer ("beam"); - return dynamic_cast (unsmob_element (b)); + SCM b= me->get_grob_property ("beam"); + return unsmob_grob (b); } // ugh still very long. Stem_info -Stem::calc_stem_info () const +Stem::calc_stem_info (Grob*me) { - assert (beam_l ()); + Grob * beam = beam_l (me); - Direction beam_dir = directional_element (beam_l ()).get (); + Direction beam_dir = Directional_element_interface::get (beam); 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 staff_space = Staff_symbol_referencer::staff_space (me); 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 (); + int multiplicity = Beam::get_multiplicity (beam); + + SCM space_proc = beam->get_grob_property ("space-function"); + SCM space = gh_call1 (space_proc, gh_int2scm (multiplicity)); + Real interbeam_f = gh_scm2double (space) * staff_space; + + Real thick = gh_scm2double (beam->get_grob_property ("thickness")); Stem_info info; - info.idealy_f_ = chord_start_f (); + info.idealy_f_ = chord_start_f (me); // for simplicity, we calculate as if dir == UP info.idealy_f_ *= beam_dir; - SCM grace_prop = get_elt_property ("grace"); + SCM grace_prop = me->get_grob_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())); + s = me->get_grob_property("beamed-minimum-lengths"); 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_grob_property ("beamed-lengths"); a.clear(); for (SCM q = s; q != SCM_EOL; q = gh_cdr (q)) @@ -575,7 +585,7 @@ Stem::calc_stem_info () const Real stem_length = a[multiplicity get_grob_property ("no-stem-extend")); if (!grace_b && !no_extend_b) { /* highest beam of (UP) beam must never be lower than middle @@ -625,11 +635,14 @@ Stem::calc_stem_info () const info.idealy_f_ = (info.maxy_f_ ? info.miny_f_; - s = beam_l ()->get_elt_property ("shorten"); + s = beam->get_grob_property ("shorten"); if (gh_number_p (s)) info.idealy_f_ -= gh_scm2double (s); - Real interstaff_f = -beam_dir* calc_interstaff_dist (this, beam_l ()); + 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.idealy_f_ += interstaff_f; info.miny_f_ += interstaff_f; @@ -638,3 +651,14 @@ Stem::calc_stem_info () const return info; } +bool +Stem::has_interface (Grob*m) +{ + return m && m->has_interface (ly_symbol2scm ("stem-interface")); +} + +void +Stem::set_interface (Grob*me) +{ + me->set_interface (ly_symbol2scm ("stem-interface")); +}