From: Han-Wen Nienhuys Date: Sun, 20 Aug 2006 00:32:57 +0000 (+0000) Subject: (stop_translation_timestep): use X-Git-Tag: cvs/HEAD~153 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d7232b3e970b936008ef8c869e1deab01118cc6e;p=lilypond.git (stop_translation_timestep): use Dscho's fix for spacing spanner. --- diff --git a/ChangeLog b/ChangeLog index f013f38465..55c5a5be58 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-08-20 Han-Wen Nienhuys + * lily/spacing-engraver.cc (stop_translation_timestep): use + Dscho's fix for spacing spanner. + * scm/define-music-types.scm (music-descriptions): use apply-output-event for ApplyOutputEvent diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc index c35d5fe98b..a77fb9b593 100644 --- a/lily/spacing-engraver.cc +++ b/lily/spacing-engraver.cc @@ -107,6 +107,7 @@ Spacing_engraver::start_spanner () { assert (!spacing_); + spacing_ = make_spanner ("SpacingSpanner", SCM_EOL); spacing_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn"))); @@ -171,12 +172,12 @@ Spacing_engraver::stop_translation_timestep () = dynamic_cast (unsmob_grob (get_property ("currentMusicalColumn"))); - if (spacing_) - { - musical_column->set_object ("spacing", spacing_->self_scm ()); - unsmob_grob (get_property ("currentCommandColumn")) - ->set_object ("spacing", spacing_->self_scm ()); - } + 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))