X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-spanner-engraver.cc;h=9c1ebdcf0f0f2a76e565e40c6366c39ca98c63f6;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=4f339eb92cf7e6238f943b788d17ff1b03c2bef2;hpb=005035fec14e578c6824a87517574888d655596a;p=lilypond.git diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc index 4f339eb92c..9c1ebdcf0f 100644 --- a/lily/text-spanner-engraver.cc +++ b/lily/text-spanner-engraver.cc @@ -3,153 +3,97 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Jan Nieuwenhuizen + (c) 2000--2008 Jan Nieuwenhuizen */ -#include "dimensions.hh" -#include "musical-request.hh" -#include "paper-column.hh" +#include "engraver.hh" + +#include "international.hh" #include "note-column.hh" -#include "item.hh" +#include "pointer-group-interface.hh" #include "side-position-interface.hh" -#include "engraver.hh" -#include "group-interface.hh" -#include "directional-element-interface.hh" -#include "translator-group.hh" -#include "axis-group-interface.hh" +#include "spanner.hh" +#include "stream-event.hh" +#include "translator.icc" class Text_spanner_engraver : public Engraver { public: - VIRTUAL_COPY_CONS (Translator); - Text_spanner_engraver (); - + TRANSLATOR_DECLARATIONS (Text_spanner_engraver); protected: virtual void finalize (); - virtual void acknowledge_grob (Grob_info); - virtual bool try_music (Music *); - virtual void stop_translation_timestep (); - virtual void start_translation_timestep (); - virtual void create_grobs (); + DECLARE_TRANSLATOR_LISTENER (text_span); + DECLARE_ACKNOWLEDGER (note_column); + void stop_translation_timestep (); + void process_music (); private: Spanner *span_; Spanner *finished_; - Span_req *current_req_; - Drul_array req_drul_; + Stream_event *current_event_; + Drul_array event_drul_; void typeset_all (); }; -ADD_THIS_TRANSLATOR (Text_spanner_engraver); - - Text_spanner_engraver::Text_spanner_engraver () { finished_ = 0; - current_req_ = 0; - span_ =0; - req_drul_[START] = 0; - req_drul_[STOP] = 0; + current_event_ = 0; + span_ = 0; + event_drul_[START] = 0; + event_drul_[STOP] = 0; } +IMPLEMENT_TRANSLATOR_LISTENER (Text_spanner_engraver, text_span); void -Text_spanner_engraver::start_translation_timestep () +Text_spanner_engraver::listen_text_span (Stream_event *ev) { - req_drul_[START] = 0; - req_drul_[STOP] = 0; -} - -bool -Text_spanner_engraver::try_music (Music *m) -{ - if (Span_req *s = dynamic_cast (m)) - { - String t = ly_scm2string (s->get_mus_property ("span-type")); - if (t == "abort") - { - req_drul_[LEFT] = 0; - req_drul_[RIGHT] = 0; - if (span_) - span_->suicide (); - span_ = 0; - } - else if (t == "text") - { - req_drul_[s->get_span_dir()] = s; - return true; - } - } - return false; + Direction d = to_dir (ev->get_property ("span-direction")); + ASSIGN_EVENT_ONCE (event_drul_[d], ev); } void -Text_spanner_engraver::create_grobs () +Text_spanner_engraver::process_music () { - if (req_drul_[STOP]) + if (event_drul_[STOP]) { if (!span_) - { - req_drul_[STOP]->origin ()->warning - (_ ("can't find start of text spanner")); - } + event_drul_[STOP]->origin ()->warning (_ ("cannot find start of text spanner")); else { - assert (!finished_); - Grob* e = unsmob_grob (get_property ("currentMusicalColumn")); - span_->set_bound (RIGHT, e); - finished_ = span_; + announce_end_grob (finished_, SCM_EOL); span_ = 0; - current_req_ = 0; - req_drul_[STOP] = 0; + current_event_ = 0; } } - if (req_drul_[START]) + if (event_drul_[START]) { - if (current_req_) - { - req_drul_[START]->origin ()->warning - (_ ("already have a text spanner")); - } + if (current_event_) + event_drul_[START]->origin ()->warning (_ ("already have a text spanner")); else { - current_req_ = req_drul_[START]; - span_ = new Spanner (get_property ("TextSpanner")); - - /* Ugh. Reset (de)cresc. specific properties */ - span_->set_grob_property ("outer", SCM_BOOL_T); - span_->set_grob_property ("if-text-padding", gh_double2scm (0)); - span_->set_grob_property ("width-correct", gh_double2scm (0)); - - Side_position::set_axis (span_, Y_AXIS); - Grob *e = unsmob_grob (get_property ("currentMusicalColumn")); - span_->set_bound (LEFT, e); - - announce_grob (span_, req_drul_[START]); - req_drul_[START] = 0; - } - } -} + current_event_ = event_drul_[START]; + span_ = make_spanner ("TextSpanner", event_drul_[START]->self_scm ()); -void -Text_spanner_engraver::acknowledge_grob (Grob_info info) -{ - if (span_ && Note_column::has_interface (info.elem_l_)) - { - Side_position::add_support (span_, info.elem_l_); - add_bound_item (span_, dynamic_cast (info.elem_l_)); + Side_position_interface::set_axis (span_, Y_AXIS); + event_drul_[START] = 0; + } } } void Text_spanner_engraver::typeset_all () -{ +{ if (finished_) { - Side_position::add_staff_support (finished_); - typeset_grob (finished_); + if (!finished_->get_bound (RIGHT)) + { + Grob *e = unsmob_grob (get_property ("currentMusicalColumn")); + finished_->set_bound (RIGHT, e); + } finished_ = 0; } } @@ -157,7 +101,15 @@ Text_spanner_engraver::typeset_all () void Text_spanner_engraver::stop_translation_timestep () { + if (span_ && !span_->get_bound (LEFT)) + { + Grob *e = unsmob_grob (get_property ("currentMusicalColumn")); + span_->set_bound (LEFT, e); + } + typeset_all (); + event_drul_[START] = 0; + event_drul_[STOP] = 0; } void @@ -166,9 +118,40 @@ Text_spanner_engraver::finalize () typeset_all (); if (span_) { - current_req_->origin ()->warning (_ ("unterminated text spanner")); + current_event_->origin ()->warning (_ ("unterminated text spanner")); span_->suicide (); span_ = 0; } } + +void +Text_spanner_engraver::acknowledge_note_column (Grob_info info) +{ + if (span_) { + Pointer_group_interface::add_grob (span_, + ly_symbol2scm ("note-columns"), + info.grob()); + add_bound_item (span_, info.grob ()); + } else if (finished_) { + Pointer_group_interface::add_grob (finished_, ly_symbol2scm ("note-columns"), + info.grob()); + add_bound_item (finished_, info.grob ()); + } +} + +ADD_ACKNOWLEDGER (Text_spanner_engraver, note_column); + +ADD_TRANSLATOR (Text_spanner_engraver, + /* doc */ + "Create text spanner from an event.", + + /* create */ + "TextSpanner ", + + /* read */ + "", + + /* write */ + "" + );