X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-heads-engraver.cc;h=436861c0aec1e88eac35734fd49f44916e02104f;hb=984b59eda4c1dded74567bc9eedcce2ba2ed0eb5;hp=c1bfea9317267b6349d6ed925e095b257fe1c8a6;hpb=01d84d552854fb399bd0e819502c6c2db2a1b214;p=lilypond.git diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc index c1bfea9317..436861c0ae 100644 --- a/lily/note-heads-engraver.cc +++ b/lily/note-heads-engraver.cc @@ -1,121 +1,137 @@ /* - head-grav.cc -- part of GNU LilyPond + This file is part of LilyPond, the GNU music typesetter. - (c) 1997--1999 Han-Wen Nienhuys + Copyright (C) 1997--2012 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 "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" -Note_heads_engraver::Note_heads_engraver() +#include "translator.icc" + +class Note_heads_engraver : public Engraver { -} + vector note_evs_; + +public: + TRANSLATOR_DECLARATIONS (Note_heads_engraver); -bool -Note_heads_engraver::do_try_music (Music *m) +protected: + DECLARE_TRANSLATOR_LISTENER (note); + void process_music (); + void stop_translation_timestep (); +}; + +Note_heads_engraver::Note_heads_engraver () { - if (Note_req * n =dynamic_cast (m)) - { - note_req_l_arr_.push (n); - notes_end_pq_.insert (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 notes_end_pq_.size (); - } - 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; - } +IMPLEMENT_TRANSLATOR_LISTENER (Note_heads_engraver, note); void -Note_heads_engraver::do_process_requests() +Note_heads_engraver::listen_note (Stream_event *ev) { - if (note_p_arr_.size ()) - return ; - - SCM noteheadstyle = get_property ("noteHeadStyle", 0); - for (int i=0; i < note_req_l_arr_.size (); i++) - { - Note_head *note_p = new Note_head; - Note_req * note_req_l = note_req_l_arr_[i]; - - note_p->balltype_i_ = note_req_l->duration_.durlog_i_ duration_.dots_i_) - { - Dots * d = new Dots; - note_p->add_dots (d); - d->dots_i_ = note_req_l->duration_.dots_i_; - announce_element (Score_element_info (d,0)); - dot_p_arr_.push (d); - } - note_p->set_position(note_req_l->pitch_.steps ()); - - /* - TODO: transparent note heads. - */ - - if (gh_string_p (noteheadstyle)) - { - note_p->set_elt_property ("style", noteheadstyle); - } - - Score_element_info itinf (note_p,note_req_l); - announce_element (itinf); - note_p_arr_.push (note_p); - } + note_evs_.push_back (ev); } - + void -Note_heads_engraver::do_pre_move_processing() +Note_heads_engraver::process_music () { - 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++) + SCM c0 = get_property ("middleCPosition"); + SCM layout_proc = get_property ("staffLineLayoutFunction"); + + for (vsize i = 0; i < note_evs_.size (); i++) { - typeset_element (dot_p_arr_[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->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 (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); + } } - dot_p_arr_.clear (); - - note_req_l_arr_.clear (); } void -Note_heads_engraver::do_post_move_processing() +Note_heads_engraver::stop_translation_timestep () { - Moment n (now_mom ()); - while (notes_end_pq_.size () && notes_end_pq_.front () <=n) - notes_end_pq_.get (); + note_evs_.clear (); } +ADD_TRANSLATOR (Note_heads_engraver, + /* doc */ + "Generate note heads.", + /* create */ + "NoteHead ", -ADD_THIS_TRANSLATOR(Note_heads_engraver); + /* read */ + "middleCPosition " + "staffLineLayoutFunction ", + /* write */ + "" + );