X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-column.cc;h=2ba81c66c47b0349865a459ff3e12b630c72b1e2;hb=bb8e85cd462106714a69afcdf89d94cafe48a6b2;hp=075e61d1ab79567738c9330753f0d1c89e28823e;hpb=e85b008ae96fef8fc0c15529e8a172584d5d08fd;p=lilypond.git diff --git a/lily/note-column.cc b/lily/note-column.cc index 075e61d1ab..2ba81c66c4 100644 --- a/lily/note-column.cc +++ b/lily/note-column.cc @@ -1,160 +1,219 @@ /* - note-column.cc -- implement Note_column + This file is part of LilyPond, the GNU music typesetter. - source file of the LilyPond music typesetter + Copyright (C) 1997--2011 Han-Wen Nienhuys - (c) 1997 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 "debug.hh" -#include "script.hh" -#include "notehead.hh" -#include "stem.hh" -IMPLEMENT_STATIC_NAME(Note_column); +#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) +*/ -void -Note_column::add(Stem*stem_l) +bool +Note_column::has_rests (Grob *me) { - assert(!stem_l_); - stem_l_ = stem_l; - add_dependency(stem_l); + return unsmob_grob (me->get_object ("rest")); } -void -Note_column::add(Notehead* n_l) +bool +Note_column::shift_less (Grob *const &p1, Grob *const &p2) { - if (head_l_arr_.size()){ - if (n_l->rest_b_ != rest_b_) return; // ugly fix. Should think about integrating rests into colunms. - } else - rest_b_ = n_l->rest_b_; - - head_l_arr_.push(n_l); - add_dependency(n_l); + 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; } -void -Note_column::add(Script*s_l) +Item * +Note_column::get_stem (Grob *me) { - script_l_arr_.push(s_l); - add_dependency(s_l); + SCM s = me->get_object ("stem"); + return unsmob_item (s); } -void -Note_column::translate(Offset o) +Slice +Note_column::head_positions_interval (Grob *me) { - for (int i=0; i < head_l_arr_.size(); i++) - head_l_arr_[i]->translate(o); - for (int i=0; i < script_l_arr_.size(); i++) - script_l_arr_[i]->translate(o); - if (stem_l_) - stem_l_->translate(o); -} + Slice iv; + iv.set_empty (); -void -Note_column::do_print()const + extract_grob_set (me, "note-heads", heads); + for (vsize i = 0; i < heads.size (); i++) + { + Grob *se = heads[i]; + + int j = Staff_symbol_referencer::get_rounded_position (se); + iv.unite (Slice (j, j)); + } + return iv; +} + +Direction +Note_column::dir (Grob *me) { - mtor << "heads: " << head_l_arr_.size() << '\n'; - mtor << "scripts: " << script_l_arr_.size() << '\n'; + Grob *stem = unsmob_grob (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 ()); + } + + programming_error ("note column without heads and stem"); + return CENTER; } -Interval -Note_column::do_height()const return r +void +Note_column::set_stem (Grob *me, Grob *stem) { - if (stem_l_) - r.unite(stem_l_->height()); - for (int i=0; i < head_l_arr_.size(); i++) - r.unite(head_l_arr_[i]->height()); - for (int i=0; i < script_l_arr_.size(); i++) - r.unite(script_l_arr_[i]->height()); + me->set_object ("stem", stem->self_scm ()); + Axis_group_interface::add_element (me, stem); } -Interval -Note_column::do_width()const return r; +Grob * +Note_column::get_rest (Grob *me) { - if (stem_l_) - r.unite(stem_l_->width()); - for (int i=0; i < head_l_arr_.size(); i++) - r.unite(head_l_arr_[i]->width()); - for (int i=0; i < script_l_arr_.size(); i++) - r.unite(script_l_arr_[i]->width()); + return unsmob_grob (me->get_object ("rest")); } void -Note_column::do_pre_processing() +Note_column::add_head (Grob *me, Grob *h) { - if (stem_l_ && !dir_i_) - dir_i_ = stem_l_->dir_i_; - - if (!script_l_arr_.size()) - return; - - Array placed_l_arr_a[4]; - for (int i=0; i < script_l_arr_.size(); i++) { - Script*s_l = script_l_arr_[i]; - int j = (s_l->dir_i_ >0) ? 0 : 2; - if (!s_l->inside_staff_b_) - j ++; - - placed_l_arr_a[j].push(s_l); + bool both = false; + if (Rest::has_interface (h)) + { + extract_grob_set (me, "note-heads", heads); + if (heads.size ()) + both = true; + else + me->set_object ("rest", h->self_scm ()); } - for (int j =0; j <4; j++) { - placed_l_arr_a[j].sort( Script::compare); + else if (Note_head::has_interface (h)) + { + if (unsmob_grob (me->get_object ("rest"))) + both = true; + Pointer_group_interface::add_grob (me, ly_symbol2scm ("note-heads"), h); } - - Notehead *top_head_l=0; - Notehead *bot_head_l=0; - for (int i=0; i< head_l_arr_.size(); i++) { - if (head_l_arr_[i]->extremal == -1) - bot_head_l = head_l_arr_[i]; - else if (head_l_arr_[i]->extremal == 1) - top_head_l = head_l_arr_[i]; - } - /* argh. This sux. */ - if (!top_head_l) - top_head_l = bot_head_l; - if (!bot_head_l) - bot_head_l = top_head_l; - assert(bot_head_l && top_head_l); - Item *support_l=top_head_l; - int j; - for (j = 0; j < 2; j++ ) { - for (int i=0; i < placed_l_arr_a[j].size(); i++) { - placed_l_arr_a[j][i]->add_support(support_l); - support_l = placed_l_arr_a[j][i]; - } - } - - support_l=bot_head_l; - for (; j < 4; j++ ) { - for (int i=0; i < placed_l_arr_a[j].size(); i++) { - placed_l_arr_a[j][i]->add_support(support_l); - support_l = placed_l_arr_a[j][i]; - } + + if (both) + me->warning (_ ("cannot have note heads and rests together on a stem")); + else + Axis_group_interface::add_element (me, h); +} + +Grob * +Note_column::first_head (Grob *me) +{ + Grob *st = get_stem (me); + return st ? Stem::first_head (st) : 0; +} + +/* + 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 (vsize i = 0; i < heads.size (); i++) + { + Grob *h = heads[i]; + acc = h ? unsmob_grob (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); + + /* compatibility. */ + return acc; } -Note_column::Note_column() +Grob * +Note_column::dot_column (Grob *me) { - h_shift_b_ =false; - stem_l_ =0; - rest_b_ = false; - dir_i_ =0; + 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; } -void -Note_column::sort() + +Grob * +Note_column::arpeggio (Grob *me) { - head_l_arr_.sort( Notehead::compare); + return unsmob_grob (me->get_object ("arpeggio")); } - -Interval_t -Note_column::head_positions_interval()const + +/* 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) { - ( (Note_column*)this)->sort(); - return Interval_t ( head_l_arr_[0]->position, - head_l_arr_.top()->position); + 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 " + );