X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-column.cc;h=9e6c4cdc1c1ab2a7cf4ff878c2e740bc67116c67;hb=38655bc28e73a0b218ba1582bdb84bab0fdfec4b;hp=075e61d1ab79567738c9330753f0d1c89e28823e;hpb=e85b008ae96fef8fc0c15529e8a172584d5d08fd;p=lilypond.git diff --git a/lily/note-column.cc b/lily/note-column.cc index 075e61d1ab..9e6c4cdc1c 100644 --- a/lily/note-column.cc +++ b/lily/note-column.cc @@ -1,160 +1,162 @@ /* note-column.cc -- implement Note_column - source file of the LilyPond music typesetter + source file of the GNU LilyPond music typesetter - (c) 1997 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ +#include // ceil +#include "axis-group-interface.hh" #include "note-column.hh" -#include "debug.hh" -#include "script.hh" -#include "notehead.hh" #include "stem.hh" - -IMPLEMENT_STATIC_NAME(Note_column); - - -void -Note_column::add(Stem*stem_l) +#include "debug.hh" +#include "paper-def.hh" +#include "group-interface.hh" +#include "staff-symbol-referencer.hh" +#include "rest.hh" +#include "note-head.hh" +#include "accidental-placement.hh" + +bool +Note_column::rest_b (Grob*me) { - assert(!stem_l_); - stem_l_ = stem_l; - add_dependency(stem_l); + return unsmob_grob (me->get_grob_property ("rest")); } -void -Note_column::add(Notehead* n_l) +int +Note_column::shift_compare (Grob *const &p1, Grob *const&p2) { - if (head_l_arr_.size()){ - if (n_l->rest_b_ != rest_b_) return; // ugly fix. Should think about integrating rests into colunms. - } else - rest_b_ = n_l->rest_b_; - - head_l_arr_.push(n_l); - add_dependency(n_l); -} + SCM s1 = p1->get_grob_property ("horizontal-shift"); + SCM s2 = p2->get_grob_property ("horizontal-shift"); -void -Note_column::add(Script*s_l) -{ - script_l_arr_.push(s_l); - add_dependency(s_l); + 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::translate(Offset o) +Item * +Note_column::stem_l (Grob*me) { - for (int i=0; i < head_l_arr_.size(); i++) - head_l_arr_[i]->translate(o); - for (int i=0; i < script_l_arr_.size(); i++) - script_l_arr_[i]->translate(o); - if (stem_l_) - stem_l_->translate(o); + SCM s = me->get_grob_property ("stem"); + return unsmob_item (s); } + +Slice +Note_column::head_positions_interval (Grob *me) +{ + Slice iv; + iv.set_empty (); -void -Note_column::do_print()const -{ - mtor << "heads: " << head_l_arr_.size() << '\n'; - mtor << "scripts: " << script_l_arr_.size() << '\n'; + SCM h = me->get_grob_property ("note-heads"); + for (; gh_pair_p (h); h = ly_cdr (h)) + { + Grob *se = unsmob_grob (ly_car (h)); + + int j = int (Staff_symbol_referencer::position_f (se)); + iv.unite (Slice (j,j)); + } + return iv; } -Interval -Note_column::do_height()const return r +Direction +Note_column::dir (Grob* me) { - if (stem_l_) - r.unite(stem_l_->height()); - for (int i=0; i < head_l_arr_.size(); i++) - r.unite(head_l_arr_[i]->height()); - for (int i=0; i < script_l_arr_.size(); i++) - r.unite(script_l_arr_[i]->height()); + 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; } -Interval -Note_column::do_width()const return r; + +void +Note_column::set_stem (Grob*me,Grob * stem_l) { - if (stem_l_) - r.unite(stem_l_->width()); - for (int i=0; i < head_l_arr_.size(); i++) - r.unite(head_l_arr_[i]->width()); - for (int i=0; i < script_l_arr_.size(); i++) - r.unite(script_l_arr_[i]->width()); + 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_pre_processing() +Note_column::add_head (Grob*me,Grob *h) { - if (stem_l_ && !dir_i_) - dir_i_ = stem_l_->dir_i_; - - if (!script_l_arr_.size()) - return; - - Array placed_l_arr_a[4]; - for (int i=0; i < script_l_arr_.size(); i++) { - Script*s_l = script_l_arr_[i]; - int j = (s_l->dir_i_ >0) ? 0 : 2; - if (!s_l->inside_staff_b_) - j ++; - - placed_l_arr_a[j].push(s_l); - } - for (int j =0; j <4; j++) { - placed_l_arr_a[j].sort( Script::compare); - } - - Notehead *top_head_l=0; - Notehead *bot_head_l=0; - for (int i=0; i< head_l_arr_.size(); i++) { - if (head_l_arr_[i]->extremal == -1) - bot_head_l = head_l_arr_[i]; - else if (head_l_arr_[i]->extremal == 1) - top_head_l = head_l_arr_[i]; - } - /* argh. This sux. */ - if (!top_head_l) - top_head_l = bot_head_l; - if (!bot_head_l) - bot_head_l = top_head_l; - assert(bot_head_l && top_head_l); - Item *support_l=top_head_l; - int j; - for (j = 0; j < 2; j++ ) { - for (int i=0; i < placed_l_arr_a[j].size(); i++) { - placed_l_arr_a[j][i]->add_support(support_l); - support_l = placed_l_arr_a[j][i]; - } + if (Rest::has_interface (h)) + { + me->set_grob_property ("rest", h->self_scm ()); } - - support_l=bot_head_l; - for (; j < 4; j++ ) { - for (int i=0; i < placed_l_arr_a[j].size(); i++) { - placed_l_arr_a[j][i]->add_support(support_l); - support_l = placed_l_arr_a[j][i]; - } + else if (Note_head::has_interface (h)) + { + Pointer_group_interface::add_grob (me, ly_symbol2scm ("note-heads"),h); } + Axis_group_interface::add_element (me, h); } -Note_column::Note_column() +/** + translate the rest symbols vertically by amount DY_I, but only if + they have no staff-position set. +*/ +void +Note_column::translate_rests (Grob*me,int dy_i) { - h_shift_b_ =false; - stem_l_ =0; - rest_b_ = false; - dir_i_ =0; + Grob * r = unsmob_grob (me->get_grob_property ("rest")); + if (r && !gh_number_p (r->get_grob_property ("staff-position"))) + { + r->translate_axis (dy_i * Staff_symbol_referencer::staff_space (r)/2.0, Y_AXIS); + } } + + void -Note_column::sort() +Note_column::set_dotcol (Grob*me,Grob *d) +{ + Axis_group_interface::add_element (me, d); +} + + + + +Grob* +Note_column::first_head (Grob*me) { - head_l_arr_.sort( Notehead::compare); + Grob * st = stem_l (me); + return st? Stem::first_head (st): 0; } - -Interval_t -Note_column::head_positions_interval()const + + +/* + Return the first Accidentals grob that we find in a note-head. + */ +Grob* +Note_column::accidentals (Grob *me) { - ( (Note_column*)this)->sort(); - return Interval_t ( head_l_arr_[0]->position, - head_l_arr_.top()->position); + 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"); +