X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-engraver.cc;h=62a81ce2b21e4b9d9be23a45854b73e6cd18c193;hb=bbd89dfe7865636f9fb1eccf9326db4831f632e8;hp=723e111741e04760f4bac5cde99403b68eb8f5cf;hpb=d765f3af45be51f15da55cf570a4b172200e1035;p=lilypond.git diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc index 723e111741..62a81ce2b2 100644 --- a/lily/text-engraver.cc +++ b/lily/text-engraver.cc @@ -1,120 +1,115 @@ -/* - text-engraver.cc -- implement Text_engraver - +/* + text-engraver.cc -- implement Text_engraver + source file of the GNU LilyPond music typesetter - - (c) 1998--2002 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: - TRANSLATOR_DECLARATIONS(Text_engraver); + TRANSLATOR_DECLARATIONS (Text_engraver); protected: - virtual bool try_music (Music* m); - virtual void stop_translation_timestep (); - virtual void start_translation_timestep (); - virtual void process_acknowledged_grobs (); - virtual void acknowledge_grob (Grob_info); + virtual bool try_music (Music *m); + void stop_translation_timestep (); + void process_acknowledged (); + + DECLARE_ACKNOWLEDGER (stem_tremolo); + DECLARE_ACKNOWLEDGER (stem); + DECLARE_ACKNOWLEDGER (rhythmic_head); }; bool Text_engraver::try_music (Music *m) { - if (dynamic_cast (m) - && m->get_mus_property ("text-type") != ly_symbol2scm ("finger") - && 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; } void -Text_engraver::acknowledge_grob (Grob_info inf) +Text_engraver::acknowledge_rhythmic_head (Grob_info inf) { - 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_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); - } - } - - if (Stem::has_interface (inf.grob_)) - { - for (int i=0; i < texts_.size (); i++) - { - Side_position_interface::add_support (texts_[i],inf.grob_); - } + 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::process_acknowledged_grobs () +Text_engraver::acknowledge_stem (Grob_info inf) +{ + for (int i = 0; i < texts_.size (); i++) + Side_position_interface::add_support (texts_[i], inf.grob ()); +} + +void +Text_engraver::acknowledge_stem_tremolo (Grob_info info) +{ + for (int i = 0; i < texts_.size (); i++) + Side_position_interface::add_support (texts_[i], info.grob ()); +} + +void +Text_engraver::process_acknowledged () { 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]; - - // URG: Text vs TextScript - String basic = "TextScript"; + Music *r = evs_[i]; - Item *text = new Item (get_property (basic.to_str0 ())); + // URG: Text vs TextScript + Item *text = make_item ("TextScript", r->self_scm ()); - /* - FIXME -> need to use basic props. - */ - SCM axisprop = get_property ("scriptHorizontal"); - - Axis ax = to_boolean (axisprop) ? X_AXIS : Y_AXIS; + Axis ax = Y_AXIS; Side_position_interface::set_axis (text, ax); // Hmm int priority = 200; - SCM s = text->get_grob_property ("script-priority"); - if (gh_number_p (s)) - priority = gh_scm2int (s); - + SCM s = text->get_property ("script-priority"); + if (scm_is_number (s)) + priority = scm_to_int (s); + /* see script-engraver.cc */ priority += i; - - text->set_grob_property ("script-priority", gh_int2scm (priority)); - - if (r->get_direction ()) - Side_position_interface::set_direction (text, r->get_direction ()); - - text->set_grob_property ("text", r->get_mus_property ("text")); - announce_grob (text, r->self_scm ()); + + 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 (text); } } @@ -122,28 +117,22 @@ Text_engraver::process_acknowledged_grobs () void Text_engraver::stop_translation_timestep () { - for (int i=0; i < texts_.size (); i++) - { - Item *ti = texts_[i]; - if (!to_boolean (get_property ("scriptHorizontal"))) - Side_position_interface::add_staff_support (ti); - typeset_grob (ti); - } texts_.clear (); + evs_.clear (); } -void -Text_engraver::start_translation_timestep () +Text_engraver::Text_engraver () { - reqs_.clear (); } - -Text_engraver::Text_engraver(){} - -ENTER_DESCRIPTION(Text_engraver, -/* descr */ "Create text-scripts", -/* creats*/ "TextScript", -/* acks */ "rhythmic-head-interface stem-interface", -/* reads */ "scriptHorizontal", -/* write */ ""); +#include "translator.icc" + +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", + /* accept */ "text-script-event", + /* read */ "", + /* write */ "");