X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspacing-engraver.cc;h=dffb21d638cab98b0c29d179998b339954692a0f;hb=543171165412bc915d8ea1f308d070c74924b2f1;hp=4b09a917d333bfe21b60877e4403f1384755bf38;hpb=64313890b232c731d432e5b096f30bffc3f3756d;p=lilypond.git diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc index 4b09a917d3..dffb21d638 100644 --- a/lily/spacing-engraver.cc +++ b/lily/spacing-engraver.cc @@ -3,16 +3,18 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2006 Han-Wen Nienhuys + (c) 1999--2008 Han-Wen Nienhuys */ -#include "paper-column.hh" #include "engraver.hh" -#include "pqueue.hh" +#include "moment.hh" #include "note-spacing.hh" -#include "staff-spacing.hh" +#include "paper-column.hh" #include "pointer-group-interface.hh" +#include "pqueue.hh" #include "spanner.hh" +#include "staff-spacing.hh" +#include "stream-event.hh" #include "translator.icc" @@ -32,9 +34,21 @@ struct Rhythmic_tuple static int time_compare (Rhythmic_tuple const &, Rhythmic_tuple const &); }; -/* - TODO: allow starting & stopping of spacing regions. -*/ +inline int +compare (Rhythmic_tuple const &a, Rhythmic_tuple const &b) +{ + return Rhythmic_tuple::time_compare (a, b); +} + +int +Rhythmic_tuple::time_compare (Rhythmic_tuple const &h1, + Rhythmic_tuple const &h2) +{ + return (h1.end_ - h2.end_).main_part_.sign (); +} + +/****************************************************************/ + /* Acknowledge rhythmic elements, for initializing spacing fields in the columns. @@ -42,54 +56,74 @@ struct Rhythmic_tuple class Spacing_engraver : public Engraver { PQueue playing_durations_; - std::vector now_durations_; - std::vector stopped_durations_; + vector now_durations_; + vector stopped_durations_; Moment now_; Spanner *spacing_; - + Stream_event *start_section_; + TRANSLATOR_DECLARATIONS (Spacing_engraver); protected: DECLARE_ACKNOWLEDGER (staff_spacing); DECLARE_ACKNOWLEDGER (note_spacing); DECLARE_ACKNOWLEDGER (rhythmic_head); + DECLARE_ACKNOWLEDGER (rhythmic_grob); + DECLARE_TRANSLATOR_LISTENER (spacing_section); void start_translation_timestep (); void stop_translation_timestep (); void process_music (); + void add_starter_duration (Grob_info i); + virtual void finalize (); + + void start_spanner (); + void stop_spanner (); }; -inline int -compare (Rhythmic_tuple const &a, Rhythmic_tuple const &b) +Spacing_engraver::Spacing_engraver () { - return Rhythmic_tuple::time_compare (a, b); + spacing_ = 0; + start_section_ = 0; } -int -Rhythmic_tuple::time_compare (Rhythmic_tuple const &h1, - Rhythmic_tuple const &h2) +IMPLEMENT_TRANSLATOR_LISTENER (Spacing_engraver, spacing_section); +void +Spacing_engraver::listen_spacing_section (Stream_event *ev) { - return (h1.end_ - h2.end_).main_part_.sign (); + ASSIGN_EVENT_ONCE (start_section_, ev); } -Spacing_engraver::Spacing_engraver () +void +Spacing_engraver::process_music () { - spacing_ = 0; + if (start_section_ && spacing_) + stop_spanner (); + + if (!spacing_) + start_spanner (); } void -Spacing_engraver::process_music () +Spacing_engraver::start_spanner () { - if (!spacing_) - { - spacing_ = make_spanner ("SpacingSpanner", SCM_EOL); - spacing_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn"))); - } + assert (!spacing_); + + + spacing_ = make_spanner ("SpacingSpanner", SCM_EOL); + spacing_->set_bound (LEFT, + unsmob_grob (get_property ("currentCommandColumn"))); } void Spacing_engraver::finalize () +{ + stop_spanner (); +} + +void +Spacing_engraver::stop_spanner () { if (spacing_) { @@ -112,8 +146,21 @@ Spacing_engraver::acknowledge_staff_spacing (Grob_info i) Pointer_group_interface::add_grob (spacing_, ly_symbol2scm ("wishes"), i.grob ()); } +void +Spacing_engraver::acknowledge_rhythmic_grob (Grob_info i) +{ + add_starter_duration (i); +} + void Spacing_engraver::acknowledge_rhythmic_head (Grob_info i) +{ + add_starter_duration (i); +} + + +void +Spacing_engraver::add_starter_duration (Grob_info i) { if (i.grob ()->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface")) || i.grob ()->internal_has_interface (ly_symbol2scm ("multi-measure-interface"))) @@ -124,10 +171,10 @@ Spacing_engraver::acknowledge_rhythmic_head (Grob_info i) */ if (!now_.grace_part_) { - Music *r = i.music_cause (); - if (r && r->is_mus_type ("rhythmic-event")) + Stream_event *r = i.event_cause (); + if (r && r->in_event_class ("rhythmic-event")) { - Moment len = r->get_length (); + Moment len = get_event_length (r, now_); Rhythmic_tuple t (i, now_mom () + len); now_durations_.push_back (t); } @@ -140,11 +187,20 @@ Spacing_engraver::stop_translation_timestep () Paper_column *musical_column = dynamic_cast (unsmob_grob (get_property ("currentMusicalColumn"))); + + if (!spacing_) + start_spanner (); + + musical_column->set_object ("spacing", spacing_->self_scm ()); + unsmob_grob (get_property ("currentCommandColumn")) + ->set_object ("spacing", spacing_->self_scm ()); + SCM proportional = get_property ("proportionalNotationDuration"); if (unsmob_moment (proportional)) { musical_column->set_property ("shortest-playing-duration", proportional); musical_column->set_property ("shortest-starter-duration", proportional); + musical_column->set_property ("used", SCM_BOOL_T); return; } @@ -152,10 +208,11 @@ Spacing_engraver::stop_translation_timestep () shortest_playing.set_infinite (1); for (vsize i = 0; i < playing_durations_.size (); i++) { - Music *mus = playing_durations_[i].info_.music_cause (); - if (mus) + Stream_event *ev = playing_durations_[i].info_.event_cause (); + if (ev) { - Moment m = mus->get_length (); + Moment now = now_mom (); + Moment m = get_event_length (ev); shortest_playing = min (shortest_playing, m); } } @@ -164,7 +221,7 @@ Spacing_engraver::stop_translation_timestep () for (vsize i = 0; i < now_durations_.size (); i++) { - Moment m = now_durations_[i].info_.music_cause ()->get_length (); + Moment m = get_event_length (now_durations_[i].info_.event_cause ()); if (m.to_bool ()) { starter = min (starter, m); @@ -183,11 +240,16 @@ Spacing_engraver::stop_translation_timestep () musical_column->set_property ("shortest-starter-duration", st); } + + void Spacing_engraver::start_translation_timestep () { + start_section_ = 0; + now_ = now_mom (); stopped_durations_.clear (); + while (playing_durations_.size () && playing_durations_.front ().end_ < now_) playing_durations_.delmin (); while (playing_durations_.size () && playing_durations_.front ().end_ == now_) @@ -197,16 +259,21 @@ Spacing_engraver::start_translation_timestep () ADD_ACKNOWLEDGER (Spacing_engraver, staff_spacing); ADD_ACKNOWLEDGER (Spacing_engraver, note_spacing); ADD_ACKNOWLEDGER (Spacing_engraver, rhythmic_head); +ADD_ACKNOWLEDGER (Spacing_engraver, rhythmic_grob); ADD_TRANSLATOR (Spacing_engraver, - "make a SpacingSpanner and do " - "bookkeeping of shortest starting and playing notes ", + /* doc */ + "Make a @code{SpacingSpanner} and do bookkeeping of shortest" + " starting and playing notes.", + + /* create */ + "SpacingSpanner ", - /* create */ "SpacingSpanner", - /* accept */ "", /* read */ "currentMusicalColumn " "currentCommandColumn " - "proportionalNotationDuration", + "proportionalNotationDuration ", - /* write */ ""); + /* write */ + "" + );