X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcontext-def.cc;h=1650076669cf089976f4f0a5fd2565194e218fb6;hb=0d3c78505a6adb958f9280509bb7fa170de54611;hp=e9c7f4da3c8785b4794a7ad4b7535443f7b12876;hpb=61bba8a98a53e424054b26d63ead26b0696ea29d;p=lilypond.git diff --git a/lily/context-def.cc b/lily/context-def.cc index e9c7f4da3c..1650076669 100644 --- a/lily/context-def.cc +++ b/lily/context-def.cc @@ -1,17 +1,17 @@ -/* - translator-def.cc -- implement Context_def +/* + translator-def.cc -- implement Context_def source file of the GNU LilyPond music typesetter - (c) 2000--2004 Han-Wen Nienhuys + (c) 2000--2005 Han-Wen Nienhuys */ /* TODO: should junk this class an replace by a single list of context modifications? */ #include "context-def.hh" + #include "engraver.hh" -#include "lily-proto.hh" #include "output-def.hh" #include "performer.hh" #include "score-context.hh" @@ -26,6 +26,7 @@ Context_def::Context_def () translator_mods_ = SCM_EOL; property_ops_ = SCM_EOL; context_name_ = SCM_EOL; + default_child_ = SCM_EOL; description_ = SCM_EOL; smobify_self (); @@ -33,20 +34,22 @@ Context_def::Context_def () 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_; @@ -66,7 +69,7 @@ IMPLEMENT_DEFAULT_EQUAL_P (Context_def); 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_name_, port); @@ -77,14 +80,15 @@ Context_def::print_smob (SCM smob, SCM port, scm_print_state*) 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_; } @@ -92,30 +96,37 @@ Context_def::mark_smob (SCM smob) void Context_def::add_context_mod (SCM mod) { - SCM tag = ly_car (mod); + SCM tag = scm_car (mod); if (ly_symbol2scm ("description") == tag) { - description_ = ly_cadr (mod); + description_ = scm_cadr (mod); return; } - SCM sym = ly_cadr (mod); - if (ly_c_string_p (sym)) + /* + 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 @@ -124,12 +135,12 @@ Context_def::add_context_mod (SCM mod) 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 @@ -143,58 +154,82 @@ Context_def::get_accepted (SCM user_mod) const { SCM mods = scm_reverse_x (scm_list_copy (accept_mods_), user_mod); SCM acc = SCM_EOL; - for (SCM s = mods; ly_c_pair_p (s); s = ly_cdr (s)) + for (SCM s = mods; scm_is_pair (s); s = scm_cdr (s)) { - SCM tag = ly_caar (s); - SCM sym = ly_cadar (s); + SCM tag = scm_caar (s); + SCM sym = scm_cadar (s); if (tag == ly_symbol2scm ("accepts")) acc = scm_cons (sym, acc); 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::path_to_acceptable_context (SCM type_sym, Output_def *odef) const { - assert (ly_c_symbol_p (type_sym)); - + assert (scm_is_symbol (type_sym)); + SCM accepted = get_accepted (SCM_EOL); Link_array accepteds; - for (SCM s = accepted; ly_c_pair_p (s); s = ly_cdr (s)) + for (SCM s = accepted; scm_is_pair (s); s = scm_cdr (s)) if (Context_def *t = unsmob_context_def (find_context_def (odef, - ly_car (s)))) + scm_car (s)))) accepteds.push (t); Link_array best_result; - for (int i=0; i < accepteds.size (); i++) + for (int i = 0; i < accepteds.size (); i++) { /* do not check aliases, because \context Staff should not create RhythmicStaff. */ - if (ly_c_equal_p (accepteds[i]->get_context_name (), type_sym)) + if (ly_is_equal (accepteds[i]->get_context_name (), type_sym)) { best_result.push (accepteds[i]); return best_result; } } - int best_depth= INT_MAX; - for (int i=0; i < accepteds.size (); i++) + 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 result = g->path_to_acceptable_context (type_sym, odef); if (result.size () && result.size () < best_depth) { - 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 (); + result.insert (g, 0); + best_result = result; } } @@ -205,42 +240,38 @@ SCM Context_def::get_translator_names (SCM user_mod) const { SCM l1 = SCM_EOL; - SCM l2 = SCM_EOL; SCM mods = scm_reverse_x (scm_list_copy (translator_mods_), user_mod); - - for (SCM s = mods; ly_c_pair_p (s); s = ly_cdr (s)) + + for (SCM s = mods; scm_is_pair (s); s = scm_cdr (s)) { - SCM tag = ly_caar (s); - SCM arg = ly_cadar (s); + SCM tag = scm_caar (s); + SCM arg = scm_cadar (s); - if (ly_c_string_p (arg)) + 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 ("consists-end") == tag) - l2 = scm_cons (arg, l2); else if (ly_symbol2scm ("remove") == tag) { l1 = scm_delete_x (arg, l1); - l2 = scm_delete_x (arg, l2); } } - return scm_append_x (scm_list_2 (l1, l2)); + + return l1; } SCM filter_performers (SCM ell) { - for (SCM *tail = ℓ ly_c_pair_p (*tail); tail = SCM_CDRLOC (*tail)) + SCM *tail = ℓ + for (SCM p = ell; scm_is_pair (p); p = scm_cdr (p)) { - if (dynamic_cast (unsmob_translator (ly_car (*tail)))) - { - *tail = ly_cdr (*tail); - if (!ly_c_pair_p (*tail)) - break ; - } + if (dynamic_cast (unsmob_translator (scm_car (*tail)))) + *tail = scm_cdr (*tail); + else + tail = SCM_CDRLOC(*tail); } return ell; } @@ -248,86 +279,98 @@ filter_performers (SCM ell) SCM filter_engravers (SCM ell) { - SCM *tail = ℓ - for (; ly_c_pair_p (*tail) ; tail = SCM_CDRLOC (*tail)) + SCM *tail = ℓ + for (SCM p = ell; scm_is_pair (p); p = scm_cdr (p)) { - if (dynamic_cast (unsmob_translator (ly_car (*tail)))) - { - *tail = ly_cdr (*tail); - if (!ly_c_pair_p (*tail)) - break ; - } + if (dynamic_cast (unsmob_translator (scm_car (*tail)))) + *tail = scm_cdr (*tail); + else + tail = SCM_CDRLOC(*tail); } return ell; } - Context * -Context_def::instantiate (SCM ops) +Context_def::instantiate (SCM ops, Object_key const *key) { - Context *tg = 0; + Context *context = 0; if (context_name_ == ly_symbol2scm ("Score")) - tg = new Score_context (); + context = new Score_context (key); else - tg = new Context (); + context = new Context (key); - tg->definition_ = self_scm (); + context->definition_ = self_scm (); - SCM trans_names = get_translator_names (ops); + SCM trans_names = get_translator_names (ops); - Translator *g = get_translator (translator_group_type_); - g = g->clone (); - - g->simple_trans_list_ = SCM_EOL; + Translator_group *g = get_translator_group (translator_group_type_); + SCM trans_list = SCM_EOL; - for (SCM s = trans_names; ly_c_pair_p (s) ; s = ly_cdr (s)) + for (SCM s = trans_names; scm_is_pair (s); s = scm_cdr (s)) { - Translator *t = get_translator (ly_car (s)); + Translator *t = get_translator (scm_car (s)); if (!t) warning (_f ("can't find: `%s'", s)); else { Translator *tr = t->clone (); SCM str = tr->self_scm (); - g->simple_trans_list_ = scm_cons (str, g->simple_trans_list_); - tr->daddy_context_ = tg; - scm_gc_unprotect_object (str); + + 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_ = context; + tr->unprotect (); } } - - tg->implementation_ = g->self_scm (); - if (dynamic_cast (g)) + + + /* + Ugh, todo: should just make a private + copy of Context_def with the user mods. + */ + + g->simple_trans_list_ = trans_list; + + context->implementation_ = g; + if (dynamic_cast (g)) g->simple_trans_list_ = filter_performers (g->simple_trans_list_); - else if (dynamic_cast (g)) + else if (dynamic_cast (g)) g->simple_trans_list_ = filter_engravers (g->simple_trans_list_); - - g->daddy_context_ = tg; - tg->aliases_ = context_aliases_ ; - - scm_gc_unprotect_object (g->self_scm ()); - - tg->accepts_list_ = get_accepted (ops); - - return tg; + + g->context_ = context; + context->aliases_ = context_aliases_; + + g->unprotect (); + + context->accepts_list_ = get_accepted (ops); + + return context; } SCM Context_def::clone_scm () const { - Context_def * t = new Context_def (*this); - SCM x = t->self_scm (); - scm_gc_unprotect_object (x); - return x; + Context_def *t = new Context_def (*this); + return t->unprotect (); } SCM Context_def::make_scm () { - Context_def* t = new Context_def; - SCM x = t->self_scm (); - scm_gc_unprotect_object (x); - return x; + Context_def *t = new Context_def; + return t->unprotect (); } void @@ -352,9 +395,9 @@ Context_def::to_alist () const ell = scm_cons (scm_cons (ly_symbol2scm ("context-name"), context_name_), ell); - if (ly_c_symbol_p (translator_group_type_)) + 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; }