(stop_translation_timestep): use

Dscho's fix for spacing spanner.

diff --git a/ChangeLog b/ChangeLog
index f013f38465f121c6a505f94191836920a5f2dacf..55c5a5be58e75b0a2f43c78ec79cf038fe8fdf11 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-08-20  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * 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 c35d5fe98b08abbe2412bb7ce13230fb887c7fb8..a77fb9b593447be82b633abe8063144950cb5fa0 100644 (file)
--- 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<Paper_column *> (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))