X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-engraver.cc;fp=lily%2Ftext-engraver.cc;h=270855febde233ecc7d34f52f5b592d0430bc7f1;hb=941dff9d2a67080e0dd8474f1e70f0c72ace6424;hp=f27a74bf84fa50bf79c6f41ed73459a37697aa39;hpb=5a22d6233a39d3164e1ca043244794c268be4ad0;p=lilypond.git diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc index f27a74bf84..270855febd 100644 --- a/lily/text-engraver.cc +++ b/lily/text-engraver.cc @@ -1,19 +1,28 @@ /* - text-engraver.cc -- implement Text_engraver + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1998--2011 Han-Wen Nienhuys - (c) 1998--2009 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 "directional-element-interface.hh" #include "engraver.hh" -#include "rhythmic-head.hh" +#include "item.hh" #include "side-position-interface.hh" -#include "stem.hh" #include "stream-event.hh" #include "text-interface.hh" -#include "item.hh" #include "translator.icc" @@ -23,12 +32,11 @@ class Text_engraver : public Engraver { vector evs_; - vector texts_; public: TRANSLATOR_DECLARATIONS (Text_engraver); protected: void stop_translation_timestep (); - void process_acknowledged (); + void process_music (); DECLARE_TRANSLATOR_LISTENER (text_script); }; @@ -41,10 +49,8 @@ Text_engraver::listen_text_script (Stream_event *ev) } void -Text_engraver::process_acknowledged () +Text_engraver::process_music () { - if (texts_.size ()) - return; for (vsize i = 0; i < evs_.size (); i++) { Stream_event *r = evs_[i]; @@ -67,14 +73,12 @@ Text_engraver::process_acknowledged () SCM mark = r->get_property ("text"); text->set_property ("text", mark); - texts_.push_back (text); } } void Text_engraver::stop_translation_timestep () { - texts_.clear (); evs_.clear (); }