X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspacing-engraver.cc;h=a5c42eaf2a58cbae930e6b75b4cf37abc5ad8624;hb=6ac8e1b2d7640826ae251e040de5efbc36da68ab;hp=e8a5e38292d14ce5a94b1e61820604ce31e8df90;hpb=2873636a53f0011f837aaf6e2072de602730d957;p=lilypond.git diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc index e8a5e38292..a5c42eaf2a 100644 --- a/lily/spacing-engraver.cc +++ b/lily/spacing-engraver.cc @@ -3,14 +3,57 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Han-Wen Nienhuys + (c) 1999--2003 Han-Wen Nienhuys */ -#include "musical-request.hh" -#include "score-column.hh" -#include "spacing-engraver.hh" -#include "spacing-spanner.hh" +#include "event.hh" +#include "paper-column.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 +{ + 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 &); +}; + +/** + Acknowledge rhythmic elements, for initializing spacing fields in + the columns. + + should be the last one of the toplevel context +*/ +class Spacing_engraver : public Engraver +{ + PQueue playing_durations_; + Array now_durations_; + Array stopped_durations_; + Moment now_; + 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 process_music (); + virtual void finalize (); +}; inline int compare (Rhythmic_tuple const &a, Rhythmic_tuple const &b) @@ -22,94 +65,124 @@ 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; + spacing_ = 0; } void -Spacing_engraver::do_creation_processing () +Spacing_engraver::process_music () { - spacing_p_ =new Spacing_spanner; - spacing_p_->set_bounds (LEFT, get_staff_info ().command_pcol_l ()); - announce_element (Score_element_info (spacing_p_, 0)); + if (!spacing_) + { + spacing_ = make_spanner ("SpacingSpanner"); + spacing_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn"))); + announce_grob(spacing_, SCM_EOL); + } } void -Spacing_engraver::do_removal_processing () +Spacing_engraver::finalize () { - Paper_column * p = get_staff_info ().command_pcol_l (); - - spacing_p_->set_bounds (RIGHT, p); - typeset_element (spacing_p_); - spacing_p_ =0; + if (spacing_) + { + Grob * p = unsmob_grob (get_property ("currentCommandColumn")); + + spacing_->set_bound (RIGHT, p); + typeset_grob (spacing_); + spacing_ =0; + } } void -Spacing_engraver::acknowledge_element (Score_element_info i) +Spacing_engraver::acknowledge_grob (Grob_info i) { - if (i.elem_l_->get_elt_property ("grace") != SCM_UNDEFINED) + if (Note_spacing::has_interface (i.grob_) || Staff_spacing::has_interface (i.grob_)) + { + Pointer_group_interface::add_grob (spacing_, ly_symbol2scm ("wishes"), i.grob_); + } + + if (i.grob_->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface"))) return; - if (i.elem_l_->get_elt_property ("non-rhythmic") != SCM_UNDEFINED) - return; - - if (Rhythmic_req * r = dynamic_cast(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); + Music *r = i.music_cause (); + if (r && r->is_mus_type ("rhythmic-event")) + { + Moment len = r->get_length (); + Rhythmic_tuple t (i, now_mom () + len); + now_durations_.push (t); + } } } void -Spacing_engraver::do_pre_move_processing () +Spacing_engraver::stop_translation_timestep () { Moment shortest_playing; 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 get_length (); + shortest_playing = shortest_playing length_mom (); - if (m) - starter = starter get_length (); + if (m.to_bool ()) + { + starter = starter (get_staff_info ().musical_pcol_l ()); + Paper_column * sc + = dynamic_cast (unsmob_grob (get_property ("currentMusicalColumn"))); + + assert (starter.to_bool ()); + SCM sh = shortest_playing.smobbed_copy (); + SCM st = starter.smobbed_copy (); - sc->shortest_playing_mom_ = shortest_playing; - sc->shortest_starter_mom_ = starter; + sc->set_grob_property ("shortest-playing-duration", sh); + sc->set_grob_property ("shortest-starter-duration", st); } void -Spacing_engraver::do_post_move_processing () +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", +/* accepts */ "", +/* acks */ "grob-interface", +/* reads */ "", +/* write */ "");