release: 1.3.87

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

diff --git a/lily/global-translator.cc b/lily/global-translator.cc
index de0ee4c4afbf9d9a6b2d5a994caaca064bbaf8d4..1713ce373637844343ec828a977c3c9b08e7d7b1 100644 (file)
--- a/lily/global-translator.cc
+++ b/lily/global-translator.cc
@@ -83,73 +83,21 @@ Global_translator::finish ()
 void
 Global_translator::run_iterator_on_me (Music_iterator * iter)
 {
-  bool first = true;
+
   while (iter->ok () || moments_left_i ())
     {
       Moment w;
       w.set_infinite (1);
       if (iter->ok ())
        {
-         w = iter->next_moment();
-
-         if (!first)
-           iter->next ();
-         else
-           first = false;
+         w = iter->pending_moment();
       
          DEBUG_OUT << "proccing: " << w << '\n';
-         if (flower_dstream && !flower_dstream->silent_b ("walking"))
-           iter->print();
        }
 
       w = sneaky_insert_extra_moment (w);
       prepare (w);
-      
-      if (flower_dstream && !flower_dstream->silent_b ("walking"))
-       print();
-
       iter->process (w);
-
-      /*
-       Urg, this is request_chord_iterator.
-       */
-      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);
-         for (SCM s = dynamic_cast<Music_sequence *> (m)->music_list ();
-              gh_pair_p (s);  s = SCM_CDR (s))
-           {
-             Music *m = unsmob_music (SCM_CAR (s));
-             if (Request* r = dynamic_cast<Request*> (m))
-               {
-                 bool b = t->try_music (m);
-                 if (!b)
-                   m->origin ()->warning (_f ("Junking request: `%s'",
-                                              classname(m)));
-               }
-             else
-               m->origin ()->warning (_f ("Huh?  Not a Request: `%s'",
-                                          classname (m)));
-           }
-         if (! dynamic_cast<Music_sequence *> (m))
-           {
-             bool b = t->try_music (m);
-             if (!b)
-               {
-                 /*
-                   Children?
-                 */
-                 printf ("junking:\n");
-                 m->print ();
-                 t->print ();
-               }
-           }
-       }
       
       process ();
     }