-/*
- spacing-engraver.cc -- implement Spacing_engraver
-
+/*
+ spacing-engraver.cc -- implement Spacing_engraver
+
source file of the GNU LilyPond music typesetter
-
- (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
- */
-#include "musical-request.hh"
+ (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
+
#include "paper-column.hh"
#include "engraver.hh"
#include "pqueue.hh"
#include "note-spacing.hh"
#include "staff-spacing.hh"
-#include "group-interface.hh"
+#include "pointer-group-interface.hh"
#include "spanner.hh"
struct Rhythmic_tuple
{
Grob_info info_;
Moment end_;
-
+
Rhythmic_tuple ()
- {
- }
+ {
+ }
Rhythmic_tuple (Grob_info i, Moment m)
- {
- info_ = i;
- end_ = m;
- }
- static int time_compare (Rhythmic_tuple const &, Rhythmic_tuple const &);
+ {
+ info_ = i;
+ end_ = m;
+ }
+ static int time_compare (Rhythmic_tuple const &, Rhythmic_tuple const &);
};
/**
Array<Rhythmic_tuple> now_durations_;
Array<Rhythmic_tuple> stopped_durations_;
Moment now_;
- Spanner * spacing_p_;
-
- TRANSLATOR_DECLARATIONS(Spacing_engraver);
+ Spanner *spacing_;
+
+ TRANSLATOR_DECLARATIONS (Spacing_engraver);
protected:
virtual void acknowledge_grob (Grob_info);
- virtual void start_translation_timestep ();
- virtual void stop_translation_timestep ();
- virtual void initialize ();
+ PRECOMPUTED_VIRTUAL void start_translation_timestep ();
+ PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
+ PRECOMPUTED_VIRTUAL void process_music ();
virtual void finalize ();
};
inline int
compare (Rhythmic_tuple const &a, Rhythmic_tuple const &b)
{
- return Rhythmic_tuple::time_compare (a,b);
+ return Rhythmic_tuple::time_compare (a, b);
}
int
Spacing_engraver::Spacing_engraver ()
{
- spacing_p_ = 0;
+ spacing_ = 0;
}
void
-Spacing_engraver::initialize ()
+Spacing_engraver::process_music ()
{
- spacing_p_ =new Spanner (get_property ("SpacingSpanner"));
- spacing_p_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
- announce_grob(spacing_p_, SCM_EOL);
+ if (!spacing_)
+ {
+ spacing_ = make_spanner ("SpacingSpanner", SCM_EOL);
+ spacing_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
+ }
}
void
Spacing_engraver::finalize ()
{
- Grob * p = unsmob_grob (get_property ("currentCommandColumn"));
- spacing_p_->set_bound (RIGHT, p);
- typeset_grob (spacing_p_);
- spacing_p_ =0;
+ if (spacing_)
+ {
+ Grob *p = unsmob_grob (get_property ("currentCommandColumn"));
+
+ spacing_->set_bound (RIGHT, p);
+ spacing_ = 0;
+ }
}
void
Spacing_engraver::acknowledge_grob (Grob_info i)
{
- if (Note_spacing::has_interface (i.grob_l_) || Staff_spacing::has_interface (i.grob_l_))
+ if (Note_spacing::has_interface (i.grob ()) || Staff_spacing::has_interface (i.grob ()))
{
- Pointer_group_interface::add_grob (spacing_p_, ly_symbol2scm ("wishes"), i.grob_l_);
+ Pointer_group_interface::add_grob (spacing_, ly_symbol2scm ("wishes"), i.grob ());
}
-
- if (to_boolean (i.grob_l_->get_grob_property ("non-rhythmic")))
+
+ if (i.grob ()->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface"))
+ || i.grob ()->internal_has_interface (ly_symbol2scm ("multi-measure-event")))
return;
/*
- only pay attention to durations that are not grace notes.
- */
+ only pay attention to durations that are not grace notes.
+ */
if (!now_.grace_part_)
{
- if (Rhythmic_req * r = dynamic_cast<Rhythmic_req*> (i.music_cause ()))
+ Music *r = i.music_cause ();
+ if (r && r->is_mus_type ("rhythmic-event"))
{
- Moment len = r->length_mom ();
+ Moment len = r->get_length ();
Rhythmic_tuple t (i, now_mom () + len);
now_durations_.push (t);
}
{
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++)
{
- Moment m = (playing_durations_[i].info_.music_cause ())->length_mom ();
- shortest_playing = shortest_playing <? m;
+ Music *mus = playing_durations_[i].info_.music_cause ();
+ if (mus)
+ {
+ Moment m = mus->get_length ();
+ shortest_playing = min (shortest_playing, m);
+ }
}
-
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 ()->length_mom ();
+ Moment m = now_durations_[i].info_.music_cause ()->get_length ();
if (m.to_bool ())
{
- starter = starter <? m;
+ starter = min (starter, m);
playing_durations_.insert (now_durations_[i]);
}
}
now_durations_.clear ();
-
- shortest_playing = shortest_playing <? starter;
-
- Paper_column * sc
- = dynamic_cast<Paper_column*> (unsmob_grob (get_property ("currentMusicalColumn")));
+
+ shortest_playing = min (shortest_playing, starter);
+
+ Paper_column *sc
+ = dynamic_cast<Paper_column *> (unsmob_grob (get_property ("currentMusicalColumn")));
assert (starter.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
stopped_durations_.push (playing_durations_.get ());
}
+#include "translator.icc"
-
-
-ENTER_DESCRIPTION(Spacing_engraver,
-/* descr */ "make a SpacingSpanner and do bookkeeping of shortest starting and playing notes ",
-/* creats*/ "SpacingSpanner",
-/* acks */ "grob-interface",
-/* reads */ "",
-/* write */ "");
+ADD_TRANSLATOR (Spacing_engraver,
+ /* descr */ "make a SpacingSpanner and do bookkeeping of shortest starting and playing notes ",
+ /* creats*/ "SpacingSpanner",
+ /* accepts */ "",
+ /* acks */ "grob-interface",
+ /* reads */ "",
+ /* write */ "");
projects / lilypond.git / blobdiff