X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-column.cc;h=76bde1c3d60f632cae6a3c338f2009fef5504632;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=80e7b8c553b9b587d7b45d1abcbe7e9e1e5be519;hpb=94189ec2b8da6d7e89dc619c646a927adead9b19;p=lilypond.git diff --git a/lily/note-column.cc b/lily/note-column.cc index 80e7b8c553..76bde1c3d6 100644 --- a/lily/note-column.cc +++ b/lily/note-column.cc @@ -3,140 +3,222 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2008 Han-Wen Nienhuys */ -#include // ceil -#include "axis-group-interface.hh" #include "note-column.hh" -#include "stem.hh" -#include "debug.hh" -#include "paper-def.hh" -#include "group-interface.hh" -#include "staff-symbol-referencer.hh" -#include "rest.hh" + +#include // ceil +using namespace std; + +#include "accidental-placement.hh" +#include "axis-group-interface.hh" +#include "directional-element-interface.hh" +#include "international.hh" +#include "item.hh" #include "note-head.hh" +#include "output-def.hh" +#include "pointer-group-interface.hh" +#include "rest.hh" +#include "staff-symbol-referencer.hh" +#include "stem.hh" +#include "warn.hh" + +/* + TODO: figure out if we can prune this class. This is just an + annoying layer between (rest)collision & (note-head + stem) +*/ bool -Note_column::rest_b (Grob*me) +Note_column::has_rests (Grob *me) { - return unsmob_grob (me->get_grob_property ("rest")); + return unsmob_grob (me->get_object ("rest")); } -int -Note_column::shift_compare (Grob *const &p1, Grob *const&p2) +bool +Note_column::shift_less (Grob *const &p1, Grob *const &p2) { - SCM s1 = p1->get_grob_property ("horizontal-shift"); - SCM s2 = p2->get_grob_property ("horizontal-shift"); - - int h1 = (gh_number_p (s1))? gh_scm2int (s1) :0; - int h2 = (gh_number_p (s2)) ? gh_scm2int (s2):0; - return h1 - h2; -} + SCM s1 = p1->get_property ("horizontal-shift"); + SCM s2 = p2->get_property ("horizontal-shift"); -void -Note_column::set_interface (Grob* me) -{ - me->set_grob_property ("note-heads", SCM_EOL); - me->set_interface (ly_symbol2scm ("note-column-interface")); - - Axis_group_interface::set_interface (me); - Axis_group_interface::set_axes (me, X_AXIS, Y_AXIS); + int h1 = (scm_is_number (s1)) ? scm_to_int (s1) : 0; + int h2 = (scm_is_number (s2)) ? scm_to_int (s2) : 0; + return h1 < h2; } Item * -Note_column::stem_l (Grob*me) +Note_column::get_stem (Grob *me) { - SCM s = me->get_grob_property ("stem"); - return dynamic_cast(unsmob_grob (s)); + SCM s = me->get_object ("stem"); + return unsmob_item (s); } - + Slice -Note_column::head_positions_interval(Grob *me) +Note_column::head_positions_interval (Grob *me) { - Slice iv; + Slice iv; iv.set_empty (); - SCM h = me->get_grob_property ("note-heads"); - for (; gh_pair_p (h); h = gh_cdr (h)) + extract_grob_set (me, "note-heads", heads); + for (vsize i = 0; i < heads.size (); i++) { - Grob *se = unsmob_grob (gh_car (h)); - - int j = int (Staff_symbol_referencer::position_f (se)); - iv.unite (Slice (j,j)); + Grob *se = heads[i]; + + int j = Staff_symbol_referencer::get_rounded_position (se); + iv.unite (Slice (j, j)); } return iv; } Direction -Note_column::dir (Grob* me) +Note_column::dir (Grob *me) { - Grob *stem = unsmob_grob (me->get_grob_property ("stem")); + Grob *stem = unsmob_grob (me->get_object ("stem")); if (stem && Stem::has_interface (stem)) - return Stem::get_direction (stem); - else if (gh_pair_p (me->get_grob_property ("note-heads"))) - return (Direction)sign (head_positions_interval (me).center ()); + return get_grob_direction (stem); + else + { + extract_grob_set (me, "note-heads", heads); + if (heads.size ()) + return (Direction)sign (head_positions_interval (me).center ()); + } - programming_error ("Note column without heads and stem!"); + programming_error ("note column without heads and stem"); return CENTER; } - void -Note_column::set_stem (Grob*me,Grob * stem_l) +Note_column::set_stem (Grob *me, Grob *stem) { - me->set_grob_property ("stem", stem_l->self_scm ()); - me->add_dependency (stem_l); - Axis_group_interface::add_element (me, stem_l); + me->set_object ("stem", stem->self_scm ()); + Axis_group_interface::add_element (me, stem); +} + +Grob * +Note_column::get_rest (Grob *me) +{ + return unsmob_grob (me->get_object ("rest")); } void -Note_column::add_head (Grob*me,Grob *h) +Note_column::add_head (Grob *me, Grob *h) { + bool both = false; if (Rest::has_interface (h)) { - me->set_grob_property ("rest", h->self_scm ()); + extract_grob_set (me, "note-heads", heads); + if (heads.size ()) + both = true; + else + me->set_object ("rest", h->self_scm ()); } else if (Note_head::has_interface (h)) { - Pointer_group_interface::add_element (me, "note-heads",h); + if (unsmob_grob (me->get_object ("rest"))) + both = true; + Pointer_group_interface::add_grob (me, ly_symbol2scm ("note-heads"), h); } - Axis_group_interface::add_element (me, h); + + if (both) + me->warning (_ ("cannot have note heads and rests together on a stem")); + else + Axis_group_interface::add_element (me, h); } /** - translate the rest symbols vertically by amount DY_I. - */ + translate the rest symbols vertically by amount DY, but only if + they have no staff-position set. +*/ void -Note_column::translate_rests (Grob*me,int dy_i) +Note_column::translate_rests (Grob *me, int dy) { - Grob * r = unsmob_grob (me->get_grob_property ("rest")); - if (r) + Grob *r = unsmob_grob (me->get_object ("rest")); + if (r && !scm_is_number (r->get_property ("staff-position"))) { - r->translate_axis (dy_i * Staff_symbol_referencer::staff_space (r)/2.0, Y_AXIS); + r->translate_axis (dy * Staff_symbol_referencer::staff_space (r) / 2.0, Y_AXIS); + Grob *p = r->get_parent (Y_AXIS); + p->flush_extent_cache (Y_AXIS); } } - -void -Note_column::set_dotcol (Grob*me,Grob *d) +Grob * +Note_column::first_head (Grob *me) { - Axis_group_interface::add_element (me, d); + Grob *st = get_stem (me); + return st ? Stem::first_head (st) : 0; } +/* + Return the first Accidentals grob that we find in a note-head. +*/ +Grob * +Note_column::accidentals (Grob *me) +{ + extract_grob_set (me, "note-heads", heads); + Grob *acc = 0; + for (vsize i = 0; i < heads.size (); i++) + { + Grob *h = heads[i]; + acc = h ? unsmob_grob (h->get_object ("accidental-grob")) : 0; + if (acc) + break; + } + + if (!acc) + return 0; + if (Accidental_placement::has_interface (acc->get_parent (X_AXIS))) + return acc->get_parent (X_AXIS); + /* compatibility. */ + return acc; +} -Grob* -Note_column::first_head (Grob*me) +Grob * +Note_column::dot_column (Grob *me) { - Grob * st = stem_l (me); - return st? Stem::first_head (st): 0; + extract_grob_set (me, "note-heads", heads); + for (vsize i = 0; i < heads.size (); i++) + { + Grob *dots = unsmob_grob (heads[i]->get_object ("dot")); + if (dots) + return dots->get_parent (X_AXIS); + } + + return 0; } -bool -Note_column::has_interface (Grob*me) +Grob * +Note_column::arpeggio (Grob *me) { - return me && me->has_interface (ly_symbol2scm ("note-column-interface")); + return unsmob_grob (me->get_object ("arpeggio")); } + +/* If a note-column contains a cross-staff stem then + nc->extent (Y_AXIS, refp) will not consider the extent of the stem. + If you want the extent of the stem to be included (and you are safe + from any cross-staff issues) then call this function instead. */ +Interval +Note_column::cross_staff_extent (Grob *me, Grob *refp) +{ + Interval iv = me->extent (refp, Y_AXIS); + if (Grob *s = get_stem (me)) + iv.unite (s->extent (refp, Y_AXIS)); + + return iv; +} + +ADD_INTERFACE (Note_column, + "Stem and noteheads combined.", + + /* properties */ + "arpeggio " + "force-hshift " + "horizontal-shift " + "ignore-collision " + "note-heads " + "rest " + "rest-collision " + "stem " + );