(c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-#include "music-output-def.hh"
+#include "output-def.hh"
#include "translator-group.hh"
#include "translator.hh"
#include "warn.hh"
Translator_group*
Translator_group::get_daddy_translator () const
{
- Translator *t
- = unsmob_translator (get_parent_context ()->get_parent_context ()->implementation_);
- return dynamic_cast<Translator_group*> (t);
+ return context ()->get_parent_context ()->implementation ();
}
void
translator_each (SCM list, Translator_method method)
{
- for (SCM p = list; is_pair (p); p = ly_cdr (p))
+ for (SCM p = list; ly_c_pair_p (p); p = ly_cdr (p))
(unsmob_translator (ly_car (p))->*method) ();
}
Translator_group::initialize ()
{
SCM tab = scm_make_vector (scm_int2num (19), SCM_BOOL_F);
- get_parent_context ()->set_property ("acceptHashTable", tab);
+ context ()->set_property ("acceptHashTable", tab);
}
SCM ack_ifs = scm_assoc (ly_symbol2scm ("events-accepted"),
tr->translator_description ());
ack_ifs = ly_cdr (ack_ifs);
- for (SCM s = ifaces; is_pair (s); s = ly_cdr (s))
+ for (SCM s = ifaces; ly_c_pair_p (s); s = ly_cdr (s))
if (scm_c_memq (ly_car (s), ack_ifs) != SCM_BOOL_F)
return true;
return false;
find_accept_translators (SCM gravlist, SCM ifaces)
{
SCM l = SCM_EOL;
- for (SCM s = gravlist; is_pair (s); s = ly_cdr (s))
+ for (SCM s = gravlist; ly_c_pair_p (s); s = ly_cdr (s))
{
Translator* tr = unsmob_translator (ly_car (s));
if (translator_accepts_any_of (tr, ifaces))
SCM name = scm_sloppy_assq (ly_symbol2scm ("name"),
m->get_property_alist (false));
- if (!is_pair (name))
+ if (!ly_c_pair_p (name))
return false;
name = ly_cdr (name);
scm_hashq_set_x (tab, name, accept_list);
}
- for (SCM p = accept_list; is_pair (p); p = ly_cdr (p))
+ for (SCM p = accept_list; ly_c_pair_p (p); p = ly_cdr (p))
{
Translator * t = unsmob_translator (ly_car (p));
if (t && t->try_music (m))
recurse_over_translators (Context * c, Translator_method ptr, Direction dir)
{
Translator_group * tg
- = dynamic_cast<Translator_group*> (unsmob_translator (c->implementation_));
+ = dynamic_cast<Translator_group*> (c->implementation ());
/*
(tg->*ptr) ();
}
- for (SCM s = c->children_contexts () ; is_pair (s);
+ for (SCM s = c->children_contexts () ; ly_c_pair_p (s);
s =ly_cdr (s))
{
recurse_over_translators (unsmob_context (ly_car (s)), ptr, dir);