X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-heads-engraver.cc;h=173961cb08d73b4a4e22183877478c034e02d688;hb=220cea65f9373eea8795a6c4598d1214919fe79d;hp=b6fd727f5b9f84e18463dce8831ec6bb4dc7132d;hpb=2804f8f79e01dc606ce067bffda2d966524e6e36;p=lilypond.git diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc index b6fd727f5b..173961cb08 100644 --- a/lily/note-heads-engraver.cc +++ b/lily/note-heads-engraver.cc @@ -1,141 +1,127 @@ /* - head-grav.cc -- part of GNU LilyPond + note-heads-engraver.cc -- part of GNU LilyPond - (c) 1997--2002 Han-Wen Nienhuys + (c) 1997--2007 Han-Wen Nienhuys */ -#include +#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 "paper-def.hh" -#include "musical-request.hh" -#include "dots.hh" -#include "dot-column.hh" #include "staff-symbol-referencer.hh" -#include "item.hh" -#include "score-engraver.hh" +#include "stream-event.hh" #include "warn.hh" -/** - make balls and rests - */ +#include "translator.icc" + class Note_heads_engraver : public Engraver { - Link_array note_p_arr_; - - Link_array dot_p_arr_; - Link_array note_req_l_arr_; + vector notes_; + vector note_evs_; public: - TRANSLATOR_DECLARATIONS(Note_heads_engraver); + TRANSLATOR_DECLARATIONS (Note_heads_engraver); protected: - virtual void start_translation_timestep (); - virtual bool try_music (Music *req_l) ; - virtual void process_music (); - - virtual void stop_translation_timestep (); + DECLARE_TRANSLATOR_LISTENER (note); + void process_music (); + void stop_translation_timestep (); }; - -Note_heads_engraver::Note_heads_engraver() +Note_heads_engraver::Note_heads_engraver () { } -bool -Note_heads_engraver::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); - return true; - } - else if (dynamic_cast (m)) - { - return note_req_l_arr_.size (); - } - - return false; + note_evs_.push_back (ev); } - void Note_heads_engraver::process_music () { - for (int i=0; i < note_req_l_arr_.size (); i++) - { - Item *note_p = new Item (get_property ("NoteHead")); - - Staff_symbol_referencer::set_interface (note_p); + SCM c0 = get_property ("middleCPosition"); + SCM layout_proc = get_property("staffLineLayoutFunction"); - Music * req = note_req_l_arr_[i]; - - Duration dur = *unsmob_duration (req->get_mus_property ("duration")); + for (vsize i = 0; i < note_evs_.size (); i++) + { + Stream_event *ev = note_evs_[i]; + Item *note = make_item ("NoteHead", ev->self_scm ()); - note_p->set_grob_property ("duration-log", gh_int2scm (dur.duration_log ())); + Pitch *pit = unsmob_pitch (ev->get_property ("pitch")); - if (dur.dot_count ()) - { - Item * d = new Item (get_property ("Dots")); - Rhythmic_head::set_dots (note_p, d); - - if (dur.dot_count () - != gh_scm2int (d->get_grob_property ("dot-count"))) - d->set_grob_property ("dot-count", gh_int2scm (dur.dot_count ())); - - d->set_parent (note_p, Y_AXIS); - announce_grob (d, SCM_EOL); - dot_p_arr_.push (d); - } +#if 0 /* TODO: should have a mechanism to switch off these warnings. */ - Pitch *pit =unsmob_pitch (req->get_mus_property ("pitch")); + if (!pit) + ev->origin ()->warning (_ ("NoteEvent without pitch")); +#endif - int pos = pit->steps (); - SCM c0 = get_property ("centralCPosition"); - if (gh_number_p (c0)) - pos += gh_scm2int (c0); + 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 (); - note_p->set_grob_property ("staff-position", gh_int2scm (pos)); - if (to_boolean (get_property ("easyPlay"))) - { - char s[2] = "a"; - s[0] = (pit->notename_i_ + 2)%7 + 'a'; + if (scm_is_number (c0)) + pos += scm_to_int(c0); + + note->set_property ("staff-position", scm_from_int (pos)); - s[0] = toupper (s[0]); - note_p->set_grob_property ("note-character", ly_str02scm (s)); + /* + Shape 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); } - - announce_grob (note_p,req->self_scm()); - note_p_arr_.push (note_p); + + notes_.push_back (note); } } void Note_heads_engraver::stop_translation_timestep () { - for (int i=0; i < note_p_arr_.size (); i++) - { - typeset_grob (note_p_arr_[i]); - } - - note_p_arr_.clear (); - for (int i=0; i < dot_p_arr_.size (); i++) - { - typeset_grob (dot_p_arr_[i]); - } - dot_p_arr_.clear (); - - note_req_l_arr_.clear (); + notes_.clear (); + note_evs_.clear (); } -void -Note_heads_engraver::start_translation_timestep () -{ -} +ADD_TRANSLATOR (Note_heads_engraver, + /* doc */ + "Generate note heads.", + + /* create */ + "NoteHead ", + /* read */ + "middleCPosition " + "staffLineLayoutFunction ", -ENTER_DESCRIPTION(Note_heads_engraver, -/* descr */ "Generate one or more noteheads from Music of type Note_req.", -/* creats*/ "NoteHead Dots", -/* acks */ "", -/* reads */ "easyPlay centralCPosition", -/* write */ ""); + /* write */ + "" + );