* lily/include/lily-guile.hh: is_x -> ly_c_X_p naming.

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

diff --git a/lily/include/context-def.hh b/lily/include/context-def.hh
index ec7201cc91b2acc2ce9dbc165d8ed595e1fa9df7..01484666a6d797744cba2bb0faac913b03c45524 100644 (file)
--- a/lily/include/context-def.hh
+++ b/lily/include/context-def.hh
@@ -3,12 +3,12 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c)  2000--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
-#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 (Music_output_def*, SCM extra_ops);
+  Link_array<Context_def> path_to_acceptable_context (SCM type_string,
+                                                     Music_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 */