X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-engraver.cc;h=270855febde233ecc7d34f52f5b592d0430bc7f1;hb=bb8e85cd462106714a69afcdf89d94cafe48a6b2;hp=39a732cc01fe4d6c2c17068a77dd67a07414ac8c;hpb=bc95f4434f760d41191341ab4508b2064eb19025;p=lilypond.git diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc index 39a732cc01..270855febd 100644 --- a/lily/text-engraver.cc +++ b/lily/text-engraver.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1998--2010 Han-Wen Nienhuys + Copyright (C) 1998--2011 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 @@ -19,12 +19,10 @@ #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" @@ -34,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); }; @@ -52,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]; @@ -78,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 (); }