Use queue for prioritizing slur scores.

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

diff --git a/lily/include/context-def.hh b/lily/include/context-def.hh
index 5d133ddbf44b2a367aefa727dd92bcbe39b40ead..6024c68e06ae30f58d2afba6db1f4c14f78f54d5 100644 (file)
--- 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--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2000--2007 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,6 +25,7 @@
 #include "smobs.hh"
 #include "input.hh"
 #include "virtual-methods.hh"
+#include <set>
 
 
 /*
@@ -49,8 +61,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 ();