X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-column.cc;h=a576939ae16542c0ce1769c404201a842c5554a1;hb=4ebb61bb6f16135ecbe329c5acb2f88969981a91;hp=ab26d7b48d25e596807056087bf096909061e580;hpb=42760f5db93014a878f17f05538464326683d354;p=lilypond.git diff --git a/lily/note-column.cc b/lily/note-column.cc index ab26d7b48d..a576939ae1 100644 --- a/lily/note-column.cc +++ b/lily/note-column.cc @@ -3,67 +3,77 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1999 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ -#include "dot-column.hh" + #include "note-column.hh" -#include "beam.hh" -#include "note-head.hh" + +#include // ceil + +#include "axis-group-interface.hh" #include "stem.hh" +#include "warn.hh" +#include "output-def.hh" +#include "staff-symbol-referencer.hh" #include "rest.hh" -#include "debug.hh" -#include "paper-def.hh" +#include "note-head.hh" +#include "accidental-placement.hh" + +/* + 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_property ("rest")); } int -Note_column::shift_compare (Note_column *const &p1, Note_column*const&p2) +Note_column::shift_compare (Grob *const &p1, Grob *const&p2) { - SCM s1 = p1->get_elt_property (horizontal_shift_scm_sym); - SCM s2 = p2->get_elt_property (horizontal_shift_scm_sym); + SCM s1 = p1->get_property ("horizontal-shift"); + SCM s2 = p2->get_property ("horizontal-shift"); - int h1 = (s1 == SCM_BOOL_F) ? 0 : gh_scm2int (SCM_CDR(s1)); - int h2 = (s2 == SCM_BOOL_F) ? 0 : gh_scm2int (SCM_CDR(s2)); + 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; } -Note_column::Note_column() +Item * +Note_column::get_stem (Grob*me) { - set_axes (X_AXIS, Y_AXIS); - stem_l_ = 0; -} - -void -Note_column::sort() -{ - head_l_arr_.sort (Note_head::compare); + SCM s = me->get_property ("stem"); + return unsmob_item (s); } Slice -Note_column::head_positions_interval() const +Note_column::head_positions_interval (Grob *me) { Slice iv; iv.set_empty (); - for (int i=0; i get_property ("note-heads"); + for (; scm_is_pair (h); h = scm_cdr (h)) { - int j = int (head_l_arr_[i]->position_f ()); + Grob *se = unsmob_grob (scm_car (h)); + + int j = Staff_symbol_referencer::get_rounded_position (se); iv.unite (Slice (j,j)); } return iv; } Direction -Note_column::dir () const +Note_column::dir (Grob* me) { - if (stem_l_) - return stem_l_->dir_; - else if (head_l_arr_.size ()) - return (Direction)sign (head_positions_interval().center ()); + Grob *stem = unsmob_grob (me->get_property ("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 ()); programming_error ("Note column without heads and stem!"); return CENTER; @@ -71,116 +81,105 @@ Note_column::dir () const void -Note_column::set_stem (Stem * stem_l) +Note_column::set_stem (Grob*me,Grob * stem) { - stem_l_ = stem_l; - add_dependency (stem_l); - add_element (stem_l); + me->set_property ("stem", stem->self_scm ()); + me->add_dependency (stem); + Axis_group_interface::add_element (me, stem); } +Grob* +Note_column::get_rest (Grob*me) +{ + return unsmob_grob (me->get_property ("rest")); +} + void -Note_column::do_substitute_element_pointer (Score_element*o, Score_element*n) +Note_column::add_head (Grob*me,Grob *h) { - if (stem_l_ == o) + bool both = false; + if (Rest::has_interface (h)) { - stem_l_ = n ? dynamic_cast (n):0; + if (scm_is_pair (me->get_property ("note-heads"))) + both = true; + else + me->set_property ("rest", h->self_scm ()); } - if (dynamic_cast (o)) + else if (Note_head::has_interface (h)) { - head_l_arr_.substitute (dynamic_cast (o), - (n)? dynamic_cast (n) : 0); + if (unsmob_grob (me->get_property ("rest"))) + both = true; + Pointer_group_interface::add_grob (me, ly_symbol2scm ("note-heads"),h); } - if (dynamic_cast (o)) - { - rest_l_arr_.substitute (dynamic_cast (o), - (n)? dynamic_cast (n) : 0); - } + if (both) + me->warning ("Can't have rests and note heads 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_head (Rhythmic_head *h) +Note_column::translate_rests (Grob*me, int dy) { - if (Rest*r=dynamic_cast (h)) + Grob * r = unsmob_grob (me->get_property ("rest")); + if (r && !scm_is_number (r->get_property ("staff-position"))) { - rest_l_arr_.push (r); + r->translate_axis (dy * Staff_symbol_referencer::staff_space (r)/2.0, Y_AXIS); } - if (Note_head *nh=dynamic_cast (h)) - { - head_l_arr_.push (nh); - } - add_element (h); } -/** - translate the rest symbols vertically by amount DY_I. - */ -void -Note_column::translate_rests (int dy_i) -{ - invalidate_cache (Y_AXIS); - for (int i=0; i < rest_l_arr_.size(); i++) - rest_l_arr_[i]->translate_axis (dy_i * rest_l_arr_[i]->staff_line_leading_f ()/2.0, - Y_AXIS); -} void -Note_column::do_print() const +Note_column::set_dotcol (Grob*me,Grob *d) { -#ifndef NPRINT - DOUT << "rests: " << rest_l_arr_.size() << ", "; - DOUT << "heads: " << head_l_arr_.size(); -#endif + Axis_group_interface::add_element (me, d); } -void -Note_column::set_dotcol (Dot_column *d) + + + +Grob* +Note_column::first_head (Grob*me) { - add_element (d); + Grob * st = get_stem (me); + return st? Stem::first_head (st): 0; } -/* - [TODO] - handle rest under beam (do_post: beams are calculated now) - what about combination of collisions and rest under beam. - - Should lookup - - rest -> stem -> beam -> interpolate_y_position () - -*/ -void -Note_column::do_post_processing () +/* + Return the first Accidentals grob that we find in a note-head. + */ +Grob* +Note_column::accidentals (Grob *me) { - if (!stem_l_ || !rest_b ()) - return; + SCM heads = me->get_property ("note-heads"); + Grob * acc = 0; + for (;scm_is_pair (heads); heads = scm_cdr (heads)) + { + Grob * h = unsmob_grob (scm_car (heads)); + acc = h ? unsmob_grob (h->get_property ("accidental-grob")) : 0; + if (acc) + break; + } - Beam * b = stem_l_->beam_l_; - if (!b || !b->stems_.size ()) - return; + if (!acc) + return 0; - /* ugh. Should be done by beam. */ - Direction d = stem_l_->get_dir (); - Real beamy = (stem_l_->hpos_f () - b->stems_[0]->hpos_f ()) * b->slope_f_ + b->left_y_; - - Real staff_space = rest_l_arr_[0]->staff_line_leading_f (); - Real rest_dim = extent (Y_AXIS)[d]*2.0 /staff_space ; + if (Accidental_placement::has_interface (acc->get_parent (X_AXIS))) + return acc->get_parent (X_AXIS); - Real minimum_dist - = paper_l ()->get_var ("restcollision_minimum_beamdist") ; - Real dist = - minimum_dist + -d * (beamy - rest_dim) >? 0; + /* compatibility. */ + return acc; +} - int stafflines = rest_l_arr_[0]->lines_i (); - // move discretely by half spaces. - int discrete_dist = int (ceil (dist )); - // move by whole spaces inside the staff. - if (discrete_dist < stafflines+1) - discrete_dist = int (ceil (discrete_dist / 2.0)* 2.0); +ADD_INTERFACE (Note_column,"note-column-interface", + "Stem and noteheads combined", + "arpeggio note-heads rest-collision rest horizontal-shift stem accidentals force-hshift"); - translate_rests (-d * discrete_dist); -}