X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-spanner-engraver.cc;h=52ad7201b1199d123b9ea274785c835a4bc61c20;hb=058370efc7e9710f149d0f444328bb1fcd7bdec1;hp=69f4c55c848da4fbd412681bbaf912e685f2e535;hpb=a7f82e4dc22fc6219a9fe0f6874f8c91e3f31f24;p=lilypond.git diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc index 69f4c55c84..52ad7201b1 100644 --- a/lily/text-spanner-engraver.cc +++ b/lily/text-spanner-engraver.cc @@ -1,14 +1,32 @@ /* - text-spanner-engraver.cc -- implement Text_spanner_engraver + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2000--2014 Jan Nieuwenhuizen - (c) 2000--2005 Jan Nieuwenhuizen + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ +#include "engraver.hh" + +#include "international.hh" #include "note-column.hh" +#include "pointer-group-interface.hh" #include "side-position-interface.hh" -#include "engraver.hh" +#include "spanner.hh" +#include "stream-event.hh" + +#include "translator.icc" class Text_spanner_engraver : public Engraver { @@ -16,86 +34,63 @@ public: TRANSLATOR_DECLARATIONS (Text_spanner_engraver); protected: virtual void finalize (); - virtual void acknowledge_grob (Grob_info); - virtual bool try_music (Music *); - PRECOMPUTED_VIRTUAL void stop_translation_timestep (); - PRECOMPUTED_VIRTUAL void process_music (); + DECLARE_TRANSLATOR_LISTENER (text_span); + DECLARE_ACKNOWLEDGER (note_column); + void stop_translation_timestep (); + void process_music (); private: Spanner *span_; Spanner *finished_; - Music *current_req_; - Drul_array req_drul_; + Stream_event *current_event_; + Drul_array event_drul_; void typeset_all (); }; Text_spanner_engraver::Text_spanner_engraver () { finished_ = 0; - current_req_ = 0; + current_event_ = 0; span_ = 0; - req_drul_[START] = 0; - req_drul_[STOP] = 0; + event_drul_.set (0, 0); } -bool -Text_spanner_engraver::try_music (Music *m) +IMPLEMENT_TRANSLATOR_LISTENER (Text_spanner_engraver, text_span); +void +Text_spanner_engraver::listen_text_span (Stream_event *ev) { - if (m->is_mus_type ("text-span-event")) - { - Direction d = to_dir (m->get_property ("span-direction")); - req_drul_[d] = m; - return true; - } - - return false; + Direction d = to_dir (ev->get_property ("span-direction")); + ASSIGN_EVENT_ONCE (event_drul_[d], ev); } void 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 - { - finished_ = span_; - span_ = 0; - current_req_ = 0; - } + { + finished_ = span_; + announce_end_grob (finished_, SCM_EOL); + span_ = 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_ = make_spanner ("TextSpanner", req_drul_[START]->self_scm ()); + { + current_event_ = event_drul_[START]; + span_ = make_spanner ("TextSpanner", event_drul_[START]->self_scm ()); - Side_position_interface::set_axis (span_, Y_AXIS); - req_drul_[START] = 0; - } - } -} - -void -Text_spanner_engraver::acknowledge_grob (Grob_info info) -{ - Spanner *spans[2] ={span_, finished_}; - for (int i = 0; i < 2; i++) - { - if (spans[i] && Note_column::has_interface (info.grob ())) - { - Side_position_interface::add_support (spans[i], info.grob ()); - add_bound_item (spans[i], dynamic_cast (info.grob ())); - } + Side_position_interface::set_axis (span_, Y_AXIS); + event_drul_[START] = 0; + } } } @@ -105,10 +100,10 @@ Text_spanner_engraver::typeset_all () if (finished_) { if (!finished_->get_bound (RIGHT)) - { - Grob *e = unsmob_grob (get_property ("currentMusicalColumn")); - finished_->set_bound (RIGHT, e); - } + { + Grob *e = unsmob_grob (get_property ("currentMusicalColumn")); + finished_->set_bound (RIGHT, e); + } finished_ = 0; } } @@ -123,8 +118,7 @@ Text_spanner_engraver::stop_translation_timestep () } typeset_all (); - req_drul_[START] = 0; - req_drul_[STOP] = 0; + event_drul_.set (0, 0); } void @@ -133,18 +127,45 @@ 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; } } -#include "translator.icc" +void +Text_spanner_engraver::acknowledge_note_column (Grob_info info) +{ + if (span_) + { + Pointer_group_interface::add_grob (span_, + ly_symbol2scm ("note-columns"), + info.grob ()); + if (!span_->get_bound (LEFT)) + add_bound_item (span_, info.grob ()); + } + else if (finished_) + { + Pointer_group_interface::add_grob (finished_, + ly_symbol2scm ("note-columns"), + info.grob ()); + if (!finished_->get_bound (RIGHT)) + add_bound_item (finished_, info.grob ()); + } +} + +ADD_ACKNOWLEDGER (Text_spanner_engraver, note_column); ADD_TRANSLATOR (Text_spanner_engraver, - /* descr */ "Create text spanner from a Music.", - /* creats*/ "TextSpanner", - /* accepts */ "text-span-event", - /* acks */ "note-column-interface", - /* reads */ "", - /* write */ ""); + /* doc */ + "Create text spanner from an event.", + + /* create */ + "TextSpanner ", + + /* read */ + "currentMusicalColumn ", + + /* write */ + "" + );