X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-column.cc;h=9d75a326f1e9651c188764bfa01176b5b5920d3b;hb=5f03f8603e38802a1c38cf7a85a1c833ccfc2c39;hp=4c81e4af067df13f5657ae214161e379a484076c;hpb=a7f82e4dc22fc6219a9fe0f6874f8c91e3f31f24;p=lilypond.git diff --git a/lily/note-column.cc b/lily/note-column.cc index 4c81e4af06..9d75a326f1 100644 --- a/lily/note-column.cc +++ b/lily/note-column.cc @@ -1,24 +1,39 @@ /* - 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--2009 Han-Wen Nienhuys - (c) 1997--2005 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 "note-column.hh" -#include // ceil +#include // ceil +using namespace std; +#include "accidental-placement.hh" #include "axis-group-interface.hh" -#include "stem.hh" -#include "warn.hh" -#include "output-def.hh" -#include "staff-symbol-referencer.hh" -#include "rest.hh" +#include "directional-element-interface.hh" +#include "international.hh" +#include "item.hh" #include "note-head.hh" -#include "accidental-placement.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 @@ -31,15 +46,15 @@ Note_column::has_rests (Grob *me) return unsmob_grob (me->get_object ("rest")); } -int -Note_column::shift_compare (Grob *const &p1, Grob *const &p2) +bool +Note_column::shift_less (Grob *const &p1, Grob *const &p2) { SCM s1 = p1->get_property ("horizontal-shift"); SCM s2 = p2->get_property ("horizontal-shift"); 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; + return h1 < h2; } Item * @@ -57,7 +72,7 @@ Note_column::head_positions_interval (Grob *me) iv.set_empty (); extract_grob_set (me, "note-heads", heads); - for (int i = 0; i < heads.size(); i++) + for (vsize i = 0; i < heads.size (); i++) { Grob *se = heads[i]; @@ -72,9 +87,13 @@ Note_column::dir (Grob *me) { Grob *stem = unsmob_grob (me->get_object ("stem")); if (stem && Stem::has_interface (stem)) - return Stem::get_direction (stem); - else if (scm_is_pair (me->get_object ("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"); return CENTER; @@ -84,7 +103,6 @@ void Note_column::set_stem (Grob *me, Grob *stem) { me->set_object ("stem", stem->self_scm ()); - me->add_dependency (stem); Axis_group_interface::add_element (me, stem); } @@ -114,7 +132,7 @@ Note_column::add_head (Grob *me, Grob *h) } if (both) - me->warning (_ ("can't have note heads and rests together on a stem")); + me->warning (_ ("cannot have note heads and rests together on a stem")); else Axis_group_interface::add_element (me, h); } @@ -135,12 +153,6 @@ Note_column::translate_rests (Grob *me, int dy) } } -void -Note_column::set_dotcol (Grob *me, Grob *d) -{ - Axis_group_interface::add_element (me, d); -} - Grob * Note_column::first_head (Grob *me) { @@ -156,7 +168,7 @@ Note_column::accidentals (Grob *me) { extract_grob_set (me, "note-heads", heads); Grob *acc = 0; - for (int i = 0; i < heads.size(); i++) + for (vsize i = 0; i < heads.size (); i++) { Grob *h = heads[i]; acc = h ? unsmob_grob (h->get_object ("accidental-grob")) : 0; @@ -174,7 +186,50 @@ Note_column::accidentals (Grob *me) 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"); +Grob * +Note_column::dot_column (Grob *me) +{ + extract_grob_set (me, "note-heads", heads); + for (vsize i = 0; i < heads.size (); i++) + { + Grob *dots = unsmob_grob (heads[i]->get_object ("dot")); + if (dots) + return dots->get_parent (X_AXIS); + } + + return 0; +} + +Grob * +Note_column::arpeggio (Grob *me) +{ + return unsmob_grob (me->get_object ("arpeggio")); +} + +/* 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) +{ + 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 */ + "arpeggio " + "force-hshift " + "horizontal-shift " + "ignore-collision " + "note-heads " + "rest " + "rest-collision " + "stem " + );