X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frhythmic-column-engraver.cc;h=8246749c0687fe7d4edcf42512bfb9648369ca19;hb=23cd484ee45d2e5807540265a6fe6b70e9eb2020;hp=41e3f4a85143e30dcffc23ac33eed31838b6a87c;hpb=fbc5381fb54df596fd5652236eedc7c1078601e6;p=lilypond.git diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc index 41e3f4a851..8246749c06 100644 --- a/lily/rhythmic-column-engraver.cc +++ b/lily/rhythmic-column-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2003 Han-Wen Nienhuys */ @@ -13,70 +13,121 @@ #include "stem.hh" #include "note-column.hh" #include "dot-column.hh" -#include "musical-request.hh" +#include "event.hh" #include "item.hh" +#include "group-interface.hh" + + + +/* + 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_; + Link_array rheads_; + Grob * stem_; + Grob * note_column_; + Grob * dotcol_; + + Grob * last_spacing_; + Grob * spacing_; TRANSLATOR_DECLARATIONS(Rhythmic_column_engraver); protected: virtual void acknowledge_grob (Grob_info); - virtual void create_grobs (); + virtual void process_acknowledged_grobs (); virtual void stop_translation_timestep (); virtual void start_translation_timestep (); - }; Rhythmic_column_engraver::Rhythmic_column_engraver () { - stem_l_ =0; - ncol_p_=0; - dotcol_l_ =0; + spacing_ =0 ; + last_spacing_ = 0; + + stem_ =0; + note_column_=0; + dotcol_ =0; } void -Rhythmic_column_engraver::create_grobs () +Rhythmic_column_engraver::process_acknowledged_grobs () { - if (rhead_l_arr_.size ()) + if (rheads_.size ()) { - if (!ncol_p_) + if (!note_column_) { - ncol_p_ = new Item (get_property ("NoteColumn")); - Note_column::set_interface (ncol_p_); - announce_grob (ncol_p_, 0); + note_column_ = new Item (get_property ("NoteColumn")); + announce_grob(note_column_, SCM_EOL); + + + spacing_ = new Item (get_property ("NoteSpacing")); + spacing_->set_grob_property ("left-items", gh_cons (note_column_->self_scm (), SCM_EOL)); + + /* + Should insert a cause. Collision warnings go into the void. + + */ + announce_grob(spacing_, SCM_EOL); + + if (last_spacing_) + { + Pointer_group_interface::add_grob (last_spacing_, + ly_symbol2scm ("right-items" ), + note_column_); + } + } - for (int i=0; i < rhead_l_arr_.size (); i++) + for (int i=0; i < rheads_.size (); i++) { - if (!rhead_l_arr_[i]->parent_l (X_AXIS)) - Note_column::add_head (ncol_p_, rhead_l_arr_[i]); + if (!rheads_[i]->get_parent (X_AXIS)) + Note_column::add_head (note_column_, rheads_[i]); } - rhead_l_arr_.set_size (0); + rheads_.set_size (0); } - if (ncol_p_) + if (note_column_) { - if (dotcol_l_ - && !dotcol_l_->parent_l (X_AXIS)) + if (dotcol_ + && !dotcol_->get_parent (X_AXIS)) { - Note_column::set_dotcol (ncol_p_, dotcol_l_); + Note_column::set_dotcol (note_column_, dotcol_); } - if (stem_l_ - && !stem_l_->parent_l (X_AXIS)) + if (stem_ + && !stem_->get_parent (X_AXIS)) { - Note_column::set_stem (ncol_p_, stem_l_); - stem_l_ = 0; + Note_column::set_stem (note_column_, stem_); + stem_ = 0; } } @@ -85,43 +136,53 @@ Rhythmic_column_engraver::create_grobs () void Rhythmic_column_engraver::acknowledge_grob (Grob_info i) { - Item * item = dynamic_cast (i.grob_l_); - if (item && Stem::has_interface (item)) + Item * item = dynamic_cast (i.grob_); + if (!item || item->get_parent (X_AXIS)) + return ; + if (Stem::has_interface (item)) { - stem_l_ = item; + stem_ = item; } - else if (item && Rhythmic_head::has_interface (item)) + else if (Rhythmic_head::has_interface (item)) { - rhead_l_arr_.push (item); + rheads_.push (item); } - else if (item && Dot_column::has_interface (item)) + else if (Dot_column::has_interface (item)) { - dotcol_l_ = item; + dotcol_ = item; } } void Rhythmic_column_engraver::stop_translation_timestep () { - if (ncol_p_) + if (note_column_) + { + typeset_grob (note_column_); + note_column_ =0; + } + + if (spacing_) { - typeset_grob (ncol_p_); - ncol_p_ =0; + typeset_grob (spacing_); + last_spacing_ = spacing_; + spacing_ =0; } } void Rhythmic_column_engraver::start_translation_timestep () { - dotcol_l_ =0; - stem_l_ =0; + dotcol_ =0; + stem_ =0; } ENTER_DESCRIPTION(Rhythmic_column_engraver, /* descr */ "Generates NoteColumn, an objects that groups stems, noteheads and rests.", -/* creats*/ "NoteColumn", -/* acks */ "stem-interface rhythmic-head-interface dot-column-interface", +/* creats*/ "NoteColumn NoteSpacing", +/* accepts */ "", +/* acks */ "stem-interface rhythmic-head-interface dot-column-interface", /* reads */ "", /* write */ "");