source file of the GNU LilyPond music typesetter
- (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "engraver.hh"
protected:
DECLARE_TRANSLATOR_LISTENER (slur);
DECLARE_ACKNOWLEDGER (accidental);
- DECLARE_ACKNOWLEDGER (dynamic_line_spanner);
DECLARE_ACKNOWLEDGER (fingering);
DECLARE_ACKNOWLEDGER (note_column);
DECLARE_ACKNOWLEDGER (script);
acknowledge_extra_object (info);
}
-void
-Slur_engraver::acknowledge_dynamic_line_spanner (Grob_info info)
-{
- acknowledge_extra_object (info);
-}
-
void
Slur_engraver::acknowledge_fingering (Grob_info info)
{
Slur_engraver::finalize ()
{
if (slurs_.size ())
- slurs_[0]->warning (_ ("unterminated slur"));
+ {
+ slurs_[0]->warning (_ ("unterminated slur"));
+ for (vsize i = 0; i < slurs_.size (); i++)
+ slurs_[i]->suicide ();
+ }
}
void
void
Slur_engraver::stop_translation_timestep ()
{
- if (Grob *g = unsmob_grob (get_property ("breakableSeparationItem")))
+ if (Grob *g = unsmob_grob (get_property ("currentCommandColumn")))
{
for (vsize i = 0; i < end_slurs_.size (); i++)
Slur::add_extra_encompass (end_slurs_[i], g);
for (vsize i = 0; i < end_slurs_.size (); i++)
- announce_end_grob (end_slurs_[i], SCM_EOL);
+ {
+ Spanner * s = dynamic_cast<Spanner*> (end_slurs_[i]);
+ if (!s->get_bound (RIGHT))
+ s->set_bound (RIGHT, unsmob_grob (get_property ("currentMusicalColumn")));
+ announce_end_grob (s, SCM_EOL);
+ }
end_slurs_.clear ();
events_[START] = events_[STOP] = 0;
}
ADD_ACKNOWLEDGER (Slur_engraver, accidental);
-ADD_ACKNOWLEDGER (Slur_engraver, dynamic_line_spanner);
ADD_ACKNOWLEDGER (Slur_engraver, fingering);
ADD_ACKNOWLEDGER (Slur_engraver, note_column);
ADD_ACKNOWLEDGER (Slur_engraver, script);
ADD_ACKNOWLEDGER (Slur_engraver, tie);
ADD_ACKNOWLEDGER (Slur_engraver, tuplet_number);
ADD_TRANSLATOR (Slur_engraver,
- /* doc */ "Build slur grobs from slur events",
- /* create */ "Slur",
+ /* doc */
+ "Build slur grobs from slur events.",
+
+ /* create */
+ "Slur ",
+
/* read */
"slurMelismaBusy "
"doubleSlurs ",
- /* write */ "");
+ /* write */
+ ""
+ );