Translator_group::~Translator_group ()
{
- //assert (removable_b ());
+ //assert (is_removable ());
}
Translator_group *trg = dynamic_cast<Translator_group*> (unsmob_translator (ly_car (p)));
trg->check_removal ();
- if (trg->removable_b ())
+ if (trg->is_removable ())
terminate_translator (trg);
}
}
bool
-Translator_group::removable_b () const
+Translator_group::is_removable () const
{
return trans_group_list_ == SCM_EOL && ! iterator_count_;
}
Translator_group *
-Translator_group::find_existing_translator (String n, String id)
+Translator_group::find_existing_translator (SCM n, String id)
{
- if ((is_alias_b (n) && (id_string_ == id || id.empty_b ())) || n == "Current")
+ if ((is_alias (n) && (id_string_ == id || id.is_empty ())) || n == ly_symbol2scm ("Current"))
return this;
Translator_group* r = 0;
Translator_group*
-Translator_group::find_create_translator (String n, String id)
+Translator_group::find_create_translator (SCM n, String id)
{
Translator_group * existing = find_existing_translator (n,id);
if (existing)
return existing;
Link_array<Translator_def> path
- = unsmob_translator_def (definition_)->path_to_acceptable_translator (scm_makfrom0str ((char*)n.to_str0 ()), get_output_def ());
+ = unsmob_translator_def (definition_)->path_to_acceptable_translator (n, get_output_def ());
if (path.size ())
{
ret = daddy_trans_->find_create_translator (n,id);
else
{
- warning (_f ("can't find or create `%s' called `%s'", n, id));
+ warning (_f ("can't find or create `%s' called `%s'", ly_symbol2string (n).to_str0 (), id));
ret =0;
}
return ret;
if (!hebbes_b && daddy_trans_)
hebbes_b = daddy_trans_->try_music (m);
+
return hebbes_b ;
}
void
Translator_group::terminate_translator (Translator*r)
{
- r->removal_processing ();
+ r->finalize ();
/*
Return value ignored. GC does the rest.
*/
bool
Translator_group::is_bottom_translator_b () const
{
- return !gh_string_p (unsmob_translator_def (definition_)->default_child_context_name ());
+ return !gh_symbol_p (unsmob_translator_def (definition_)->default_child_context_name ());
}
Translator_group*
{
SCM prev = internal_get_property (prop);
+ /*
+ TODO: should have scm_equal_something () for reverting
+ autobeam properties.
+ */
SCM newprops= SCM_EOL ;
- while (gh_pair_p (prev) && ly_caar (prev) != eltprop)
+ while (gh_pair_p (prev) && !SCM_EQ_P(ly_caar (prev), eltprop))
{
newprops = gh_cons (ly_car (prev), newprops);
prev = ly_cdr (prev);
void
Translator_group::finalize ()
{
- each (&Translator::removal_processing);
+ each (&Translator::finalize);
}
{
return properties_dict()->to_alist();
}
-
+
+String
+Translator_group::context_name () const
+{
+ Translator_def * td = unsmob_translator_def (definition_ );
+ return ly_symbol2string (td->type_name_);
+}