X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fengraver-group-engraver.cc;h=aa25efaa6e457e1d0e0549af72567503e99653b0;hb=7aabfb20c46e0a1de41698ddc6859ccd3a6dea85;hp=7df4fd80ccbfe636ecf168a6add254fb87601281;hpb=fb2cb5e32d671334270e101a7a286ee80d5ade00;p=lilypond.git

diff --git a/lily/engraver-group-engraver.cc b/lily/engraver-group-engraver.cc
index 7df4fd80cc..aa25efaa6e 100644
--- a/lily/engraver-group-engraver.cc
+++ b/lily/engraver-group-engraver.cc
@@ -3,29 +3,23 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "flower-proto.hh"
 #include "engraver-group-engraver.hh"
 #include "engraver.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "paper-score.hh"
 #include "grob.hh"
 
 void
 Engraver_group_engraver::announce_grob (Grob_info info)
 {
-  announce_info_arr_.push (info);
+  announce_infos_.push (info);
   Engraver::announce_grob (info);
 }
 
-void
-Engraver_group_engraver::start_translation_timestep ()
-{
-  Translator_group::start_translation_timestep();
-}
-
 void
 Engraver_group_engraver::process_acknowledged_grobs_in_simple_children ()
 {
@@ -71,10 +65,12 @@ acks.
 
 */
 SCM find_acknowledge_engravers (SCM gravlist, SCM meta);
+SCM find_accept_engravers (SCM gravlist, SCM music_descr);
+
 void
 Engraver_group_engraver::acknowledge_grobs ()
 {
-  if (!announce_info_arr_.size ())
+  if (!announce_infos_.size ())
     return ;
   
   SCM tab = get_property ("acknowledgeHashTable");
@@ -82,11 +78,11 @@ Engraver_group_engraver::acknowledge_grobs ()
   SCM meta_sym = ly_symbol2scm ("meta");  
 
   
-  for (int j =0; j < announce_info_arr_.size (); j++)
+  for (int j =0; j < announce_infos_.size (); j++)
     {
-      Grob_info info = announce_info_arr_[j];
+      Grob_info info = announce_infos_[j];
       
-      SCM meta = info.grob_l_->internal_get_grob_property (meta_sym);
+      SCM meta = info.grob_->internal_get_grob_property (meta_sym);
       SCM nm = scm_assoc (name_sym, meta);
       if (gh_pair_p (nm))
 	nm = ly_cdr (nm);
@@ -115,7 +111,7 @@ Engraver_group_engraver::acknowledge_grobs ()
 	{
 	  Translator * t = unsmob_translator (ly_car (p));
 	  Engraver * eng = dynamic_cast<Engraver*> (t);
-	  if (eng && eng!= info.origin_trans_l_)
+	  if (eng && eng!= info.origin_trans_)
 	    eng->acknowledge_grob (info);
 	}
     }
@@ -135,10 +131,10 @@ Engraver_group_engraver::do_announces ()
    do
     {
       acknowledge_grobs ();
-      announce_info_arr_.clear ();
+      announce_infos_.clear ();
       process_acknowledged_grobs_in_simple_children ();
     }
-   while (announce_info_arr_.size ());
+   while (announce_infos_.size ());
 }
 
 
@@ -169,7 +165,11 @@ Engraver_group_engraver::process_music ()
 void
 Engraver_group_engraver::initialize ()
 {
-  SCM tab = scm_make_vector (gh_int2scm (61), SCM_BOOL_F); // magic ->
+  /*
+    docme: why bool_f.
+    
+   */
+  SCM tab = scm_make_vector (gh_int2scm (61), SCM_BOOL_F);
   set_property ("acknowledgeHashTable", tab);
 
   Translator_group::initialize ();
@@ -180,7 +180,8 @@ Engraver_group_engraver::Engraver_group_engraver() {}
 ENTER_DESCRIPTION(Engraver_group_engraver,
 /* descr */       "A group of engravers taken together",
 /* creats*/       "",
-/* acks  */       "",
+/* accepts */     "",
+/* acks  */      "",
 /* reads */       "",
 /* write */       "");
 
@@ -200,6 +201,7 @@ bool engraver_valid (Translator*tr, SCM ifaces)
 }
 
 
+
 SCM
 find_acknowledge_engravers (SCM gravlist, SCM meta_alist)
 {
@@ -216,3 +218,5 @@ find_acknowledge_engravers (SCM gravlist, SCM meta_alist)
 
   return l;
 }
+
+