* lily/include/translator.icc: new file.

[lilypond.git] / lily / grob-pq-engraver.cc

diff --git a/lily/grob-pq-engraver.cc b/lily/grob-pq-engraver.cc
index fad29ac48de6ff45c8d3b6b0d1dcdf2cfe6349a8..08def8d83be11d20ffbf08fc4c42bfada4c9d42e 100644 (file)
--- a/lily/grob-pq-engraver.cc
+++ b/lily/grob-pq-engraver.cc
@@ -1,159 +1,125 @@
-/*   
-  grob-pq-engraver.cc --  implement Grob_pq_engraver
+/*
+  grob-pq-engraver.cc -- implement Grob_pq_engraver
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2001--2005  Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "translator-group.hh"
+#include "context.hh"
 #include "engraver.hh"
 #include "grob.hh"
 #include "warn.hh"
 
-struct Grob_mom
-{
-  Grob * grob_ ;
-  Moment end_;
-  Grob_mom () {}
-  Grob_mom (Grob*gr, Moment e)
-  {
-    grob_ = gr;
-    end_ = e;
-  }
-};
-
-int compare  (Grob_mom const &a, Grob_mom const &b)
-{
-  return Moment::compare (a.end_, b.end_);
-}
-
-class Grob_pq_engraver: public Engraver
+class Grob_pq_engraver : public Engraver
 {
 public:
-  TRANSLATOR_DECLARATIONS(Grob_pq_engraver);
-
-  Array<Grob_mom> current_grobs_;
+  TRANSLATOR_DECLARATIONS (Grob_pq_engraver);
 protected:
   virtual void initialize ();
   virtual void acknowledge_grob (Grob_info);
-  virtual void start_translation_timestep ();
-  virtual void stop_translation_timestep ();
+  PRECOMPUTED_VIRTUAL void start_translation_timestep ();
+  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
 };
 
-
-Grob_pq_engraver::Grob_pq_engraver()
+Grob_pq_engraver::Grob_pq_engraver ()
 {
 }
 
-
 void
 Grob_pq_engraver::initialize ()
 {
-  daddy_trans_l_->set_property ("busyGrobs", SCM_EOL); 
+  context ()->set_property ("busyGrobs", SCM_EOL);
+}
+
+LY_DEFINE (ly_grob_pq_less_p, "ly:grob-pq-less?",
+          2, 0, 0, (SCM a, SCM b),
+          "Compare 2 grob priority queue entries. Internal")
+{
+  if (Moment::compare (*unsmob_moment (scm_car (a)),
+                      *unsmob_moment (scm_car (b))) < 0)
+    return SCM_BOOL_T;
+  else
+    return SCM_BOOL_F;
 }
 
 void
 Grob_pq_engraver::acknowledge_grob (Grob_info gi)
 {
-  Music  * m = gi.music_cause ();
+  Music *m = gi.music_cause ();
 
-  if (m)
+  if (m
+      && !gi.grob ()->internal_has_interface (ly_symbol2scm ("multi-measure-interface")))
     {
       Moment n = now_mom ();
-      Moment l = m->length_mom ();
+      Moment l = m->get_length ();
 
       if (!l.to_bool ())
-       return ;
-      
+       return;
+
       if (n.grace_part_)
        {
          l.grace_part_ = l.main_part_;
          l.main_part_ = 0;
        }
 
-      current_grobs_.push (Grob_mom (gi.grob_l_, n + l));
+      Moment end = n + l;
+      SCM lst = scm_acons (end.smobbed_copy (),
+                          gi.grob ()->self_scm (),
+                          SCM_EOL);
+
+      SCM busy = get_property ("busyGrobs");
+      busy = scm_merge_x (lst, busy, ly_grob_pq_less_p_proc);
+      context ()->set_property ("busyGrobs", busy);
     }
 }
 
 void
 Grob_pq_engraver::stop_translation_timestep ()
 {
-  Moment now = now_mom();
-
-  current_grobs_.sort (&compare);
-
-  SCM busy = get_property ("busyGrobs");
-  while (gh_pair_p (busy) && *unsmob_moment (gh_caar (busy)) == now)
+  Moment now = now_mom ();
+  SCM start_busy = get_property ("busyGrobs");
+  SCM busy = start_busy;
+  while (scm_is_pair (busy) && *unsmob_moment (scm_caar (busy)) == now)
     {
-      busy = gh_cdr (busy);
+      busy = scm_cdr (busy);
     }
-  
-  SCM start = busy;
-  SCM * current_cell = &start;
-
-  int  i = 0; 
-  while (i  < current_grobs_.size ())
-    {
-      Moment stop;
-      stop.set_infinite (1);
-      
-      if (gh_pair_p (busy))
-       {
-         SCM h = gh_car (busy);
-         stop = *unsmob_moment (gh_car (h));
-       }
 
-      Moment current_stop = current_grobs_[i].end_;
-      if (current_stop <= stop)
-       {
-         SCM new_entry = gh_cons (current_stop.smobbed_copy(),
-                                  current_grobs_[i].grob_->self_scm ());
-
-         /*
-           Insert before BUSY.
-          */
-         i ++;
-         *current_cell = gh_cons (new_entry, busy);
-         current_cell = SCM_CDRLOC(*current_cell);
-       }
-      else
-       {
-         /*
-           if current_stop > stop, then stop != infty, and we
-           apparently have a next entry */
-         busy = gh_cdr (busy);
-         current_cell = SCM_CDRLOC(*current_cell);
-       }
-    }
-
-  current_grobs_.clear ();
-  daddy_trans_l_->set_property ("busyGrobs", start);
+  if (start_busy != busy)
+    context ()->set_property ("busyGrobs", busy);
 }
 
 void
 Grob_pq_engraver::start_translation_timestep ()
 {
- Moment now = now_mom();
+  Moment now = now_mom ();
 
   SCM start_busy = get_property ("busyGrobs");
   SCM busy = start_busy;
-  while (gh_pair_p (busy) && *unsmob_moment (gh_caar (busy)) < now)
+  while (scm_is_pair (busy) && *unsmob_moment (scm_caar (busy)) < now)
     {
-      programming_error ("Skipped something ?!");
-      
-      busy = gh_cdr (busy);
+      /*
+       The grob-pq-engraver is not water tight, and stuff like
+       tupletSpannerDuration confuses it.
+      */
+      busy = scm_cdr (busy);
     }
 
   if (start_busy != busy)
-    daddy_trans_l_->set_property ("busyGrobs", busy);
+    context ()->set_property ("busyGrobs", busy);
 }
 
+#include "translator.icc"
+
+ADD_TRANSLATOR (Grob_pq_engraver,
 
-ENTER_DESCRIPTION(Grob_pq_engraver,
-/* descr */       "Administrate when certain grobs (eg. note heads) stop playing.
+               /* descr */ "Administrate when certain grobs (eg. note heads) stop playing; this \
+engraver is a sort-of a failure, since it doesn't handle all sorts of \
+borderline cases very well. \
 ",
-/* creats*/       "",
-/* acks  */       "grob-interface",
-/* reads */       "busyGrobs",
-/* write */       "busyGrobs");
+
+               /* creats*/ "",\
+               /* accepts */ "",\
+               /* acks  */ "grob-interface",\
+               /* reads */ "busyGrobs",\
+               /* write */ "busyGrobs");