X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fcontext-def.hh;h=c734ed924086a6a5a7bcf65e25a78c0d016d75db;hb=8c8aa84f618801e2d5b0b4e39fc55528c3e6b805;hp=0011b7c7c8399f655859cb0cf9e369f1fb32fb77;hpb=02f736306b34d878f2e25ec7c1ab1fd980bb69f5;p=lilypond.git

diff --git a/lily/include/context-def.hh b/lily/include/context-def.hh
index 0011b7c7c8..c734ed9240 100644
--- a/lily/include/context-def.hh
+++ b/lily/include/context-def.hh
@@ -7,8 +7,8 @@
   
  */
 
-#ifndef TRANSLATOR_DEF_HH
-#define TRANSLATOR_DEF_HH
+#ifndef CONTEXT_DEF_HH
+#define CONTEXT_DEF_HH
 
 #include "lily-proto.hh"
 #include "smobs.hh"
@@ -36,28 +36,28 @@ public:
   void add_context_mod (SCM);
   SCM default_child_context_name ();
   SCM get_context_name () const;
-  SCM get_accepted (SCM)  const;
-  SCM get_property_ops ()  const { return property_ops_; }
+  SCM get_accepted (SCM) const;
+  SCM get_property_ops () const { return property_ops_; }
   SCM get_translator_names (SCM) const;
   void set_acceptor (SCM accepts, bool add);
 
-  Link_array<Context_def> path_to_acceptable_translator (SCM type_string, Music_output_def* odef) const;
-  Translator_group * instantiate (SCM extra_ops);
+  Link_array<Context_def> path_to_acceptable_context (SCM type_string,
+						      Output_def*) const;
+  Context * instantiate (SCM extra_ops);
 
   SCM to_alist () const;
-  bool is_alias (SCM) const;
-  static SCM make_scm () ;
+  static SCM make_scm ();
+
+  SCM clone_scm () const;
+  void apply_default_property_operations (Context*);
 
-  SCM clone_scm ()const;
-  void apply_default_property_operations (Translator_group*);
 private:
-  DECLARE_SMOBS (Context_def,foo);
+  DECLARE_SMOBS (Context_def, foo);
   Context_def ();
   Context_def (Context_def const&);
 };
 
-DECLARE_UNSMOB(Context_def,context_def);
-
+DECLARE_UNSMOB (Context_def, context_def);
 
-#endif /* TRANSLATOR_DEF_HH */
+#endif /* CONTEXT_DEF_HH */