X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fcontext-def.hh;h=ec737a1308e2c54063055922dc76c7233963e88a;hb=4b4331d24c2c39592f2da381156da92d140c9419;hp=ac7b776208f0e45772b1aa57c8ac258201c01137;hpb=9e69cb84d6ee5b0a861cd97869b10e3bdf0c833c;p=lilypond.git

diff --git a/lily/include/context-def.hh b/lily/include/context-def.hh
index ac7b776208..ec737a1308 100644
--- a/lily/include/context-def.hh
+++ b/lily/include/context-def.hh
@@ -1,9 +1,20 @@
 /*
-  context-def.hh -- declare Context_def
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2000--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef CONTEXT_DEF_HH
@@ -14,7 +25,7 @@
 #include "smobs.hh"
 #include "input.hh"
 #include "virtual-methods.hh"
-
+#include <set>
 
 /*
   The definition of a interpretation context as given in the
@@ -46,11 +57,16 @@ public:
   SCM get_translator_group_type () const { return translator_group_type_; }
   void set_acceptor (SCM accepts, bool add);
 
-  VIRTUAL_COPY_CONSTRUCTOR(Context_def, Context_def);
+  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 *);
+  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 ();