* lily/note-column.cc (dir): idem.

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

diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc
index 48cb143b8d3ab90f422aa0a31540b1fd60e7e20e..b2b27ff282448a83bbb13bbf83ea220f3c32c891 100644 (file)
--- a/lily/spacing-engraver.cc
+++ b/lily/spacing-engraver.cc
@@ -1,34 +1,33 @@
-/*   
-  spacing-engraver.cc --  implement Spacing_engraver
-  
+/*
+  spacing-engraver.cc -- implement Spacing_engraver
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
 
 #include "paper-column.hh"
 #include "engraver.hh"
 #include "pqueue.hh"
 #include "note-spacing.hh"
 #include "staff-spacing.hh"
-#include "group-interface.hh"
+#include "pointer-group-interface.hh"
 #include "spanner.hh"
 
 struct Rhythmic_tuple
 {
   Grob_info info_;
   Moment end_;
-  
+
   Rhythmic_tuple ()
-    {
-    }
+  {
+  }
   Rhythmic_tuple (Grob_info i, Moment m)
-    {
-      info_ = i;
-      end_ = m;
-    }
-  static int time_compare (Rhythmic_tuple const &, Rhythmic_tuple const &);  
+  {
+    info_ = i;
+    end_ = m;
+  }
+  static int time_compare (Rhythmic_tuple const &, Rhythmic_tuple const &);
 };
 
 /**
@@ -43,21 +42,21 @@ class Spacing_engraver : public Engraver
   Array<Rhythmic_tuple> now_durations_;
   Array<Rhythmic_tuple> stopped_durations_;
   Moment now_;
-  Spanner * spacing_;
-  
+  Spanner *spacing_;
+
   TRANSLATOR_DECLARATIONS (Spacing_engraver);
 protected:
   virtual void acknowledge_grob (Grob_info);
-  virtual void start_translation_timestep ();
-  virtual void stop_translation_timestep ();
-  virtual void process_music ();
+  PRECOMPUTED_VIRTUAL void start_translation_timestep ();
+  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
+  PRECOMPUTED_VIRTUAL void process_music ();
   virtual void finalize ();
 };
 
 inline int
 compare (Rhythmic_tuple const &a, Rhythmic_tuple const &b)
 {
-  return Rhythmic_tuple::time_compare (a,b);
+  return Rhythmic_tuple::time_compare (a, b);
 }
 
 int
@@ -78,8 +77,7 @@ Spacing_engraver::process_music ()
   if (!spacing_)
     {
       spacing_ = make_spanner ("SpacingSpanner", SCM_EOL);
-      spacing_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));  
-      
+      spacing_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
     }
 }
 
@@ -88,8 +86,8 @@ Spacing_engraver::finalize ()
 {
   if (spacing_)
     {
-      Grob * p = unsmob_grob (get_property ("currentCommandColumn"));
-  
+      Grob *p = unsmob_grob (get_property ("currentCommandColumn"));
+
       spacing_->set_bound (RIGHT, p);
       spacing_ = 0;
     }
@@ -98,18 +96,18 @@ Spacing_engraver::finalize ()
 void
 Spacing_engraver::acknowledge_grob (Grob_info i)
 {
-  if (Note_spacing::has_interface (i.grob_) || Staff_spacing::has_interface (i.grob_))
+  if (Note_spacing::has_interface (i.grob ()) || Staff_spacing::has_interface (i.grob ()))
     {
-      Pointer_group_interface::add_grob (spacing_, ly_symbol2scm  ("wishes"), i.grob_);
+      Pointer_group_interface::add_grob (spacing_, ly_symbol2scm ("wishes"), i.grob ());
     }
-  
-  if (i.grob_->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface"))
-      || i.grob_->internal_has_interface (ly_symbol2scm ("multi-measure-event")))
+
+  if (i.grob ()->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface"))
+      || i.grob ()->internal_has_interface (ly_symbol2scm ("multi-measure-event")))
     return;
 
   /*
-    only pay attention to durations that are not grace notes. 
-   */
+    only pay attention to durations that are not grace notes.
+  */
   if (!now_.grace_part_)
     {
       Music *r = i.music_cause ();
@@ -129,11 +127,11 @@ Spacing_engraver::stop_translation_timestep ()
   shortest_playing.set_infinite (1);
   for (int i = 0; i < playing_durations_.size (); i++)
     {
-      Music * mus = playing_durations_[i].info_.music_cause ();
+      Music *mus = playing_durations_[i].info_.music_cause ();
       if (mus)
        {
          Moment m = mus->get_length ();
-         shortest_playing = shortest_playing <? m;
+         shortest_playing = min (shortest_playing, m);
        }
     }
   Moment starter;
@@ -144,23 +142,22 @@ Spacing_engraver::stop_translation_timestep ()
       Moment m = now_durations_[i].info_.music_cause ()->get_length ();
       if (m.to_bool ())
        {
-         starter = starter <? m;
+         starter = min (starter, m);
          playing_durations_.insert (now_durations_[i]);
-
        }
     }
   now_durations_.clear ();
-  
-  shortest_playing = shortest_playing <? starter;
-  
-  Paper_column * sc
-    = dynamic_cast<Paper_column*> (unsmob_grob (get_property ("currentMusicalColumn")));
+
+  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-playing-duration", sh);
   sc->set_property ("shortest-starter-duration", st);
 }
 
@@ -175,13 +172,12 @@ Spacing_engraver::start_translation_timestep ()
     stopped_durations_.push (playing_durations_.get ());
 }
 
+#include "translator.icc"
 
-
-
-ENTER_DESCRIPTION (Spacing_engraver,
-/* descr */       "make a SpacingSpanner and do bookkeeping of shortest starting and playing notes  ",
-/* creats*/       "SpacingSpanner",
-/* accepts */     "",
-/* acks  */      "grob-interface",
-/* reads */       "",
-/* write */       "");
+ADD_TRANSLATOR (Spacing_engraver,
+               /* descr */ "make a SpacingSpanner and do bookkeeping of shortest starting and playing notes  ",
+               /* creats*/ "SpacingSpanner",
+               /* accepts */ "",
+               /* acks  */ "grob-interface",
+               /* reads */ "",
+               /* write */ "");