* mf/feta-bolletjes.mf (overdone_heads): cleanup triangle

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

diff --git a/lily/engraver-group-engraver.cc b/lily/engraver-group-engraver.cc
index dc51fd495f52acbd7a9e365c0a8a4a5207788c3b..dcb46f9792ef76cbb53b34924ea87f70d1fa790b 100644 (file)
--- a/lily/engraver-group-engraver.cc
+++ b/lily/engraver-group-engraver.cc
@@ -6,16 +6,14 @@
   (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "flower-proto.hh"
 #include "engraver-group-engraver.hh"
-#include "engraver.hh"
+
+#include "flower-proto.hh"
 #include "warn.hh"
 #include "paper-score.hh"
 #include "grob.hh"
 #include "context.hh"
 
-
-
 void
 Engraver_group_engraver::announce_grob (Grob_info info)
 {
@@ -44,8 +42,8 @@ Engraver_group_engraver::acknowledge_grobs ()
       
       SCM meta = info.grob_->internal_get_property (meta_sym);
       SCM nm = scm_assoc (name_sym, meta);
-      if (ly_pair_p (nm))
-       nm = ly_cdr (nm);
+      if (scm_is_pair (nm))
+       nm = scm_cdr (nm);
       else
        {
          /*
@@ -67,9 +65,9 @@ Engraver_group_engraver::acknowledge_grobs ()
          scm_hashq_set_x (tab, nm, acklist);
        }
 
-      for (SCM p = acklist; ly_pair_p (p); p = ly_cdr (p))
+      for (SCM p = acklist; scm_is_pair (p); p = scm_cdr (p))
        {
-         Translator * t = unsmob_translator (ly_car (p));
+         Translator * t = unsmob_translator (scm_car (p));
          Engraver * eng = dynamic_cast<Engraver*> (t);
          if (eng && eng != info.origin_trans_)
            eng->acknowledge_grob (info);
@@ -78,21 +76,56 @@ Engraver_group_engraver::acknowledge_grobs ()
 }
 
 
+/*
+  Ugh. This is slightly expensive. We could/should cache the value of
+  the group count?
+ */
+int
+Engraver_group_engraver::pending_grob_count () const
+{
+  int count = announce_infos_.size ();
+  for (SCM s = context ()->children_contexts ();
+       scm_is_pair (s); s = scm_cdr (s))
+    {
+      Context *c = unsmob_context (scm_car (s));
+      Engraver_group_engraver * group
+       =dynamic_cast<Engraver_group_engraver*> (c->implementation ());
+
+      if (group)
+       count += group->pending_grob_count (); 
+    }
+  return count; 
+}
+
 void
 Engraver_group_engraver::do_announces ()
 {
-  do
-    {
-      engraver_each (get_simple_trans_list (),
-                    &Engraver::process_acknowledged_grobs);
+  do {
+    for (SCM s = context ()->children_contexts ();
+        scm_is_pair (s); s = scm_cdr (s))
+      {
+       Context *c = unsmob_context (scm_car (s));
+       Engraver_group_engraver * group
+         = dynamic_cast<Engraver_group_engraver*> (c->implementation ());
+       if (group)
+         group->do_announces ();
+      }
+
+    do
+      {
+       engraver_each (get_simple_trans_list (),
+                      &Engraver::process_acknowledged_grobs);
+
+      
+       if (announce_infos_.size () == 0)
+         break;
 
-      if (!announce_infos_.size ())
-       break;
+       acknowledge_grobs ();
+       announce_infos_.clear ();
+      }
+    while (1);
 
-      acknowledge_grobs ();
-      announce_infos_.clear ();
-    }
-  while (1);
+  } while (pending_grob_count () > 0);
 }
 
 
@@ -101,7 +134,7 @@ void
 Engraver_group_engraver::initialize ()
 {
   SCM tab = scm_make_vector (scm_int2num (61), SCM_BOOL_F);
-  daddy_context_->set_property ("acknowledgeHashTable", tab);
+  context ()->set_property ("acknowledgeHashTable", tab);
 
   Translator_group::initialize ();
 }
@@ -125,9 +158,9 @@ bool
 engraver_valid (Translator*tr, SCM ifaces)
 {
   SCM ack_ifs = scm_assoc (ly_symbol2scm ("interfaces-acked"), tr->translator_description ());
-  ack_ifs = ly_cdr (ack_ifs);
-  for (SCM s = ifaces; ly_pair_p (s); s = ly_cdr (s))
-    if (scm_c_memq (ly_car (s), ack_ifs) != SCM_BOOL_F)
+  ack_ifs = scm_cdr (ack_ifs);
+  for (SCM s = ifaces; scm_is_pair (s); s = scm_cdr (s))
+    if (scm_c_memq (scm_car (s), ack_ifs) != SCM_BOOL_F)
       return true;
   return false;
 }
@@ -137,12 +170,12 @@ engraver_valid (Translator*tr, SCM ifaces)
 SCM
 find_acknowledge_engravers (SCM gravlist, SCM meta_alist)
 {
-  SCM ifaces = ly_cdr (scm_assoc (ly_symbol2scm ("interfaces"), meta_alist));
+  SCM ifaces = scm_cdr (scm_assoc (ly_symbol2scm ("interfaces"), meta_alist));
 
   SCM l = SCM_EOL;
-  for (SCM s = gravlist; ly_pair_p (s);  s = ly_cdr (s))
+  for (SCM s = gravlist; scm_is_pair (s);  s = scm_cdr (s))
     {
-      Translator* tr = unsmob_translator (ly_car (s));
+      Translator* tr = unsmob_translator (scm_car (s));
       if (engraver_valid (tr, ifaces))
        l = scm_cons (tr->self_scm (), l); 
     }
@@ -157,7 +190,7 @@ void
 recurse_down_engravers (Context * c, Engraver_method ptr, bool context_first)
 {
   Engraver_group_engraver * tg
-    = dynamic_cast<Engraver_group_engraver*> (unsmob_translator (c->implementation_));
+    = dynamic_cast<Engraver_group_engraver*> (c->implementation ());
 
 
   if (!context_first)
@@ -168,10 +201,10 @@ recurse_down_engravers (Context * c, Engraver_method ptr, bool context_first)
       (tg->*ptr) ();
     }
 
-  for (SCM s = c->context_list_ ; ly_pair_p (s);
-       s =ly_cdr (s))
+  for (SCM s = c->children_contexts () ; scm_is_pair (s);
+       s =scm_cdr (s))
     {
-      recurse_down_engravers (unsmob_context (ly_car (s)), ptr, context_first);
+      recurse_down_engravers (unsmob_context (scm_car (s)), ptr, context_first);
     }
 
   if (context_first)
@@ -186,9 +219,9 @@ recurse_down_engravers (Context * c, Engraver_method ptr, bool context_first)
 void
 engraver_each (SCM list, Engraver_method method)
 {
-  for (SCM p = list; ly_pair_p (p); p = ly_cdr (p))
+  for (SCM p = list; scm_is_pair (p); p = scm_cdr (p))
     {
-      Engraver * e = dynamic_cast<Engraver*>(unsmob_translator (ly_car (p)));
+      Engraver * e = dynamic_cast<Engraver*>(unsmob_translator (scm_car (p)));
       if (e)
        (e->*method) ();
     }