source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "musical-request.hh"
#include "paper-column.hh"
-
-#include "spacing-spanner.hh"
#include "engraver.hh"
#include "pqueue.hh"
+#include "note-spacing.hh"
+#include "staff-spacing.hh"
+#include "group-interface.hh"
+#include "spanner.hh"
struct Rhythmic_tuple
{
Rhythmic_tuple ()
{
}
- Rhythmic_tuple (Grob_info i, Moment m )
+ Rhythmic_tuple (Grob_info i, Moment m)
{
info_ = i;
end_ = m;
PQueue<Rhythmic_tuple> playing_durations_;
Array<Rhythmic_tuple> now_durations_;
Array<Rhythmic_tuple> stopped_durations_;
-
+ Moment now_;
Spanner * spacing_p_;
+
+ TRANSLATOR_DECLARATIONS(Spacing_engraver);
protected:
- VIRTUAL_COPY_CONS(Translator);
virtual void acknowledge_grob (Grob_info);
virtual void start_translation_timestep ();
virtual void stop_translation_timestep ();
- virtual void do_creation_processing ();
- virtual void do_removal_processing ();
-public:
- Spacing_engraver ();
+ virtual void initialize ();
+ virtual void finalize ();
};
inline int
Rhythmic_tuple::time_compare (Rhythmic_tuple const &h1,
Rhythmic_tuple const &h2)
{
- return (h1.end_ - h2.end_ ).sign ();
+ return (h1.end_ - h2.end_).main_part_.sign ();
}
-Spacing_engraver::Spacing_engraver()
+Spacing_engraver::Spacing_engraver ()
{
spacing_p_ = 0;
}
void
-Spacing_engraver::do_creation_processing ()
+Spacing_engraver::initialize ()
{
spacing_p_ =new Spanner (get_property ("SpacingSpanner"));
- Spacing_spanner::set_interface (spacing_p_);
- spacing_p_->set_bound (LEFT, unsmob_element (get_property ("currentCommandColumn")));
- announce_grob (spacing_p_, 0);
+ spacing_p_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
+ announce_grob(spacing_p_, SCM_EOL);
}
void
-Spacing_engraver::do_removal_processing ()
+Spacing_engraver::finalize ()
{
- Grob * p = unsmob_element (get_property ("currentCommandColumn"));
+ Grob * p = unsmob_grob (get_property ("currentCommandColumn"));
spacing_p_->set_bound (RIGHT, p);
typeset_grob (spacing_p_);
spacing_p_ =0;
void
Spacing_engraver::acknowledge_grob (Grob_info i)
{
- if (to_boolean (i.elem_l_->get_grob_property ("grace")))
+ if (Note_spacing::has_interface (i.grob_l_) || Staff_spacing::has_interface (i.grob_l_))
+ {
+ Pointer_group_interface::add_grob (spacing_p_, ly_symbol2scm ("wishes"), i.grob_l_);
+ }
+
+ if (i.grob_l_->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface")))
return;
- if (to_boolean (i.elem_l_->get_grob_property ("non-rhythmic")))
- return;
-
- if (Rhythmic_req * r = dynamic_cast<Rhythmic_req*>(i.req_l_))
+ /*
+ only pay attention to durations that are not grace notes.
+ */
+ if (!now_.grace_part_)
{
- Rhythmic_tuple t(i, now_mom () + r->length_mom ());
- now_durations_.push (t);
+ if (Rhythmic_req * r = dynamic_cast<Rhythmic_req*> (i.music_cause ()))
+ {
+ Moment len = r->length_mom ();
+ Rhythmic_tuple t (i, now_mom () + len);
+ now_durations_.push (t);
+ }
}
}
shortest_playing.set_infinite (1);
for (int i=0; i < playing_durations_.size (); i++)
{
- Moment m = (playing_durations_[i].info_.req_l_)->length_mom ();
- if (m)
- {
- shortest_playing = shortest_playing <? m;
- }
+ Moment m = (playing_durations_[i].info_.music_cause ())->length_mom ();
+ shortest_playing = shortest_playing <? m;
}
- Moment starter, inf;
- inf.set_infinite (1);
- starter=inf;
+ Moment starter;
+ starter.set_infinite (1);
+
for (int i=0; i < now_durations_.size (); i++)
{
- Moment m = now_durations_[i].info_.req_l_->length_mom ();
- if (m)
- starter = starter <? m;
+ Moment m = now_durations_[i].info_.music_cause ()->length_mom ();
+ if (m.to_bool ())
+ {
+ starter = starter <? m;
+ playing_durations_.insert (now_durations_[i]);
- playing_durations_.insert (now_durations_[i]);
+ }
}
now_durations_.clear ();
shortest_playing = shortest_playing <? starter;
Paper_column * sc
- = dynamic_cast<Paper_column*> (unsmob_element (get_property ("currentMusicalColumn")));
+ = dynamic_cast<Paper_column*> (unsmob_grob (get_property ("currentMusicalColumn")));
- SCM sh = shortest_playing.smobbed_copy( );
- SCM st = starter.smobbed_copy();
+ 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);
void
Spacing_engraver::start_translation_timestep ()
{
- Moment now = now_mom ();
+ now_ = now_mom ();
stopped_durations_.clear ();
- while (playing_durations_.size () && playing_durations_.front ().end_ < now)
+ while (playing_durations_.size () && playing_durations_.front ().end_ < now_)
playing_durations_.delmin ();
- while (playing_durations_.size () && playing_durations_.front ().end_ == now)
+ while (playing_durations_.size () && playing_durations_.front ().end_ == now_)
stopped_durations_.push (playing_durations_.get ());
}
-ADD_THIS_TRANSLATOR(Spacing_engraver);
+
+ENTER_DESCRIPTION(Spacing_engraver,
+/* descr */ "make a SpacingSpanner and do bookkeeping of shortest starting and playing notes ",
+/* creats*/ "SpacingSpanner",
+/* acks */ "grob-interface",
+/* reads */ "",
+/* write */ "");