X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-engraver.cc;h=1766ac64b710a3a5c937af577d776033ac360876;hb=f07f18bef861d6afa48b941b7579079d5d40df80;hp=cb668b414608a00662aede9453005f015fcdaa9b;hpb=94189ec2b8da6d7e89dc619c646a927adead9b19;p=lilypond.git diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc index cb668b4146..1766ac64b7 100644 --- a/lily/text-engraver.cc +++ b/lily/text-engraver.cc @@ -1,45 +1,40 @@ -/* - text-engraver.cc -- implement Text_engraver - +/* + text-engraver.cc -- implement Text_engraver + source file of the GNU LilyPond music typesetter - - (c) 1998--2001 Han-Wen Nienhuys - - */ + (c) 1998--2005 Han-Wen Nienhuys +*/ +#include "directional-element-interface.hh" #include "engraver.hh" #include "side-position-interface.hh" -#include "item.hh" -#include "musical-request.hh" #include "stem.hh" #include "rhythmic-head.hh" - +#include "text-interface.hh" /** typeset directions that are plain text. - */ +*/ class Text_engraver : public Engraver { - Link_array reqs_; + Link_array evs_; Link_array texts_; public: - VIRTUAL_COPY_CONS(Translator); + TRANSLATOR_DECLARATIONS (Text_engraver); protected: - virtual bool try_music (Music* m); + virtual bool try_music (Music *m); virtual void stop_translation_timestep (); - virtual void start_translation_timestep (); - virtual void create_grobs (); + virtual void process_acknowledged_grobs (); virtual void acknowledge_grob (Grob_info); }; bool 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)); + evs_.push (m); return true; } return false; @@ -48,93 +43,67 @@ Text_engraver::try_music (Music *m) void 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++) + for (int i = 0; i < texts_.size (); i++) { - Grob*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++) + 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::create_grobs () +Text_engraver::process_acknowledged_grobs () { if (texts_.size ()) return; - for (int i=0; i < reqs_.size (); i++) + for (int i = 0; i < evs_.size (); i++) { - Text_script_req * r = reqs_[i]; - + Music *r = evs_[i]; + // URG: Text vs TextScript - String basic = "TextScript"; + Item *text = make_item ("TextScript", r->self_scm ()); - if (r->get_mus_property ("text-type") == ly_symbol2scm ("finger")) - { - basic = "Fingering"; - } + Axis ax = Y_AXIS; + Side_position_interface::set_axis (text, ax); - Item *text = new Item (get_property (basic.ch_C ())); + // Hmm + int priority = 200; + SCM s = text->get_property ("script-priority"); + if (scm_is_number (s)) + priority = scm_to_int (s); - /* - 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); + /* see script-engraver.cc */ + priority += i; -#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_grob_property ("script-priority", - gh_int2scm (200 + i)); - - if (r->get_direction ()) - Side_position::set_direction (text, r->get_direction ()); - - text->set_grob_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_grob_property ("no-spacing-rods" , SCM_BOOL_F); - - announce_grob (text, r); + text->set_property ("script-priority", scm_int2num (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 (text); } } @@ -142,20 +111,18 @@ Text_engraver::create_grobs () void Text_engraver::stop_translation_timestep () { - for (int i=0; i < texts_.size (); i++) - { - Item *ti = texts_[i]; - Side_position::add_staff_support (ti); - typeset_grob (ti); - } texts_.clear (); + evs_.clear (); } -void -Text_engraver::start_translation_timestep () +Text_engraver::Text_engraver () { - reqs_.clear (); } -ADD_THIS_TRANSLATOR(Text_engraver); - +ADD_TRANSLATOR (Text_engraver, + /* descr */ "Create text-scripts", + /* creats*/ "TextScript", + /* accepts */ "text-script-event", + /* acks */ "rhythmic-head-interface stem-interface", + /* reads */ "", + /* write */ "");