X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdrum-note-engraver.cc;h=591fc9d1b6468445c3fa36d9f5ac8cf31c4cdb5d;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=221fe7b44fd945475f315a9477cff3925f212fd1;hpb=4b975f3177880e16e759f67be4517f67109c2633;p=lilypond.git diff --git a/lily/drum-note-engraver.cc b/lily/drum-note-engraver.cc index 221fe7b44f..591fc9d1b6 100644 --- a/lily/drum-note-engraver.cc +++ b/lily/drum-note-engraver.cc @@ -1,35 +1,51 @@ /* - drum-note-engraver.cc + This file is part of LilyPond, the GNU music typesetter. - (c) 1997--2005 Han-Wen Nienhuys + Copyright (C) 1997--2014 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 +using namespace std; -#include "rhythmic-head.hh" +#include "item.hh" +#include "duration.hh" #include "engraver.hh" -#include "warn.hh" +#include "note-column.hh" +#include "rhythmic-head.hh" #include "side-position-interface.hh" #include "script-interface.hh" #include "stem.hh" -#include "note-column.hh" -#include "duration.hh" +#include "stream-event.hh" +#include "warn.hh" + +#include "translator.icc" class Drum_notes_engraver : public Engraver { - Link_array notes_; - Link_array dots_; - Link_array scripts_; - Link_array events_; + vector scripts_; + vector events_; public: TRANSLATOR_DECLARATIONS (Drum_notes_engraver); protected: - virtual bool try_music (Music *ev); void process_music (); - DECLARE_ACKNOWLEDGER(stem); - DECLARE_ACKNOWLEDGER(note_column); + DECLARE_ACKNOWLEDGER (stem); + DECLARE_ACKNOWLEDGER (note_column); + DECLARE_TRANSLATOR_LISTENER (note); void stop_translation_timestep (); }; @@ -37,139 +53,107 @@ Drum_notes_engraver::Drum_notes_engraver () { } -bool -Drum_notes_engraver::try_music (Music *m) +IMPLEMENT_TRANSLATOR_LISTENER (Drum_notes_engraver, note); +void +Drum_notes_engraver::listen_note (Stream_event *ev) { - if (m->is_mus_type ("note-event")) - { - events_.push (m); - return true; - } - else if (m->is_mus_type ("busy-playing-event")) - return events_.size (); - - return false; + events_.push_back (ev); } void Drum_notes_engraver::process_music () { SCM tab = 0; - for (int i = 0; i < events_.size (); i++) + for (vsize i = 0; i < events_.size (); i++) { if (!tab) - tab = get_property ("drumStyleTable"); + tab = get_property ("drumStyleTable"); - Music *ev = events_[i]; + Stream_event *ev = events_[i]; Item *note = make_item ("NoteHead", ev->self_scm ()); - Duration dur = *unsmob_duration (ev->get_property ("duration")); - - note->set_property ("duration-log", scm_from_int (dur.duration_log ())); - - if (dur.dot_count ()) - { - Item *d = make_item ("Dots", ev->self_scm ()); - Rhythmic_head::set_dots (note, d); - - if (dur.dot_count () - != robust_scm2int (d->get_property ("dot-count"), 0)) - d->set_property ("dot-count", scm_from_int (dur.dot_count ())); - - d->set_parent (note, Y_AXIS); - - dots_.push (d); - } - SCM drum_type = ev->get_property ("drum-type"); SCM defn = SCM_EOL; if (scm_hash_table_p (tab) == SCM_BOOL_T) - defn = scm_hashq_ref (tab, drum_type, SCM_EOL); + defn = scm_hashq_ref (tab, drum_type, SCM_EOL); if (scm_is_pair (defn)) - { - SCM pos = scm_caddr (defn); - SCM style = scm_car (defn); - SCM script = scm_cadr (defn); - - if (scm_integer_p (pos) == SCM_BOOL_T) - note->set_property ("staff-position", pos); - if (scm_is_symbol (style)) - note->set_property ("style", style); - - if (scm_is_string (script)) - { - Item *p = make_item ("Script", ev->self_scm ()); - bool follow; - make_script_from_event (p, &follow, - context (), script, - 0); - - if (p->get_property ("follow-into-staff")) - p->set_property ("staff-padding", SCM_EOL); - - p->set_parent (note, Y_AXIS); - Side_position_interface::add_support (p, note); - scripts_.push (p); - } - } - - notes_.push (note); + { + SCM pos = scm_caddr (defn); + SCM style = scm_car (defn); + SCM script = scm_cadr (defn); + + if (scm_integer_p (pos) == SCM_BOOL_T) + note->set_property ("staff-position", pos); + if (scm_is_symbol (style)) + note->set_property ("style", style); + + if (scm_is_string (script)) + { + Item *p = make_item ("Script", ev->self_scm ()); + make_script_from_event (p, context (), script, + 0); + + p->set_parent (note, Y_AXIS); + Side_position_interface::add_support (p, note); + scripts_.push_back (p); + } + } } } void Drum_notes_engraver::acknowledge_stem (Grob_info inf) { - for (int i = 0; i < scripts_.size (); i++) + for (vsize i = 0; i < scripts_.size (); i++) { Grob *e = scripts_[i]; if (to_dir (e->get_property ("side-relative-direction"))) - e->set_object ("direction-source", inf.grob ()->self_scm ()); + e->set_object ("direction-source", inf.grob ()->self_scm ()); - /* - add dep ? - */ - e->add_dependency (inf.grob ()); Side_position_interface::add_support (e, inf.grob ()); } } + void Drum_notes_engraver::acknowledge_note_column (Grob_info inf) { - for (int i = 0; i < scripts_.size (); i++) + for (vsize i = 0; i < scripts_.size (); i++) { Grob *e = scripts_[i]; if (!e->get_parent (X_AXIS) - && Side_position_interface::get_axis (e) == Y_AXIS) - { - e->set_parent (inf.grob (), X_AXIS); - } + && Side_position_interface::get_axis (e) == Y_AXIS) + e->set_parent (inf.grob (), X_AXIS); + + Side_position_interface::add_support (e, inf.grob ()); } } void Drum_notes_engraver::stop_translation_timestep () { - notes_.clear (); - dots_.clear (); scripts_.clear (); - events_.clear (); } -#include "translator.icc" +ADD_ACKNOWLEDGER (Drum_notes_engraver, stem); +ADD_ACKNOWLEDGER (Drum_notes_engraver, note_column); -ADD_ACKNOWLEDGER(Drum_notes_engraver, stem); -ADD_ACKNOWLEDGER(Drum_notes_engraver,note_column); ADD_TRANSLATOR (Drum_notes_engraver, - /* descr */ "Generate noteheads.", - /* creats*/ "NoteHead Dots Script", - /* accepts */ "note-event busy-playing-event", - /* reads */ "drumStyleTable", - /* write */ ""); + /* doc */ + "Generate drum note heads.", + + /* create */ + "NoteHead " + "Script ", + + /* read */ + "drumStyleTable ", + /* write */ + "" + );