patch::: 1.3.78.jcn1

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

diff --git a/lily/global-translator.cc b/lily/global-translator.cc
index 1c8179441f5dcc95ffa9d10674983b51a5a6f2b0..4993504d7bf8e0c284659714c19e533d3026f723 100644 (file)
--- a/lily/global-translator.cc
+++ b/lily/global-translator.cc
@@ -1,23 +1,27 @@
 /*
-  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@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "global-translator.hh"
+#include "music-iterator.hh"
+#include "debug.hh"
 
 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)
@@ -43,19 +47,59 @@ 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->next_moment();
+         DEBUG_OUT << "proccing: " << w << '\n';
+         if (flower_dstream && !flower_dstream->silent_b ("walking"))
+           iter->print();
+       }
+      
+      modify_next (w);
+      prepare (w);
+      
+      if (flower_dstream && !flower_dstream->silent_b ("walking"))
+       print();
+
+      iter->process_and_next (w);
+      process();
+    }
+}