Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / lily / spacing-engraver.cc

diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc
index b3ca5753932cb2253c2cc3e3d385bc8d18c61940..c6fc091de0711f4a4ac31bbff8be752d64bd62f7 100644 (file)
--- a/lily/spacing-engraver.cc
+++ b/lily/spacing-engraver.cc
@@ -6,13 +6,15 @@
   (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "paper-column.hh"
 #include "engraver.hh"
-#include "pqueue.hh"
+#include "moment.hh"
 #include "note-spacing.hh"
-#include "staff-spacing.hh"
+#include "paper-column.hh"
 #include "pointer-group-interface.hh"
+#include "pqueue.hh"
 #include "spanner.hh"
+#include "staff-spacing.hh"
+#include "stream-event.hh"
 
 #include "translator.icc"
 
@@ -58,7 +60,7 @@ class Spacing_engraver : public Engraver
   vector<Rhythmic_tuple> stopped_durations_;
   Moment now_;
   Spanner *spacing_;
-  Music *start_section_;
+  Stream_event *start_section_;
   
   TRANSLATOR_DECLARATIONS (Spacing_engraver);
 
@@ -66,13 +68,13 @@ protected:
   DECLARE_ACKNOWLEDGER (staff_spacing);
   DECLARE_ACKNOWLEDGER (note_spacing);
   DECLARE_ACKNOWLEDGER (rhythmic_head);
+  DECLARE_TRANSLATOR_LISTENER (spacing_section);
 
   void start_translation_timestep ();
   void stop_translation_timestep ();
   void process_music ();
   
   virtual void finalize ();
-  virtual bool try_music (Music *m);
 
   void start_spanner ();
   void stop_spanner ();
@@ -84,11 +86,11 @@ Spacing_engraver::Spacing_engraver ()
   start_section_ = 0;
 }
 
-bool
-Spacing_engraver::try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Spacing_engraver, spacing_section);
+void
+Spacing_engraver::listen_spacing_section (Stream_event *ev)
 {
-  start_section_ = m;
-  return true;  
+  ASSIGN_EVENT_ONCE (start_section_, ev);
 }
 
 void
@@ -106,6 +108,7 @@ Spacing_engraver::start_spanner ()
 {
   assert (!spacing_);
 
+
   spacing_ = make_spanner ("SpacingSpanner", SCM_EOL);
   spacing_->set_bound (LEFT,
                       unsmob_grob (get_property ("currentCommandColumn")));
@@ -153,10 +156,10 @@ Spacing_engraver::acknowledge_rhythmic_head (Grob_info i)
   */
   if (!now_.grace_part_)
     {
-      Music *r = i.music_cause ();
-      if (r && r->is_mus_type ("rhythmic-event"))
+      Stream_event *r = i.event_cause ();
+      if (r && r->in_event_class ("rhythmic-event"))
        {
-         Moment len = r->get_length ();
+         Moment len = get_event_length (r);
          Rhythmic_tuple t (i, now_mom () + len);
          now_durations_.push_back (t);
        }
@@ -169,11 +172,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;
     }
 
@@ -181,10 +193,10 @@ Spacing_engraver::stop_translation_timestep ()
   shortest_playing.set_infinite (1);
   for (vsize i = 0; i < playing_durations_.size (); i++)
     {
-      Music *mus = playing_durations_[i].info_.music_cause ();
-      if (mus)
+      Stream_event *ev = playing_durations_[i].info_.event_cause ();
+      if (ev)
        {
-         Moment m = mus->get_length ();
+         Moment m = get_event_length (ev);
          shortest_playing = min (shortest_playing, m);
        }
     }
@@ -193,7 +205,7 @@ Spacing_engraver::stop_translation_timestep ()
 
   for (vsize i = 0; i < now_durations_.size (); i++)
     {
-      Moment m = now_durations_[i].info_.music_cause ()->get_length ();
+      Moment m = get_event_length (now_durations_[i].info_.event_cause ());
       if (m.to_bool ())
        {
          starter = min (starter, m);
@@ -212,6 +224,8 @@ Spacing_engraver::stop_translation_timestep ()
   musical_column->set_property ("shortest-starter-duration", st);
 }
 
+
+
 void
 Spacing_engraver::start_translation_timestep ()
 {
@@ -235,8 +249,6 @@ ADD_TRANSLATOR (Spacing_engraver,
                "bookkeeping of shortest starting and playing notes  ",
 
                /* create */ "SpacingSpanner",
-               /* accept */
-               "spacing-section-event ",
                /* read */
                "currentMusicalColumn "
                "currentCommandColumn "