X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-column.cc;h=67d4f78e8a0f90caa18779ddcace4a0f33612585;hb=d44d9333d8318a9a1dee7a68ea8e9149877b7d4b;hp=540922d4f0cc65dbe41eab052b1f179aeaa658f3;hpb=2181534bd94587fcac8f1769f2dda7bece693649;p=lilypond.git diff --git a/lily/note-column.cc b/lily/note-column.cc index 540922d4f0..67d4f78e8a 100644 --- a/lily/note-column.cc +++ b/lily/note-column.cc @@ -3,142 +3,222 @@ source file of the GNU LilyPond music typesetter - (c) 1997 Han-Wen Nienhuys + (c) 1997--2007 Han-Wen Nienhuys */ -#include "dot-column.hh" + #include "note-column.hh" -#include "script.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 "stem.hh" +#include "output-def.hh" +#include "pointer-group-interface.hh" #include "rest.hh" -#include "debug.hh" +#include "staff-symbol-referencer.hh" +#include "stem.hh" +#include "warn.hh" -IMPLEMENT_IS_TYPE_B1(Note_column,Script_column); +/* + 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 () const +Note_column::has_rests (Grob *me) { - return rest_l_arr_.size (); + return unsmob_grob (me->get_object ("rest")); } -Note_column::Note_column() +bool +Note_column::shift_less (Grob *const &p1, Grob *const &p2) { - stem_l_ = 0; - h_shift_b_ = false; - dir_ =CENTER; + 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; } -void -Note_column::sort() +Item * +Note_column::get_stem (Grob *me) { - head_l_arr_.sort (Note_head::compare); + SCM s = me->get_object ("stem"); + return unsmob_item (s); } - -Interval_t -Note_column::head_positions_interval() const + +Slice +Note_column::head_positions_interval (Grob *me) { - ((Note_column*)this)->sort(); - return Interval_t (head_l_arr_[0]->position_i_, - head_l_arr_.top()->position_i_); + Slice iv; + iv.set_empty (); + + extract_grob_set (me, "note-heads", heads); + for (vsize i = 0; i < heads.size (); i++) + { + Grob *se = heads[i]; + + int j = Staff_symbol_referencer::get_rounded_position (se); + iv.unite (Slice (j, j)); + } + return iv; } -void -Note_column::do_pre_processing() +Direction +Note_column::dir (Grob *me) { - - if (!dir_) + Grob *stem = unsmob_grob (me->get_object ("stem")); + if (stem && Stem::has_interface (stem)) + return get_grob_direction (stem); + else { - if (stem_l_) - dir_ = stem_l_->dir_; - else if (head_l_arr_.size ()) - { - dir_ = (head_positions_interval().center () >= 5) ? DOWN:UP; - } + extract_grob_set (me, "note-heads", heads); + if (heads.size ()) + return (Direction)sign (head_positions_interval (me).center ()); } - Script_column::do_pre_processing(); -} - + programming_error ("note column without heads and stem"); + return CENTER; +} void -Note_column::set (Stem * stem_l) +Note_column::set_stem (Grob *me, Grob *stem) { - add_support (stem_l); - stem_l_ = stem_l; - /* - don't add stem to support; mostly invisible for rest-columns (and possibly taken . .) - */ - Score_elem::add_dependency (stem_l); - for (int i=0; i < script_l_arr_.size(); i++) - script_l_arr_[i]->set_stem (stem_l); + me->set_object ("stem", stem->self_scm ()); + Axis_group_interface::add_element (me, stem); } -void -Note_column::add (Script *script_l) +Grob * +Note_column::get_rest (Grob *me) { - Script_column::add (script_l) ; - if (stem_l_) - script_l->set_stem (stem_l_); + return unsmob_grob (me->get_object ("rest")); } void -Note_column::do_substitute_dependency (Score_elem*o, Score_elem*n) +Note_column::add_head (Grob *me, Grob *h) { - if (stem_l_ == o) - { - stem_l_ = n ? (Stem*)n->item():0; - } - if (o->is_type_b (Note_head::static_name ())) + bool both = false; + if (Rest::has_interface (h)) { - head_l_arr_.substitute ((Note_head*)o->item(), - (n)? (Note_head*)n->item() : 0); + extract_grob_set (me, "note-heads", heads); + if (heads.size ()) + both = true; + else + me->set_object ("rest", h->self_scm ()); } - Script_column::do_substitute_dependency (o,n); - if (o->is_type_b (Rest::static_name ())) + else if (Note_head::has_interface (h)) { - rest_l_arr_.substitute ((Rest*)o->item(), - (n)? (Rest*)n->item() : 0); + if (unsmob_grob (me->get_object ("rest"))) + both = true; + Pointer_group_interface::add_grob (me, ly_symbol2scm ("note-heads"), 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, but only if + they have no staff-position set. +*/ void -Note_column::add (Rhythmic_head *h) +Note_column::translate_rests (Grob *me, int dy) { - if (h->is_type_b (Rest::static_name ())) + Grob *r = unsmob_grob (me->get_object ("rest")); + if (r && !scm_is_number (r->get_property ("staff-position"))) { - rest_l_arr_.push ((Rest*)h); - add_support (h); + 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); } - if (h->is_type_b (Note_head::static_name ())) +} + +Grob * +Note_column::first_head (Grob *me) +{ + 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++) { - head_l_arr_.push ((Note_head*) h); - add_support (h); + 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; } -/** - translate the rest symbols - */ -void -Note_column::translate_rests (int dy_i) +Grob * +Note_column::dot_column (Grob *me) { - invalidate_cache (Y_AXIS); - for (int i=0; i < rest_l_arr_.size(); i++) - rest_l_arr_[i]->position_i_ += dy_i; + 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; } -void -Note_column::do_print() const +Grob * +Note_column::arpeggio (Grob *me) { -#ifndef NPRINT - DOUT << "rests: " << rest_l_arr_.size() << ", "; - DOUT << "heads: " << head_l_arr_.size(); -#endif + return unsmob_grob (me->get_object ("arpeggio")); } -void -Note_column::set (Dot_column *d) +/* 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) { - add_element (d); + 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 " + );