X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fglobal-translator.cc;h=e7fe6790d7eb86656a006479c4370194c7311772;hb=a2991295b2c1fb36bec19de207161855ca3c1756;hp=d38f7bd8c6dce208ef3d530c779bb0e6e1649bda;hpb=0d11cc81d96ba3cbe5d3c221aba3ee16e916c4c9;p=lilypond.git

diff --git a/lily/global-translator.cc b/lily/global-translator.cc
index d38f7bd8c6..e7fe6790d7 100644
--- a/lily/global-translator.cc
+++ b/lily/global-translator.cc
@@ -1,50 +1,55 @@
 /*
-  global-translator.cc -- implement 
+  global-translator.cc -- implement Global_translator
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "global-translator.hh"
-#include "music-iterator.hh"
 #include "debug.hh"
+#include "music.hh"
+#include "request.hh"
+#include "music-list.hh"
+#include "music-iterator.hh"
+#include "global-translator.hh"
 
-Global_translator::Global_translator()
+Global_translator::Global_translator ()
 {
-  last_mom_ = 0;
 }
 
 void
 Global_translator::add_moment_to_process (Moment m)
 {
-  if (m  > last_mom_)
+  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::moments_left_i () const
 {
-  return extra_mom_pq_.size();
+  return extra_mom_pq_.size ();
 }
 
 void
 Global_translator::prepare (Moment m)
 {
+  prev_mom_  = now_mom_;
   now_mom_ = m;
 }
 
@@ -57,13 +62,13 @@ Global_translator::now_mom () const
 
 
 Music_output*
-Global_translator::get_output_p()
+Global_translator::get_output_p ()
 {
   return 0;
 }
 
 void
-Global_translator::process ()
+Global_translator::one_time_step ()
 {
 }
 void
@@ -78,25 +83,21 @@ Global_translator::finish ()
 void
 Global_translator::run_iterator_on_me (Music_iterator * iter)
 {
-  while (iter->ok() || moments_left_i ())
+  while (iter->ok () || moments_left_i ())
     {
       Moment w;
       w.set_infinite (1);
-      if (iter->ok())
+      if (iter->ok ())
 	{
-	  w = iter->next_moment();
-	  DOUT << "proccing: " << w << '\n';
-	  if (!monitor->silent_b ("walking"))
-	    iter->print();
-	}
+	  w = iter->pending_moment ();
       
-      modify_next (w);
+	}
+
+      w = sneaky_insert_extra_moment (w);
       prepare (w);
+      if (iter->ok ())
+	iter->process (w);
       
-      if (!monitor->silent_b ("walking"))
-	print();
-
-      iter->process_and_next (w);
-      process();
+      one_time_step ();
     }
 }