2003 -> 2004

[lilypond.git] / lily / global-translator.cc

diff --git a/lily/global-translator.cc b/lily/global-translator.cc
index 9ee578925abe5c49f1e2f874fef42d57c26c7369..dc6280681157dbd899191c58c4f98503f94c31b3 100644 (file)
--- a/lily/global-translator.cc
+++ b/lily/global-translator.cc
@@ -3,13 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include <stdio.h>
 
-#include "debug.hh"
+#include "warn.hh"
 #include "music.hh"
-#include "request.hh"
+#include "event.hh"
 #include "music-list.hh"
 #include "music-iterator.hh"
 #include "global-translator.hh"
@@ -42,7 +42,7 @@ Global_translator::sneaky_insert_extra_moment (Moment w)
 }
 
 int
-Global_translator::moments_left_i () const
+Global_translator::get_moments_left () const
 {
   return extra_mom_pq_.size ();
 }
@@ -63,7 +63,7 @@ Global_translator::now_mom () const
 
 
 Music_output*
-Global_translator::get_output_p ()
+Global_translator::get_output ()
 {
   return 0;
 }
@@ -72,6 +72,7 @@ void
 Global_translator::one_time_step ()
 {
 }
+
 void
 Global_translator::start ()
 {
@@ -88,7 +89,7 @@ Global_translator::run_iterator_on_me (Music_iterator * iter)
     prev_mom_ = now_mom_ = iter->pending_moment ();
 
   bool first = true;
-  while (iter->ok () || moments_left_i ())
+  while (iter->ok () || get_moments_left ())
     {
       Moment w;
       w.set_infinite (1);
@@ -98,11 +99,11 @@ Global_translator::run_iterator_on_me (Music_iterator * iter)
        }
 
       w = sneaky_insert_extra_moment (w);
+      if (w.main_part_.is_infinity ())
+       break ;
       
-      //      printf ("proccing %s\n ",       w.str().ch_C());
-
-
       
+      //      printf ("proccing %s\n ",       w.to_string ().to_str0 ());
       if (first)
        {
          first = false;
@@ -116,3 +117,39 @@ Global_translator::run_iterator_on_me (Music_iterator * iter)
       one_time_step ();
     }
 }
+
+void
+Global_translator::apply_finalizations ()
+{
+  SCM lst = get_property ("finalizations");
+  set_property ("finalizations" , SCM_EOL); 
+  for (SCM s = lst ; gh_pair_p (s); s = gh_cdr (s))
+    {
+      scm_primitive_eval (gh_car (s));
+    }
+}
+
+/*
+   Add a function to execute before stepping to the next time step.
+ */
+void
+Global_translator::add_finalization (SCM x)
+{
+  SCM lst = get_property ("finalizations");
+  lst = scm_cons (x, lst);
+  set_property ("finalizations" ,lst); 
+}
+
+
+Global_translator *
+Translator::top_translator()const
+{
+  if (dynamic_cast<Global_translator*>((Translator*)this))
+    return dynamic_cast<Global_translator*> ((Translator*)this);
+
+  if (daddy_trans_)
+    return daddy_trans_->top_translator ();
+
+  programming_error ("No top translator!");
+  return 0;
+}