X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspacing-engraver.cc;h=d567cb6ebc279d53e1f55ed741b7c9020bf2cf22;hb=8347f6f06cd4c56d7a2d2ec482647afaaade1267;hp=377d88bbdf115d3bb5f5c1eda27a3e6a6e69b120;hpb=243db47a88df9240a66bde37356b43aaeb41260d;p=lilypond.git diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc index 377d88bbdf..d567cb6ebc 100644 --- a/lily/spacing-engraver.cc +++ b/lily/spacing-engraver.cc @@ -1,64 +1,69 @@ -/* - spacing-engraver.cc -- implement Spacing_engraver - +/* + spacing-engraver.cc -- implement Spacing_engraver + source file of the GNU LilyPond music typesetter - - (c) 1999--2003 Han-Wen Nienhuys - - */ -#include "event.hh" + (c) 1999--2006 Han-Wen Nienhuys +*/ + #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" +#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 &); + { + 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 +/* + TODO: allow starting & stopping of spacing regions. +*/ +/* + Acknowledge rhythmic elements, for initializing spacing fields in + the columns. */ class Spacing_engraver : public Engraver { PQueue playing_durations_; - Array now_durations_; - Array stopped_durations_; + vector now_durations_; + vector stopped_durations_; Moment now_; - Spanner * spacing_; - - 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 process_music (); + DECLARE_ACKNOWLEDGER (staff_spacing); + DECLARE_ACKNOWLEDGER (note_spacing); + DECLARE_ACKNOWLEDGER (rhythmic_head); + + void start_translation_timestep (); + void stop_translation_timestep (); + 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 @@ -78,34 +83,45 @@ Spacing_engraver::process_music () { if (!spacing_) { - spacing_ =make_spanner ("SpacingSpanner"); - spacing_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn"))); - announce_grob(spacing_, SCM_EOL); + 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_->set_bound (RIGHT, p); - typeset_grob (spacing_); - spacing_ =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) +Spacing_engraver::acknowledge_note_spacing (Grob_info i) { - 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"))) + 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 ()); +} + +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; /* - only pay attention to durations that are not grace notes. - */ + only pay attention to durations that are not grace notes. + */ if (!now_.grace_part_) { Music *r = i.music_cause (); @@ -113,7 +129,7 @@ Spacing_engraver::acknowledge_grob (Grob_info i) { Moment len = r->get_length (); Rhythmic_tuple t (i, now_mom () + len); - now_durations_.push (t); + now_durations_.push_back (t); } } } @@ -121,43 +137,50 @@ Spacing_engraver::acknowledge_grob (Grob_info i) void Spacing_engraver::stop_translation_timestep () { + Paper_column *musical_column + = dynamic_cast (unsmob_grob (get_property ("currentMusicalColumn"))); + + 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++) { - Music * mus = playing_durations_[i].info_.music_cause (); + Music *mus = playing_durations_[i].info_.music_cause (); if (mus) { Moment m = mus->get_length (); - shortest_playing = shortest_playing get_length (); if (m.to_bool ()) { - starter = starter (unsmob_grob (get_property ("currentMusicalColumn"))); + + shortest_playing = min (shortest_playing, starter); 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); + musical_column->set_property ("shortest-playing-duration", sh); + musical_column->set_property ("shortest-starter-duration", st); } void @@ -168,16 +191,22 @@ Spacing_engraver::start_translation_timestep () 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 ()); + stopped_durations_.push_back (playing_durations_.get ()); } - - - -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 */ ""); +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", + /* accept */ "", + /* read */ + "currentMusicalColumn " + "currentCommandColumn " + "proportionalNotationDuration", + + /* write */ "");