X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-heads-engraver.cc;h=34c65a1cbdd3af945c209a527974cf952f352260;hb=684b5c3b30504c1328392a702985bea5c63860e9;hp=8fc1e6f13a111838c6612adc94a7d6671cd896c6;hpb=94375d04f45b415ad705fd444fdb344416f116d9;p=lilypond.git diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc index 8fc1e6f13a..34c65a1cbd 100644 --- a/lily/note-heads-engraver.cc +++ b/lily/note-heads-engraver.cc @@ -1,162 +1,134 @@ /* - head-grav.cc -- part of GNU LilyPond + note-heads-engraver.cc -- part of GNU LilyPond - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2005 Han-Wen Nienhuys */ -#include + +#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: - 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 (); + virtual bool try_music (Music *ev); + void process_music (); + void stop_translation_timestep (); }; +Note_heads_engraver::Note_heads_engraver () +{ +} + bool -Note_heads_engraver::try_music (Music *m) +Note_heads_engraver::try_music (Music *m) { - if (Note_req * n =dynamic_cast (m)) + if (m->is_mus_type ("note-event")) { - note_req_l_arr_.push (n); - note_end_mom_ = note_end_mom_ >? now_mom () + m->length_mom (); - + note_evs_.push (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::process_music () { - 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_grob_property ("duration-log", - gh_int2scm (dur.duration_log () 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); - + Item *d = make_item ("Dots", note->self_scm ()); + Rhythmic_head::set_dots (note, d); + if (dur.dot_count () - != gh_scm2int (d->get_grob_property ("dot-count"))) - d->set_grob_property ("dot-count", gh_int2scm (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_p, Y_AXIS); - announce_grob (d,0); - dot_p_arr_.push (d); + d->set_parent (note, Y_AXIS); + + dots_.push (d); } - Pitch *pit =unsmob_pitch (req->get_mus_property ("pitch")); + Pitch *pit = unsmob_pitch (ev->get_property ("pitch")); - int pos = pit->steps (); - SCM c0 = get_property ("centralCPosition"); - if (gh_number_p (c0)) - pos += gh_scm2int (c0); +#if 0 /* TODO: should have a mechanism to switch off these warnings. */ - 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 (!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)); - 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); - note_p_arr_.push (note_p); - } -} - -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]); + + notes_.push (note); } - dot_p_arr_.clear (); - - note_req_l_arr_.clear (); } void -Note_heads_engraver::start_translation_timestep () +Note_heads_engraver::stop_translation_timestep () { - - /* - TODO: make this settable? - - TODO: what if someone wants a line break in a grace note section?? - */ - // if (note_end_mom_ > now_mom ()) - if (note_end_mom_.main_part_ > now_mom ().main_part_) - { - Score_engraver * e = 0; - Translator * t = daddy_grav_l (); - for (; !e && t; t = t->daddy_trans_l_) - { - e = dynamic_cast (t); - } - - if (!e) - programming_error ("No score engraver!"); - else - e->forbid_breaks (); // guh. Use properties! - } + notes_.clear (); + dots_.clear (); + note_evs_.clear (); } -Note_heads_engraver::Note_heads_engraver() -{} +#include "translator.icc" -ENTER_DESCRIPTION(Note_heads_engraver, -/* descr */ "Generate one or more noteheads from Music of type Note_req.", -/* creats*/ "NoteHead Dots", -/* acks */ "", -/* reads */ "", -/* write */ ""); +ADD_TRANSLATOR (Note_heads_engraver, + /* doc */ "Generate noteheads.", + /* create */ "NoteHead Dots", + /* accept */ "note-event busy-playing-event", + /* read */ "middleCPosition", + /* write */ "");