#include "translator.icc"
-
/*
NOTE NOTE NOTE
This is largely similar to Slur_engraver. Check if fixes
- apply there too.
+ apply there too.
(on principle, engravers don't use inheritance for code sharing)
-
+
*/
/*
It is possible that a slur starts and ends on the same note. At
least, it is for phrasing slurs: a note can be both beginning and
ending of a phrase.
-
*/
class Phrasing_slur_engraver : public Engraver
{
vector<Stream_event *> start_events_;
vector<Stream_event *> stop_events_;
- vector<Grob*> slurs_;
- vector<Grob*> end_slurs_;
+ 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);
virtual void finalize ();
-
public:
TRANSLATOR_DECLARATIONS (Phrasing_slur_engraver);
};
{
Direction d = to_dir (ev->get_property ("span-direction"));
if (d == START)
- start_events_.push_back(ev);
+ start_events_.push_back (ev);
else if (d == STOP)
- stop_events_.push_back(ev);
+ stop_events_.push_back (ev);
else ev->origin ()->warning (_f ("direction of %s invalid: %d",
- "phrasing-slur-event", int (d)));
+ "phrasing-slur-event", int (d)));
}
void
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);
}
// Check if we already have a slur with the same spanner-id.
// In that case, don't create a new slur, but print a warning
for (vsize i = 0; i < slurs_.size (); i++)
- have_slur = have_slur || (id == robust_scm2string (slurs_[i]->get_property ("spanner-id"), ""));
-
+ have_slur = have_slur || (id == robust_scm2string (slurs_[i]->get_property ("spanner-id"), ""));
+
if (have_slur)
- ev->origin ()->warning(_ ("already have phrasing slur"));
- else
+ ev->origin ()->warning (_ ("already have phrasing slur"));
+ else
{
Grob *slur = make_spanner ("PhrasingSlur", ev->self_scm ());
Direction updown = to_dir (ev->get_property ("direction"));
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);
ADD_TRANSLATOR (Phrasing_slur_engraver,
- /* doc */
- "Print phrasing slurs. Similar to @ref{Slur_engraver}.",
+ /* doc */
+ "Print phrasing slurs. Similar to @ref{Slur_engraver}.",
- /* create */
- "PhrasingSlur ",
+ /* create */
+ "PhrasingSlur ",
- /* read */
- "",
+ /* read */
+ "",
- /* write */
- ""
- );
+ /* write */
+ ""
+ );