X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-column.cc;h=76bde1c3d60f632cae6a3c338f2009fef5504632;hb=3d979b464ff0db6fd66573ef6249ba0088173bf0;hp=61f7df05c5dede746f106193998ec34b71711937;hpb=57be7394ffa2e7d7ba6d60548dba563f3409d472;p=lilypond.git diff --git a/lily/note-column.cc b/lily/note-column.cc index 61f7df05c5..76bde1c3d6 100644 --- a/lily/note-column.cc +++ b/lily/note-column.cc @@ -3,21 +3,26 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2005 Han-Wen Nienhuys + (c) 1997--2008 Han-Wen Nienhuys */ #include "note-column.hh" -#include // ceil +#include // ceil +using namespace std; +#include "accidental-placement.hh" #include "axis-group-interface.hh" -#include "stem.hh" -#include "warn.hh" +#include "directional-element-interface.hh" +#include "international.hh" +#include "item.hh" +#include "note-head.hh" #include "output-def.hh" -#include "staff-symbol-referencer.hh" +#include "pointer-group-interface.hh" #include "rest.hh" -#include "note-head.hh" -#include "accidental-placement.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 @@ -27,24 +32,24 @@ bool Note_column::has_rests (Grob *me) { - return unsmob_grob (me->get_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_property ("horizontal-shift"); SCM s2 = p2->get_property ("horizontal-shift"); 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; + return h1 < h2; } Item * Note_column::get_stem (Grob *me) { - SCM s = me->get_property ("stem"); + SCM s = me->get_object ("stem"); return unsmob_item (s); } @@ -55,10 +60,10 @@ Note_column::head_positions_interval (Grob *me) iv.set_empty (); - SCM h = me->get_property ("note-heads"); - for (; scm_is_pair (h); h = scm_cdr (h)) + extract_grob_set (me, "note-heads", heads); + for (vsize i = 0; i < heads.size (); i++) { - Grob *se = unsmob_grob (scm_car (h)); + Grob *se = heads[i]; int j = Staff_symbol_referencer::get_rounded_position (se); iv.unite (Slice (j, j)); @@ -69,11 +74,15 @@ Note_column::head_positions_interval (Grob *me) Direction Note_column::dir (Grob *me) { - Grob *stem = unsmob_grob (me->get_property ("stem")); + Grob *stem = unsmob_grob (me->get_object ("stem")); if (stem && Stem::has_interface (stem)) - return Stem::get_direction (stem); - else if (scm_is_pair (me->get_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"); return CENTER; @@ -82,15 +91,14 @@ Note_column::dir (Grob *me) void Note_column::set_stem (Grob *me, Grob *stem) { - me->set_property ("stem", stem->self_scm ()); - me->add_dependency (stem); + 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_property ("rest")); + return unsmob_grob (me->get_object ("rest")); } void @@ -99,20 +107,21 @@ Note_column::add_head (Grob *me, Grob *h) bool both = false; if (Rest::has_interface (h)) { - if (scm_is_pair (me->get_property ("note-heads"))) + extract_grob_set (me, "note-heads", heads); + if (heads.size ()) both = true; else - me->set_property ("rest", h->self_scm ()); + me->set_object ("rest", h->self_scm ()); } else if (Note_head::has_interface (h)) { - if (unsmob_grob (me->get_property ("rest"))) + if (unsmob_grob (me->get_object ("rest"))) both = true; Pointer_group_interface::add_grob (me, ly_symbol2scm ("note-heads"), h); } if (both) - me->warning (_ ("can't have note heads and rests together on a stem")); + me->warning (_ ("cannot have note heads and rests together on a stem")); else Axis_group_interface::add_element (me, h); } @@ -124,7 +133,7 @@ Note_column::add_head (Grob *me, Grob *h) void Note_column::translate_rests (Grob *me, int dy) { - Grob *r = unsmob_grob (me->get_property ("rest")); + Grob *r = unsmob_grob (me->get_object ("rest")); if (r && !scm_is_number (r->get_property ("staff-position"))) { r->translate_axis (dy * Staff_symbol_referencer::staff_space (r) / 2.0, Y_AXIS); @@ -133,12 +142,6 @@ Note_column::translate_rests (Grob *me, int dy) } } -void -Note_column::set_dotcol (Grob *me, Grob *d) -{ - Axis_group_interface::add_element (me, d); -} - Grob * Note_column::first_head (Grob *me) { @@ -152,12 +155,12 @@ Note_column::first_head (Grob *me) Grob * Note_column::accidentals (Grob *me) { - SCM heads = me->get_property ("note-heads"); + extract_grob_set (me, "note-heads", heads); Grob *acc = 0; - for (;scm_is_pair (heads); heads = scm_cdr (heads)) + for (vsize i = 0; i < heads.size (); i++) { - Grob *h = unsmob_grob (scm_car (heads)); - acc = h ? unsmob_grob (h->get_property ("accidental-grob")) : 0; + Grob *h = heads[i]; + acc = h ? unsmob_grob (h->get_object ("accidental-grob")) : 0; if (acc) break; } @@ -172,7 +175,50 @@ Note_column::accidentals (Grob *me) return acc; } -ADD_INTERFACE (Note_column, "note-column-interface", - "Stem and noteheads combined", - "arpeggio note-heads rest-collision rest horizontal-shift stem accidentals force-hshift"); +Grob * +Note_column::dot_column (Grob *me) +{ + 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; +} + +Grob * +Note_column::arpeggio (Grob *me) +{ + 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 " + );