X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fnote-heads-engraver.cc;h=02dc7d02923c68e58aecc8879db2543018f9703f;hb=0d3c78505a6adb958f9280509bb7fa170de54611;hp=310a180fadf3e29f239e05eaf980b74c517532e8;hpb=a4d7106c75b325441063fd9ba9c4131979784aa5;p=lilypond.git diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc index 310a180fad..02dc7d0292 100644 --- a/lily/note-heads-engraver.cc +++ b/lily/note-heads-engraver.cc @@ -1,171 +1,141 @@ /* - head-grav.cc -- part of GNU LilyPond + note-heads-engraver.cc -- part of GNU LilyPond - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2005 Han-Wen Nienhuys */ +#include "engraver.hh" + +#include + #include "rhythmic-head.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 "score-engraver.hh" #include "warn.hh" +#include "duration.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_; + Link_array notes_; + Link_array dots_; + Link_array note_evs_; + public: - VIRTUAL_COPY_CONS(Translator); - Note_heads_engraver(); - + TRANSLATOR_DECLARATIONS (Note_heads_engraver); + protected: - virtual void do_post_move_processing (); - virtual bool do_try_music (Music *req_l) ; - virtual void process_acknowledged (); - virtual void acknowledge_element (Score_element_info) ; - void deprecated_process_music(); - virtual void do_pre_move_processing(); + virtual bool try_music (Music *ev); + PRECOMPUTED_VIRTUAL void process_music (); + PRECOMPUTED_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 ( dynamic_cast (m)) - { - return true; - } - else if ( dynamic_cast (m)) - { - return true; - } - else if (dynamic_cast (m)) + if (m->is_mus_type ("note-event")) { + note_evs_.push (m); return true; } - else if (dynamic_cast (m)) - { - return now_mom () < note_end_mom_; - } - return false; - -} + else if (m->is_mus_type ("busy-playing-event")) + return note_evs_.size (); -void -Note_heads_engraver::process_acknowledged () -{ - deprecated_process_music (); -} - -void -Note_heads_engraver::acknowledge_element (Score_element_info) -{ - //deprecated_process_music (); + return false; } void -Note_heads_engraver::deprecated_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++) { - Item *note_p = new Item (get_property ("NoteHead")); - - Staff_symbol_referencer::set_interface (note_p); + Music *ev = note_evs_[i]; + Item *note = make_item ("NoteHead", ev->self_scm ()); + Duration dur = *unsmob_duration (ev->get_property ("duration")); - - Music * req = note_req_l_arr_[i]; - - Duration dur = *unsmob_duration (req->get_mus_property ("duration")); - note_p->set_elt_property ("duration-log", - gh_int2scm (dur.duration_log () set_property ("duration-log", scm_int2num (dur.duration_log ())); if (dur.dot_count ()) { - Item * d = new Item (get_property ("Dots")); - Rhythmic_head::set_dots (note_p, d); - + Item *d = make_item ("Dots", note->self_scm ()); + Rhythmic_head::set_dots (note, d); + if (dur.dot_count () - != gh_scm2int (d->get_elt_property ("dot-count"))) - d->set_elt_property ("dot-count", gh_int2scm (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); - d->set_parent (note_p, Y_AXIS); - announce_element (d,0); - dot_p_arr_.push (d); + dots_.push (d); } - note_p->set_elt_property("staff-position", gh_int2scm (unsmob_pitch (req->get_mus_property ("pitch"))->steps ())); + Pitch *pit = unsmob_pitch (ev->get_property ("pitch")); - announce_element (note_p,req); - note_p_arr_.push (note_p); - } -} - -void -Note_heads_engraver::do_pre_move_processing() -{ - 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 (); -} - -void -Note_heads_engraver::do_post_move_processing () -{ - /* TODO:make this settable? - */ - if (note_end_mom_ > now_mom()) - { - Score_engraver * e = 0; - Translator * t = daddy_grav_l (); - for (; !e && t; t = t->daddy_trans_l_) +#if 0 + /* + TODO: should have a mechanism to switch off these warnings. + */ + if (!pit) { - e = dynamic_cast (t); + ev->origin ()->warning (_ ("NoteEvent without pitch")); + } +#endif + + 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 (scm_is_vector (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_c_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); + } } - if (!e) - programming_error ("No score engraver!"); - else - e->forbid_breaks (); // guh. Use properties! + notes_.push (note); } } +void +Note_heads_engraver::stop_translation_timestep () +{ + notes_.clear (); + dots_.clear (); + note_evs_.clear (); +} +#include "translator.icc" -ADD_THIS_TRANSLATOR(Note_heads_engraver); - +ADD_TRANSLATOR (Note_heads_engraver, + /* descr */ "Generate noteheads.", + /* creats*/ "NoteHead Dots", + /* accepts */ "note-event busy-playing-event", + /* reads */ "middleCPosition", + /* write */ "");