X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-engraver.cc;h=e87234978e2a9bc537c82cbd2583fe467df56ab5;hb=abd05b0ad0ccc4b63bb77ed128a8f28d5d48f330;hp=c18a61f614c9e023e440b0e031dc8f09934aa96c;hpb=5cbe821608ec464ea8f418cba15f012b9b1cad80;p=lilypond.git diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc index c18a61f614..e87234978e 100644 --- a/lily/text-engraver.cc +++ b/lily/text-engraver.cc @@ -3,17 +3,17 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Han-Wen Nienhuys + (c) 1998--2004 Han-Wen Nienhuys */ - - +#include "directional-element-interface.hh" #include "engraver.hh" #include "side-position-interface.hh" #include "item.hh" -#include "musical-request.hh" +#include "event.hh" #include "stem.hh" #include "rhythmic-head.hh" +#include "text-item.hh" /** @@ -21,139 +21,120 @@ */ class Text_engraver : public Engraver { - Link_array reqs_; + Link_array reqs_; Link_array 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); + virtual bool try_music (Music* m); + virtual void stop_translation_timestep (); + virtual void process_acknowledged_grobs (); + virtual void acknowledge_grob (Grob_info); }; bool -Text_engraver::do_try_music (Music *m) +Text_engraver::try_music (Music *m) { - if (dynamic_cast (m) - && m->get_mus_property ("text-type") != ly_symbol2scm ("dynamic")) + if (m->is_mus_type ("text-script-event")) { - reqs_.push (dynamic_cast (m)); + reqs_.push (m); return true; } return false; } void -Text_engraver::acknowledge_element (Score_element_info inf) +Text_engraver::acknowledge_grob (Grob_info inf) { - if (Rhythmic_head::has_interface (inf.elem_l_)) + if (Rhythmic_head::has_interface (inf.grob_)) { for (int i=0; i < texts_.size (); i++) { - Score_element*t = texts_[i]; - Side_position::add_support (t,inf.elem_l_); + Grob*t = texts_[i]; + Side_position_interface::add_support (t,inf.grob_); /* 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 (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); } } - if (Stem::has_interface (inf.elem_l_)) + if (Stem::has_interface (inf.grob_)) { for (int i=0; i < texts_.size (); i++) { - Side_position::add_support(texts_[i],inf.elem_l_); + Side_position_interface::add_support (texts_[i],inf.grob_); } } } void -Text_engraver::do_process_music () +Text_engraver::process_acknowledged_grobs () { + if (texts_.size ()) + return; for (int i=0; i < reqs_.size (); i++) { - Text_script_req * r = reqs_[i]; + Music * r = reqs_[i]; // URG: Text vs TextScript - String basic = "TextScript"; + Item *text = make_item ("TextScript"); - if (r->get_mus_property ("text-type") == ly_symbol2scm ("finger")) - { - basic = "Fingering"; - } + + Axis ax = Y_AXIS; + Side_position_interface::set_axis (text, ax); + + // Hmm + int priority = 200; + SCM s = text->get_property ("script-priority"); + if (gh_number_p (s)) + priority = gh_scm2int (s); + + /* see script-engraver.cc */ + priority += i; + + text->set_property ("script-priority", gh_int2scm (priority)); - Item *text = new Item (get_property (basic.ch_C ())); + Direction dir = to_dir (r->get_property ("direction")); + if (dir) + set_grob_direction (text, dir); - /* - 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 - + SCM mark = r->get_property ("text"); - - /* - 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->get_mus_property ("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); + text->set_property ("text", mark); + announce_grob (text, r->self_scm ()); texts_.push (text); } } void -Text_engraver::do_pre_move_processing () +Text_engraver::stop_translation_timestep () { for (int i=0; i < texts_.size (); i++) { Item *ti = texts_[i]; - Side_position::add_staff_support (ti); - typeset_element (ti); + typeset_grob (ti); } texts_.clear (); + reqs_.clear (); } -void -Text_engraver::do_post_move_processing () + +Text_engraver::Text_engraver () { - reqs_.clear (); } -ADD_THIS_TRANSLATOR(Text_engraver); - +ENTER_DESCRIPTION (Text_engraver, +/* descr */ "Create text-scripts", +/* creats*/ "TextScript", +/* accepts */ "text-script-event", +/* acks */ "rhythmic-head-interface stem-interface", +/* reads */ "", +/* write */ "");