X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fglobal-translator.cc;h=ce30c74db6feebf5d78560a85006867e915ed78c;hb=d02e96479e11bc7e3714ab92a460a08d8a68f54f;hp=9728a4c0f265553823b6f94b7b73f0775c070ce0;hpb=7ed4019033adf7db7a8f64c4eb7b7f6d0449402f;p=lilypond.git

diff --git a/lily/global-translator.cc b/lily/global-translator.cc
index 9728a4c0f2..ce30c74db6 100644
--- a/lily/global-translator.cc
+++ b/lily/global-translator.cc
@@ -3,14 +3,18 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
+#include <stdio.h>
 
-#include "global-translator.hh"
+#include "warn.hh"
+#include "music.hh"
+#include "event.hh"
+#include "music-list.hh"
 #include "music-iterator.hh"
-#include "debug.hh"
+#include "global-translator.hh"
 
-Global_translator::Global_translator()
+Global_translator::Global_translator ()
 {
 }
 
@@ -19,26 +23,28 @@ Global_translator::add_moment_to_process (Moment m)
 {
   if (m  > final_mom_)
     return;
+
+  if (m < now_mom_)
+    programming_error ("Trying to freeze in time.");
   
-  for (int i=0; i <  extra_mom_pq_.size(); i++)
+  for (int i=0; i <  extra_mom_pq_.size (); i++)
     if (extra_mom_pq_[i] == m)
       return;
   extra_mom_pq_.insert (m);
 }
 
-void
-Global_translator::modify_next (Moment &w)
+Moment
+Global_translator::sneaky_insert_extra_moment (Moment w)
 {
-  while (extra_mom_pq_.size() && 
-	 extra_mom_pq_.front() <= w)
-	
-    w =extra_mom_pq_.get();
+  while (extra_mom_pq_.size () && extra_mom_pq_.front () <= w)
+    w = extra_mom_pq_.get ();
+  return w;
 }
 
 int
-Global_translator::moments_left_i() const
+Global_translator::get_moments_left () const
 {
-  return extra_mom_pq_.size();
+  return extra_mom_pq_.size ();
 }
 
 void
@@ -57,15 +63,16 @@ Global_translator::now_mom () const
 
 
 Music_output*
-Global_translator::get_output_p()
+Global_translator::get_output ()
 {
   return 0;
 }
 
 void
-Global_translator::process ()
+Global_translator::one_time_step ()
 {
 }
+
 void
 Global_translator::start ()
 {
@@ -78,25 +85,68 @@ Global_translator::finish ()
 void
 Global_translator::run_iterator_on_me (Music_iterator * iter)
 {
-  while (iter->ok() || moments_left_i ())
+  if (iter-> ok ())
+    prev_mom_ = now_mom_ = iter->pending_moment ();
+
+  bool first = true;
+  while (iter->ok () || get_moments_left ())
     {
       Moment w;
       w.set_infinite (1);
-      if (iter->ok())
+      if (iter->ok ())
 	{
-	  w = iter->next_moment();
-	  DEBUG_OUT << "proccing: " << w << '\n';
-	  if (flower_dstream && !flower_dstream->silent_b ("walking"))
-	    iter->print();
+	  w = iter->pending_moment ();
 	}
+
+      w = sneaky_insert_extra_moment (w);
       
-      modify_next (w);
+      //      printf ("proccing %s\n ",       w.to_string ().to_str0 ());
+      if (first)
+	{
+	  first = false;
+	  set_property ("measurePosition", w.smobbed_copy ());
+	}
+
       prepare (w);
+      if (iter->ok ())
+	iter->process (w);
       
-      if (flower_dstream && !flower_dstream->silent_b ("walking"))
-	print();
+      one_time_step ();
+    }
+}
 
-      iter->process_and_next (w);
-      process();
+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;
+}