X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fcontext-def.hh;h=ea81eb1295be8f55aab47b8fa6c7ada6e3b93dd0;hb=997f899fa8184636570db2cb661cc8a8a5953bd6;hp=a92ad4fee53e352c8c650018e0ffbab884c78caf;hpb=8d796a54fbfc350c56f04088cb0c009ee0287256;p=lilypond.git

diff --git a/lily/include/context-def.hh b/lily/include/context-def.hh
index a92ad4fee5..ea81eb1295 100644
--- a/lily/include/context-def.hh
+++ b/lily/include/context-def.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef CONTEXT_DEF_HH
@@ -13,12 +13,14 @@
 #include "lily-proto.hh"
 #include "smobs.hh"
 #include "input.hh"
+#include "virtual-methods.hh"
+
 
 /*
   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:
   /*
@@ -32,8 +34,9 @@ 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_; }
@@ -46,8 +49,8 @@ public:
   VIRTUAL_COPY_CONSTRUCTOR(Context_def, Context_def);
 
   vector<Context_def*> path_to_acceptable_context (SCM type_string,
-						      Output_def *) const;
-  Context *instantiate (SCM extra_ops, Object_key const *);
+						   Output_def *, SCM) const;
+  Context *instantiate (SCM extra_ops);
 
   SCM to_alist () const;
   static SCM make_scm ();
@@ -55,7 +58,7 @@ public:
   void apply_default_property_operations (Context *);
 
 private:
-  DECLARE_SMOBS (Context_def, foo);
+  DECLARE_SMOBS (Context_def);
   Context_def ();
   Context_def (Context_def const &);
 };