X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftranslator-dispatch-list.cc;h=6c74b259be4ab377aec8cd4117d9a757a9c36a2c;hb=864ce06c432a62191773b0d59401348c9b51568c;hp=319a976cbdf92e7219c4c14d97775dc7a33346ae;hpb=75eebcb49e52d296b1da3e1074e0825d2c780db4;p=lilypond.git diff --git a/lily/translator-dispatch-list.cc b/lily/translator-dispatch-list.cc index 319a976cbd..6c74b259be 100644 --- a/lily/translator-dispatch-list.cc +++ b/lily/translator-dispatch-list.cc @@ -1,14 +1,23 @@ /* - translator-dispatch-list.cc -- implement Translator_dispatch_list + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2005--2012 Han-Wen Nienhuys - (c) 2005--2006 Han-Wen Nienhuys + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "translator-dispatch-list.hh" - -#include "grob-info.hh" #include "engraver.hh" #include "ly-smobs.icc" @@ -17,11 +26,11 @@ 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); } @@ -29,7 +38,7 @@ 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); @@ -39,39 +48,42 @@ Engraver_dispatch_list::create (SCM trans_list, for (SCM s = trans_list; scm_is_pair (s); s = scm_cdr (s)) { Engraver *eng - = dynamic_cast (unsmob_translator (scm_car (s))); + = dynamic_cast (unsmob_translator (scm_car (s))); if (!eng) - continue; + continue; entry.engraver_ = eng; 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)); - if (ptr) - { - entry.function_ = ptr; - list->dispatch_entries_.push (entry); - found = true; - } - } + { + Engraver_void_function_engraver_grob_info ptr + = (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_back (entry); + found = true; + } + } } return found ? retval : SCM_EOL; } SCM -Engraver_dispatch_list::mark_smob (SCM x) +Engraver_dispatch_list::mark_smob (SCM) { - (void)x; return SCM_BOOL_F; } int -Engraver_dispatch_list::print_smob (SCM x, SCM p, scm_print_state *) +Engraver_dispatch_list::print_smob (SCM /* x */, + SCM p, + scm_print_state *) { - (void)x; scm_puts ("#", p); return 1; }