X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-engraver.cc;h=a3447ccce7175cdceaffd377ac45aa7c4510815e;hb=9e69cb84d6ee5b0a861cd97869b10e3bdf0c833c;hp=39b0a973ffb7b719efec4f054c5e5a3fd055a540;hpb=eb66ec523c4af50dbf86c569ab423668ca790ee0;p=lilypond.git diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc index 39b0a973ff..a3447ccce7 100644 --- a/lily/text-engraver.cc +++ b/lily/text-engraver.cc @@ -1,144 +1,129 @@ -/* - text-engraver.cc -- implement Text_engraver - +/* + text-engraver.cc -- implement Text_engraver + source file of the GNU LilyPond music typesetter - - (c) 1998--2002 Han-Wen Nienhuys - - */ + (c) 1998--2006 Han-Wen Nienhuys +*/ +#include "directional-element-interface.hh" #include "engraver.hh" +#include "rhythmic-head.hh" #include "side-position-interface.hh" -#include "item.hh" -#include "musical-request.hh" #include "stem.hh" -#include "rhythmic-head.hh" +#include "stream-event.hh" +#include "text-interface.hh" +#include "item.hh" +#include "translator.icc" /** typeset directions that are plain text. - */ +*/ class Text_engraver : public Engraver { - Link_array reqs_; - Link_array texts_; + vector evs_; + vector texts_; public: - TRANSLATOR_DECLARATIONS(Text_engraver); + TRANSLATOR_DECLARATIONS (Text_engraver); protected: - virtual bool try_music (Music* m); - virtual void stop_translation_timestep (); - virtual void start_translation_timestep (); - virtual void create_grobs (); - virtual void acknowledge_grob (Grob_info); + void stop_translation_timestep (); + void process_acknowledged (); + + DECLARE_TRANSLATOR_LISTENER (text_script); + DECLARE_ACKNOWLEDGER (stem_tremolo); + DECLARE_ACKNOWLEDGER (stem); + DECLARE_ACKNOWLEDGER (rhythmic_head); }; -bool -Text_engraver::try_music (Music *m) +IMPLEMENT_TRANSLATOR_LISTENER (Text_engraver, text_script); +void +Text_engraver::listen_text_script (Stream_event *ev) { - if (dynamic_cast (m) - && m->get_mus_property ("text-type") != ly_symbol2scm ("finger") - && m->get_mus_property ("text-type") != ly_symbol2scm ("dynamic")) - { - reqs_.push (dynamic_cast (m)); - return true; - } - return false; + evs_.push_back (ev); } void -Text_engraver::acknowledge_grob (Grob_info inf) +Text_engraver::acknowledge_rhythmic_head (Grob_info inf) { - if (Rhythmic_head::has_interface (inf.grob_l_)) - { - for (int i=0; i < texts_.size (); i++) - { - Grob*t = texts_[i]; - Side_position_interface::add_support (t,inf.grob_l_); - - /* - ugh. - */ - if (Side_position_interface::get_axis (t) == X_AXIS - && !t->get_parent (Y_AXIS)) - t->set_parent (inf.grob_l_, Y_AXIS); - else if (Side_position_interface::get_axis (t) == Y_AXIS - && !t->get_parent (X_AXIS)) - t->set_parent (inf.grob_l_, X_AXIS); - } - } - - if (Stem::has_interface (inf.grob_l_)) + for (vsize i = 0; i < texts_.size (); i++) { - for (int i=0; i < texts_.size (); i++) - { - Side_position_interface::add_support (texts_[i],inf.grob_l_); - } + Grob *t = texts_[i]; + Side_position_interface::add_support (t, inf.grob ()); + + /* + ugh. + */ + if (Side_position_interface::get_axis (t) == X_AXIS + && !t->get_parent (Y_AXIS)) + t->set_parent (inf.grob (), Y_AXIS); + else if (Side_position_interface::get_axis (t) == Y_AXIS + && !t->get_parent (X_AXIS)) + t->set_parent (inf.grob (), X_AXIS); } } void -Text_engraver::create_grobs () +Text_engraver::acknowledge_stem (Grob_info inf) +{ + for (vsize i = 0; i < texts_.size (); i++) + Side_position_interface::add_support (texts_[i], inf.grob ()); +} + +void +Text_engraver::acknowledge_stem_tremolo (Grob_info info) +{ + for (vsize i = 0; i < texts_.size (); i++) + Side_position_interface::add_support (texts_[i], info.grob ()); +} + +void +Text_engraver::process_acknowledged () { if (texts_.size ()) return; - for (int i=0; i < reqs_.size (); i++) + for (vsize i = 0; i < evs_.size (); i++) { - Text_script_req * r = reqs_[i]; - + Stream_event *r = evs_[i]; + // URG: Text vs TextScript - String basic = "TextScript"; + Item *text = make_item ("TextScript", r->self_scm ()); - Item *text = new Item (get_property (basic.ch_C ())); + int priority = robust_scm2int (text->get_property ("script-priority"), + 200); - /* - FIXME -> need to use basic props. - */ - SCM axisprop = get_property ("scriptHorizontal"); - - Axis ax = to_boolean (axisprop) ? X_AXIS : Y_AXIS; - Side_position_interface::set_axis (text, ax); + /* see script-engraver.cc */ + priority += i; - /* - make sure they're in order by adding i to the priority field. - */ - text->set_grob_property ("script-priority", - gh_int2scm (200 + i)); - - if (r->get_direction ()) - Side_position_interface::set_direction (text, r->get_direction ()); - - text->set_grob_property ("text", r->get_mus_property ("text")); - announce_grob (text, r->self_scm ()); - texts_.push (text); + text->set_property ("script-priority", scm_from_int (priority)); + + Direction dir = to_dir (r->get_property ("direction")); + if (dir) + set_grob_direction (text, dir); + + SCM mark = r->get_property ("text"); + + text->set_property ("text", mark); + texts_.push_back (text); } } void Text_engraver::stop_translation_timestep () { - for (int i=0; i < texts_.size (); i++) - { - Item *ti = texts_[i]; - if (!to_boolean (get_property ("scriptHorizontal"))) - Side_position_interface::add_staff_support (ti); - typeset_grob (ti); - } texts_.clear (); + evs_.clear (); } -void -Text_engraver::start_translation_timestep () +Text_engraver::Text_engraver () { - reqs_.clear (); } - -Text_engraver::Text_engraver(){} - -ENTER_DESCRIPTION(Text_engraver, -/* descr */ "Create text-scripts", -/* creats*/ "TextScript", -/* acks */ "rhythmic-head-interface stem-interface", -/* reads */ "scriptHorizontal", -/* write */ ""); +ADD_ACKNOWLEDGER (Text_engraver, stem); +ADD_ACKNOWLEDGER (Text_engraver, stem_tremolo); +ADD_ACKNOWLEDGER (Text_engraver, rhythmic_head); +ADD_TRANSLATOR (Text_engraver, + /* doc */ "Create text-scripts", + /* create */ "TextScript", + /* read */ "", + /* write */ "");