X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=blobdiff_plain;f=lily%2Finclude%2Fcontext-def.hh;h=8f5ba8686d02f8a56d98126a6c724c43cd39d397;hb=9f3572d98bb948c9689cd1f75401a029451fa001;hp=dd7045015b60c2d2939f91c3e6a3d677e4106256;hpb=04265f11d1f21416ccebd2dcaa1d903dc781b36e;p=lilypond.git diff --git a/lily/include/context-def.hh b/lily/include/context-def.hh index dd7045015b..8f5ba8686d 100644 --- a/lily/include/context-def.hh +++ b/lily/include/context-def.hh @@ -18,7 +18,7 @@ The definition of a interpretation context as given in the input. The lists are stored in order of definition. */ -struct Context_def +struct Context_def : public Input { private: /* @@ -32,20 +32,16 @@ private: SCM context_aliases_; SCM translator_group_type_; SCM default_child_; - SCM input_location_; + public: - Input *origin () const; void add_context_mod (SCM); SCM get_default_child (SCM user_mods) const; - SCM get_context_name () const { return context_name_; } + SCM get_context_name () const; SCM get_accepted (SCM user_mods) const; SCM get_property_ops () const { return property_ops_; } SCM get_translator_names (SCM) const; - SCM get_translator_group_type () const { return translator_group_type_; } void set_acceptor (SCM accepts, bool add); - VIRTUAL_COPY_CONSTRUCTOR(Context_def, Context_def); - vector path_to_acceptable_context (SCM type_string, Output_def *) const; Context *instantiate (SCM extra_ops, Object_key const *); @@ -53,6 +49,7 @@ public: SCM to_alist () const; static SCM make_scm (); + SCM clone_scm () const; void apply_default_property_operations (Context *); private: