X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftranslator-dispatch-list.cc;h=28ea71afa248746eab08669ed95763185f67a340;hb=e10092cbaddbbe8bf2a3668eb70ee4dafb54af8a;hp=7dac8ea0917767298288846a949f29a9a9ebc6b3;hpb=7f6816438d66f6d70db5b68454d80656a0f3f131;p=lilypond.git diff --git a/lily/translator-dispatch-list.cc b/lily/translator-dispatch-list.cc index 7dac8ea091..28ea71afa2 100644 --- a/lily/translator-dispatch-list.cc +++ b/lily/translator-dispatch-list.cc @@ -3,8 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2005 Han-Wen Nienhuys - + (c) 2005--2006 Han-Wen Nienhuys */ #include "translator-dispatch-list.hh" @@ -14,15 +13,15 @@ #include "ly-smobs.icc" -void +void Engraver_dispatch_list::apply (Grob_info gi) { Translator *origin = gi.origin_translator (); - for (int i = 0; i < dispatch_entries_.size (); i++) + for (vsize i = 0; i < dispatch_entries_.size (); i++) { Engraver_dispatch_entry const &e (dispatch_entries_[i]); if (e.engraver_ == origin) - continue; + continue; (*e.function_) (e.engraver_, gi); } @@ -30,37 +29,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 (unsmob_translator (scm_car (s))); + Engraver *eng + = dynamic_cast (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; } @@ -71,7 +71,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 *) { @@ -80,5 +79,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);