X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspacing-engraver.cc;h=56886a560c6205f696ca3fe2a49f0e668c9c474d;hb=7653e2f45f427ecb67ad8231bd5e24afb8d204e4;hp=8146b7267678e57d4d3c62e8199d18d5314076c2;hpb=b542997680bb2d95c3a03a77468b67e04d30685f;p=lilypond.git diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc index 8146b72676..56886a560c 100644 --- a/lily/spacing-engraver.cc +++ b/lily/spacing-engraver.cc @@ -1,120 +1,256 @@ -/* - spacing-engraver.cc -- implement Spacing_engraver - +/* + spacing-engraver.cc -- implement Spacing_engraver + source file of the GNU LilyPond music typesetter - - (c) 1999--2000 Han-Wen Nienhuys - - */ -#include "musical-request.hh" + (c) 1999--2006 Han-Wen Nienhuys +*/ + +#include "engraver.hh" +#include "moment.hh" +#include "note-spacing.hh" #include "paper-column.hh" -#include "spacing-engraver.hh" -#include "spacing-spanner.hh" +#include "pointer-group-interface.hh" +#include "pqueue.hh" +#include "spanner.hh" +#include "staff-spacing.hh" +#include "stream-event.hh" + +#include "translator.icc" + +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 &); +}; 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 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. +*/ +class Spacing_engraver : public Engraver +{ + PQueue playing_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_TRANSLATOR_LISTENER (spacing_section); + + void start_translation_timestep (); + void stop_translation_timestep (); + void process_music (); - return (h1.end_ - h2.end_ ).sign (); + virtual void finalize (); + + void start_spanner (); + void stop_spanner (); +}; + +Spacing_engraver::Spacing_engraver () +{ + spacing_ = 0; + start_section_ = 0; } -Spacing_engraver::Spacing_engraver() +IMPLEMENT_TRANSLATOR_LISTENER (Spacing_engraver, spacing_section); +void +Spacing_engraver::listen_spacing_section (Stream_event *ev) { - spacing_p_ = 0; + ASSIGN_EVENT_ONCE (start_section_, ev); } void -Spacing_engraver::do_creation_processing () +Spacing_engraver::process_music () { - spacing_p_ =new Spacing_spanner (SCM_EOL); - spacing_p_->set_bound (LEFT, get_staff_info ().command_pcol_l ()); - announce_element (Score_element_info (spacing_p_, 0)); + if (start_section_ && spacing_) + stop_spanner (); + + if (!spacing_) + start_spanner (); } void -Spacing_engraver::do_removal_processing () +Spacing_engraver::start_spanner () { - Paper_column * p = get_staff_info ().command_pcol_l (); + assert (!spacing_); + - spacing_p_->set_bound (RIGHT, p); - typeset_element (spacing_p_); - spacing_p_ =0; + spacing_ = make_spanner ("SpacingSpanner", SCM_EOL); + spacing_->set_bound (LEFT, + unsmob_grob (get_property ("currentCommandColumn"))); } void -Spacing_engraver::acknowledge_element (Score_element_info i) +Spacing_engraver::finalize () { - if (to_boolean (i.elem_l_->get_elt_property ("grace"))) - return; + stop_spanner (); +} + +void +Spacing_engraver::stop_spanner () +{ + if (spacing_) + { + Grob *p = unsmob_grob (get_property ("currentCommandColumn")); + + spacing_->set_bound (RIGHT, p); + spacing_ = 0; + } +} + +void +Spacing_engraver::acknowledge_note_spacing (Grob_info i) +{ + Pointer_group_interface::add_grob (spacing_, ly_symbol2scm ("wishes"), i.grob ()); +} + +void +Spacing_engraver::acknowledge_staff_spacing (Grob_info i) +{ + Pointer_group_interface::add_grob (spacing_, ly_symbol2scm ("wishes"), i.grob ()); +} - if (to_boolean (i.elem_l_->get_elt_property ("non-rhythmic"))) +void +Spacing_engraver::acknowledge_rhythmic_head (Grob_info i) +{ + if (i.grob ()->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface")) + || i.grob ()->internal_has_interface (ly_symbol2scm ("multi-measure-interface"))) 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); + Stream_event *r = i.event_cause (); + if (r && r->in_event_class ("rhythmic-event")) + { + Moment len = get_event_length (r); + Rhythmic_tuple t (i, now_mom () + len); + now_durations_.push_back (t); + } } } void -Spacing_engraver::do_pre_move_processing () +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); + return; + } + Moment shortest_playing; shortest_playing.set_infinite (1); - for (int i=0; i < playing_durations_.size (); i++) + for (vsize i = 0; i < playing_durations_.size (); i++) { - Moment m = (playing_durations_[i].info_.req_l_)->length_mom (); - if (m) + Stream_event *ev = playing_durations_[i].info_.event_cause (); + if (ev) { - shortest_playing = shortest_playing length_mom (); - if (m) - starter = starter (get_staff_info ().musical_pcol_l ()); - SCM sh = smobify (new Moment (shortest_playing)); - SCM st = smobify (new Moment (starter)); + shortest_playing = min (shortest_playing, starter); + + assert (starter.to_bool ()); + SCM sh = shortest_playing.smobbed_copy (); + SCM st = starter.smobbed_copy (); - sc->set_elt_property ("shortest-playing-duration", sh); - sc->set_elt_property ("shortest-starter-duration", st); + musical_column->set_property ("shortest-playing-duration", sh); + musical_column->set_property ("shortest-starter-duration", st); } + + void -Spacing_engraver::do_post_move_processing () +Spacing_engraver::start_translation_timestep () { - Moment now = now_mom (); + start_section_ = 0; + + 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) - stopped_durations_.push (playing_durations_.get ()); + while (playing_durations_.size () && playing_durations_.front ().end_ == now_) + stopped_durations_.push_back (playing_durations_.get ()); } -ADD_THIS_TRANSLATOR(Spacing_engraver); +ADD_ACKNOWLEDGER (Spacing_engraver, staff_spacing); +ADD_ACKNOWLEDGER (Spacing_engraver, note_spacing); +ADD_ACKNOWLEDGER (Spacing_engraver, rhythmic_head); +ADD_TRANSLATOR (Spacing_engraver, + "make a SpacingSpanner and do " + "bookkeeping of shortest starting and playing notes ", + /* create */ "SpacingSpanner", + /* read */ + "currentMusicalColumn " + "currentCommandColumn " + "proportionalNotationDuration", + + /* write */ "");