X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-column.cc;h=8eb3ed0282c38e2e7397b79b12a75b5f5411f326;hb=7e72a1e50e94a7f9738d62599de79fe7745f600c;hp=b00cb5ea0aa7c5fbead811724d1bd26e8d6283ec;hpb=9efbad2d9487a05b04423e7e9f062968e8f8eaf4;p=lilypond.git diff --git a/lily/note-column.cc b/lily/note-column.cc index b00cb5ea0a..8eb3ed0282 100644 --- a/lily/note-column.cc +++ b/lily/note-column.cc @@ -3,157 +3,160 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1998 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ -#include "dot-column.hh" +#include // ceil + +#include "axis-group-interface.hh" #include "note-column.hh" -#include "script.hh" -#include "note-head.hh" #include "stem.hh" +#include "warn.hh" +#include "paper-def.hh" +#include "group-interface.hh" +#include "staff-symbol-referencer.hh" #include "rest.hh" -#include "debug.hh" - -IMPLEMENT_IS_TYPE_B1(Note_column,Script_column); +#include "note-head.hh" +#include "accidental-placement.hh" bool -Note_column::rest_b () const +Note_column::rest_b (Grob*me) { - return rest_l_arr_.size (); + return unsmob_grob (me->get_grob_property ("rest")); } -Note_column::Note_column() +int +Note_column::shift_compare (Grob *const &p1, Grob *const&p2) { - stem_l_ = 0; - h_shift_b_ = false; - dir_ =CENTER; + 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; } -void -Note_column::sort() +Item * +Note_column::get_stem (Grob*me) { - head_l_arr_.sort (Note_head::compare); + SCM s = me->get_grob_property ("stem"); + return unsmob_item (s); } -Interval_t -Note_column::head_positions_interval() const -{ - ((Note_column*)this)->sort(); - Interval_t iv; - - iv.set_empty (); - - if (head_l_arr_.size ()) - iv = Interval_t(head_l_arr_[0]->position_i_, - head_l_arr_.top()->position_i_); - - return iv; -} - -Interval -Note_column::width () const +Slice +Note_column::head_positions_interval (Grob *me) { - if (head_l_arr_.size ()) - return head_l_arr_[0]->width (); - else - return Interval (0,0); -} + Slice iv; -void -Note_column::do_pre_processing() -{ + iv.set_empty (); - if (!dir_) + SCM h = me->get_grob_property ("note-heads"); + for (; gh_pair_p (h); h = ly_cdr (h)) { - if (stem_l_) - dir_ = stem_l_->dir_; - else if (head_l_arr_.size ()) - { - dir_ = (head_positions_interval().center () >= 5) ? DOWN:UP; - } + Grob *se = unsmob_grob (ly_car (h)); + + int j = int (Staff_symbol_referencer::get_position (se)); + iv.unite (Slice (j,j)); } - Script_column::do_pre_processing(); + return iv; } - - -void -Note_column::set_stem (Stem * stem_l) +Direction +Note_column::dir (Grob* me) { - add_support (stem_l); - stem_l_ = stem_l; - /* - don't add stem to support; mostly invisible for rest-columns (and possibly taken . .) - */ - Score_element::add_dependency (stem_l); - for (int i=0; i < script_l_arr_.size(); i++) - script_l_arr_[i]->set_stem (stem_l); + Grob *stem = unsmob_grob (me->get_grob_property ("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 ()); + + programming_error ("Note column without heads and stem!"); + return CENTER; } + void -Note_column::add_script (Script *script_l) +Note_column::set_stem (Grob*me,Grob * stem) { - Script_column::add_script (script_l) ; - if (stem_l_) - script_l->set_stem (stem_l_); + me->set_grob_property ("stem", stem->self_scm ()); + me->add_dependency (stem); + Axis_group_interface::add_element (me, stem); } void -Note_column::do_substitute_dependency (Score_element*o, Score_element*n) +Note_column::add_head (Grob*me,Grob *h) { - if (stem_l_ == o) + if (Rest::has_interface (h)) { - stem_l_ = n ? (Stem*)dynamic_cast (n):0; + me->set_grob_property ("rest", h->self_scm ()); } - if (o->is_type_b (Note_head::static_name ())) + else if (Note_head::has_interface (h)) { - head_l_arr_.substitute ((Note_head*)dynamic_cast (o), - (n)? (Note_head*)dynamic_cast (n) : 0); - } - Script_column::do_substitute_dependency (o,n); - if (o->is_type_b (Rest::static_name ())) - { - rest_l_arr_.substitute ((Rest*)dynamic_cast (o), - (n)? (Rest*)dynamic_cast (n) : 0); + Pointer_group_interface::add_grob (me, ly_symbol2scm ("note-heads"),h); } + Axis_group_interface::add_element (me, h); } +/** + translate the rest symbols vertically by amount DY_I, but only if + they have no staff-position set. +*/ void -Note_column::add_head (Rhythmic_head *h) +Note_column::translate_rests (Grob*me,int dy_i) { - if (h->is_type_b (Rest::static_name ())) - { - rest_l_arr_.push ((Rest*)h); - add_support (h); - } - if (h->is_type_b (Note_head::static_name ())) + Grob * r = unsmob_grob (me->get_grob_property ("rest")); + if (r && !gh_number_p (r->get_grob_property ("staff-position"))) { - head_l_arr_.push ((Note_head*) h); - add_support (h); + r->translate_axis (dy_i * Staff_symbol_referencer::staff_space (r)/2.0, Y_AXIS); } } -/** - translate the rest symbols - */ + void -Note_column::translate_rests (int dy_i) +Note_column::set_dotcol (Grob*me,Grob *d) { - invalidate_cache (Y_AXIS); - for (int i=0; i < rest_l_arr_.size(); i++) - rest_l_arr_[i]->position_i_ += dy_i; + Axis_group_interface::add_element (me, d); } -void -Note_column::do_print() const + + + +Grob* +Note_column::first_head (Grob*me) { -#ifndef NPRINT - DOUT << "rests: " << rest_l_arr_.size() << ", "; - DOUT << "heads: " << head_l_arr_.size(); -#endif + Grob * st = get_stem (me); + return st? Stem::first_head (st): 0; } -void -Note_column::set_dotcol (Dot_column *d) + +/* + Return the first Accidentals grob that we find in a note-head. + */ +Grob* +Note_column::accidentals (Grob *me) { - add_element (d); + SCM heads = me->get_grob_property ("note-heads"); + Grob * acc = 0; + for (;gh_pair_p (heads); heads =gh_cdr (heads)) + { + Grob * h = unsmob_grob (gh_car (heads)); + acc = h ? unsmob_grob (h->get_grob_property ("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; } + + + +ADD_INTERFACE (Note_column,"note-column-interface", + "Stem and noteheads combined", + "arpeggio note-heads rest-collision rest horizontal-shift stem accidentals force-hshift"); +