source file of the GNU LilyPond music typesetter
- (c) 1999--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-#include "event.hh"
#include "paper-column.hh"
#include "engraver.hh"
#include "pqueue.hh"
Moment now_;
Spanner * spacing_;
- TRANSLATOR_DECLARATIONS(Spacing_engraver);
+ TRANSLATOR_DECLARATIONS (Spacing_engraver);
protected:
virtual void acknowledge_grob (Grob_info);
virtual void start_translation_timestep ();
{
if (!spacing_)
{
- spacing_ =make_spanner ("SpacingSpanner");
+ spacing_ = make_spanner ("SpacingSpanner", SCM_EOL);
spacing_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
- announce_grob(spacing_, SCM_EOL);
+
}
}
+
void
Spacing_engraver::finalize ()
{
- Grob * p = unsmob_grob (get_property ("currentCommandColumn"));
- spacing_->set_bound (RIGHT, p);
- typeset_grob (spacing_);
- spacing_ =0;
+ if (spacing_)
+ {
+ Grob * p = unsmob_grob (get_property ("currentCommandColumn"));
+
+ spacing_->set_bound (RIGHT, p);
+ spacing_ = 0;
+ }
}
void
Pointer_group_interface::add_grob (spacing_, ly_symbol2scm ("wishes"), i.grob_);
}
- if (i.grob_->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface")))
+ if (i.grob_->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface"))
+ || i.grob_->internal_has_interface (ly_symbol2scm ("multi-measure-event")))
return;
/*
{
Moment shortest_playing;
shortest_playing.set_infinite (1);
- for (int i=0; i < playing_durations_.size (); i++)
+ for (int i = 0; i < playing_durations_.size (); i++)
{
Music * mus = playing_durations_[i].info_.music_cause ();
if (mus)
Moment starter;
starter.set_infinite (1);
- for (int i=0; i < now_durations_.size (); i++)
+ for (int i = 0; i < now_durations_.size (); i++)
{
Moment m = now_durations_[i].info_.music_cause ()->get_length ();
if (m.to_bool ())
SCM sh = shortest_playing.smobbed_copy ();
SCM st = starter.smobbed_copy ();
- sc->set_grob_property ("shortest-playing-duration", sh);
- sc->set_grob_property ("shortest-starter-duration", st);
+ sc->set_property ("shortest-playing-duration", sh);
+ sc->set_property ("shortest-starter-duration", st);
}
void
-ENTER_DESCRIPTION(Spacing_engraver,
+ADD_TRANSLATOR (Spacing_engraver,
/* descr */ "make a SpacingSpanner and do bookkeeping of shortest starting and playing notes ",
/* creats*/ "SpacingSpanner",
/* accepts */ "",