release: 1.5.9

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

diff --git a/lily/global-translator.cc b/lily/global-translator.cc
index f4213dd6a6a8f4fb29d7420167798561e09757c5..4e4208bd8282ab00b31d6e982ff3cbd83375e136 100644 (file)
--- a/lily/global-translator.cc
+++ b/lily/global-translator.cc
@@ -1,67 +1,116 @@
 /*
-  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--2001 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;
-}
-
-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;
+
+  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)
-           return;
+  for (int i=0; i <  extra_mom_pq_.size (); i++)
+    if (extra_mom_pq_[i] == m)
+      return;
   extra_mom_pq_.insert (m);
 }
 
-int
-Global_translator::depth_i() const
+Moment
+Global_translator::sneaky_insert_extra_moment (Moment w)
 {
-  return 0;
+  while (extra_mom_pq_.size () && extra_mom_pq_.front () <= w)
+    w = extra_mom_pq_.get ();
+  return w;
 }
 
-void
-Global_translator::modify_next (Moment &w)
+int
+Global_translator::moments_left_i () const
 {
-  while (extra_mom_pq_.size() && 
-       extra_mom_pq_.front() <= w)
-       
-       w =extra_mom_pq_.get();
+  return extra_mom_pq_.size ();
 }
 
-int
-Global_translator::moments_left_i() const
+void
+Global_translator::prepare (Moment m)
 {
-  return extra_mom_pq_.size();
+  prev_mom_  = now_mom_;
+  now_mom_ = m;
 }
 
-void
-Global_translator::prepare (Moment)
+Moment
+Global_translator::now_mom () const
 {
+  return now_mom_;
 }
 
 
-IMPLEMENT_IS_TYPE_B1(Global_translator, Translator);
 
 Music_output*
-Global_translator::get_output_p()
+Global_translator::get_output_p ()
 {
   return 0;
 }
+
+void
+Global_translator::one_time_step ()
+{
+}
+void
+Global_translator::start ()
+{
+}
+void
+Global_translator::finish ()
+{
+}
+
+void
+Global_translator::run_iterator_on_me (Music_iterator * iter)
+{
+  if (iter-> ok ())
+    prev_mom_ = now_mom_ = iter->pending_moment ();
+
+  bool first = true;
+  while (iter->ok () || moments_left_i ())
+    {
+      Moment w;
+      w.set_infinite (1);
+      if (iter->ok ())
+       {
+         w = iter->pending_moment ();
+       }
+
+      w = sneaky_insert_extra_moment (w);
+
+      //      cout << "Proccing " << w << endl;
+
+      
+      if (first)
+       {
+         first = false;
+         set_property (ly_symbol2scm ("measurePosition"), w.smobbed_copy ());
+       }
+
+      prepare (w);
+      if (iter->ok ())
+       iter->process (w);
+      
+      one_time_step ();
+    }
+}