Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc
index 5d51b2f394bb2dcbaad2664cdd0a2e69119e4377..d567cb6ebc279d53e1f55ed741b7c9020bf2cf22 100644 (file)
--- a/lily/spacing-engraver.cc
+++ b/lily/spacing-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "paper-column.hh"
@@ -14,6 +14,8 @@
 #include "pointer-group-interface.hh"
 #include "spanner.hh"
 
+#include "translator.icc"
+
 struct Rhythmic_tuple
 {
   Grob_info info_;
@@ -30,28 +32,31 @@ struct Rhythmic_tuple
   static int time_compare (Rhythmic_tuple const &, Rhythmic_tuple const &);
 };
 
-/**
-   Acknowledge rhythmic elements, for initializing spacing fields in
-   the columns.
-
-   should be the  last one of the toplevel context
+/*
+  TODO: allow starting & stopping of spacing regions.
+*/
+/*
+  Acknowledge rhythmic elements, for initializing spacing fields in
+  the columns.
 */
 class Spacing_engraver : public Engraver
 {
   PQueue<Rhythmic_tuple> playing_durations_;
-  Array<Rhythmic_tuple> now_durations_;
-  Array<Rhythmic_tuple> stopped_durations_;
+  vector<Rhythmic_tuple> now_durations_;
+  vector<Rhythmic_tuple> stopped_durations_;
   Moment now_;
   Spanner *spacing_;
 
   TRANSLATOR_DECLARATIONS (Spacing_engraver);
+
 protected:
-  DECLARE_ACKNOWLEDGER(staff_spacing);
-  DECLARE_ACKNOWLEDGER(note_spacing);
-  DECLARE_ACKNOWLEDGER(rhythmic_head);
-  PRECOMPUTED_VIRTUAL void start_translation_timestep ();
-  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
-  PRECOMPUTED_VIRTUAL void process_music ();
+  DECLARE_ACKNOWLEDGER (staff_spacing);
+  DECLARE_ACKNOWLEDGER (note_spacing);
+  DECLARE_ACKNOWLEDGER (rhythmic_head);
+
+  void start_translation_timestep ();
+  void stop_translation_timestep ();
+  void process_music ();
   virtual void finalize ();
 };
 
@@ -106,7 +111,7 @@ Spacing_engraver::acknowledge_staff_spacing (Grob_info i)
 {
   Pointer_group_interface::add_grob (spacing_, ly_symbol2scm ("wishes"), i.grob ());
 }
-  
+
 void
 Spacing_engraver::acknowledge_rhythmic_head (Grob_info i)
 {
@@ -124,7 +129,7 @@ Spacing_engraver::acknowledge_rhythmic_head (Grob_info i)
        {
          Moment len = r->get_length ();
          Rhythmic_tuple t (i, now_mom () + len);
-         now_durations_.push (t);
+         now_durations_.push_back (t);
        }
     }
 }
@@ -132,9 +137,20 @@ Spacing_engraver::acknowledge_rhythmic_head (Grob_info i)
 void
 Spacing_engraver::stop_translation_timestep ()
 {
+  Paper_column *musical_column
+    = dynamic_cast<Paper_column *> (unsmob_grob (get_property ("currentMusicalColumn")));
+
+  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);
+      return;
+    }
+
   Moment shortest_playing;
   shortest_playing.set_infinite (1);
-  for (int i = 0; i < playing_durations_.size (); i++)
+  for (vsize i = 0; i < playing_durations_.size (); i++)
     {
       Music *mus = playing_durations_[i].info_.music_cause ();
       if (mus)
@@ -146,7 +162,7 @@ Spacing_engraver::stop_translation_timestep ()
   Moment starter;
   starter.set_infinite (1);
 
-  for (int i = 0; i < now_durations_.size (); i++)
+  for (vsize i = 0; i < now_durations_.size (); i++)
     {
       Moment m = now_durations_[i].info_.music_cause ()->get_length ();
       if (m.to_bool ())
@@ -159,15 +175,12 @@ Spacing_engraver::stop_translation_timestep ()
 
   shortest_playing = min (shortest_playing, starter);
 
-  Paper_column *sc
-    = dynamic_cast<Paper_column *> (unsmob_grob (get_property ("currentMusicalColumn")));
-
   assert (starter.to_bool ());
   SCM sh = shortest_playing.smobbed_copy ();
   SCM st = starter.smobbed_copy ();
 
-  sc->set_property ("shortest-playing-duration", sh);
-  sc->set_property ("shortest-starter-duration", st);
+  musical_column->set_property ("shortest-playing-duration", sh);
+  musical_column->set_property ("shortest-starter-duration", st);
 }
 
 void
@@ -178,19 +191,22 @@ Spacing_engraver::start_translation_timestep ()
   while (playing_durations_.size () && playing_durations_.front ().end_ < now_)
     playing_durations_.delmin ();
   while (playing_durations_.size () && playing_durations_.front ().end_ == now_)
-    stopped_durations_.push (playing_durations_.get ());
+    stopped_durations_.push_back (playing_durations_.get ());
 }
 
-#include "translator.icc"
+ADD_ACKNOWLEDGER (Spacing_engraver, staff_spacing);
+ADD_ACKNOWLEDGER (Spacing_engraver, note_spacing);
+ADD_ACKNOWLEDGER (Spacing_engraver, rhythmic_head);
 
-ADD_ACKNOWLEDGER(Spacing_engraver,staff_spacing);
-ADD_ACKNOWLEDGER(Spacing_engraver,note_spacing);
-ADD_ACKNOWLEDGER(Spacing_engraver,rhythmic_head);
-  
 ADD_TRANSLATOR (Spacing_engraver,
-               /* descr */ "make a SpacingSpanner and do bookkeeping of shortest starting and playing notes  ",
-               /* creats*/ "SpacingSpanner",
-               /* accepts */ "",
-               /* acks  */ "",
-               /* reads */ "",
+               "make a SpacingSpanner and do "
+               "bookkeeping of shortest starting and playing notes  ",
+
+               /* create */ "SpacingSpanner",
+               /* accept */ "",
+               /* read */
+               "currentMusicalColumn "
+               "currentCommandColumn "
+               "proportionalNotationDuration",
+               
                /* write */ "");