X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftranslator-dispatch-list.cc;h=a4bddefca83013d6d281fe95669ae63f7d7f173e;hb=a276a19dc6bd57832db3107f2f2cbb04cb4677b6;hp=21b6514556c0a5040b3b4fbd13c822b7ec756d72;hpb=7512d98b2fa5f9cea2add48cccb93cc591defe32;p=lilypond.git

diff --git a/lily/translator-dispatch-list.cc b/lily/translator-dispatch-list.cc
index 21b6514556..a4bddefca8 100644
--- a/lily/translator-dispatch-list.cc
+++ b/lily/translator-dispatch-list.cc
@@ -3,25 +3,23 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
+  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "translator-dispatch-list.hh"
-
-#include "grob-info.hh"
 #include "engraver.hh"
 
 #include "ly-smobs.icc"
 
-void 
+void
 Engraver_dispatch_list::apply (Grob_info gi)
 {
-  for (int i = 0; i < dispatch_entries_.size (); i++)
+  Translator *origin = gi.origin_translator ();
+  for (vsize i = 0; i < dispatch_entries_.size (); i++)
     {
       Engraver_dispatch_entry const &e (dispatch_entries_[i]);
-      if (e.engraver_ == gi.origin_translator ())
-	continue; 
+      if (e.engraver_ == origin)
+	continue;
 
       (*e.function_) (e.engraver_, gi);
     }
@@ -29,37 +27,38 @@ Engraver_dispatch_list::apply (Grob_info gi)
 
 SCM
 Engraver_dispatch_list::create (SCM trans_list,
-				SCM iface_list)
+				SCM iface_list, Direction start_end)
 {
-  SCM retval = Engraver_dispatch_list().smobbed_copy ();
-  Engraver_dispatch_list * list = Engraver_dispatch_list::unsmob (retval);
+  SCM retval = Engraver_dispatch_list ().smobbed_copy ();
+  Engraver_dispatch_list *list = Engraver_dispatch_list::unsmob (retval);
 
   Engraver_dispatch_entry entry;
-  bool found = false; 
+  bool found = false;
   for (SCM s = trans_list; scm_is_pair (s); s = scm_cdr (s))
     {
-      Engraver * eng
-	= dynamic_cast<Engraver*> (unsmob_translator (scm_car (s)));
+      Engraver *eng
+	= dynamic_cast<Engraver *> (unsmob_translator (scm_car (s)));
 
       if (!eng)
 	continue;
 
       entry.engraver_ = eng;
-      for (SCM i =  iface_list; scm_is_pair (i); i = scm_cdr (i))
+      for (SCM i = iface_list; scm_is_pair (i); i = scm_cdr (i))
 	{
 	  Engraver_void_function_engraver_grob_info ptr
-	    = eng->get_acknowledger (scm_car (i));
+	    = (start_end == START)
+	    ? eng->get_acknowledger (scm_car (i))
+	    : eng->get_end_acknowledger (scm_car (i));
+	  
 	  if (ptr)
 	    {
 	      entry.function_ = ptr;
-	      list->dispatch_entries_.push (entry);
+	      list->dispatch_entries_.push_back (entry);
 	      found = true;
 	    }
-	  
 	}
     }
 
-  
   return found ? retval : SCM_EOL;
 }
 
@@ -70,7 +69,6 @@ Engraver_dispatch_list::mark_smob (SCM x)
   return SCM_BOOL_F;
 }
 
-
 int
 Engraver_dispatch_list::print_smob (SCM x, SCM p, scm_print_state *)
 {
@@ -79,5 +77,5 @@ Engraver_dispatch_list::print_smob (SCM x, SCM p, scm_print_state *)
   return 1;
 }
 
-IMPLEMENT_SIMPLE_SMOBS(Engraver_dispatch_list);
-IMPLEMENT_DEFAULT_EQUAL_P(Engraver_dispatch_list);
+IMPLEMENT_SIMPLE_SMOBS (Engraver_dispatch_list);
+IMPLEMENT_DEFAULT_EQUAL_P (Engraver_dispatch_list);