-/*
- translator-def.cc -- implement Context_def
+/*
+ translator-def.cc -- implement Context_def
source file of the GNU LilyPond music typesetter
translator_mods_ = SCM_EOL;
property_ops_ = SCM_EOL;
context_name_ = SCM_EOL;
+ default_child_ = SCM_EOL;
description_ = SCM_EOL;
smobify_self ();
context_name_ = ly_symbol2scm ("");
}
-Context_def::Context_def (Context_def const & s)
+Context_def::Context_def (Context_def const &s)
: Input (s)
{
context_aliases_ = SCM_EOL;
translator_group_type_ = SCM_EOL;
- accept_mods_ = SCM_EOL;
+ accept_mods_ = SCM_EOL;
translator_mods_ = SCM_EOL;
property_ops_ = SCM_EOL;
context_name_ = SCM_EOL;
description_ = SCM_EOL;
-
+ default_child_ = SCM_EOL;
+
smobify_self ();
description_ = s.description_;
+ default_child_ = s.default_child_;
accept_mods_ = s.accept_mods_;
property_ops_ = s.property_ops_;
translator_mods_ = s.translator_mods_;
int
Context_def::print_smob (SCM smob, SCM port, scm_print_state*)
{
- Context_def* me = (Context_def*) SCM_CELL_WORD_1 (smob);
+ Context_def *me = (Context_def *) SCM_CELL_WORD_1 (smob);
scm_puts ("#<Context_def ", port);
scm_display (me->context_name_, port);
SCM
Context_def::mark_smob (SCM smob)
{
- Context_def* me = (Context_def*) SCM_CELL_WORD_1 (smob);
+ Context_def *me = (Context_def *) SCM_CELL_WORD_1 (smob);
scm_gc_mark (me->description_);
scm_gc_mark (me->context_aliases_);
scm_gc_mark (me->accept_mods_);
scm_gc_mark (me->translator_mods_);
- scm_gc_mark (me->property_ops_);
+ scm_gc_mark (me->property_ops_);
scm_gc_mark (me->translator_group_type_);
+ scm_gc_mark (me->default_child_);
return me->context_name_;
}
return;
}
+ /*
+ other modifiers take symbols as argument.
+ */
SCM sym = scm_cadr (mod);
if (scm_is_string (sym))
sym = scm_string_to_symbol (sym);
-
- if (ly_symbol2scm ("consists") == tag
+
+ if (ly_symbol2scm ("default-child") == tag)
+ {
+ default_child_ = sym;
+ }
+ else if (ly_symbol2scm ("consists") == tag
|| ly_symbol2scm ("consists-end") == tag
|| ly_symbol2scm ("remove") == tag)
{
if (!get_translator (sym))
- error (_f ("Program has no such type: `%s'",
+ error (_f ("program has no such type: `%s'",
ly_symbol2string (sym).to_str0 ()));
else
translator_mods_ = scm_cons (scm_list_2 (tag, sym), translator_mods_);
}
else if (ly_symbol2scm ("accepts") == tag
|| ly_symbol2scm ("denies") == tag)
- accept_mods_ = scm_cons (scm_list_2 (tag, sym), accept_mods_);
+ accept_mods_ = scm_cons (scm_list_2 (tag, sym), accept_mods_);
else if (ly_symbol2scm ("poppush") == tag
|| ly_symbol2scm ("pop") == tag
|| ly_symbol2scm ("push") == tag
property_ops_ = scm_cons (mod, property_ops_);
else if (ly_symbol2scm ("alias") == tag)
context_aliases_ = scm_cons (sym, context_aliases_);
- else if (ly_symbol2scm ("translator-type") == tag)
+ else if (ly_symbol2scm ("translator-type") == tag)
translator_group_type_ = sym;
- else if (ly_symbol2scm ("context-name") == tag)
+ else if (ly_symbol2scm ("context-name") == tag)
context_name_ = sym;
else
- programming_error ("Unknown context mod tag.");
+ programming_error ("unknown context mod tag");
}
SCM
else if (tag == ly_symbol2scm ("denies"))
acc = scm_delete_x (sym, acc);
}
+
+ SCM def = get_default_child (user_mod);
+ if (scm_is_symbol (def))
+ {
+ if (scm_memq (def, acc))
+ acc = scm_delete_x (def, acc);
+ acc = scm_cons (def, acc);
+ }
+
return acc;
}
+
+SCM
+Context_def::get_default_child (SCM user_mod) const
+{
+ SCM name = default_child_;
+ for (SCM s = user_mod; scm_is_pair (s); s = scm_cdr (s))
+ {
+ SCM entry = scm_car (s);
+ if (scm_car (entry) == ly_symbol2scm ("default-child"))
+ {
+ name = scm_cadr (entry);
+ break;
+ }
+ }
+
+ return name;
+}
+
Link_array<Context_def>
Context_def::path_to_acceptable_context (SCM type_sym, Output_def *odef) const
{
assert (scm_is_symbol (type_sym));
-
+
SCM accepted = get_accepted (SCM_EOL);
Link_array<Context_def> accepteds;
int best_depth = INT_MAX;
for (int i = 0; i < accepteds.size (); i++)
{
- Context_def * g = accepteds[i];
+ Context_def *g = accepteds[i];
Link_array<Context_def> result
= g->path_to_acceptable_context (type_sym, odef);
if (result.size () && result.size () < best_depth)
{
+ best_depth = result.size ();
result.insert (g, 0);
best_result = result;
-
- /* this following line was added in 1.9.3, but hsould've been
- there all along... Let's hope it doesn't cause nightmares. */
- best_depth = result.size ();
}
}
SCM l1 = SCM_EOL;
SCM mods = scm_reverse_x (scm_list_copy (translator_mods_), user_mod);
-
+
for (SCM s = mods; scm_is_pair (s); s = scm_cdr (s))
{
SCM tag = scm_caar (s);
if (scm_is_string (arg))
arg = scm_string_to_symbol (arg);
-
+
if (ly_symbol2scm ("consists") == tag)
l1 = scm_cons (arg, l1);
else if (ly_symbol2scm ("remove") == tag)
{
for (SCM *tail = ℓ scm_is_pair (*tail); tail = SCM_CDRLOC (*tail))
{
- if (dynamic_cast<Performer*> (unsmob_translator (scm_car (*tail))))
+ if (dynamic_cast<Performer *> (unsmob_translator (scm_car (*tail))))
{
*tail = scm_cdr (*tail);
if (!scm_is_pair (*tail))
- break ;
+ break;
}
}
return ell;
SCM
filter_engravers (SCM ell)
{
- SCM *tail = ℓ
- for (; scm_is_pair (*tail) ; tail = SCM_CDRLOC (*tail))
+ SCM *tail = ℓ
+ for (; scm_is_pair (*tail); tail = SCM_CDRLOC (*tail))
{
- if (dynamic_cast<Engraver*> (unsmob_translator (scm_car (*tail))))
+ if (dynamic_cast<Engraver *> (unsmob_translator (scm_car (*tail))))
{
*tail = scm_cdr (*tail);
if (!scm_is_pair (*tail))
- break ;
+ break;
}
}
return ell;
}
-
Context *
Context_def::instantiate (SCM ops, Object_key const *key)
{
- Context *tg = 0;
+ Context *tg = 0;
if (context_name_ == ly_symbol2scm ("Score"))
tg = new Score_context (key);
tg->definition_ = self_scm ();
- SCM trans_names = get_translator_names (ops);
+ SCM trans_names = get_translator_names (ops);
- Translator_group *g = dynamic_cast<Translator_group*>
+ Translator_group *g = dynamic_cast<Translator_group *>
(get_translator (translator_group_type_));
- g = dynamic_cast<Translator_group*> (g->clone ());
+ g = dynamic_cast<Translator_group *> (g->clone ());
SCM trans_list = SCM_EOL;
-
- for (SCM s = trans_names; scm_is_pair (s) ; s = scm_cdr (s))
+
+ for (SCM s = trans_names; scm_is_pair (s); s = scm_cdr (s))
{
Translator *t = get_translator (scm_car (s));
if (!t)
scm_gc_unprotect_object (str);
}
}
-
- g->simple_trans_list_ = trans_list;
+
+
+ /*
+ Ugh, todo: should just make a private
+ copy of Context_def with the user mods.
+ */
+
+ g->simple_trans_list_ = trans_list;
tg->implementation_ = g->self_scm ();
- if (dynamic_cast<Engraver*> (g))
+ if (dynamic_cast<Engraver *> (g))
g->simple_trans_list_ = filter_performers (g->simple_trans_list_);
- else if (dynamic_cast<Performer*> (g))
+ else if (dynamic_cast<Performer *> (g))
g->simple_trans_list_ = filter_engravers (g->simple_trans_list_);
-
+
g->daddy_context_ = tg;
- tg->aliases_ = context_aliases_ ;
-
+ tg->aliases_ = context_aliases_;
+
scm_gc_unprotect_object (g->self_scm ());
-
- tg->accepts_list_ = get_accepted (ops);
+ tg->accepts_list_ = get_accepted (ops);
+
return tg;
}
if (scm_is_symbol (translator_group_type_))
ell = scm_cons (scm_cons (ly_symbol2scm ("group-type"),
- translator_group_type_), ell);
- return ell;
+ translator_group_type_), ell);
+ return ell;
}