X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcontext-def.cc;h=fb5657b6ed0aec0520bb0cb19f1e7d48dc92b1dd;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=a68b6f05e53ebe5c0c9a6a326458c68887770d4d;hpb=a6bd229f7fe1dc4a03478e14ccc0c0c66b225061;p=lilypond.git diff --git a/lily/context-def.cc b/lily/context-def.cc index a68b6f05e5..fb5657b6ed 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--2010 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 @@ -23,6 +23,7 @@ #include "context-def.hh" #include "context.hh" +#include "context-mod.hh" #include "international.hh" #include "output-def.hh" #include "translator.hh" @@ -66,7 +67,7 @@ Context_def::Context_def (Context_def const &s) smobify_self (); description_ = s.description_; - input_location_ = make_input (*s.origin ()); + input_location_ = make_input (*s.origin ()); default_child_ = s.default_child_; accept_mods_ = s.accept_mods_; property_ops_ = s.property_ops_; @@ -83,14 +84,18 @@ Context_def::~Context_def () #include "ly-smobs.icc" IMPLEMENT_SMOBS (Context_def); IMPLEMENT_DEFAULT_EQUAL_P (Context_def); +IMPLEMENT_TYPE_P (Context_def, "ly:context-def?"); int -Context_def::print_smob (SCM smob, SCM port, scm_print_state*) +Context_def::print_smob (SCM smob, SCM port, scm_print_state *) { Context_def *me = (Context_def *) SCM_CELL_WORD_1 (smob); 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; } @@ -98,8 +103,8 @@ 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); scm_gc_mark (me->description_); @@ -134,17 +139,18 @@ Context_def::add_context_mod (SCM mod) if (ly_symbol2scm ("default-child") == tag) default_child_ = sym; else if (ly_symbol2scm ("consists") == tag - || ly_symbol2scm ("remove") == tag) + || ly_symbol2scm ("remove") == tag) { translator_mods_ = scm_cons (scm_list_2 (tag, sym), translator_mods_); } else if (ly_symbol2scm ("accepts") == tag - || ly_symbol2scm ("denies") == tag) + || ly_symbol2scm ("denies") == tag) accept_mods_ = scm_cons (scm_list_2 (tag, sym), accept_mods_); else if (ly_symbol2scm ("pop") == tag - || ly_symbol2scm ("push") == tag - || ly_symbol2scm ("assign") == tag - || ly_symbol2scm ("unset") == tag) + || ly_symbol2scm ("push") == tag + || ly_symbol2scm ("assign") == 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_); @@ -166,16 +172,15 @@ Context_def::get_accepted (SCM user_mod) const SCM tag = scm_caar (s); SCM sym = scm_cadar (s); if (tag == ly_symbol2scm ("accepts")) - acc = scm_cons (sym, acc); + acc = scm_cons (sym, acc); else if (tag == ly_symbol2scm ("denies")) - acc = scm_delete_x (sym, acc); + 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_delete_x (def, acc); acc = scm_cons (def, acc); } @@ -190,10 +195,10 @@ Context_def::get_default_child (SCM user_mod) const { SCM entry = scm_car (s); if (scm_car (entry) == ly_symbol2scm ("default-child")) - { - name = scm_cadr (entry); - break; - } + { + name = scm_cadr (entry); + break; + } } return name; @@ -205,7 +210,7 @@ Context_def::get_default_child (SCM user_mod) const - the first element in the list defines a context that is a valid child of the context defined by this Context_def - each subsequent element in the list defines a context that is a valid child - of the the context defined by the preceding element in the list + of the context defined by the preceding element in the list - the last element in the list defines a context with the given name The ADDITIONAL_ACCEPTS parameter is a list of additional contexts that this @@ -213,8 +218,8 @@ Context_def::get_default_child (SCM user_mod) const */ vector Context_def::path_to_acceptable_context (SCM type_sym, - Output_def *odef, - SCM additional_accepts) const + Output_def *odef, + SCM additional_accepts) const { set seen; return internal_path_to_acceptable_context (type_sym, odef, additional_accepts, &seen); @@ -224,32 +229,32 @@ Context_def::path_to_acceptable_context (SCM type_sym, The SEEN parameter is a set which keeps track of visited contexts, allowing contexts of the same type to be nested. */ -vector +vector Context_def::internal_path_to_acceptable_context (SCM type_sym, - Output_def *odef, - SCM additional_accepts, - set *seen) const + Output_def *odef, + SCM additional_accepts, + set *seen) const { assert (scm_is_symbol (type_sym)); SCM accepted = get_accepted (additional_accepts); - vector accepteds; + 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, - scm_car (s)))) + scm_car (s)))) accepteds.push_back (t); - vector best_result; + vector best_result; for (vsize i = 0; i < accepteds.size (); i++) { /* do not check aliases, because \context Staff should not - create RhythmicStaff. */ + create RhythmicStaff. */ if (ly_is_equal (accepteds[i]->get_context_name (), type_sym)) - { - best_result.push_back (accepteds[i]); - return best_result; - } + { + best_result.push_back (accepteds[i]); + return best_result; + } } seen->insert (this); @@ -259,16 +264,16 @@ Context_def::internal_path_to_acceptable_context (SCM type_sym, Context_def *g = accepteds[i]; if (!seen->count (g)) - { - vector result - = g->internal_path_to_acceptable_context (type_sym, odef, SCM_EOL, seen); - if (result.size () && result.size () < best_depth) - { - best_depth = result.size (); - result.insert (result.begin (), g); - best_result = result; - } - } + { + vector result + = g->internal_path_to_acceptable_context (type_sym, odef, SCM_EOL, seen); + if (result.size () && result.size () < best_depth) + { + best_depth = result.size (); + result.insert (result.begin (), g); + best_result = result; + } + } } seen->erase (this); @@ -288,13 +293,15 @@ Context_def::get_translator_names (SCM user_mod) const SCM arg = scm_cadar (s); if (scm_is_string (arg)) - arg = scm_string_to_symbol (arg); + arg = scm_string_to_symbol (arg); if (ly_symbol2scm ("consists") == tag) - l1 = scm_cons (arg, l1); + l1 = scm_cons (arg, l1); else if (ly_symbol2scm ("remove") == tag - && get_translator (arg)) - l1 = scm_delete_x (arg, l1); + && (scm_is_pair (arg) + || ly_is_procedure (arg) + || get_translator (arg))) + l1 = scm_delete_x (arg, l1); } return l1; @@ -309,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; } @@ -323,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 @@ -332,19 +340,97 @@ Context_def::to_alist () const SCM ell = SCM_EOL; ell = scm_cons (scm_cons (ly_symbol2scm ("consists"), - get_translator_names (SCM_EOL)), ell); + 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); + 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_), - ell); + ell); ell = scm_cons (scm_cons (ly_symbol2scm ("context-name"), context_name_), - ell); + ell); if (scm_is_symbol (translator_group_type_)) ell = scm_cons (scm_cons (ly_symbol2scm ("group-type"), - translator_group_type_), ell); + translator_group_type_), ell); return ell; } +SCM +Context_def::lookup (SCM sym) const +{ + if (scm_is_eq (ly_symbol2scm ("default-child"), sym)) + return default_child_; + else if (scm_is_eq (ly_symbol2scm ("consists"), sym)) + return get_translator_names (SCM_EOL); + else if (scm_is_eq (ly_symbol2scm ("description"), sym)) + return description_; + else if (scm_is_eq (ly_symbol2scm ("aliases"), sym)) + return context_aliases_; + else if (scm_is_eq (ly_symbol2scm ("accepts"), sym)) + return get_accepted (SCM_EOL); + else if (scm_is_eq (ly_symbol2scm ("property-ops"), sym)) + return property_ops_; + else if (scm_is_eq (ly_symbol2scm ("context-name"), sym)) + return context_name_; + else if (scm_is_eq (ly_symbol2scm ("group-type"), sym)) + return translator_group_type_; + 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.") +{ + LY_ASSERT_SMOB (Context_def, def, 1); + Context_def *cd = unsmob_context_def (def); + LY_ASSERT_TYPE (ly_is_symbol, sym, 2); + + SCM res = cd->lookup (sym); + + scm_remember_upto_here_1 (def); + + if (SCM_UNBNDP (res)) + res = SCM_EOL; + + if (scm_is_null (res) && !SCM_UNBNDP (val)) + return val; + + return res; +} + +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}.") +{ + LY_ASSERT_SMOB (Context_def, def, 1); + LY_ASSERT_SMOB (Context_mod, mod, 2); + + Context_def *cd = unsmob_context_def (def)->clone (); + + for (SCM s = unsmob_context_mod (mod)->get_mods (); + scm_is_pair (s); + s = scm_cdr (s)) + cd->add_context_mod (scm_car (s)); + + return cd->unprotect (); +}