X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspacing-engraver.cc;h=7051ae75c483568818a5f6cb89f5c14a110e3162;hb=7bec331188c446b8cc0777e1199f8a86bbb2f218;hp=d544410227cff4d0ef252a933a8a8c0ebf94ea48;hpb=1a0e26e91fa7152dd1abaaeb8585a26d169c028b;p=lilypond.git

diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc
index d544410227..7051ae75c4 100644
--- a/lily/spacing-engraver.cc
+++ b/lily/spacing-engraver.cc
@@ -3,10 +3,11 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
+#include "moment.hh"
 #include "note-spacing.hh"
 #include "paper-column.hh"
 #include "pointer-group-interface.hh"
@@ -67,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 ();
@@ -89,7 +92,7 @@ IMPLEMENT_TRANSLATOR_LISTENER (Spacing_engraver, spacing_section);
 void
 Spacing_engraver::listen_spacing_section (Stream_event *ev)
 {
-  start_section_ = ev;
+  ASSIGN_EVENT_ONCE (start_section_, ev);
 }
 
 void
@@ -107,6 +110,7 @@ Spacing_engraver::start_spanner ()
 {
   assert (!spacing_);
 
+
   spacing_ = make_spanner ("SpacingSpanner", SCM_EOL);
   spacing_->set_bound (LEFT,
 		       unsmob_grob (get_property ("currentCommandColumn")));
@@ -142,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")))
@@ -157,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);
 	}
@@ -170,15 +187,20 @@ Spacing_engraver::stop_translation_timestep ()
   Paper_column *musical_column
     = dynamic_cast<Paper_column *> (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);
+      musical_column->set_property ("used", SCM_BOOL_T);
       return;
     }
 
@@ -189,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);
 	}
@@ -236,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 */
+		""
+		);