release: 1.5.8

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

diff --git a/lily/global-translator.cc b/lily/global-translator.cc
index 3ecc44b4e085101cdf6a0d6c2422e3c4ffb95b2d..d66b6f05e9b439fbe67bca93d2a060b3e111ffa0 100644 (file)
--- a/lily/global-translator.cc
+++ b/lily/global-translator.cc
@@ -3,11 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.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"
 
@@ -21,10 +23,10 @@ Global_translator::add_moment_to_process (Moment m)
   if (m  > final_mom_)
     return;
 
-  if (m < now_mom_ )
+  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);
@@ -33,15 +35,15 @@ Global_translator::add_moment_to_process (Moment m)
 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
@@ -60,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
@@ -81,47 +83,34 @@ Global_translator::finish ()
 void
 Global_translator::run_iterator_on_me (Music_iterator * iter)
 {
-  while (iter->ok() || moments_left_i ())
+  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())
+      if (iter->ok ())
        {
-         w = iter->next_moment();
-         DEBUG_OUT << "proccing: " << w << '\n';
-         if (flower_dstream && !flower_dstream->silent_b ("walking"))
-           iter->print();
+         w = iter->pending_moment ();
        }
-      
+
       w = sneaky_insert_extra_moment (w);
-      prepare (w);
-      
-      if (flower_dstream && !flower_dstream->silent_b ("walking"))
-       print();
 
-      iter->process (w);
-      for (SCM i = iter->get_music (); gh_pair_p (i); i = SCM_CDR (i))
-       {
-         assert (gh_pair_p (i));
-         SCM p = SCM_CAR (i);
-         Music *m = unsmob_music (SCM_CAR (p));
-         Translator *t = unsmob_translator (SCM_CDR (p));
-         assert (m);
-         assert (t);
-         bool b = t->try_music (m);
-         if (!b)
-           {
-             /*
-               Children?
-             */
-             printf ("junking:\n");
-             m->print ();
-             t->print ();
-           }
+      cout << "Proccing " << w << endl;
 
+      
+      if (first)
+       {
+         first = false;
+         set_property (ly_symbol2scm ("measurePosition"), w.smobbed_copy ());
        }
+
+      prepare (w);
+      if (iter->ok ())
+       iter->process (w);
       
-      iter->next ();
-      process();
+      one_time_step ();
     }
 }