X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-heads-engraver.cc;h=2aa23935b71a7be680a1b04cea41b3c38c56e8b1;hb=75eebcb49e52d296b1da3e1074e0825d2c780db4;hp=ec47cb0442d293f67f874d045d35a240ab535cf1;hpb=0af6d4cb04fa3e4aa69a7aecb76034e4cb1ec49b;p=lilypond.git diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc index ec47cb0442..2aa23935b7 100644 --- a/lily/note-heads-engraver.cc +++ b/lily/note-heads-engraver.cc @@ -1,156 +1,134 @@ /* - head-grav.cc -- part of GNU LilyPond + note-heads-engraver.cc -- part of GNU LilyPond - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2006 Han-Wen Nienhuys */ +#include "engraver.hh" + +#include +using namespace std; + #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 do_process_music(); - virtual void do_pre_move_processing(); + virtual bool try_music (Music *ev); + void process_music (); + 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)) + if (m->is_mus_type ("note-event")) { + note_evs_.push (m); return true; } - else if ( dynamic_cast (m)) - { - return true; - } - else if (dynamic_cast (m)) - { - return true; - } - else if (dynamic_cast (m)) - { - return now_mom () < note_end_mom_; - } + 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++) { - 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")); - - 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_ duration_.dots_i_) + note->set_property ("duration-log", scm_from_int (dur.duration_log ())); + if (dur.dot_count ()) { - Item * d = new Item (get_property ("Dots")); - Rhythmic_head::set_dots (note_p, d); - - 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); - announce_element (d,0); - dot_p_arr_.push (d); + Item *d = make_item ("Dots", note->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); } - note_p->set_elt_property("staff-position", gh_int2scm (note_req_l->pitch_.steps ())); + Pitch *pit = unsmob_pitch (ev->get_property ("pitch")); - announce_element (note_p,note_req_l); - 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 (); -} +#if 0 /* TODO: should have a mechanism to switch off these warnings. */ -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 (!pit) + 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_from_int (pos)); + + /* + Shape note heads change on step of the scale. + */ + SCM shape_vector = get_property ("shapeNoteStyles"); + if (scm_is_vector (shape_vector)) { - e = dynamic_cast (t); + 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, + /* doc */ "Generate noteheads.", + /* create */ "NoteHead Dots", + /* accept */ "note-event busy-playing-event", + /* read */ "middleCPosition", + /* write */ "");