X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcontext-def.cc;h=41f3b8eafb8ace8ea9458738047a1705ded21a17;hb=5bbfc22fce036b9b69df5e420de93e11da23c05e;hp=9b9628c6dcf0ea32e6cb9580975131f2eb14a07c;hpb=9d1520b21710bd22872010ae9aa4c4899014e9d4;p=lilypond.git diff --git a/lily/context-def.cc b/lily/context-def.cc index 9b9628c6dc..41f3b8eafb 100644 --- a/lily/context-def.cc +++ b/lily/context-def.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2000--2012 Han-Wen Nienhuys + Copyright (C) 2000--2014 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -93,6 +93,9 @@ Context_def::print_smob (SCM smob, SCM port, scm_print_state *) scm_puts ("#context_name_, port); + scm_puts (" ", port); + string loc = me->origin ()->location_string (); + scm_puts (loc.c_str (), port); scm_puts (">", port); return 1; } @@ -100,7 +103,7 @@ Context_def::print_smob (SCM smob, SCM port, scm_print_state *) SCM Context_def::mark_smob (SCM smob) { - ASSERT_LIVE_IS_ALLOWED (); + ASSERT_LIVE_IS_ALLOWED (smob); Context_def *me = (Context_def *) SCM_CELL_WORD_1 (smob); @@ -146,7 +149,8 @@ Context_def::add_context_mod (SCM mod) else if (ly_symbol2scm ("pop") == tag || ly_symbol2scm ("push") == tag || ly_symbol2scm ("assign") == tag - || ly_symbol2scm ("unset") == tag) + || ly_symbol2scm ("unset") == tag + || ly_symbol2scm ("apply") == tag) property_ops_ = scm_cons (mod, property_ops_); else if (ly_symbol2scm ("alias") == tag) context_aliases_ = scm_cons (sym, context_aliases_); @@ -237,7 +241,7 @@ Context_def::internal_path_to_acceptable_context (SCM type_sym, vector accepteds; for (SCM s = accepted; scm_is_pair (s); s = scm_cdr (s)) - if (Context_def *t = unsmob_context_def (find_context_def (odef, + if (Context_def *t = Context_def::unsmob (find_context_def (odef, scm_car (s)))) accepteds.push_back (t); @@ -295,8 +299,8 @@ Context_def::get_translator_names (SCM user_mod) const l1 = scm_cons (arg, l1); else if (ly_symbol2scm ("remove") == tag && (scm_is_pair (arg) - || ly_is_procedure (arg) - || get_translator (arg))) + || ly_is_procedure (arg) + || get_translator (arg))) l1 = scm_delete_x (arg, l1); } @@ -312,6 +316,7 @@ Context_def::instantiate (SCM ops) context->definition_mods_ = ops; context->aliases_ = context_aliases_; context->accepts_list_ = get_accepted (ops); + context->default_child_ = get_default_child (ops); return context; } @@ -326,7 +331,7 @@ Context_def::make_scm () void Context_def::apply_default_property_operations (Context *tg) { - apply_property_operations (tg, property_ops_); + apply_property_operations (tg, scm_reverse (property_ops_)); } SCM @@ -338,6 +343,10 @@ Context_def::to_alist () const get_translator_names (SCM_EOL)), ell); ell = scm_cons (scm_cons (ly_symbol2scm ("description"), description_), ell); ell = scm_cons (scm_cons (ly_symbol2scm ("aliases"), context_aliases_), ell); + ell = scm_cons (scm_cons (ly_symbol2scm ("accepts"), get_accepted (SCM_EOL)), + ell); + if (scm_is_symbol (default_child_)) + ell = scm_acons (ly_symbol2scm ("default-child"), default_child_, ell); ell = scm_cons (scm_cons (ly_symbol2scm ("accepts"), get_accepted (SCM_EOL)), ell); ell = scm_cons (scm_cons (ly_symbol2scm ("property-ops"), property_ops_), @@ -373,14 +382,29 @@ Context_def::lookup (SCM sym) const return SCM_UNDEFINED; } +bool +Context_def::is_alias (SCM sym) const +{ + if (scm_is_eq (sym, ly_symbol2scm ("Bottom"))) + return !scm_is_symbol (get_default_child (SCM_EOL)); + + if (scm_is_eq (sym, get_context_name ())) + return true; + + return scm_is_true (scm_c_memq (sym, context_aliases_)); +} + LY_DEFINE (ly_context_def_lookup, "ly:context-def-lookup", - 2, 1, 0, (SCM def, SCM sym, SCM val), - "Return the value of @var{sym} in output definition @var{def}" - " (e.g., @code{\\paper}). If no value is found, return" - " @var{val} or @code{'()} if @var{val} is undefined.") + 2, 1, 0, (SCM def, SCM sym, SCM val), + "Return the value of @var{sym} in context definition @var{def}" + " (e.g., @code{\\Voice}). If no value is found, return" + " @var{val} or @code{'()} if @var{val} is undefined." + " @var{sym} can be any of @samp{default-child}, @samp{consists}," + " @samp{description}, @samp{aliases}, @samp{accepts}," + " @samp{property-ops}, @samp{context-name}, @samp{group-type}.") { LY_ASSERT_SMOB (Context_def, def, 1); - Context_def *cd = unsmob_context_def (def); + Context_def *cd = Context_def::unsmob (def); LY_ASSERT_TYPE (ly_is_symbol, sym, 2); SCM res = cd->lookup (sym); @@ -397,16 +421,16 @@ LY_DEFINE (ly_context_def_lookup, "ly:context-def-lookup", } LY_DEFINE (ly_context_def_modify, "ly:context-def-modify", - 2, 0, 0, (SCM def, SCM mod), - "Return the result of applying the context-mod @var{mod} to" - " the context definition @var{def}. Does not change @var{def}.") + 2, 0, 0, (SCM def, SCM mod), + "Return the result of applying the context-mod @var{mod} to" + " the context definition @var{def}. Does not change @var{def}.") { LY_ASSERT_SMOB (Context_def, def, 1); LY_ASSERT_SMOB (Context_mod, mod, 2); - Context_def *cd = unsmob_context_def (def)->clone (); + Context_def *cd = Context_def::unsmob (def)->clone (); - for (SCM s = unsmob_context_mod (mod)->get_mods (); + for (SCM s = Context_mod::unsmob (mod)->get_mods (); scm_is_pair (s); s = scm_cdr (s)) cd->add_context_mod (scm_car (s));