X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspacing-engraver.cc;h=dffb21d638cab98b0c29d179998b339954692a0f;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=914c672ccd59cd073cb546da1f082960a3ada0ee;hpb=68f8545bd6a0221ee1100336e4ad49399a7ffaa4;p=lilypond.git diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc index 914c672ccd..dffb21d638 100644 --- a/lily/spacing-engraver.cc +++ b/lily/spacing-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2006 Han-Wen Nienhuys + (c) 1999--2008 Han-Wen Nienhuys */ #include "engraver.hh" @@ -68,12 +68,14 @@ 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 (); @@ -144,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"))) @@ -159,7 +174,7 @@ Spacing_engraver::acknowledge_rhythmic_head (Grob_info i) Stream_event *r = i.event_cause (); if (r && r->in_event_class ("rhythmic-event")) { - Moment len = get_event_length (r); + Moment len = get_event_length (r, now_); Rhythmic_tuple t (i, now_mom () + len); now_durations_.push_back (t); } @@ -185,6 +200,7 @@ Spacing_engraver::stop_translation_timestep () { 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; } @@ -195,6 +211,7 @@ Spacing_engraver::stop_translation_timestep () Stream_event *ev = playing_durations_[i].info_.event_cause (); if (ev) { + Moment now = now_mom (); Moment m = get_event_length (ev); shortest_playing = min (shortest_playing, m); } @@ -242,17 +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 */ - "spacing-section-event ", /* read */ "currentMusicalColumn " "currentCommandColumn " - "proportionalNotationDuration", + "proportionalNotationDuration ", - /* write */ ""); + /* write */ + "" + );