X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-column.cc;h=91a7690697e338a8fe054808d2aabc9c4401b19d;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=380182f85623cd74fca631b1d04a4715bc02fcf1;hpb=87eedcd59f4082cb0841528ad5bc82cb1d1191e3;p=lilypond.git diff --git a/lily/note-column.cc b/lily/note-column.cc index 380182f856..91a7690697 100644 --- a/lily/note-column.cc +++ b/lily/note-column.cc @@ -1,14 +1,25 @@ /* - 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--2015 Han-Wen Nienhuys - (c) 1997--2007 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" @@ -32,7 +43,7 @@ using namespace std; bool Note_column::has_rests (Grob *me) { - return unsmob_grob (me->get_object ("rest")); + return Grob::is_smob (me->get_object ("rest")); } bool @@ -50,7 +61,19 @@ Item * Note_column::get_stem (Grob *me) { SCM s = me->get_object ("stem"); - return unsmob_item (s); + return Item::unsmob (s); +} + +Item * +Note_column::get_flag (Grob *me) +{ + Item *stem = get_stem (me); + if (stem) + { + SCM s = stem->get_object ("flag"); + return Item::unsmob (s); + } + return 0; } Slice @@ -74,17 +97,20 @@ Note_column::head_positions_interval (Grob *me) Direction Note_column::dir (Grob *me) { - Grob *stem = unsmob_grob (me->get_object ("stem")); + Grob *stem = Grob::unsmob (me->get_object ("stem")); if (stem && Stem::has_interface (stem)) return get_grob_direction (stem); else { 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"); + if (has_interface (me)) + programming_error ("Note_column without heads and stem"); + else + programming_error ("dir() given grob without Note_column interface"); return CENTER; } @@ -98,7 +124,7 @@ Note_column::set_stem (Grob *me, Grob *stem) Grob * Note_column::get_rest (Grob *me) { - return unsmob_grob (me->get_object ("rest")); + return Grob::unsmob (me->get_object ("rest")); } void @@ -109,14 +135,14 @@ 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; + if (Grob::is_smob (me->get_object ("rest"))) + both = true; Pointer_group_interface::add_grob (me, ly_symbol2scm ("note-heads"), h); } @@ -126,28 +152,6 @@ Note_column::add_head (Grob *me, Grob *h) 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) { @@ -156,7 +160,34 @@ Note_column::first_head (Grob *me) } /* - Return the first Accidentals grob that we find in a note-head. + Return extent of the noteheads in the "main column", + (i.e. excluding any suspended noteheads), or extent + of the rest (if there are no heads). +*/ +Interval +Note_column::calc_main_extent (Grob *me) +{ + Grob *main_head = 0; + if (get_stem (me)) + main_head = first_head (me); + else + { + // no stems => no suspended noteheads. + extract_grob_set (me, "note-heads", heads); + if (heads.size()) + main_head = heads[0]; + } + Grob *main_item = main_head + ? main_head + : Grob::unsmob (me->get_object ("rest")); + + return main_item + ? main_item->extent (me, X_AXIS) + : Interval (0, 0); +} + +/* + Return the first AccidentalPlacement grob that we find in a note-head. */ Grob * Note_column::accidentals (Grob *me) @@ -166,9 +197,9 @@ Note_column::accidentals (Grob *me) for (vsize i = 0; i < heads.size (); i++) { Grob *h = heads[i]; - acc = h ? unsmob_grob (h->get_object ("accidental-grob")) : 0; + acc = h ? Grob::unsmob (h->get_object ("accidental-grob")) : 0; if (acc) - break; + break; } if (!acc) @@ -182,20 +213,42 @@ Note_column::accidentals (Grob *me) } Grob * -Note_column::arpeggio (Grob *me) +Note_column::dot_column (Grob *me) { - return unsmob_grob (me->get_object ("arpeggio")); + 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; +} + +/* 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 " - "note-heads " - "rest " - "rest-collision " - "stem " - ); + "Stem and noteheads combined.", + + /* properties */ + "force-hshift " + "horizontal-shift " + "ignore-collision " + "note-heads " + "rest " + "rest-collision " + "stem " + );