release: 1.3.10

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

diff --git a/lily/global-translator.cc b/lily/global-translator.cc
index f4213dd6a6a8f4fb29d7420167798561e09757c5..9728a4c0f265553823b6f94b7b73f0775c070ce0 100644 (file)
--- a/lily/global-translator.cc
+++ b/lily/global-translator.cc
@@ -1,49 +1,38 @@
 /*
-  global-translator.cc -- implement 
+  global-translator.cc -- implement Global_translator
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1999 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;
-}
-
-Translator*
-Global_translator::ancestor_l (int)
-{
-  return this;
 }
 
 void
 Global_translator::add_moment_to_process (Moment m)
 {
-  if (m  > last_mom_)
-       return;
+  if (m  > final_mom_)
+    return;
   
   for (int i=0; i <  extra_mom_pq_.size(); i++)
-       if (extra_mom_pq_[i] == m)
-           return;
+    if (extra_mom_pq_[i] == m)
+      return;
   extra_mom_pq_.insert (m);
 }
 
-int
-Global_translator::depth_i() const
-{
-  return 0;
-}
-
 void
 Global_translator::modify_next (Moment &w)
 {
   while (extra_mom_pq_.size() && 
-       extra_mom_pq_.front() <= w)
+        extra_mom_pq_.front() <= w)
        
-       w =extra_mom_pq_.get();
+    w =extra_mom_pq_.get();
 }
 
 int
@@ -53,15 +42,61 @@ Global_translator::moments_left_i() const
 }
 
 void
-Global_translator::prepare (Moment)
+Global_translator::prepare (Moment m)
+{
+  prev_mom_  = now_mom_;
+  now_mom_ = m;
+}
+
+Moment
+Global_translator::now_mom () const
 {
+  return now_mom_;
 }
 
 
-IMPLEMENT_IS_TYPE_B1(Global_translator, Translator);
 
 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();
+    }
+}