X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-engraver.cc;h=ed9473e000d3213ad08b762506a7b75b2572f7b9;hb=a2991295b2c1fb36bec19de207161855ca3c1756;hp=718845c75577dedb6cdeec3b720f85f76876174a;hpb=875cf3061b68867a109cdaf52c93be868a3e01be;p=lilypond.git diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc index 718845c755..ed9473e000 100644 --- a/lily/text-engraver.cc +++ b/lily/text-engraver.cc @@ -3,18 +3,18 @@ source file of the GNU LilyPond music typesetter - (c) 1998--1999 Han-Wen Nienhuys + (c) 1998--2001 Han-Wen Nienhuys */ -#include "dimension-cache.hh" + #include "engraver.hh" -#include "staff-side.hh" -#include "text-item.hh" +#include "side-position-interface.hh" +#include "item.hh" #include "musical-request.hh" -#include "note-head.hh" #include "stem.hh" -#include "staff-symbol.hh" +#include "rhythmic-head.hh" + /** typeset directions that are plain text. @@ -22,111 +22,140 @@ class Text_engraver : public Engraver { Link_array reqs_; - Link_array texts_; + Link_array texts_; public: - - VIRTUAL_COPY_CONS(Translator); + VIRTUAL_COPY_CONS (Translator); protected: - virtual bool do_try_music (Music* m); - virtual void do_pre_move_processing (); - virtual void do_post_move_processing (); - virtual void do_process_requests (); - virtual void acknowledge_element (Score_element_info); + 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); }; - bool -Text_engraver::do_try_music (Music *m) +Text_engraver::try_music (Music *m) { - if (Text_script_req *r = dynamic_cast (m)) + if (dynamic_cast (m) + && m->get_mus_property ("text-type") != ly_symbol2scm ("dynamic")) { - reqs_.push (r); + reqs_.push (dynamic_cast (m)); return true; } return false; } - void -Text_engraver::acknowledge_element (Score_element_info i) +Text_engraver::acknowledge_grob (Grob_info inf) { - if (Note_head *n = dynamic_cast (i.elem_l_)) + if (Rhythmic_head::has_interface (inf.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); + Grob*t = texts_[i]; + Side_position_interface::add_support (t,inf.elem_l_); + + /* + ugh. + */ + if (Side_position_interface::get_axis (t) == X_AXIS + && !t->parent_l (Y_AXIS)) + t->set_parent (inf.elem_l_, Y_AXIS); + else if (Side_position_interface::get_axis (t) == Y_AXIS + && !t->parent_l (X_AXIS)) + t->set_parent (inf.elem_l_, X_AXIS); } } - if (Stem *n = dynamic_cast (i.elem_l_)) + + if (Stem::has_interface (inf.elem_l_)) { for (int i=0; i < texts_.size (); i++) { - Side_position_interface st(texts_[i]); - st.add_support (n); + Side_position_interface::add_support (texts_[i],inf.elem_l_); } } } void -Text_engraver::do_process_requests () +Text_engraver::create_grobs () { + if (texts_.size ()) + return; for (int i=0; i < reqs_.size (); i++) { Text_script_req * r = reqs_[i]; + + // URG: Text vs TextScript + String basic = "TextScript"; + + if (r->get_mus_property ("text-type") == ly_symbol2scm ("finger")) + { + basic = "Fingering"; + } + + Item *text = new Item (get_property (basic.ch_C ())); - Text_item *text = new Text_item; - Side_position_interface stafy (text); + /* + 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); - SCM axisprop = get_property ("scriptHorizontal",0); - if (gh_boolean_p (axisprop) && gh_scm2bool (axisprop)) +#if 0 + if (r->style_str_ == "finger" && ax == Y_AXIS) { - stafy.set_axis (X_AXIS); - // text->set_parent (ss, Y_AXIS); + /* + nicely center the scripts. + */ + text->add_offset_callback (Side_position_interface::aligned_on_self_proc, X_AXIS); + text->add_offset_callback (Side_position_interface::centered_on_parent_proc, X_AXIS); } - else - stafy.set_axis (Y_AXIS); +#endif - text->set_elt_property ("script-priority", - gh_int2scm (200)); - if (r->get_direction ()) - stafy.set_direction (r->get_direction ()); - text->text_str_ = r->text_str_; + /* + 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 ()); - if (r->style_str_.length_i ()) - text->set_elt_property ("style", ly_str02scm (r->style_str_.ch_C())); + text->set_grob_property ("text", r->get_mus_property ("text")); - SCM empty = get_property ("textEmptyDimension", 0); - if (gh_boolean_p (empty) && gh_scm2bool (empty)) - { - text->set_empty (true, X_AXIS); - } - - announce_element (Score_element_info (text, r)); + SCM nonempty = get_property ("textNonEmpty"); + if (to_boolean (nonempty)) + /* + empty text: signal that no rods should be applied. + */ + text->set_grob_property ("no-spacing-rods" , SCM_BOOL_F); + + announce_grob (text, r); texts_.push (text); } } void -Text_engraver::do_pre_move_processing () +Text_engraver::stop_translation_timestep () { for (int i=0; i < texts_.size (); i++) { - typeset_element (texts_[i]); + Item *ti = texts_[i]; + Side_position_interface::add_staff_support (ti); + typeset_grob (ti); } texts_.clear (); } void -Text_engraver::do_post_move_processing () +Text_engraver::start_translation_timestep () { reqs_.clear (); } -ADD_THIS_TRANSLATOR(Text_engraver); +ADD_THIS_TRANSLATOR (Text_engraver);