X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-heads-engraver.cc;h=0431981eb65a46b3543acd02b9c8af0c78dc1e06;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=2aa23935b71a7be680a1b04cea41b3c38c56e8b1;hpb=75eebcb49e52d296b1da3e1074e0825d2c780db4;p=lilypond.git diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc index 2aa23935b7..0431981eb6 100644 --- a/lily/note-heads-engraver.cc +++ b/lily/note-heads-engraver.cc @@ -1,7 +1,20 @@ /* - note-heads-engraver.cc -- part of GNU LilyPond + This file is part of LilyPond, the GNU music typesetter. - (c) 1997--2006 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 "engraver.hh" @@ -9,26 +22,26 @@ #include using namespace std; -#include "rhythmic-head.hh" +#include "duration.hh" +#include "item.hh" #include "output-def.hh" -#include "dots.hh" -#include "dot-column.hh" +#include "pitch.hh" +#include "rhythmic-head.hh" #include "staff-symbol-referencer.hh" -#include "item.hh" +#include "stream-event.hh" #include "warn.hh" -#include "duration.hh" + +#include "translator.icc" class Note_heads_engraver : public Engraver { - Link_array notes_; - Link_array dots_; - Link_array note_evs_; + vector note_evs_; public: TRANSLATOR_DECLARATIONS (Note_heads_engraver); protected: - virtual bool try_music (Music *ev); + DECLARE_TRANSLATOR_LISTENER (note); void process_music (); void stop_translation_timestep (); }; @@ -37,98 +50,88 @@ 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 (m->is_mus_type ("note-event")) - { - note_evs_.push (m); - return true; - } - else if (m->is_mus_type ("busy-playing-event")) - return note_evs_.size (); - - return false; + note_evs_.push_back (ev); } void Note_heads_engraver::process_music () { - for (int i = 0; i < note_evs_.size (); i++) + SCM c0 = get_property ("middleCPosition"); + SCM layout_proc = get_property ("staffLineLayoutFunction"); + + for (vsize i = 0; i < note_evs_.size (); i++) { - Music *ev = note_evs_[i]; + Stream_event *ev = note_evs_[i]; Item *note = make_item ("NoteHead", ev->self_scm ()); - Duration dur = *unsmob_duration (ev->get_property ("duration")); - - note->set_property ("duration-log", scm_from_int (dur.duration_log ())); - if (dur.dot_count ()) - { - Item *d = make_item ("Dots", note->self_scm ()); - Rhythmic_head::set_dots (note, d); - - if (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, Y_AXIS); - - dots_.push (d); - } - - Pitch *pit = unsmob_pitch (ev->get_property ("pitch")); + Pitch *pit = Pitch::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")); + ev->origin ()->warning (_ ("NoteEvent without pitch")); #endif - int pos = pit ? pit->steps () : 0; - SCM c0 = get_property ("middleCPosition"); + 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); + pos += scm_to_int (c0); note->set_property ("staff-position", scm_from_int (pos)); /* - Shape note heads change on step of the scale. + 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); - } - - notes_.push (note); + { + SCM scm_tonic = get_property ("tonic"); + Pitch tonic; + if (Pitch::is_smob (scm_tonic)) + tonic = *Pitch::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::stop_translation_timestep () { - notes_.clear (); - dots_.clear (); note_evs_.clear (); } -#include "translator.icc" - ADD_TRANSLATOR (Note_heads_engraver, - /* doc */ "Generate noteheads.", - /* create */ "NoteHead Dots", - /* accept */ "note-event busy-playing-event", - /* read */ "middleCPosition", - /* write */ ""); + /* doc */ + "Generate note heads.", + + /* create */ + "NoteHead ", + + /* read */ + "middleCPosition " + "staffLineLayoutFunction ", + + /* write */ + "" + );