X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fcontext-def.hh;h=ecf1cb0c42d3040c2ea83aea7b48b581a249a707;hb=5bbfc22fce036b9b69df5e420de93e11da23c05e;hp=c734ed924086a6a5a7bcf65e25a78c0d016d75db;hpb=664070d837cc4855091455892cb942cdcedeef0c;p=lilypond.git

diff --git a/lily/include/context-def.hh b/lily/include/context-def.hh
index c734ed9240..ecf1cb0c42 100644
--- a/lily/include/context-def.hh
+++ b/lily/include/context-def.hh
@@ -1,24 +1,37 @@
-/*   
-  context-def.hh -- declare Context_def
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 2000--2014 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
 #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
+  The definition of an 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 +44,43 @@ 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_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);
+  SCM lookup (SCM sym) const;
+  bool is_alias (SCM sym) const;
+
+  VIRTUAL_COPY_CONSTRUCTOR (Context_def, Context_def);
 
-  Link_array<Context_def> path_to_acceptable_context (SCM type_string,
-						      Output_def*) const;
-  Context * instantiate (SCM extra_ops);
+  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 ();
 
-  SCM clone_scm () const;
-  void apply_default_property_operations (Context*);
+  void apply_default_property_operations (Context *);
 
 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);
 
 #endif /* CONTEXT_DEF_HH */