release: 1.3.87

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

diff --git a/lily/global-translator.cc b/lily/global-translator.cc
index 3620c52d694457812d6a7de919e55347b5faf173..1713ce373637844343ec828a977c3c9b08e7d7b1 100644 (file)
--- a/lily/global-translator.cc
+++ b/lily/global-translator.cc
@@ -1,23 +1,30 @@
 /*
-  global-translator.cc -- implement 
+  global-translator.cc -- implement Global_translator
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#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++)
     if (extra_mom_pq_[i] == m)
@@ -25,13 +32,12 @@ Global_translator::add_moment_to_process (Moment m)
   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
@@ -43,19 +49,56 @@ Global_translator::moments_left_i() const
 void
 Global_translator::prepare (Moment m)
 {
+  prev_mom_  = now_mom_;
   now_mom_ = m;
 }
 
 Moment
-Global_translator::now_moment () const
+Global_translator::now_mom () const
 {
   return now_mom_;
 }
 
-IMPLEMENT_IS_TYPE_B1(Global_translator, Translator_group);
+
 
 Music_output*
 Global_translator::get_output_p()
 {
   return 0;
 }
+
+void
+Global_translator::process ()
+{
+}
+void
+Global_translator::start ()
+{
+}
+void
+Global_translator::finish ()
+{
+}
+
+void
+Global_translator::run_iterator_on_me (Music_iterator * iter)
+{
+
+  while (iter->ok () || moments_left_i ())
+    {
+      Moment w;
+      w.set_infinite (1);
+      if (iter->ok ())
+       {
+         w = iter->pending_moment();
+      
+         DEBUG_OUT << "proccing: " << w << '\n';
+       }
+
+      w = sneaky_insert_extra_moment (w);
+      prepare (w);
+      iter->process (w);
+      
+      process ();
+    }
+}