/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
vector<Stream_event *> stop_events_;
vector<Grob *> slurs_;
vector<Grob *> end_slurs_;
+ vector<Grob_info> objects_to_acknowledge_;
protected:
DECLARE_TRANSLATOR_LISTENER (phrasing_slur);
- DECLARE_ACKNOWLEDGER (accidental);
+ DECLARE_ACKNOWLEDGER (inline_accidental);
DECLARE_ACKNOWLEDGER (fingering);
DECLARE_ACKNOWLEDGER (note_column);
DECLARE_ACKNOWLEDGER (slur);
DECLARE_ACKNOWLEDGER (script);
+ DECLARE_ACKNOWLEDGER (dots);
DECLARE_ACKNOWLEDGER (text_script);
DECLARE_ACKNOWLEDGER (tie);
DECLARE_ACKNOWLEDGER (tuplet_number);
void
Phrasing_slur_engraver::acknowledge_extra_object (Grob_info info)
{
- Slur::auxiliary_acknowledge_extra_object (info, slurs_, end_slurs_);
+ objects_to_acknowledge_.push_back (info);
}
void
-Phrasing_slur_engraver::acknowledge_accidental (Grob_info info)
+Phrasing_slur_engraver::acknowledge_inline_accidental (Grob_info info)
+{
+ acknowledge_extra_object (info);
+}
+
+void
+Phrasing_slur_engraver::acknowledge_dots (Grob_info info)
{
acknowledge_extra_object (info);
}
void
Phrasing_slur_engraver::stop_translation_timestep ()
{
+ for (vsize i = 0; i < objects_to_acknowledge_.size (); i++)
+ Slur::auxiliary_acknowledge_extra_object (objects_to_acknowledge_[i], slurs_, end_slurs_);
+
end_slurs_.clear ();
start_events_.clear ();
stop_events_.clear ();
+ objects_to_acknowledge_.clear ();
}
-ADD_ACKNOWLEDGER (Phrasing_slur_engraver, accidental);
+ADD_ACKNOWLEDGER (Phrasing_slur_engraver, inline_accidental);
ADD_ACKNOWLEDGER (Phrasing_slur_engraver, fingering)
ADD_ACKNOWLEDGER (Phrasing_slur_engraver, note_column);
ADD_ACKNOWLEDGER (Phrasing_slur_engraver, slur);
ADD_ACKNOWLEDGER (Phrasing_slur_engraver, script);
+ADD_ACKNOWLEDGER (Phrasing_slur_engraver, dots);
ADD_ACKNOWLEDGER (Phrasing_slur_engraver, text_script);
ADD_ACKNOWLEDGER (Phrasing_slur_engraver, tie);
ADD_ACKNOWLEDGER (Phrasing_slur_engraver, tuplet_number);