X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frhythmic-column-engraver.cc;h=e307b512de092653ce91d6f54000161c175b07f4;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=0be292f7013d4068c59b9d29c5d6c22ced199d1b;hpb=48f2b9351f93d0161c675cfb60e95bf919041df2;p=lilypond.git diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc index 0be292f701..e307b512de 100644 --- a/lily/rhythmic-column-engraver.cc +++ b/lily/rhythmic-column-engraver.cc @@ -1,124 +1,160 @@ /* - rhythmic-column-grav.cc -- implement Rhythmic_column_engraver + 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--1999 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 "dimension-cache.hh" -#include "slur.hh" -#include "rhythmic-column-engraver.hh" -#include "note-head.hh" +#include "engraver.hh" +#include "rhythmic-head.hh" #include "stem.hh" #include "note-column.hh" +#include "item.hh" #include "dot-column.hh" -#include "musical-request.hh" +#include "pointer-group-interface.hh" + +#include "translator.icc" + +/* + this engraver glues together stems, rests and note heads into a NoteColumn + grob. + + It also generates spacing objects. Originally, we have tried to + have the spacing functionality at different levels. + + - by simply using the sequence of Separation-item as + spacing-sequences (at staff level). Unfortunately, this fucks up if + there are different kinds of tuplets in different voices (8th and + 8ths triplets combined made the program believe there were 1/12 th + notes.). + + Doing it in a separate engraver using timing info is generally + complicated (start/end time management), and fucks up if a voice + changes staff. + + Now we do it from here again. This has the problem that voices can + appear and disappear at will, leaving lots of loose ends (the note + spacing engraver don't know where to connect the last note of the + voice on the right with), but we don't complain about those, and let + the default spacing do its work. +*/ -Rhythmic_column_engraver::Rhythmic_column_engraver() +class Rhythmic_column_engraver : public Engraver +{ + vector rheads_; + Grob *stem_; + Grob *flag_; + Grob *note_column_; + + TRANSLATOR_DECLARATIONS (Rhythmic_column_engraver); +protected: + + void acknowledge_stem (Grob_info); + void acknowledge_flag (Grob_info); + void acknowledge_rhythmic_head (Grob_info); + void process_acknowledged (); + void stop_translation_timestep (); +}; + +Rhythmic_column_engraver::Rhythmic_column_engraver (Context *c) + : Engraver (c) { - stem_l_ =0; - ncol_p_=0; - dotcol_l_ =0; -} + stem_ = 0; + flag_ = 0; + note_column_ = 0; +} void Rhythmic_column_engraver::process_acknowledged () { - if (rhead_l_arr_.size ()) + if (rheads_.size ()) { - if (!ncol_p_) - { - ncol_p_ = new Note_column; - announce_element (Score_element_info (ncol_p_, 0)); - } - - for (int i=0; i < rhead_l_arr_.size (); i++) - { - if (!rhead_l_arr_[i]->parent_l(X_AXIS)) - ncol_p_->add_head (rhead_l_arr_[i]); - } - rhead_l_arr_.set_size (0); + if (!note_column_) + note_column_ = make_item ("NoteColumn", rheads_[0]->self_scm ()); + + for (vsize i = 0; i < rheads_.size (); i++) + if (!rheads_[i]->get_parent (X_AXIS)) + Note_column::add_head (note_column_, rheads_[i]); + + rheads_.resize (0); } - - if (ncol_p_) + if (note_column_) { - if (dotcol_l_ - && !dotcol_l_->parent_l(X_AXIS)) - { - ncol_p_->set_dotcol (dotcol_l_); - } - - if (stem_l_ - && !stem_l_->parent_l(X_AXIS)) - { - ncol_p_->set_stem (stem_l_); - stem_l_ = 0; - } - - SCM wg = get_property ("weAreGraceContext",0); - bool wegrace = to_boolean (wg); - - if (!wegrace) - for (int i=0; i < grace_slur_endings_.size(); i++) - grace_slur_endings_[i]->add_column (ncol_p_); - grace_slur_endings_.clear (); + if (stem_ + && !stem_->get_parent (X_AXIS)) + { + Note_column::set_stem (note_column_, stem_); + stem_ = 0; + } + + if (flag_) + { + Pointer_group_interface::add_grob (note_column_, ly_symbol2scm ("elements"), flag_); + flag_ = 0; + } } } void -Rhythmic_column_engraver::acknowledge_element (Score_element_info i) +Rhythmic_column_engraver::acknowledge_stem (Grob_info i) { - SCM wg = get_property ("weAreGraceContext",0); - bool wegrace = to_boolean (wg); - if ((wegrace != - (i.elem_l_->get_elt_property ("grace") != SCM_UNDEFINED)) - && !dynamic_cast (i.elem_l_)) - return ; - - Item * item = dynamic_cast (i.elem_l_); - if (Stem*s=dynamic_cast (item)) - { - stem_l_ = s; - } - else if (Rhythmic_head*r=dynamic_cast (item)) - { - rhead_l_arr_.push (r); - } - else if (Dot_column*d =dynamic_cast (item)) - { - dotcol_l_ = d; - } - else if (Slur *s = dynamic_cast (i.elem_l_)) - { - /* - end slurs starting on grace notes - */ - - if (to_boolean (s->get_elt_property ("grace"))) - grace_slur_endings_.push (s); - } + stem_ = i.grob (); } void -Rhythmic_column_engraver::do_pre_move_processing() +Rhythmic_column_engraver::acknowledge_flag (Grob_info i) { - if (ncol_p_) - { - typeset_element (ncol_p_); - ncol_p_ =0; - } + flag_ = i.grob (); +} + +void +Rhythmic_column_engraver::acknowledge_rhythmic_head (Grob_info i) +{ + rheads_.push_back (i.grob ()); } void -Rhythmic_column_engraver::do_post_move_processing() +Rhythmic_column_engraver::stop_translation_timestep () { - grace_slur_endings_.clear (); - dotcol_l_ =0; - stem_l_ =0; + note_column_ = 0; + stem_ = 0; + flag_ = 0; } -ADD_THIS_TRANSLATOR(Rhythmic_column_engraver); +void +Rhythmic_column_engraver::boot () +{ + ADD_ACKNOWLEDGER (Rhythmic_column_engraver, stem); + ADD_ACKNOWLEDGER (Rhythmic_column_engraver, flag); + ADD_ACKNOWLEDGER (Rhythmic_column_engraver, rhythmic_head); +} + +ADD_TRANSLATOR (Rhythmic_column_engraver, + /* doc */ + "Generate @code{NoteColumn}, an object that groups stems," + " note heads, and rests.", + + /* create */ + "NoteColumn ", + + /* read */ + "", + + /* write */ + "" + );