patch::: 1.3.96.jcn9

[lilypond.git] / lily / engraver-group-engraver.cc

diff --git a/lily/engraver-group-engraver.cc b/lily/engraver-group-engraver.cc
index 610b9890ec062c21ca82fb4b8aa3d5e2bad1b968..847bb5d13e36d16d6ccb16484cd612cb7c776582 100644 (file)
--- a/lily/engraver-group-engraver.cc
+++ b/lily/engraver-group-engraver.cc
@@ -3,10 +3,10 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "proto.hh"
+#include "flower-proto.hh"
 #include "engraver-group-engraver.hh"
 #include "engraver.hh"
 #include "debug.hh"
@@ -23,67 +23,43 @@ Engraver_group_engraver::announce_element (Score_element_info info)
   Engraver::announce_element (info);
 }
 
+
 void
 Engraver_group_engraver::do_announces()
 {
-  for (Cons<Translator> *p = trans_p_list_.head_; p; p = p->next_)
+  for (SCM p = trans_group_list_; gh_pair_p (p); p =gh_cdr ( p))
     {
-      if (Engraver_group_engraver *trg =  dynamic_cast <Engraver_group_engraver *> (p->car_))
-       trg->do_announces ();
+      Translator * t = unsmob_translator (gh_car (p));
+      dynamic_cast<Engraver_group_engraver*> (t)->do_announces ();
     }
-
-  Request dummy_req;
-
+  
   while (announce_info_arr_.size ())
     {
       for (int j =0; j < announce_info_arr_.size(); j++)
        {
          Score_element_info info = announce_info_arr_[j];
          
-         if (!info.req_l_)
-           info.req_l_ = &dummy_req;
-
-         for (Cons<Translator> *p = trans_p_list_.head_; p; p = p->next_)
+         for (SCM p = simple_trans_list_; gh_pair_p (p); p = gh_cdr (p))
            {
-             if (!dynamic_cast <Engraver_group_engraver *> (p->car_))
-               {
-                 Engraver * eng = dynamic_cast<Engraver*> (p->car_);
-                 if (eng && eng!= info.origin_trans_l_arr_[0])
-                   eng->acknowledge_element (info);
-               }                 
+             Translator * t = unsmob_translator (gh_car (p));
+             Engraver * eng = dynamic_cast<Engraver*> (t);
+             if (eng && eng!= info.origin_trans_l_)
+               eng->acknowledge_element (info);
            }
        }
-      
       announce_info_arr_.clear ();
-      for (Cons<Translator> *p = trans_p_list_.head_; p; p = p->next_)
+      for (SCM p = simple_trans_list_; gh_pair_p (p); p = gh_cdr ( p))
        {
-         if (!dynamic_cast <Engraver_group_engraver *> (p->car_))
-           {
-             Engraver * eng = dynamic_cast<Engraver*> (p->car_);
-             if (eng)
-               eng->process_acknowledged ();
-           }
+         Translator * t = unsmob_translator (gh_car (p));
+         Engraver * eng = dynamic_cast<Engraver*> (t);
+         if (eng)
+           eng->process_acknowledged ();
        }
     }
 }
 
 
-Staff_info
-Engraver_group_engraver::get_staff_info() const
-{
-  Staff_info inf = Engraver::get_staff_info();
 
-  for (Cons<Translator> *p = trans_p_list_.head_; p; p = p->next_)
-    {
-      if (!dynamic_cast <Engraver_group_engraver *> (p->car_))
-       {
-         Engraver * eng = dynamic_cast<Engraver*> (p->car_);
-         if (eng)
-           eng->fill_staff_info (inf);
-       }
-    }
-  return inf;
-}