X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-heads-engraver.cc;h=7c82106623933eecfe502f34006149dc012b6661;hb=4244c3a9fbf1f3ff2e20e665f92516d35b61de53;hp=5378672633ed823268ba4a3735ade126a9358508;hpb=9661ba1fb275f3e14f8a69f2cee2f02a2f893e48;p=lilypond.git diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc index 5378672633..7c82106623 100644 --- a/lily/note-heads-engraver.cc +++ b/lily/note-heads-engraver.cc @@ -1,146 +1,143 @@ /* - head-grav.cc -- part of GNU LilyPond + This file is part of LilyPond, the GNU music typesetter. - (c) 1997--2000 Han-Wen Nienhuys + Copyright (C) 1997--2015 Han-Wen Nienhuys + + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ -#include "rhythmic-head.hh" -#include "engraver.hh" -#include "paper-def.hh" -#include "musical-request.hh" -#include "dots.hh" -#include "dot-column.hh" -#include "staff-symbol-referencer.hh" #include "engraver.hh" -#include "pqueue.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" -/** - 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_; + vector note_evs_; + public: - VIRTUAL_COPY_CONS(Translator); - Note_heads_engraver(); - + TRANSLATOR_DECLARATIONS (Note_heads_engraver); + protected: - virtual bool do_try_music (Music *req_l) ; - virtual void do_process_music(); - virtual void do_pre_move_processing(); + void listen_note (Stream_event *); + void process_music (); + void stop_translation_timestep (); }; - - - - -Note_heads_engraver::Note_heads_engraver() +Note_heads_engraver::Note_heads_engraver (Context *c) + : Engraver (c) { } -bool -Note_heads_engraver::do_try_music (Music *m) +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++) + SCM c0 = get_property ("middleCPosition"); + SCM layout_proc = get_property ("staffLineLayoutFunction"); + + for (vsize i = 0; i < note_evs_.size (); i++) { - Item *note_p = new Item (get_property ("basicNoteHeadProperties")); - - Staff_symbol_referencer::set_interface (note_p); - - - - 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_) - { - Item * d = new Item (get_property ("basicDotsProperties")); - - Staff_symbol_referencer::set_interface (d); - - 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); - d->add_offset_callback (Dots::quantised_position_callback, Y_AXIS); - announce_element (d,0); - dot_p_arr_.push (d); - } - - note_p->set_elt_property("staff-position", gh_int2scm (note_req_l->pitch_.steps ())); - - announce_element (note_p,note_req_l); - note_p_arr_.push (note_p); + Stream_event *ev = note_evs_[i]; + Item *note = make_item ("NoteHead", ev->self_scm ()); + + Pitch *pit = unsmob (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->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)) + { + SCM scm_tonic = get_property ("tonic"); + Pitch tonic; + if (unsmob (scm_tonic)) + tonic = *unsmob (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); + } } } - + 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 (); + note_evs_.clear (); } +void +Note_heads_engraver::boot () +{ + ADD_LISTENER (Note_heads_engraver, note); +} +ADD_TRANSLATOR (Note_heads_engraver, + /* doc */ + "Generate note heads.", + /* create */ + "NoteHead ", -ADD_THIS_TRANSLATOR(Note_heads_engraver); + /* read */ + "middleCPosition " + "staffLineLayoutFunction ", + /* write */ + "" + );