X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-heads-engraver.cc;h=426eb7d84489575c8976c7e17932ef12cf0a5906;hb=74fbafa9ebed0cc66de56dec3ca01634f8ddc94d;hp=431c637b84b3bbda3e27693717b63cd77848ded8;hpb=b0064942493df77833e6e41e05d362850f4874b0;p=lilypond.git diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc index 431c637b84..426eb7d844 100644 --- a/lily/note-heads-engraver.cc +++ b/lily/note-heads-engraver.cc @@ -1,115 +1,127 @@ /* - head-grav.cc -- part of GNU LilyPond + note-heads-engraver.cc -- part of GNU LilyPond - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2009 Han-Wen Nienhuys */ -#include "note-head.hh" -#include "note-heads-engraver.hh" -#include "paper-def.hh" -#include "musical-request.hh" -#include "dots.hh" -#include "dot-column.hh" +#include "engraver.hh" + +#include +using namespace std; + +#include "duration.hh" +#include "item.hh" +#include "output-def.hh" +#include "pitch.hh" +#include "rhythmic-head.hh" #include "staff-symbol-referencer.hh" +#include "stream-event.hh" +#include "warn.hh" + +#include "translator.icc" -Note_heads_engraver::Note_heads_engraver() +class Note_heads_engraver : public Engraver +{ + vector notes_; + vector note_evs_; + +public: + TRANSLATOR_DECLARATIONS (Note_heads_engraver); + +protected: + DECLARE_TRANSLATOR_LISTENER (note); + void process_music (); + void stop_translation_timestep (); +}; + +Note_heads_engraver::Note_heads_engraver () { } -bool -Note_heads_engraver::do_try_music (Music *m) +IMPLEMENT_TRANSLATOR_LISTENER (Note_heads_engraver, note); +void +Note_heads_engraver::listen_note (Stream_event *ev) { - 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)) - { - for (int i= note_req_l_arr_.size (); i--;) - p->pitch_arr_.push (note_req_l_arr_[i]->pitch_); // GUH UGH UGHUGH. - return true; - } - return false; - + note_evs_.push_back (ev); } 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++) - { - Note_head *note_p = new Note_head (get_property ("basicNoteHeadProperties")); + SCM c0 = get_property ("middleCPosition"); + SCM layout_proc = get_property("staffLineLayoutFunction"); - Staff_symbol_referencer_interface si (note_p); - si.set_interface (); + for (vsize i = 0; i < note_evs_.size (); i++) + { + Stream_event *ev = note_evs_[i]; + Item *note = make_item ("NoteHead", ev->self_scm ()); + Pitch *pit = unsmob_pitch (ev->get_property ("pitch")); + +#if 0 /* TODO: should have a mechanism to switch off these warnings. */ + + if (!pit) + ev->origin ()->warning (_ ("NoteEvent without pitch")); +#endif + + int pos; + if (pit == 0) + pos = 0; + else if (ly_is_procedure (layout_proc)){ + SCM pitch = ev->get_property("pitch"); + pos = scm_to_int(scm_call_1 (layout_proc, pitch)); + } + else + pos = pit->steps (); + + if (scm_is_number (c0)) + pos += scm_to_int(c0); - 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_ set_property ("staff-position", scm_from_int (pos)); - if (note_req_l->duration_.dots_i_) + /* + Shape note heads change on step of the scale. + */ + SCM shape_vector = get_property ("shapeNoteStyles"); + if (scm_is_vector (shape_vector)) { - Dots * d = new Dots (get_property ("basicDotsProperties")); - - Staff_symbol_referencer_interface sd (d); - sd.set_interface (); - - 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); + 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); } - 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); + notes_.push_back (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 (); + note_evs_.clear (); } +ADD_TRANSLATOR (Note_heads_engraver, + /* doc */ + "Generate note heads.", + /* create */ + "NoteHead ", + /* read */ + "middleCPosition " + "staffLineLayoutFunction ", -ADD_THIS_TRANSLATOR(Note_heads_engraver); - + /* write */ + "" + );