X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-engraver.cc;h=a3447ccce7175cdceaffd377ac45aa7c4510815e;hb=d30cc154540a6596290f85ec14510c90233bd1b1;hp=ad69deef943190671c4744386da9e3d3dcdd083d;hpb=fbb6d20e9f58d691ffe845284cbb4d8bacf9ca60;p=lilypond.git diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc index ad69deef94..a3447ccce7 100644 --- a/lily/text-engraver.cc +++ b/lily/text-engraver.cc @@ -1,134 +1,129 @@ -/* - text-engraver.cc -- implement Text_engraver - +/* + text-engraver.cc -- implement Text_engraver + source file of the GNU LilyPond music typesetter - - (c) 1998--2000 Han-Wen Nienhuys - - */ -#include "dimension-cache.hh" + (c) 1998--2006 Han-Wen Nienhuys +*/ + +#include "directional-element-interface.hh" #include "engraver.hh" +#include "rhythmic-head.hh" #include "side-position-interface.hh" -#include "text-item.hh" -#include "musical-request.hh" -#include "note-head.hh" #include "stem.hh" -#include "staff-symbol.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: - - VIRTUAL_COPY_CONS(Translator); + TRANSLATOR_DECLARATIONS (Text_engraver); protected: - virtual bool do_try_music (Music* m); - virtual void do_pre_move_processing (); - virtual void do_post_move_processing (); - virtual void do_process_music (); - virtual void acknowledge_element (Score_element_info); + void stop_translation_timestep (); + void process_acknowledged (); + + DECLARE_TRANSLATOR_LISTENER (text_script); + DECLARE_ACKNOWLEDGER (stem_tremolo); + DECLARE_ACKNOWLEDGER (stem); + DECLARE_ACKNOWLEDGER (rhythmic_head); }; +IMPLEMENT_TRANSLATOR_LISTENER (Text_engraver, text_script); +void +Text_engraver::listen_text_script (Stream_event *ev) +{ + evs_.push_back (ev); +} -bool -Text_engraver::do_try_music (Music *m) +void +Text_engraver::acknowledge_rhythmic_head (Grob_info inf) { - if (Text_script_req *r = dynamic_cast (m)) + for (vsize i = 0; i < texts_.size (); i++) { - reqs_.push (r); - return true; + 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); } - return false; } - void -Text_engraver::acknowledge_element (Score_element_info i) +Text_engraver::acknowledge_stem (Grob_info inf) { - if (Note_head *n = dynamic_cast (i.elem_l_)) - { - for (int i=0; i < texts_.size (); i++) - { - Side_position_interface st (texts_[i]); - st.add_support (n); - if (st.get_axis( ) == X_AXIS - && !texts_[i]->parent_l (Y_AXIS)) - texts_[i]->set_parent (n, Y_AXIS); - } - } - if (Stem *n = dynamic_cast (i.elem_l_)) - { - for (int i=0; i < texts_.size (); i++) - { - Side_position_interface st(texts_[i]); - st.add_support (n); - } - } + for (vsize i = 0; i < texts_.size (); i++) + Side_position_interface::add_support (texts_[i], inf.grob ()); } void -Text_engraver::do_process_music () +Text_engraver::acknowledge_stem_tremolo (Grob_info info) { - for (int i=0; i < reqs_.size (); i++) - { - Text_script_req * r = reqs_[i]; - - Text_item *text = new Text_item; - Side_position_interface stafy (text); - - SCM axisprop = get_property ("scriptHorizontal"); - if (to_boolean (axisprop)) - { - stafy.set_axis (X_AXIS); - // text->set_parent (ss, Y_AXIS); - } - else - stafy.set_axis (Y_AXIS); - - text->set_elt_property ("script-priority", - gh_int2scm (200)); - - if (r->get_direction ()) - stafy.set_direction (r->get_direction ()); - - text->set_elt_property ("text", - ly_str02scm ( r->text_str_.ch_C ())); - - if (r->style_str_.length_i ()) - text->set_elt_property ("style", ly_str02scm (r->style_str_.ch_C())); - - SCM empty = get_property ("textEmptyDimension"); - if (to_boolean (empty)) - { - text->set_empty (X_AXIS); - } - - announce_element (Score_element_info (text, r)); - texts_.push (text); - } + for (vsize i = 0; i < texts_.size (); i++) + Side_position_interface::add_support (texts_[i], info.grob ()); } void -Text_engraver::do_pre_move_processing () +Text_engraver::process_acknowledged () { - for (int i=0; i < texts_.size (); i++) + if (texts_.size ()) + return; + for (vsize i = 0; i < evs_.size (); i++) { - side_position (texts_[i]).add_staff_support (); - typeset_element (texts_[i]); + Stream_event *r = evs_[i]; + + // URG: Text vs TextScript + Item *text = make_item ("TextScript", r->self_scm ()); + + int priority = robust_scm2int (text->get_property ("script-priority"), + 200); + + /* see script-engraver.cc */ + priority += i; + + 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); } - texts_.clear (); } void -Text_engraver::do_post_move_processing () +Text_engraver::stop_translation_timestep () { - reqs_.clear (); + texts_.clear (); + evs_.clear (); } -ADD_THIS_TRANSLATOR(Text_engraver); +Text_engraver::Text_engraver () +{ +} +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 */ "");