X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcustos-engraver.cc;h=0ebb45cd8c2dc5cbc3999e6ccfa8ebe0ee6a65a9;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=ed50050923d1a61dda4c84ab526382ea0923b866;hpb=2745cbd907f8216a4cc1fc5f488ae19efdfdbd10;p=lilypond.git diff --git a/lily/custos-engraver.cc b/lily/custos-engraver.cc index ed50050923..0ebb45cd8c 100644 --- a/lily/custos-engraver.cc +++ b/lily/custos-engraver.cc @@ -1,19 +1,32 @@ /* - 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--2014 Juergen Reuter , + Han-Wen Nienhuys - (c) 2000--2003 Juergen Reuter , - 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" -#include "bar-line.hh" #include "item.hh" #include "note-head.hh" +#include "pitch.hh" #include "staff-symbol-referencer.hh" +#include "stream-event.hh" #include "warn.hh" -#include "event.hh" + +#include "translator.icc" /* * This class implements an engraver for custos symbols. @@ -24,132 +37,124 @@ class Custos_engraver : public Engraver { public: -TRANSLATOR_DECLARATIONS( Custos_engraver); - virtual void start_translation_timestep (); - virtual void acknowledge_grob (Grob_info); - virtual void process_acknowledged_grobs (); - virtual void stop_translation_timestep (); + 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 custodes_; - 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::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::start_translation_timestep () { - for (int i = custodes_.size (); i--;) - { - typeset_grob (custodes_[i]); - } custodes_.clear (); - pitches_.clear (); - - custos_permitted = false; } +void +Custos_engraver::acknowledge_bar (Grob_info /* info */) +{ + custos_permitted_ = true; +} void -Custos_engraver::acknowledge_grob (Grob_info info) +Custos_engraver::acknowledge_note_head (Grob_info info) { - Item *item = dynamic_cast (info.grob_); - if (item) + Stream_event *ev = info.event_cause (); + if (ev && ev->in_event_class ("note-event")) { - Music * m = info.music_cause(); - if (Bar_line::has_interface (info.grob_)) - custos_permitted = true; - else if (Note_head::has_interface (info.grob_) - && m - && m->is_mus_type ("note-event")) - { - - /* - 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 (*unsmob_pitch (m->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_grobs () +Custos_engraver::process_acknowledged () { - if (gh_string_p (get_property ("whichBar"))) - custos_permitted = true; - - 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 (); + for (vsize i = pitches_.size (); i--;) + { + Item *c = create_custos (); - int p = pitches_[i].steps (); - SCM c0 = get_property ("centralCPosition"); - if (gh_number_p (c0)) - p += gh_scm2int (c0); + int p = pitches_[i].steps (); + SCM c0 = get_property ("middleCPosition"); + if (scm_is_number (c0)) + p += scm_to_int (c0); - - c->set_grob_property ("staff-position", - gh_int2scm (p)); - - } + c->set_property ("staff-position", + scm_from_int (p)); + } pitches_.clear (); } } -Item* +Item * Custos_engraver::create_custos () { - SCM basicProperties = get_property ("Custos"); - Item* custos = new Item (basicProperties); - - announce_grob(custos, SCM_EOL); - custodes_.push (custos); - + Item *custos = make_item ("Custos", SCM_EOL); + + custodes_.push_back (custos); + return custos; } void Custos_engraver::finalize () { - for (int i = custodes_.size (); i--;) - { - custodes_[i]->suicide (); - typeset_grob (custodes_[i]); - } + for (vsize i = custodes_.size (); i--;) + custodes_[i]->suicide (); custodes_.clear (); } +ADD_ACKNOWLEDGER (Custos_engraver, bar); +ADD_ACKNOWLEDGER (Custos_engraver, note_head); + +ADD_TRANSLATOR (Custos_engraver, + /* doc */ + "Engrave custodes.", + + /* create */ + "Custos ", + /* read */ + "", -ENTER_DESCRIPTION(Custos_engraver, -/* descr */ "", -/* creats*/ "Custos", -/* accepts */ "", -/* acks */ "bar-line-interface note-head-interface", -/* reads */ "", -/* write */ ""); + /* write */ + "" + );