X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-engraver.cc;h=a3447ccce7175cdceaffd377ac45aa7c4510815e;hb=9e69cb84d6ee5b0a861cd97869b10e3bdf0c833c;hp=79113f421e3ed9949ce7d535b756fb1fd563d9a1;hpb=103b4daf1ba90415029388126ce9f742b9cf62db;p=lilypond.git diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc index 79113f421e..a3447ccce7 100644 --- a/lily/text-engraver.cc +++ b/lily/text-engraver.cc @@ -1,162 +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 - - */ + (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: - 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); }; -bool -Text_engraver::do_try_music (Music *m) +IMPLEMENT_TRANSLATOR_LISTENER (Text_engraver, text_script); +void +Text_engraver::listen_text_script (Stream_event *ev) { - if (Text_script_req *r = dynamic_cast (m)) - { - reqs_.push (r); - return true; - } - return false; + evs_.push_back (ev); } void -Text_engraver::acknowledge_element (Score_element_info inf) +Text_engraver::acknowledge_rhythmic_head (Grob_info inf) { - if (Rhythmic_head::has_interface (inf.elem_l_)) + for (vsize i = 0; i < texts_.size (); i++) { - for (int i=0; i < texts_.size (); i++) - { - Score_element*t = texts_[i]; - Side_position::add_support (t,inf.elem_l_); - - /* - ugh. - */ - if (Side_position::get_axis( t) == X_AXIS - && !t->parent_l (Y_AXIS)) - t->set_parent (inf.elem_l_, Y_AXIS); - else if (Side_position::get_axis(t) == Y_AXIS - && !t->parent_l (X_AXIS)) - t->set_parent (inf.elem_l_, X_AXIS); - } - } - - if (Stem::has_interface (inf.elem_l_)) - { - for (int i=0; i < texts_.size (); i++) - { - Side_position::add_support(texts_[i],inf.elem_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::do_process_music () +Text_engraver::acknowledge_stem (Grob_info inf) { - for (int i=0; i < reqs_.size (); i++) - { - Text_script_req * r = reqs_[i]; - - // URG: Text vs TextScript - String basic = "TextScript"; - -#if 0 - // maybe use some sort of TYPE for script/dynamic/finger? - - // separate engraver? - if (r->style_str_== "finger") - { - basic = "Fingering"; - } -#endif - Item *text = new Item (get_property (basic.ch_C ())); + for (vsize i = 0; i < texts_.size (); i++) + Side_position_interface::add_support (texts_[i], inf.grob ()); +} - /* - FIXME -> need to use basic props. - */ - SCM axisprop = get_property ("scriptHorizontal"); - - Axis ax = to_boolean (axisprop) ? X_AXIS : Y_AXIS; - Side_position::set_axis (text, ax); - -#if 0 - if (r->style_str_ == "finger" && ax == Y_AXIS) - { - /* - nicely center the scripts. - */ - text->add_offset_callback (Side_position::aligned_on_self_proc, X_AXIS); - text->add_offset_callback (Side_position::centered_on_parent_proc, X_AXIS); - } -#endif - - - - /* - make sure they're in order by adding i to the priority field. - */ - text->set_elt_property ("script-priority", - gh_int2scm (200 + i)); - - if (r->get_direction ()) - Side_position::set_direction (text, r->get_direction ()); - - text->set_elt_property ("text", r->text_); - - SCM nonempty = get_property ("textNonEmpty"); - if (to_boolean (nonempty)) - /* - empty text: signal that no rods should be applied. - */ - text->set_elt_property ("no-spacing-rods" , SCM_BOOL_F); - - announce_element (text, r); - texts_.push (text); - } +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::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++) { - Item *ti = texts_[i]; - Side_position::add_staff_support (ti); - typeset_element (ti); + 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 */ "");