X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-column.cc;h=5c1b664bbe9c5aee17aa42be34988d3877f6cb75;hb=38d60c0c4e8c29beccd4acfd07aadf1cdea74097;hp=e528b9e956369d94ace5744e9f76161ee7745808;hpb=c844072722a39a5fcd20372b0497d9130bd41dd7;p=lilypond.git diff --git a/lily/note-column.cc b/lily/note-column.cc index e528b9e956..5c1b664bbe 100644 --- a/lily/note-column.cc +++ b/lily/note-column.cc @@ -3,151 +3,157 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1998 Han-Wen Nienhuys + (c) 1997--2001 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 "rest.hh" #include "debug.hh" - -IMPLEMENT_IS_TYPE_B1(Note_column,Script_column); +#include "paper-def.hh" +#include "group-interface.hh" +#include "staff-symbol-referencer.hh" +#include "rest.hh" +#include "note-head.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() +Note_column::set_interface (Grob* me) { - head_l_arr_.sort (Note_head::compare); -} + me->set_interface (ly_symbol2scm ("note-column-interface")); -Interval_t -Note_column::head_positions_interval() const -{ - ((Note_column*)this)->sort(); - return Interval_t (head_l_arr_[0]->position_i_, - head_l_arr_.top()->position_i_); - + Axis_group_interface::set_interface (me); + Axis_group_interface::set_axes (me, X_AXIS, Y_AXIS); } -Interval -Note_column::width () const +Item * +Note_column::stem_l (Grob*me) { - if (head_l_arr_.size ()) - return head_l_arr_[0]->width (); - else - return Interval (0,0); + SCM s = me->get_grob_property ("stem"); + return unsmob_item (s); } - -void -Note_column::do_pre_processing() + +Slice +Note_column::head_positions_interval (Grob *me) { + Slice iv; + + 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::position_f (se)); + iv.unite (Slice (j,j)); } - Script_column::do_pre_processing(); + return iv; } - - -void -Note_column::set (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_elem::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_l) +Note_column::set_stem (Grob*me,Grob * stem_l) { - Script_column::add (script_l) ; - if (stem_l_) - script_l->set_stem (stem_l_); + me->set_grob_property ("stem", stem_l->self_scm ()); + me->add_dependency (stem_l); + Axis_group_interface::add_element (me, stem_l); } void -Note_column::do_substitute_dependency (Score_elem*o, Score_elem*n) +Note_column::add_head (Grob*me,Grob *h) { - if (stem_l_ == o) + if (Rest::has_interface (h)) { - stem_l_ = n ? (Stem*)n->item():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*)o->item(), - (n)? (Note_head*)n->item() : 0); - } - Script_column::do_substitute_dependency (o,n); - if (o->is_type_b (Rest::static_name ())) - { - rest_l_arr_.substitute ((Rest*)o->item(), - (n)? (Rest*)n->item() : 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. + */ void -Note_column::add (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) { - 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 = stem_l (me); + return st? Stem::first_head (st): 0; } -void -Note_column::set (Dot_column *d) +bool +Note_column::has_interface (Grob*me) +{ + return me && me->has_interface (ly_symbol2scm ("note-column-interface")); +} + +/* + 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"); + for (;gh_pair_p (heads); heads =gh_cdr (heads)) + { + Grob * h = unsmob_grob (gh_car (heads)); + Grob *a = h ? unsmob_grob(h->get_grob_property ("accidentals")) : 0; + if (a) + return a; + } + + return 0; }