X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-column.cc;h=d9a8ce307827d59bb63cb9a974abaeef157e6201;hb=a1ac6142347beea8db846898b777b0e67cf9f83f;hp=db93c4370bd36a02172fef096482da15745cee8a;hpb=c21d49df60cb97801ab33ab8a1bad6f2c81cd820;p=lilypond.git diff --git a/lily/note-column.cc b/lily/note-column.cc index db93c4370b..d9a8ce3078 100644 --- a/lily/note-column.cc +++ b/lily/note-column.cc @@ -3,86 +3,76 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ #include // ceil #include "axis-group-interface.hh" -#include "dot-column.hh" #include "note-column.hh" -#include "beam.hh" -#include "note-head.hh" #include "stem.hh" -#include "rest.hh" -#include "debug.hh" +#include "warn.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" + +/* + 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) { - SCM r = get_elt_pointer ("rests"); - - return gh_pair_p (r); + 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 s2 = p2->get_elt_property ("horizontal-shift"); + SCM s1 = p1->get_property ("horizontal-shift"); + SCM s2 = p2->get_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; } -Note_column::Note_column( SCM s) - : Item (s) -{ - set_elt_pointer ("rests", SCM_EOL); - set_elt_pointer ("note-heads", SCM_EOL); - Axis_group_interface (this).set_interface (); - Axis_group_interface (this).set_axes (X_AXIS, Y_AXIS); - Group_interface (this, "interfaces").add_thing (ly_symbol2scm ("Note_column")); -} - -Stem * -Note_column::stem_l () const +Item * +Note_column::get_stem (Grob*me) { - SCM s = get_elt_pointer ("stem"); - return dynamic_cast (unsmob_element (s)); - + 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 (); - SCM h = get_elt_pointer ("note-heads"); - for (; gh_pair_p (h); h = gh_cdr (h)) + SCM h = me->get_property ("note-heads"); + for (; gh_pair_p (h); h = ly_cdr (h)) { - Score_element *se = unsmob_element (gh_car (h)); - Staff_symbol_referencer_interface si (se); + Grob *se = unsmob_grob (ly_car (h)); - int j = int (si.position_f ()); + 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 ()->get_direction (); - else if (gh_pair_p (get_elt_pointer ("note-heads"))) - 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 (gh_pair_p (me->get_property ("note-heads"))) + return (Direction)sign (head_positions_interval (me).center ()); programming_error ("Note column without heads and stem!"); return CENTER; @@ -90,143 +80,105 @@ Note_column::dir () const void -Note_column::set_stem (Stem * stem_l) +Note_column::set_stem (Grob*me,Grob * stem) { - set_elt_pointer ("stem", stem_l->self_scm_); - - add_dependency (stem_l); - Axis_group_interface (this).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::add_head (Rhythmic_head *h) +Note_column::add_head (Grob*me,Grob *h) { - if (Rest*r=dynamic_cast (h)) + bool both = false; + if (Rest::has_interface (h)) { - Pointer_group_interface gi (this, "rests"); - gi.add_element (h); + if (gh_pair_p (me->get_property ("note-heads"))) + both = true; + else + me->set_property ("rest", h->self_scm ()); } - if (Note_head *nh=dynamic_cast (h)) + else if (Note_head::has_interface (h)) { - Pointer_group_interface gi (this, "note-heads"); - gi.add_element (nh); + if (unsmob_grob (me->get_property ("rest"))) + both = true; + Pointer_group_interface::add_grob (me, ly_symbol2scm ("note-heads"),h); } - Axis_group_interface (this).add_element (h); + + 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_I. - */ + translate the rest symbols vertically by amount DY, but only if + they have no staff-position set. +*/ void -Note_column::translate_rests (int dy_i) +Note_column::translate_rests (Grob*me, int dy) { - SCM s = get_elt_pointer ("rests"); - for (; gh_pair_p (s); s = gh_cdr (s)) + Grob * r = unsmob_grob (me->get_property ("rest")); + if (r && !gh_number_p (r->get_property ("staff-position"))) { - Score_element * se = unsmob_element (gh_car (s)); - Staff_symbol_referencer_interface si (se); - - se->translate_axis (dy_i * si.staff_space ()/2.0, Y_AXIS); + r->translate_axis (dy * Staff_symbol_referencer::staff_space (r)/2.0, Y_AXIS); } } void -Note_column::set_dotcol (Dot_column *d) +Note_column::set_dotcol (Grob*me,Grob *d) { - Axis_group_interface (this).add_element (d); + Axis_group_interface::add_element (me, d); } -/* - [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 () -*/ - -GLUE_SCORE_ELEMENT(Note_column,after_line_breaking); -SCM -Note_column::member_after_line_breaking () -{ - if (!stem_l () || !rest_b ()) - return SCM_UNDEFINED; - - Beam * b = stem_l ()->beam_l (); - if (!b || !b->visible_stem_count ()) - return SCM_UNDEFINED; - - /* ugh. Should be done by beam. - (what? should be done --jcn) - scary too?: height is calculated during post_processing - */ - Real beam_dy = 0; - Real beam_y = 0; - - SCM s = b->get_elt_property ("height"); - if (gh_number_p (s)) - beam_dy = gh_scm2double (s); - - s = b->get_elt_property ("y-position"); - if (gh_number_p (s)) - beam_y = gh_scm2double (s); - - - Real x0 = b->first_visible_stem ()->relative_coordinate (0, X_AXIS); - Real dx = b->last_visible_stem ()->relative_coordinate (0, X_AXIS) - x0; - Real dydx = beam_dy && dx ? beam_dy/dx : 0; - - Direction d = stem_l ()->get_direction (); - Real beamy = (stem_l ()->relative_coordinate (0, X_AXIS) - x0) * dydx + beam_y; - - s = get_elt_pointer ("rests"); - Score_element * se = unsmob_element (gh_car (s)); - Staff_symbol_referencer_interface si (se); - - Real staff_space = si.staff_space (); - Real rest_dim = extent (Y_AXIS)[d]*2.0 /staff_space ; - - Real minimum_dist - = paper_l ()->get_var ("restcollision_minimum_beamdist") ; - Real dist = - minimum_dist + -d * (beamy - rest_dim) >? 0; - int stafflines = si.line_count (); - // 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); - - translate_rests (-d * discrete_dist); - - return SCM_UNDEFINED; +Grob* +Note_column::first_head (Grob*me) +{ + Grob * st = get_stem (me); + return st? Stem::first_head (st): 0; } -Interval -Note_column::rest_dim () const +/* + Return the first Accidentals grob that we find in a note-head. + */ +Grob* +Note_column::accidentals (Grob *me) { - Interval restdim; - SCM s = get_elt_pointer ("rests"); - for (; gh_pair_p (s); s = gh_cdr (s)) + SCM heads = me->get_property ("note-heads"); + Grob * acc = 0; + for (;gh_pair_p (heads); heads =gh_cdr (heads)) { - Score_element * sc = unsmob_element ( gh_car (s)); - restdim.unite (sc->extent (Y_AXIS)); + Grob * h = unsmob_grob (gh_car (heads)); + acc = h ? unsmob_grob (h->get_property ("accidental-grob")) : 0; + if (acc) + break; } + + if (!acc) + return 0; - return restdim; -} + if (Accidental_placement::has_interface (acc->get_parent (X_AXIS))) + return acc->get_parent (X_AXIS); -Note_head* -Note_column::first_head () const -{ - Stem * st = stem_l (); - return st? st->first_head (): 0; + /* 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"); +