X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fcontext-def.hh;h=c49fee1e305a6ada60a051ac52400a0e7044bfae;hb=0dcde4fc13c8091439fb8e2d77ea755357a0e7ed;hp=b5ea240b70afa62595f7de88eef724a1a619a9b3;hpb=38d7d319eabc906e82fb42002678c6d42a23b6f7;p=lilypond.git

diff --git a/lily/include/context-def.hh b/lily/include/context-def.hh
index b5ea240b70..c49fee1e30 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--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2000--2009 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
@@ -16,13 +27,16 @@
 #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
+struct Context_def : public Smob<Context_def>
 {
+  SCM mark_smob () const;
+  int print_smob (SCM, scm_print_state *) const;
+  static const char type_p_name_[];
+  virtual ~Context_def ();
 private:
   /*
     these lists store the definition, in opposite order of entry
@@ -46,16 +60,18 @@ public:
   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);
+  VIRTUAL_COPY_CONSTRUCTOR (Context_def, Context_def);
 
-  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;
+  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;
@@ -64,12 +80,9 @@ public:
   void apply_default_property_operations (Context *);
 
 private:
-  DECLARE_SMOBS (Context_def);
   Context_def ();
   Context_def (Context_def const &);
 };
 
-DECLARE_UNSMOB (Context_def, context_def);
 
 #endif /* CONTEXT_DEF_HH */
-