X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-column.cc;h=867542bdbd39fe497b6da103e66572e5840ddf4c;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=9da1464728f07e04d3e776b2a12cd77d916af233;hpb=545092a25d8ca41dc90b87482474b3719f7130a9;p=lilypond.git diff --git a/lily/note-column.cc b/lily/note-column.cc index 9da1464728..867542bdbd 100644 --- a/lily/note-column.cc +++ b/lily/note-column.cc @@ -1,26 +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--2014 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 "directional-element-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 @@ -33,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 * @@ -51,6 +64,18 @@ Note_column::get_stem (Grob *me) return unsmob_item (s); } +Item * +Note_column::get_flag (Grob *me) +{ + Item *stem = get_stem (me); + if (stem) + { + SCM s = stem->get_object ("flag"); + return unsmob_item (s); + } + return 0; +} + Slice Note_column::head_positions_interval (Grob *me) { @@ -59,7 +84,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]; @@ -79,7 +104,7 @@ Note_column::dir (Grob *me) { extract_grob_set (me, "note-heads", heads); if (heads.size ()) - return (Direction)sign (head_positions_interval (me).center ()); + return (Direction)sign (head_positions_interval (me).center ()); } programming_error ("note column without heads and stem"); @@ -107,45 +132,23 @@ Note_column::add_head (Grob *me, Grob *h) { extract_grob_set (me, "note-heads", heads); if (heads.size ()) - both = true; + both = true; else - me->set_object ("rest", h->self_scm ()); + me->set_object ("rest", h->self_scm ()); } else if (Note_head::has_interface (h)) { if (unsmob_grob (me->get_object ("rest"))) - both = true; + both = true; Pointer_group_interface::add_grob (me, ly_symbol2scm ("note-heads"), 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); } -/** - translate the rest symbols vertically by amount DY, but only if - they have no staff-position set. -*/ -void -Note_column::translate_rests (Grob *me, int dy) -{ - Grob *r = unsmob_grob (me->get_object ("rest")); - if (r && !scm_is_number (r->get_property ("staff-position"))) - { - r->translate_axis (dy * Staff_symbol_referencer::staff_space (r) / 2.0, Y_AXIS); - Grob *p = r->get_parent (Y_AXIS); - p->flush_extent_cache (Y_AXIS); - } -} - -void -Note_column::set_dotcol (Grob *me, Grob *d) -{ - Axis_group_interface::add_element (me, d); -} - Grob * Note_column::first_head (Grob *me) { @@ -154,19 +157,19 @@ Note_column::first_head (Grob *me) } /* - Return the first Accidentals grob that we find in a note-head. + Return the first AccidentalPlacement grob that we find in a note-head. */ Grob * 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; if (acc) - break; + break; } if (!acc) @@ -180,11 +183,42 @@ Note_column::accidentals (Grob *me) } Grob * -Note_column::arpeggio (Grob *me) +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; +} + +/* 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 unsmob_grob (me->get_object ("arpeggio")); + 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, "note-column-interface", - "Stem and noteheads combined", - "arpeggio note-heads rest-collision rest horizontal-shift stem accidentals force-hshift"); +ADD_INTERFACE (Note_column, + "Stem and noteheads combined.", + + /* properties */ + "force-hshift " + "horizontal-shift " + "ignore-collision " + "note-heads " + "rest " + "rest-collision " + "stem " + );