X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-heads-engraver.cc;h=23de800ffc9e770e6b47676d753eccb6d884a118;hb=97ebd8b72cdd2db28ad8eb38629d51f285afff22;hp=fa72a59e2f55a6779d4b9f3382854987d849fed5;hpb=40c8e12b8afa8e9c7e44cf6ea3b724295884091b;p=lilypond.git diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc index fa72a59e2f..23de800ffc 100644 --- a/lily/note-heads-engraver.cc +++ b/lily/note-heads-engraver.cc @@ -1,146 +1,133 @@ /* - head-grav.cc -- part of GNU LilyPond + note-heads-engraver.cc -- part of GNU LilyPond - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ +#include + #include "rhythmic-head.hh" -#include "engraver.hh" -#include "paper-def.hh" -#include "musical-request.hh" +#include "output-def.hh" #include "dots.hh" #include "dot-column.hh" #include "staff-symbol-referencer.hh" +#include "item.hh" #include "engraver.hh" -#include "pqueue.hh" +#include "warn.hh" -/** - make balls and rests - */ class Note_heads_engraver : public Engraver { - Link_array note_p_arr_; - Link_array dot_p_arr_; - Link_array note_req_l_arr_; - Moment note_end_mom_; -public: - VIRTUAL_COPY_CONS(Translator); - Note_heads_engraver(); - -protected: - virtual bool do_try_music (Music *req_l) ; - virtual void do_process_music(); - virtual void do_pre_move_processing(); -}; - + Link_array notes_; + Link_array dots_; + Link_array note_evs_; +public: + TRANSLATOR_DECLARATIONS (Note_heads_engraver); +protected: + virtual bool try_music (Music *ev) ; + virtual void process_music (); + virtual void stop_translation_timestep (); +}; -Note_heads_engraver::Note_heads_engraver() +Note_heads_engraver::Note_heads_engraver () { } bool -Note_heads_engraver::do_try_music (Music *m) +Note_heads_engraver::try_music (Music *m) { - if (Note_req * n =dynamic_cast (m)) - { - note_req_l_arr_.push (n); - note_end_mom_ = note_end_mom_ >? now_mom () + m->length_mom (); - - return true; - } - else if (Tonic_req* t = dynamic_cast (m)) - { - return true; - } - else if (Inversion_req* i = dynamic_cast (m)) - { - 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)) + if (m->is_mus_type ("note-event")) { - for (int i= note_req_l_arr_.size (); i--;) - p->pitch_arr_.push (note_req_l_arr_[i]->pitch_); // GUH UGH UGHUGH. + note_evs_.push (m); return true; } - return false; + else if (m->is_mus_type ("busy-playing-event")) + return note_evs_.size (); + return false; } + void -Note_heads_engraver::do_process_music() +Note_heads_engraver::process_music () { - if (note_p_arr_.size ()) - return ; - - for (int i=0; i < note_req_l_arr_.size (); i++) + for (int i = 0; i < note_evs_.size (); i++) { - Rhythmic_head *note_p = new Rhythmic_head (get_property ("basicNoteHeadProperties")); - - Staff_symbol_referencer_interface si (note_p); - si.set_interface (); + Music * ev = note_evs_[i]; + Item *note = make_item ("NoteHead", ev->self_scm ()); - 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_property ("duration")); - if (note_req_l->duration_.dots_i_) + note->set_property ("duration-log", scm_int2num (dur.duration_log ())); + if (dur.dot_count ()) { - Item * d = new Item (get_property ("basicDotsProperties")); - - Staff_symbol_referencer_interface sd (d); - sd.set_interface (); + Item * d = make_item ("Dots", note->self_scm ()); + Rhythmic_head::set_dots (note, d); - note_p->set_dots (d); + if (dur.dot_count () + != robust_scm2int (d->get_property ("dot-count"), 0)) + d->set_property ("dot-count", scm_int2num (dur.dot_count ())); + + d->set_parent (note, Y_AXIS); - if (note_req_l->duration_.dots_i_ - != gh_scm2int (d->get_elt_property ("dot-count"))) - d->set_elt_property ("dot-count", gh_int2scm (note_req_l->duration_.dots_i_)); - - d->set_parent (note_p, Y_AXIS); - d->add_offset_callback (Dots::quantised_position_callback, Y_AXIS); - announce_element (Score_element_info (d,0)); - dot_p_arr_.push (d); + dots_.push (d); } - si.set_position(note_req_l->pitch_.steps ()); - Score_element_info itinf (note_p,note_req_l); - announce_element (itinf); - note_p_arr_.push (note_p); + Pitch *pit = unsmob_pitch (ev->get_property ("pitch")); + + int pos = pit ? pit->steps () : 0; + SCM c0 = get_property ("middleCPosition"); + if (scm_is_number (c0)) + pos += scm_to_int (c0); + + note->set_property ("staff-position", scm_int2num (pos)); + + /* + Shaped note heads change on step of the scale. + */ + SCM shape_vector = get_property ("shapeNoteStyles"); + if (ly_c_vector_p (shape_vector)) + { + SCM scm_tonic = get_property ("tonic"); + Pitch tonic (0,0,0); + if (unsmob_pitch (scm_tonic)) + tonic = *unsmob_pitch (scm_tonic); + + unsigned int delta = (pit->get_notename() - tonic.get_notename() + 7) % 7; + + SCM style = SCM_EOL; + if (SCM_VECTOR_LENGTH (shape_vector) > delta + && scm_is_symbol (scm_vector_ref (shape_vector, scm_from_int (delta)))) + { + style = scm_vector_ref (shape_vector, scm_from_int (delta)); + } + if (scm_is_symbol (style)) + { + note->set_property ("style", style); + } + } + + 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++) - { - typeset_element (note_p_arr_[i]); - } - note_p_arr_.clear (); - for (int i=0; i < dot_p_arr_.size (); i++) - { - typeset_element (dot_p_arr_[i]); - } - dot_p_arr_.clear (); - - note_req_l_arr_.clear (); + notes_.clear (); + dots_.clear (); + note_evs_.clear (); } - -ADD_THIS_TRANSLATOR(Note_heads_engraver); - +ADD_TRANSLATOR (Note_heads_engraver, +/* descr */ "Generate noteheads.", +/* creats*/ "NoteHead Dots", +/* accepts */ "note-event busy-playing-event", +/* acks */ "", +/* reads */ "middleCPosition", +/* write */ "");