X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fcontext-def.hh;h=b5ea240b70afa62595f7de88eef724a1a619a9b3;hb=2f38710a2b40a24977441aa7faa05b6ab132f3cf;hp=0011b7c7c8399f655859cb0cf9e369f1fb32fb77;hpb=02f736306b34d878f2e25ec7c1ab1fd980bb69f5;p=lilypond.git

diff --git a/lily/include/context-def.hh b/lily/include/context-def.hh
index 0011b7c7c8..b5ea240b70 100644
--- a/lily/include/context-def.hh
+++ b/lily/include/context-def.hh
@@ -1,24 +1,27 @@
-/*   
+/*
   context-def.hh -- declare Context_def
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
 
-#ifndef TRANSLATOR_DEF_HH
-#define TRANSLATOR_DEF_HH
+  (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,33 +34,42 @@ private:
   SCM context_name_;
   SCM context_aliases_;
   SCM translator_group_type_;
-  
+  SCM default_child_;
+  SCM input_location_;
 public:
+  Input *origin () const;
   void add_context_mod (SCM);
-  SCM default_child_context_name ();
-  SCM get_context_name () const;
-  SCM get_accepted (SCM)  const;
-  SCM get_property_ops ()  const { return property_ops_; }
+  SCM get_default_child (SCM user_mods) 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_translator (SCM type_string, Music_output_def* odef) const;
-  Translator_group * instantiate (SCM extra_ops);
+  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;
-  bool is_alias (SCM) const;
-  static SCM make_scm () ;
+  static SCM make_scm ();
+
+  void apply_default_property_operations (Context *);
 
-  SCM clone_scm ()const;
-  void apply_default_property_operations (Translator_group*);
 private:
-  DECLARE_SMOBS (Context_def,foo);
+  DECLARE_SMOBS (Context_def);
   Context_def ();
-  Context_def (Context_def const&);
+  Context_def (Context_def const &);
 };
 
-DECLARE_UNSMOB(Context_def,context_def);
-
+DECLARE_UNSMOB (Context_def, context_def);
 
-#endif /* TRANSLATOR_DEF_HH */
+#endif /* CONTEXT_DEF_HH */