X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-column.cc;h=c5d06cfb6831a6bd678c27289132a0120129c349;hb=f4abbfff5f0d985a457e15586dbcc3ae473b0dee;hp=473c0146636dbcff21dd5d5e5c27df7ffa40b342;hpb=3c2f386f1385a10dafbb811be245f5a75d6b132c;p=lilypond.git diff --git a/lily/note-column.cc b/lily/note-column.cc index 473c014663..c5d06cfb68 100644 --- a/lily/note-column.cc +++ b/lily/note-column.cc @@ -1,149 +1,244 @@ /* - note-column.cc -- implement Note_column + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2014 Han-Wen Nienhuys - (c) 1997--2000 Han-Wen Nienhuys + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ -#include // ceil -#include "axis-group-interface.hh" #include "note-column.hh" -#include "stem.hh" -#include "debug.hh" -#include "paper-def.hh" -#include "group-interface.hh" -#include "staff-symbol-referencer.hh" -#include "rest.hh" + +#include // ceil +using namespace std; + +#include "accidental-placement.hh" +#include "axis-group-interface.hh" +#include "directional-element-interface.hh" +#include "international.hh" +#include "item.hh" #include "note-head.hh" +#include "output-def.hh" +#include "pointer-group-interface.hh" +#include "rest.hh" +#include "staff-symbol-referencer.hh" +#include "stem.hh" +#include "warn.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 (Score_element*me) +Note_column::has_rests (Grob *me) { - return unsmob_element (me->get_elt_property ("rest")); + return Grob::unsmob (me->get_object ("rest")); } -int -Note_column::shift_compare (Score_element *const &p1, Score_element *const&p2) +bool +Note_column::shift_less (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; + 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; } -void -Note_column::set_interface (Score_element* me) +Item * +Note_column::get_stem (Grob *me) { - me->set_elt_property ("note-heads", SCM_EOL); - me->set_interface (ly_symbol2scm ("note-column-interface")); - - Axis_group_interface::set_interface (me); - Axis_group_interface::set_axes (me, X_AXIS, Y_AXIS); + SCM s = me->get_object ("stem"); + return Item::unsmob (s); } Item * -Note_column::stem_l (Score_element*me) +Note_column::get_flag (Grob *me) { - SCM s = me->get_elt_property ("stem"); - return dynamic_cast(unsmob_element (s)); + Item *stem = get_stem (me); + if (stem) + { + SCM s = stem->get_object ("flag"); + return Item::unsmob (s); + } + return 0; } - + Slice -Note_column::head_positions_interval(Score_element *me) +Note_column::head_positions_interval (Grob *me) { - Slice iv; + Slice iv; iv.set_empty (); - SCM h = me->get_elt_property ("note-heads"); - for (; gh_pair_p (h); h = gh_cdr (h)) + extract_grob_set (me, "note-heads", heads); + for (vsize i = 0; i < heads.size (); i++) { - Score_element *se = unsmob_element (gh_car (h)); - - int j = int (Staff_symbol_referencer::position_f (se)); - iv.unite (Slice (j,j)); + Grob *se = heads[i]; + + int j = Staff_symbol_referencer::get_rounded_position (se); + iv.unite (Slice (j, j)); } return iv; } Direction -Note_column::dir (Score_element* me) +Note_column::dir (Grob *me) { - Score_element *stem = unsmob_element (me->get_elt_property ("stem")); + Grob *stem = Grob::unsmob (me->get_object ("stem")); if (stem && Stem::has_interface (stem)) - return Stem::get_direction (stem); - else if (gh_pair_p (me->get_elt_property ("note-heads"))) - return (Direction)sign (head_positions_interval (me).center ()); + return get_grob_direction (stem); + else + { + extract_grob_set (me, "note-heads", heads); + if (heads.size ()) + return (Direction)sign (head_positions_interval (me).center ()); + } - programming_error ("Note column without heads and stem!"); + programming_error ("note column without heads and stem"); return CENTER; } - void -Note_column::set_stem (Score_element*me,Score_element * stem_l) +Note_column::set_stem (Grob *me, Grob *stem) { - me->set_elt_property ("stem", stem_l->self_scm_); - me->add_dependency (stem_l); - Axis_group_interface::add_element (me, stem_l); + me->set_object ("stem", stem->self_scm ()); + Axis_group_interface::add_element (me, stem); +} + +Grob * +Note_column::get_rest (Grob *me) +{ + return Grob::unsmob (me->get_object ("rest")); } void -Note_column::add_head (Score_element*me,Score_element *h) +Note_column::add_head (Grob *me, Grob *h) { + bool both = false; if (Rest::has_interface (h)) { - me->set_elt_property ("rest", h->self_scm_); + extract_grob_set (me, "note-heads", heads); + if (heads.size ()) + both = true; + else + me->set_object ("rest", h->self_scm ()); } else if (Note_head::has_interface (h)) { - Pointer_group_interface gi (me, "note-heads"); - gi.add_element (h); + if (Grob::unsmob (me->get_object ("rest"))) + both = true; + Pointer_group_interface::add_grob (me, ly_symbol2scm ("note-heads"), h); } - Axis_group_interface::add_element (me, h); + + if (both) + me->warning (_ ("cannot have note heads and rests together on a stem")); + else + Axis_group_interface::add_element (me, h); } -/** - translate the rest symbols vertically by amount DY_I. - */ -void -Note_column::translate_rests (Score_element*me,int dy_i) +Grob * +Note_column::first_head (Grob *me) { - Score_element * r = unsmob_element (me->get_elt_property ("rest")); - if (r) + Grob *st = get_stem (me); + return st ? Stem::first_head (st) : 0; +} + +/* + Return extent of the noteheads in the "main column", + i.e. excluding any suspended noteheads. +*/ +Interval +Note_column::calc_main_heads_extent (Grob *me) +{ + if (get_stem (me)) + return first_head (me)->extent (me, X_AXIS); + else { - r->translate_axis (dy_i * Staff_symbol_referencer::staff_space (r)/2.0, Y_AXIS); + // no stems => no suspended noteheads. + extract_grob_set (me, "note-heads", heads); + if (heads.size()) + return heads[0]->extent (me, X_AXIS); + else + return Interval (0, 0); } } - -void -Note_column::set_dotcol (Score_element*me,Score_element *d) +/* + Return the first AccidentalPlacement grob that we find in a note-head. +*/ +Grob * +Note_column::accidentals (Grob *me) { - Axis_group_interface::add_element (me, d); -} + extract_grob_set (me, "note-heads", heads); + Grob *acc = 0; + for (vsize i = 0; i < heads.size (); i++) + { + Grob *h = heads[i]; + acc = h ? Grob::unsmob (h->get_object ("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); -Interval -Note_column::rest_dim (Score_element*me) -{ - Score_element * r = unsmob_element (me->get_elt_property ("rest")); - return r->extent (Y_AXIS); + /* compatibility. */ + return acc; } -Score_element* -Note_column::first_head (Score_element*me) +Grob * +Note_column::dot_column (Grob *me) { - Score_element * st = stem_l (me); - return st? Stem::first_head (st): 0; + extract_grob_set (me, "note-heads", heads); + for (vsize i = 0; i < heads.size (); i++) + { + Grob *dots = Grob::unsmob (heads[i]->get_object ("dot")); + if (dots) + return dots->get_parent (X_AXIS); + } + + return 0; } -bool -Note_column::has_interface (Score_element*me) +/* If a note-column contains a cross-staff stem then + nc->extent (Y_AXIS, refp) will not consider the extent of the stem. + If you want the extent of the stem to be included (and you are safe + from any cross-staff issues) then call this function instead. */ +Interval +Note_column::cross_staff_extent (Grob *me, Grob *refp) { - return me && me->has_interface (ly_symbol2scm ("note-column-interface")); + Interval iv = me->extent (refp, Y_AXIS); + if (Grob *s = get_stem (me)) + iv.unite (s->extent (refp, Y_AXIS)); + + return iv; } + +ADD_INTERFACE (Note_column, + "Stem and noteheads combined.", + + /* properties */ + "force-hshift " + "horizontal-shift " + "ignore-collision " + "note-heads " + "rest " + "rest-collision " + "stem " + );