X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcustos-engraver.cc;h=6b915f5cb45114851b4a513730048dc6bfe126db;hb=32a34dcef0c0041c6d62677487a380b5c8b85712;hp=77e354d63222d96acb412f340a9c0f58854f77fc;hpb=8da6cef580cce3365b219f6aca429b434cb60fcf;p=lilypond.git diff --git a/lily/custos-engraver.cc b/lily/custos-engraver.cc index 77e354d632..6b915f5cb4 100644 --- a/lily/custos-engraver.cc +++ b/lily/custos-engraver.cc @@ -1,148 +1,160 @@ /* - custos-engraver.cc -- implement Custos_engraver + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2000--2012 Juergen Reuter , + Han-Wen Nienhuys - (C) 2000 Juergen Reuter , + 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. - Han-Wen Nienhuys - + 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" -#include "bar.hh" #include "item.hh" #include "note-head.hh" +#include "pitch.hh" #include "staff-symbol-referencer.hh" +#include "stream-event.hh" #include "warn.hh" -#include "musical-request.hh" + +#include "translator.icc" /* - This class implements an engraver for custos symbols. -*/ + * This class implements an engraver for custos symbols. + * + * FIXME: note heads inside of ligatures (i.e. ligature heads) are + * sometimes not recognized by this engraver. --jr + */ class Custos_engraver : public Engraver { public: - Custos_engraver(); - virtual void do_post_move_processing(); - virtual void acknowledge_element(Score_element_info); - virtual void do_process_music (); - virtual void process_acknowledged (); - virtual void do_pre_move_processing (); - virtual void do_removal_processing (); - VIRTUAL_COPY_CONS(Translator); + TRANSLATOR_DECLARATIONS (Custos_engraver); + void start_translation_timestep (); + DECLARE_ACKNOWLEDGER (bar); + DECLARE_ACKNOWLEDGER (note_head); + void process_acknowledged (); + void stop_translation_timestep (); + virtual void finalize (); private: - Item * create_custos(); - bool custos_permitted; - Link_array custos_arr_; - Array pitches_; + Item *create_custos (); + bool custos_permitted_; + vector custodes_; + vector pitches_; }; Custos_engraver::Custos_engraver () { - custos_permitted = false; + custos_permitted_ = false; } - void -Custos_engraver::do_pre_move_processing() +Custos_engraver::stop_translation_timestep () { /* delay typeset until we're at the next moment, so we can silence custodes at the end of the piece. - */ + */ + pitches_.clear (); + + custos_permitted_ = false; } void -Custos_engraver::do_post_move_processing () +Custos_engraver::start_translation_timestep () { - for (int i = custos_arr_.size (); i--;) - { - typeset_element (custos_arr_[i]); - } - custos_arr_.clear (); - pitches_.clear (); - - custos_permitted = false; + custodes_.clear (); } - -/* - TODO check if this works with forced bar lines? - */ void -Custos_engraver::do_process_music () +Custos_engraver::acknowledge_bar (Grob_info /* info */) { - if (gh_string_p (get_property( "whichBar"))) - custos_permitted = true; + custos_permitted_ = true; } void -Custos_engraver::acknowledge_element (Score_element_info info) +Custos_engraver::acknowledge_note_head (Grob_info info) { - Item *item = dynamic_cast (info.elem_l_); - if (item) + Stream_event *ev = info.event_cause (); + if (ev && ev->in_event_class ("note-event")) { - if (Bar::has_interface (info.elem_l_)) - custos_permitted = true; - else if (Note_head::has_interface (info.elem_l_)) - { - - /* - ideally, we'd do custos->set_parent (Y_AXIS, notehead), - but since the note head lives on the other system, we can't - - So we copy the position from the note head pitch. We - don't look at the staff-position, since we can't be sure - whether Clef_engraver already applied a vertical shift. - */ - Note_req * nr = dynamic_cast (info.req_l_); - if (nr) - pitches_.push (*unsmob_pitch (nr->get_mus_property ("pitch"))); - } + + /* + ideally, we'd do custos->set_parent (Y_AXIS, notehead), + but since the note head lives on the other system, we can't + + So we copy the position from the note head pitch. We + don't look at the staff-position, since we can't be sure + whether Clef_engraver already applied a vertical shift. + */ + pitches_.push_back (*unsmob_pitch (ev->get_property ("pitch"))); } } void Custos_engraver::process_acknowledged () { - if (custos_permitted) + if (scm_is_string (get_property ("whichBar"))) + custos_permitted_ = true; + + if (custos_permitted_) { - for (int i = pitches_.size (); i--;) - { - Item *c = create_custos (); - - c->set_elt_property ("staff-position", - gh_int2scm (pitches_[i].steps ())); - - } + for (vsize i = pitches_.size (); i--;) + { + Item *c = create_custos (); + + int p = pitches_[i].steps (); + SCM c0 = get_property ("middleCPosition"); + if (scm_is_number (c0)) + p += scm_to_int (c0); + + c->set_property ("staff-position", + scm_from_int (p)); + } pitches_.clear (); } } -Item* -Custos_engraver::create_custos() +Item * +Custos_engraver::create_custos () { - SCM basicProperties = get_property ("Custos"); - Item* custos = new Item (basicProperties); - - announce_element (custos, 0); - custos_arr_.push (custos); - + Item *custos = make_item ("Custos", SCM_EOL); + + custodes_.push_back (custos); + return custos; } void -Custos_engraver::do_removal_processing () +Custos_engraver::finalize () { - for (int i = custos_arr_.size (); i--;) - { - custos_arr_[i]->suicide (); - typeset_element (custos_arr_[i]); - } - custos_arr_.clear (); + for (vsize i = custodes_.size (); i--;) + custodes_[i]->suicide (); + custodes_.clear (); } -ADD_THIS_TRANSLATOR (Custos_engraver); +ADD_ACKNOWLEDGER (Custos_engraver, bar); +ADD_ACKNOWLEDGER (Custos_engraver, note_head); + +ADD_TRANSLATOR (Custos_engraver, + /* doc */ + "Engrave custodes.", + + /* create */ + "Custos ", + + /* read */ + "", + /* write */ + "" + );