X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-heads-engraver.cc;h=9d19e641d52443343e62874ab0d98372dccad23b;hb=refs%2Ftags%2Frelease%2F1.7.10;hp=9dcc8751922bf0383cfc889de9c1bc4533f24b56;hpb=fbb6d20e9f58d691ffe845284cbb4d8bacf9ca60;p=lilypond.git diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc index 9dcc875192..9d19e641d5 100644 --- a/lily/note-heads-engraver.cc +++ b/lily/note-heads-engraver.cc @@ -1,125 +1,145 @@ /* head-grav.cc -- part of GNU LilyPond - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ +#include -#include "note-head.hh" -#include "note-heads-engraver.hh" +#include "rhythmic-head.hh" #include "paper-def.hh" -#include "musical-request.hh" +#include "event.hh" #include "dots.hh" #include "dot-column.hh" #include "staff-symbol-referencer.hh" +#include "item.hh" +#include "engraver.hh" +#include "warn.hh" + +/** + make balls and rests + */ +class Note_heads_engraver : public Engraver +{ + Link_array notes_; + + Link_array dots_; + Link_array note_reqs_; + +public: + TRANSLATOR_DECLARATIONS(Note_heads_engraver); + +protected: + virtual void start_translation_timestep (); + virtual bool try_music (Music *req) ; + virtual void process_music (); + + virtual void stop_translation_timestep (); + +private: + bool in_ligature; +}; Note_heads_engraver::Note_heads_engraver() { + in_ligature = 0; } bool -Note_heads_engraver::do_try_music (Music *m) +Note_heads_engraver::try_music (Music *m) { - if (Note_req * n =dynamic_cast (m)) + if (m->is_mus_type ("note-event")) { - note_req_l_arr_.push (n); - note_end_mom_ = note_end_mom_ >? now_mom () + m->length_mom (); - + note_reqs_.push (m); return true; } - else if (Tonic_req* t = dynamic_cast (m)) + else if (m->is_mus_type ("busy-playing-event")) + return note_reqs_.size (); + else if (m->is_mus_type ("abort-event")) { - return true; + in_ligature = 0; } - else if (Inversion_req* i = dynamic_cast (m)) + else if (m->is_mus_type ("ligature-event")) { - return true; - } - else if (Bass_req* b = dynamic_cast (m)) - { - return true; - } - else if (Busy_playing_req * p = dynamic_cast (m)) - { - return now_mom () < note_end_mom_; - } - else if (Pitch_interrogate_req *p = dynamic_cast (m)) - { - for (int i= note_req_l_arr_.size (); i--;) - p->pitch_arr_.push (note_req_l_arr_[i]->pitch_); // GUH UGH UGHUGH. - return true; + /* + Urg ; this is not protocol. We should accept and return + true, or ignore. + */ + in_ligature = (to_dir (m->get_mus_property("span-direction")) == START); + return false; } - return false; + return false; } + void -Note_heads_engraver::do_process_music() +Note_heads_engraver::process_music () { - if (note_p_arr_.size ()) - return ; - - SCM noteheadstyle = get_property ("noteHeadStyle"); - for (int i=0; i < note_req_l_arr_.size (); i++) + for (int i=0; i < note_reqs_.size (); i++) { - Note_head *note_p = new Note_head; - - Staff_symbol_referencer_interface si (note_p); - si.set_interface (); + Item *note = + new Item (get_property ((in_ligature) ? "LigatureHead" : "NoteHead")); + Music * req = note_reqs_[i]; - Note_req * note_req_l = note_req_l_arr_[i]; - - note_p->set_elt_property ("duration-log", - gh_int2scm (note_req_l->duration_.durlog_i_ get_mus_property ("duration")); - if (note_req_l->duration_.dots_i_) - { - Dots * d = new Dots; + note->set_grob_property ("duration-log", gh_int2scm (dur.duration_log ())); - Staff_symbol_referencer_interface sd (d); - sd.set_interface (); + if (dur.dot_count ()) + { + Item * d = new Item (get_property ("Dots")); + Rhythmic_head::set_dots (note, d); - note_p->add_dots (d); - d->set_elt_property ("dot-count", gh_int2scm (note_req_l->duration_.dots_i_)); - announce_element (Score_element_info (d,0)); - dot_p_arr_.push (d); - } - si.set_position(note_req_l->pitch_.steps ()); + if (dur.dot_count () + != gh_scm2int (d->get_grob_property ("dot-count"))) + d->set_grob_property ("dot-count", gh_int2scm (dur.dot_count ())); - /* - TODO: transparent note heads. - */ - - if (gh_string_p (noteheadstyle)) - { - note_p->set_elt_property ("style", noteheadstyle); + d->set_parent (note, Y_AXIS); + announce_grob (d, SCM_EOL); + dots_.push (d); } - - Score_element_info itinf (note_p,note_req_l); - announce_element (itinf); - note_p_arr_.push (note_p); + + Pitch *pit =unsmob_pitch (req->get_mus_property ("pitch")); + + int pos = pit->steps (); + SCM c0 = get_property ("centralCPosition"); + if (gh_number_p (c0)) + pos += gh_scm2int (c0); + + note->set_grob_property ("staff-position", gh_int2scm (pos)); + announce_grob (note,req->self_scm()); + notes_.push (note); } } - + void -Note_heads_engraver::do_pre_move_processing() +Note_heads_engraver::stop_translation_timestep () { - for (int i=0; i < note_p_arr_.size (); i++) + for (int i=0; i < notes_.size (); i++) { - typeset_element (note_p_arr_[i]); + typeset_grob (notes_[i]); } - note_p_arr_.clear (); - for (int i=0; i < dot_p_arr_.size (); i++) + + notes_.clear (); + for (int i=0; i < dots_.size (); i++) { - typeset_element (dot_p_arr_[i]); + typeset_grob (dots_[i]); } - dot_p_arr_.clear (); - - note_req_l_arr_.clear (); + dots_.clear (); + note_reqs_.clear (); } +void +Note_heads_engraver::start_translation_timestep () +{ +} - -ADD_THIS_TRANSLATOR(Note_heads_engraver); - +ENTER_DESCRIPTION(Note_heads_engraver, +/* descr */ "Generate noteheads (also serves a double functions: makes ligatures.", +/* creats*/ "NoteHead LigatureHead Dots", +/* accepts */ "note-event busy-playing-event ligature-event abort-event", +/* acks */ "", +/* reads */ "centralCPosition", +/* write */ "");