X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftrill-spanner-engraver.cc;h=d71743fbce04c44514111e84ad62a75647f8dab0;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=15e628510a6fac3cb41ae10afda4d73de4d17297;hpb=c7a23c5c727ce283c5a2e9fc44382d22c7728905;p=lilypond.git diff --git a/lily/trill-spanner-engraver.cc b/lily/trill-spanner-engraver.cc index 15e628510a..d71743fbce 100644 --- a/lily/trill-spanner-engraver.cc +++ b/lily/trill-spanner-engraver.cc @@ -1,9 +1,20 @@ /* - trill-spanner-engraver.cc -- implement Trill_spanner_engraver + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2000--2015 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 . */ /* @@ -13,9 +24,14 @@ automatically is the end of the trill? */ +#include "engraver.hh" + +#include "international.hh" #include "note-column.hh" +#include "pointer-group-interface.hh" #include "side-position-interface.hh" -#include "engraver.hh" +#include "stream-event.hh" +#include "spanner.hh" #include "translator.icc" @@ -25,16 +41,17 @@ public: TRANSLATOR_DECLARATIONS (Trill_spanner_engraver); protected: virtual void finalize (); - DECLARE_ACKNOWLEDGER(note_column); - virtual bool try_music (Music *); - PRECOMPUTED_VIRTUAL void stop_translation_timestep (); - PRECOMPUTED_VIRTUAL void process_music (); + DECLARE_TRANSLATOR_LISTENER (trill_span); + DECLARE_ACKNOWLEDGER (note_column); + + void stop_translation_timestep (); + void process_music (); private: Spanner *span_; Spanner *finished_; - Music *current_event_; - Drul_array event_drul_; + Stream_event *current_event_; + Drul_array event_drul_; void typeset_all (); }; @@ -43,67 +60,57 @@ Trill_spanner_engraver::Trill_spanner_engraver () finished_ = 0; current_event_ = 0; span_ = 0; - event_drul_[START] = 0; - event_drul_[STOP] = 0; + event_drul_.set (0, 0); } -bool -Trill_spanner_engraver::try_music (Music *m) +IMPLEMENT_TRANSLATOR_LISTENER (Trill_spanner_engraver, trill_span); +void +Trill_spanner_engraver::listen_trill_span (Stream_event *ev) { - if (m->is_mus_type ("trill-span-event")) - { - Direction d = to_dir (m->get_property ("span-direction")); - event_drul_[d] = m; - return true; - } - - return false; + Direction d = to_dir (ev->get_property ("span-direction")); + ASSIGN_EVENT_ONCE (event_drul_[d], ev); } void -Trill_spanner_engraver::process_music () +Trill_spanner_engraver::acknowledge_note_column (Grob_info info) { - if (event_drul_[STOP]) + if (span_) { - if (!span_) - { - event_drul_[STOP]->origin ()->warning (_ ("can't find start of trill spanner")); - } - else - { - finished_ = span_; - span_ = 0; - current_event_ = 0; - } + Pointer_group_interface::add_grob (span_, + ly_symbol2scm ("note-columns"), + info.grob ()); + if (!span_->get_bound (LEFT)) + add_bound_item (span_, info.grob ()); } - - if (event_drul_[START]) + else if (finished_) { - if (current_event_) - { - event_drul_[START]->origin ()->warning (_ ("already have a trill spanner")); - } - else - { - current_event_ = event_drul_[START]; - span_ = make_spanner ("TrillSpanner", event_drul_[START]->self_scm ()); - Side_position_interface::set_axis (span_, Y_AXIS); - event_drul_[START] = 0; - } + Pointer_group_interface::add_grob (finished_, ly_symbol2scm ("note-columns"), + info.grob ()); + if (!finished_->get_bound (RIGHT)) + add_bound_item (finished_, info.grob ()); } } void -Trill_spanner_engraver::acknowledge_note_column (Grob_info info) +Trill_spanner_engraver::process_music () { - Spanner *spans[2] ={span_, finished_}; - for (int i = 0; i < 2; i++) + if (span_ + && (event_drul_[STOP] || event_drul_[START])) + { + Stream_event *ender = event_drul_[STOP]; + if (!ender) + ender = event_drul_[START]; + finished_ = span_; + announce_end_grob (finished_, ender->self_scm ()); + span_ = 0; + current_event_ = 0; + } + + if (event_drul_[START]) { - if (spans[i]) - { - Side_position_interface::add_support (spans[i], info.grob ()); - add_bound_item (spans[i], dynamic_cast (info.grob ())); - } + current_event_ = event_drul_[START]; + span_ = make_spanner ("TrillSpanner", event_drul_[START]->self_scm ()); + Side_position_interface::set_axis (span_, Y_AXIS); } } @@ -113,10 +120,10 @@ Trill_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 = Grob::unsmob (get_property ("currentMusicalColumn")); + finished_->set_bound (RIGHT, e); + } finished_ = 0; } } @@ -126,13 +133,12 @@ Trill_spanner_engraver::stop_translation_timestep () { if (span_ && !span_->get_bound (LEFT)) { - Grob *e = unsmob_grob (get_property ("currentMusicalColumn")); + Grob *e = Grob::unsmob (get_property ("currentMusicalColumn")); span_->set_bound (LEFT, e); } typeset_all (); - event_drul_[START] = 0; - event_drul_[STOP] = 0; + event_drul_.set (0, 0); } void @@ -141,16 +147,24 @@ Trill_spanner_engraver::finalize () typeset_all (); if (span_) { - current_event_->origin ()->warning (_ ("unterminated trill spanner")); - span_->suicide (); - span_ = 0; + Grob *e = Grob::unsmob (get_property ("currentCommandColumn")); + span_->set_bound (RIGHT, e); } } -ADD_ACKNOWLEDGER(Trill_spanner_engraver,note_column); + +ADD_ACKNOWLEDGER (Trill_spanner_engraver, note_column); + ADD_TRANSLATOR (Trill_spanner_engraver, - /* descr */ "Create trill spanner from a Music.", - /* creats*/ "TrillSpanner", - /* accepts */ "trill-span-event", - /* acks */ "", - /* reads */ "", - /* write */ ""); + /* doc */ + "Create trill spanner from an event.", + + /* create */ + "TrillSpanner ", + + /* read */ + "currentCommandColumn " + "currentMusicalColumn ", + + /* write */ + "" + );