Run `make grand-replace'.

[lilypond.git] / lily / include / context-def.hh

diff --git a/lily/include/context-def.hh b/lily/include/context-def.hh
index dd7045015b60c2d2939f91c3e6a3d677e4106256..bceb123ee2d06f016d981fbd4de09683f02512d1 100644 (file)
--- 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--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef CONTEXT_DEF_HH
@@ -13,6 +13,9 @@
 #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
@@ -47,8 +50,13 @@ 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;
+  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 ();
@@ -56,7 +64,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 &);
 };