X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftranslator-group.cc;h=700f078f16f5048c8d6d05924cefc379951effcd;hb=cd9e822d8daa2af3303f7e1a35e0852edb2282c7;hp=5bf64576eb0b647e6fabeb4239b8fad5ef000837;hpb=108cf0e8c08c8e15e2a800feb161cfad9057daa8;p=lilypond.git diff --git a/lily/translator-group.cc b/lily/translator-group.cc index 5bf64576eb..700f078f16 100644 --- a/lily/translator-group.cc +++ b/lily/translator-group.cc @@ -3,24 +3,24 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2005 Han-Wen Nienhuys + (c) 1997--2007 Han-Wen Nienhuys , + Erik Sandberg */ #include "translator-group.hh" -#include "output-def.hh" -#include "warn.hh" -#include "scm-hash.hh" #include "context-def.hh" #include "context.hh" +#include "dispatcher.hh" +#include "engraver-group.hh" +#include "international.hh" #include "main.hh" #include "music.hh" +#include "output-def.hh" +#include "performer-group.hh" +#include "scm-hash.hh" +#include "warn.hh" -Translator_group * -Translator_group::get_daddy_translator () const -{ - return context ()->get_parent_context ()->implementation (); -} void translator_each (SCM list, Translator_method method) @@ -36,62 +36,152 @@ Translator_group::initialize () } void -Translator_group::finalize () +Translator_group::connect_to_context (Context *c) +{ + if (context_) + { + programming_error ("translator group is already connected to context " + + context_->context_name ()); + } + + context_ = c; + c->event_source ()->add_listener (GET_LISTENER (create_child_translator), + ly_symbol2scm ("AnnounceNewContext")); + for (SCM tr_list = simple_trans_list_; scm_is_pair (tr_list); tr_list = scm_cdr (tr_list)) + { + Translator *tr = unsmob_translator (scm_car (tr_list)); + tr->connect_to_context (c); + } +} + +void +Translator_group::disconnect_from_context () { + for (SCM tr_list = simple_trans_list_; scm_is_pair (tr_list); tr_list = scm_cdr (tr_list)) + { + Translator *tr = unsmob_translator (scm_car (tr_list)); + tr->disconnect_from_context (context_); + } + context_->event_source ()->remove_listener (GET_LISTENER (create_child_translator), + ly_symbol2scm ("AnnounceNewContext")); + context_ = 0; + protected_events_ = SCM_EOL; } -bool -translator_accepts_any_of (Translator *tr, SCM ifaces) +void +Translator_group::finalize () { - SCM ack_ifs = scm_assoc (ly_symbol2scm ("events-accepted"), - tr->translator_description ()); - 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; } SCM -find_accept_translators (SCM gravlist, SCM ifaces) +filter_performers (SCM ell) { - SCM l = SCM_EOL; - for (SCM s = gravlist; scm_is_pair (s); s = scm_cdr (s)) + SCM *tail = ℓ + for (SCM p = ell; scm_is_pair (p); p = scm_cdr (p)) { - Translator *tr = unsmob_translator (scm_car (s)); - if (translator_accepts_any_of (tr, ifaces)) - l = scm_cons (tr->self_scm (), l); + if (dynamic_cast (unsmob_translator (scm_car (*tail)))) + *tail = scm_cdr (*tail); + else + tail = SCM_CDRLOC (*tail); } - l = scm_reverse_x (l, SCM_EOL); - - return l; + return ell; } -bool -Translator_group::try_music (Music *m) +SCM +filter_engravers (SCM ell) { - SCM name = scm_sloppy_assq (ly_symbol2scm ("name"), - m->get_property_alist (false)); - - if (!scm_is_pair (name)) - return false; - - name = scm_cdr (name); - SCM accept_list = scm_hashq_ref (accept_hash_table_, name, SCM_UNDEFINED); - if (accept_list == SCM_BOOL_F) + SCM *tail = ℓ + for (SCM p = ell; scm_is_pair (p); p = scm_cdr (p)) { - accept_list = find_accept_translators (get_simple_trans_list (), - m->get_property ("types")); - scm_hashq_set_x (accept_hash_table_, name, accept_list); + if (dynamic_cast (unsmob_translator (scm_car (*tail)))) + *tail = scm_cdr (*tail); + else + tail = SCM_CDRLOC (*tail); } + return ell; +} - for (SCM p = accept_list; scm_is_pair (p); p = scm_cdr (p)) +/* + Protects the parameter from being garbage collected. The object is + protected until the next disconnect_from_context call. + + Whenever a child translator hears an event, the event is added to + this list. This eliminates the need for derived_mark methods in most + translators; all incoming events are instead protected by the + translator group. + + TODO: Should the list also be flushed at the beginning of each new + moment? + */ +void +Translator_group::protect_event (SCM ev) +{ + protected_events_ = scm_cons (ev, protected_events_); +} + +/* + Create a new translator for a newly created child context. Triggered + by AnnounceNewContext events. + */ +IMPLEMENT_LISTENER (Translator_group, create_child_translator); +void +Translator_group::create_child_translator (SCM sev) +{ + Stream_event *ev = unsmob_stream_event (sev); + // get from AnnounceNewContext + SCM cs = ev->get_property ("context"); + Context *new_context = unsmob_context (cs); + Context_def *def = unsmob_context_def (new_context->get_definition ()); + SCM ops = new_context->get_definition_mods (); + + SCM trans_names = def->get_translator_names (ops); + + Translator_group *g = get_translator_group (def->get_translator_group_type ()); + SCM trans_list = SCM_EOL; + + for (SCM s = trans_names; scm_is_pair (s); s = scm_cdr (s)) { - Translator *t = unsmob_translator (scm_car (p)); - if (t && t->try_music (m)) - return true; + Translator *type = get_translator (scm_car (s)); + if (!type) + warning (_f ("cannot find: `%s'", ly_symbol2string (scm_car (s)).c_str ())); + else + { + Translator *tr = type->clone (); + SCM str = tr->self_scm (); + + if (tr->must_be_last ()) + { + SCM cons = scm_cons (str, SCM_EOL); + if (scm_is_pair (trans_list)) + scm_set_cdr_x (scm_last_pair (trans_list), cons); + else + trans_list = cons; + } + else + trans_list = scm_cons (str, trans_list); + + tr->daddy_context_ = new_context; + tr->unprotect (); + } } - return false; + + /* Filter unwanted translator types. Required to make + \with {\consists "..."} work. */ + if (dynamic_cast (g)) + g->simple_trans_list_ = filter_performers (trans_list); + else if (dynamic_cast (g)) + g->simple_trans_list_ = filter_engravers (trans_list); + + // TODO: scrap Context::implementation + new_context->implementation_ = g; + + g->connect_to_context (new_context); + g->unprotect (); + + recurse_over_translators (new_context, + &Translator::initialize, + &Translator_group::initialize, + DOWN); } SCM @@ -106,7 +196,7 @@ precomputed_recurse_over_translators (Context *c, Translator_precompute_index id Translator_group *tg = dynamic_cast (c->implementation ()); - if (dir == DOWN) + if (tg && dir == DOWN) { tg->precomputed_translator_foreach (idx); tg->call_precomputed_self_method (idx); @@ -116,7 +206,7 @@ precomputed_recurse_over_translators (Context *c, Translator_precompute_index id s = scm_cdr (s)) precomputed_recurse_over_translators (unsmob_context (scm_car (s)), idx, dir); - if (dir == UP) + if (tg && dir == UP) { tg->precomputed_translator_foreach (idx); tg->call_precomputed_self_method (idx); @@ -124,12 +214,13 @@ precomputed_recurse_over_translators (Context *c, Translator_precompute_index id } void -recurse_over_translators (Context *c, Translator_method ptr, Translator_group_method tg_ptr, Direction dir) +recurse_over_translators (Context *c, Translator_method ptr, + Translator_group_method tg_ptr, Direction dir) { Translator_group *tg = dynamic_cast (c->implementation ()); - if (dir == DOWN) + if (tg && dir == DOWN) { (tg->*tg_ptr) (); translator_each (tg->get_simple_trans_list (), ptr); @@ -139,7 +230,7 @@ recurse_over_translators (Context *c, Translator_method ptr, Translator_group_me s = scm_cdr (s)) recurse_over_translators (unsmob_context (scm_car (s)), ptr, tg_ptr, dir); - if (dir == UP) + if (tg && dir == UP) { translator_each (tg->get_simple_trans_list (), ptr); @@ -151,11 +242,9 @@ recurse_over_translators (Context *c, Translator_method ptr, Translator_group_me Translator_group::Translator_group () { simple_trans_list_ = SCM_EOL; - accept_hash_table_ = SCM_EOL; + protected_events_ = SCM_EOL; context_ = 0; smobify_self (); - - accept_hash_table_ = scm_c_make_hash_table (19); } void @@ -176,7 +265,7 @@ Translator_group::precompute_method_bindings () for (int i = 0; i < TRANSLATOR_METHOD_PRECOMPUTE_COUNT; i++) { if (ptrs[i]) - precomputed_method_bindings_[i].push (Translator_method_binding (tr, ptrs[i])); + precomputed_method_bindings_[i].push_back (Translator_method_binding (tr, ptrs[i])); } } @@ -186,8 +275,8 @@ Translator_group::precompute_method_bindings () void Translator_group::precomputed_translator_foreach (Translator_precompute_index idx) { - Array &bindings (precomputed_method_bindings_[idx]); - for (int i = 0; i < bindings.size (); i++) + vector &bindings (precomputed_method_bindings_[idx]); + for (vsize i = 0; i < bindings.size (); i++) bindings[i].invoke (); } @@ -220,7 +309,7 @@ Translator_group::print_smob (SCM s, SCM port, scm_print_state *) { Translator_group *me = (Translator_group *) SCM_CELL_WORD_1 (s); scm_puts ("#class_name (), port); scm_display (me->simple_trans_list_, port); scm_puts (" >", port); return 1; @@ -232,7 +321,6 @@ Translator_group::mark_smob (SCM smob) Translator_group *me = (Translator_group *)SCM_CELL_WORD_1 (smob); me->derived_mark (); - scm_gc_mark (me->accept_hash_table_); + scm_gc_mark (me->protected_events_); return me->simple_trans_list_; } -