/*
- 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 <janneke@gnu.org>
- (c) 2000--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+ 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 <http://www.gnu.org/licenses/>.
*/
/*
finished_ = 0;
current_event_ = 0;
span_ = 0;
- event_drul_[START] = 0;
- event_drul_[STOP] = 0;
+ event_drul_.set (0, 0);
}
IMPLEMENT_TRANSLATOR_LISTENER (Trill_spanner_engraver, trill_span);
void
Trill_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 ());
- }
+ 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 ());
+ }
}
void
Trill_spanner_engraver::process_music ()
{
- if (event_drul_[STOP])
+ if (span_
+ && (event_drul_[STOP] || event_drul_[START]))
{
- if (!span_)
- event_drul_[STOP]->origin ()->warning (_ ("cannot find start of trill spanner"));
- else
- {
- finished_ = span_;
- announce_end_grob (finished_, SCM_EOL);
- span_ = 0;
- current_event_ = 0;
- }
+ 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 (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;
- }
+ current_event_ = event_drul_[START];
+ span_ = make_spanner ("TrillSpanner", event_drul_[START]->self_scm ());
+ Side_position_interface::set_axis (span_, Y_AXIS);
}
}
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;
}
}
{
if (span_ && !span_->get_bound (LEFT))
{
- Grob *e = unsmob_grob (get_property ("currentMusicalColumn"));
+ Grob *e = unsmob<Grob> (get_property ("currentMusicalColumn"));
span_->set_bound (LEFT, e);
}
typeset_all ();
- event_drul_[START] = 0;
- event_drul_[STOP] = 0;
+ event_drul_.set (0, 0);
}
void
typeset_all ();
if (span_)
{
- finished_ = span_;
- typeset_all ();
+ Grob *e = unsmob<Grob> (get_property ("currentCommandColumn"));
+ span_->set_bound (RIGHT, e);
}
}
ADD_ACKNOWLEDGER (Trill_spanner_engraver, note_column);
ADD_TRANSLATOR (Trill_spanner_engraver,
- /* doc */
- "Create trill spanner from an event.",
+ /* doc */
+ "Create trill spanner from an event.",
- /* create */
- "TrillSpanner ",
+ /* create */
+ "TrillSpanner ",
- /* read */
- "",
+ /* read */
+ "currentCommandColumn "
+ "currentMusicalColumn ",
- /* write */
- ""
- );
+ /* write */
+ ""
+ );