X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frhythmic-column-engraver.cc;h=fa45a95ff373a3debbe0ff2d1702cd720f570b5a;hb=b14ca8cd4fd50af455590377c4fab5c504506635;hp=ac1515162a31870c97060ce27c11392f6b1a3c33;hpb=635827994d372f4bd0e9c719238380337bae9477;p=lilypond.git diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc index ac1515162a..fa45a95ff3 100644 --- a/lily/rhythmic-column-engraver.cc +++ b/lily/rhythmic-column-engraver.cc @@ -1,127 +1,142 @@ /* - rhythmic-column-grav.cc -- implement Rhythmic_column_engraver + rhythmic-column-engraver.cc -- implement Rhythmic_column_engraver source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2009 Han-Wen Nienhuys */ - -#include "slur.hh" #include "engraver.hh" #include "rhythmic-head.hh" #include "stem.hh" #include "note-column.hh" -#include "dot-column.hh" -#include "musical-request.hh" #include "item.hh" +#include "dot-column.hh" +#include "pointer-group-interface.hh" -class Rhythmic_column_engraver :public Engraver +#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. +*/ + +class Rhythmic_column_engraver : public Engraver { - Link_array rhead_l_arr_; - Grob * stem_l_; - Grob *ncol_p_; - Grob *dotcol_l_; - - TRANSLATOR_DECLARATIONS(Rhythmic_column_engraver); + vector rheads_; + Grob *stem_; + Grob *note_column_; + Grob *dotcol_; + Grob *arpeggio_; + + TRANSLATOR_DECLARATIONS (Rhythmic_column_engraver); protected: - virtual void acknowledge_grob (Grob_info); - virtual void create_grobs (); - virtual void stop_translation_timestep (); - virtual void start_translation_timestep (); - + DECLARE_ACKNOWLEDGER (stem); + DECLARE_ACKNOWLEDGER (rhythmic_head); + DECLARE_ACKNOWLEDGER (arpeggio); + void process_acknowledged (); + void stop_translation_timestep (); }; - - Rhythmic_column_engraver::Rhythmic_column_engraver () { - stem_l_ =0; - ncol_p_=0; - dotcol_l_ =0; + + stem_ = 0; + note_column_ = 0; + arpeggio_ = 0; } void -Rhythmic_column_engraver::create_grobs () +Rhythmic_column_engraver::process_acknowledged () { - if (rhead_l_arr_.size ()) + if (rheads_.size ()) { - if (!ncol_p_) - { - ncol_p_ = new Item (get_property ("NoteColumn")); - Note_column::set_interface (ncol_p_); - announce_grob (ncol_p_, 0); - } + if (!note_column_) + note_column_ = make_item ("NoteColumn", rheads_[0]->self_scm ()); - for (int i=0; i < rhead_l_arr_.size (); i++) - { - if (!rhead_l_arr_[i]->parent_l (X_AXIS)) - Note_column::add_head (ncol_p_, rhead_l_arr_[i]); - } - rhead_l_arr_.set_size (0); + 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)) + if (stem_ + && !stem_->get_parent (X_AXIS)) { - Note_column::set_dotcol (ncol_p_, dotcol_l_); - } - - if (stem_l_ - && !stem_l_->parent_l (X_AXIS)) - { - Note_column::set_stem (ncol_p_, stem_l_); - stem_l_ = 0; + Note_column::set_stem (note_column_, stem_); + stem_ = 0; } + if (arpeggio_) + note_column_->set_object ("arpeggio", arpeggio_->self_scm ()); } } void -Rhythmic_column_engraver::acknowledge_grob (Grob_info i) +Rhythmic_column_engraver::acknowledge_stem (Grob_info i) { - Item * item = dynamic_cast (i.grob_l_); - if (item && Stem::has_interface (item)) - { - stem_l_ = item; - } - else if (item && Rhythmic_head::has_interface (item)) - { - rhead_l_arr_.push (item); - } - else if (item && Dot_column::has_interface (item)) - { - dotcol_l_ = item; - } + stem_ = i.grob (); } void -Rhythmic_column_engraver::stop_translation_timestep () +Rhythmic_column_engraver::acknowledge_rhythmic_head (Grob_info i) { - if (ncol_p_) - { - typeset_grob (ncol_p_); - ncol_p_ =0; - } + rheads_.push_back (i.grob ()); +} + +void +Rhythmic_column_engraver::acknowledge_arpeggio (Grob_info i) +{ + arpeggio_ = i.grob (); } void -Rhythmic_column_engraver::start_translation_timestep () +Rhythmic_column_engraver::stop_translation_timestep () { - dotcol_l_ =0; - stem_l_ =0; + note_column_ = 0; + stem_ = 0; + arpeggio_ = 0; } +ADD_ACKNOWLEDGER (Rhythmic_column_engraver, stem); +ADD_ACKNOWLEDGER (Rhythmic_column_engraver, rhythmic_head); +ADD_ACKNOWLEDGER (Rhythmic_column_engraver, arpeggio); + +ADD_TRANSLATOR (Rhythmic_column_engraver, + /* doc */ + "Generate @code{NoteColumn}, an object that groups stems," + " note heads, and rests.", + + /* create */ + "NoteColumn ", + /* read */ + "", -ENTER_DESCRIPTION(Rhythmic_column_engraver, -/* descr */ "Generates NoteColumn, an objects that groups stems, noteheads and rests.", -/* creats*/ "NoteColumn", -/* acks */ "stem-interface rhythmicb-head-interface dot-column-interface", -/* reads */ "", -/* write */ ""); + /* write */ + "" + );