X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fcontext-def.hh;h=b5ea240b70afa62595f7de88eef724a1a619a9b3;hb=db4c4e9f240b6c1becad366e1b62495e395cc10c;hp=e709df9631d29ff6589bd26285b026bb63978973;hpb=545092a25d8ca41dc90b87482474b3719f7130a9;p=lilypond.git

diff --git a/lily/include/context-def.hh b/lily/include/context-def.hh
index e709df9631..b5ea240b70 100644
--- a/lily/include/context-def.hh
+++ b/lily/include/context-def.hh
@@ -3,21 +3,25 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef CONTEXT_DEF_HH
 #define CONTEXT_DEF_HH
 
+#include "std-vector.hh"
 #include "lily-proto.hh"
 #include "smobs.hh"
 #include "input.hh"
+#include "virtual-methods.hh"
+#include <set>
+
 
 /*
   The definition of a interpretation context as given in the
   input. The lists are stored in order of definition.
 */
-struct Context_def : public Input
+struct Context_def
 {
 private:
   /*
@@ -31,28 +35,36 @@ 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;
+  SCM get_context_name () const { return context_name_; }
   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);
 
-  Link_array<Context_def> path_to_acceptable_context (SCM type_string,
-						      Output_def *) const;
-  Context *instantiate (SCM extra_ops, Object_key const *);
+  VIRTUAL_COPY_CONSTRUCTOR(Context_def, Context_def);
+
+  vector<Context_def*> path_to_acceptable_context (SCM type_string,
+						   Output_def *,
+						   SCM) const;
+  vector<Context_def*> internal_path_to_acceptable_context (SCM type_string,
+							    Output_def *,
+							    SCM,
+							    set<const Context_def *> *seen) const;
+  Context *instantiate (SCM extra_ops);
 
   SCM to_alist () const;
   static SCM make_scm ();
 
-  SCM clone_scm () const;
   void apply_default_property_operations (Context *);
 
 private:
-  DECLARE_SMOBS (Context_def, foo);
+  DECLARE_SMOBS (Context_def);
   Context_def ();
   Context_def (Context_def const &);
 };