X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdrum-note-engraver.cc;h=c73cbf979102d7335674c283aadb42b205b32204;hb=5eedf005834d8d3fdc64aee2554a9936c3ef1f57;hp=ac6d359874d96df0aa3bf5027c7101b811109169;hpb=b1323f33e9aa4b9eea05eefb8755c907d4d762d4;p=lilypond.git diff --git a/lily/drum-note-engraver.cc b/lily/drum-note-engraver.cc index ac6d359874..c73cbf9791 100644 --- a/lily/drum-note-engraver.cc +++ b/lily/drum-note-engraver.cc @@ -1,17 +1,16 @@ /* drum-note-engraver.cc - - (c) 1997--2004 Han-Wen Nienhuys + + (c) 1997--2005 Han-Wen Nienhuys */ -#include + +#include #include "rhythmic-head.hh" -#include "event.hh" -#include "item.hh" #include "engraver.hh" #include "warn.hh" #include "side-position-interface.hh" -#include "script.hh" +#include "script-interface.hh" #include "stem.hh" #include "note-column.hh" @@ -23,21 +22,21 @@ class Drum_notes_engraver : public Engraver Link_array events_; public: - TRANSLATOR_DECLARATIONS(Drum_notes_engraver); + TRANSLATOR_DECLARATIONS (Drum_notes_engraver); protected: - virtual bool try_music (Music *ev) ; + virtual bool try_music (Music *ev); virtual void process_music (); - virtual void acknowledge_grob (Grob_info); + virtual void acknowledge_grob (Grob_info); virtual void stop_translation_timestep (); }; -Drum_notes_engraver::Drum_notes_engraver() +Drum_notes_engraver::Drum_notes_engraver () { } bool -Drum_notes_engraver::try_music (Music *m) +Drum_notes_engraver::try_music (Music *m) { if (m->is_mus_type ("note-event")) { @@ -46,83 +45,75 @@ Drum_notes_engraver::try_music (Music *m) } else if (m->is_mus_type ("busy-playing-event")) return events_.size (); - else if (m->is_mus_type ("start-playing-event")) - return events_.size (); - + return false; } - void Drum_notes_engraver::process_music () { SCM tab = 0; - for (int i=0; i < events_.size (); i++) + for (int i = 0; i < events_.size (); i++) { if (!tab) tab = get_property ("drumStyleTable"); - - Item *note = make_item ("NoteHead"); - Music * ev = events_[i]; - + + Music *ev = events_[i]; + Item *note = make_item ("NoteHead", ev->self_scm ()); + Duration dur = *unsmob_duration (ev->get_property ("duration")); - note->set_property ("duration-log", gh_int2scm (dur.duration_log ())); + note->set_property ("duration-log", scm_int2num (dur.duration_log ())); if (dur.dot_count ()) { - Item * d = make_item ("Dots"); + 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", gh_int2scm (dur.dot_count ())); + d->set_property ("dot-count", scm_int2num (dur.dot_count ())); d->set_parent (note, Y_AXIS); - announce_grob (d, SCM_EOL); + dots_.push (d); } - SCM drum_type = ev->get_property ("drum-type"); + 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); - - if (gh_pair_p (defn)) + + if (scm_is_pair (defn)) { - SCM pos = gh_caddr (defn); - SCM style =gh_car (defn); - SCM script = gh_cadr (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 (gh_symbol_p (style)) + if (scm_is_symbol (style)) note->set_property ("style", style); - if (gh_string_p (script)) + if (scm_is_string (script)) { - Item *p = make_item ("Script"); - SCM desc = SCM_EOL; - make_script_from_event (p, &desc, - daddy_context_, 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); - - announce_grob (p, ev->self_scm ()); p->set_parent (note, Y_AXIS); - Side_position_interface::add_support (p, note); + Side_position_interface::add_support (p, note); scripts_.push (p); } } - - - announce_grob (note,ev->self_scm()); notes_.push (note); } } @@ -132,66 +123,50 @@ Drum_notes_engraver::acknowledge_grob (Grob_info inf) { if (Stem::has_interface (inf.grob_)) { - for (int i=0; i < scripts_.size (); i++) + for (int i = 0; i < scripts_.size (); i++) { - Grob*e = scripts_[i]; + Grob *e = scripts_[i]; if (to_dir (e->get_property ("side-relative-direction"))) e->set_property ("direction-source", inf.grob_->self_scm ()); /* - add dep ? - */ + add dep ? + */ e->add_dependency (inf.grob_); Side_position_interface::add_support (e, inf.grob_); } } - else if (Note_column::has_interface (inf.grob_)) + else if (Note_column::has_interface (inf.grob_)) { - for (int i=0; i < scripts_.size (); i++) + for (int i = 0; i < scripts_.size (); i++) { Grob *e = scripts_[i]; - - if (!e->get_parent (X_AXIS) && - Side_position_interface::get_axis (e) == Y_AXIS) + + if (!e->get_parent (X_AXIS) + && Side_position_interface::get_axis (e) == Y_AXIS) { e->set_parent (inf.grob_, X_AXIS); } } } - } - void Drum_notes_engraver::stop_translation_timestep () { - for (int i=0; i < notes_.size (); i++) - { - typeset_grob (notes_[i]); - } notes_.clear (); - for (int i=0; i < dots_.size (); i++) - { - typeset_grob (dots_[i]); - } dots_.clear (); - for (int i=0; i < scripts_.size (); i++) - { - typeset_grob (scripts_[i]); - } scripts_.clear (); - + events_.clear (); } - - -ENTER_DESCRIPTION(Drum_notes_engraver, -/* descr */ "Generate noteheads.", -/* creats*/ "NoteHead Dots Script", -/* accepts */ "note-event busy-playing-event", -/* acks */ "stem-interface note-column-interface", -/* reads */ "drumStyleTable", -/* write */ ""); +ADD_TRANSLATOR (Drum_notes_engraver, + /* descr */ "Generate noteheads.", + /* creats*/ "NoteHead Dots Script", + /* accepts */ "note-event busy-playing-event", + /* acks */ "stem-interface note-column-interface", + /* reads */ "drumStyleTable", + /* write */ "");