Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/include/context-def.hh b/lily/include/context-def.hh
index e5e7d67493b378868fc218b577f4fdc36b3e76d3..8f5ba8686d02f8a56d98126a6c724c43cd39d397 100644 (file)
--- a/lily/include/context-def.hh
+++ b/lily/include/context-def.hh
@@ -1,15 +1,15 @@
-/*   
+/*
   context-def.hh -- declare Context_def
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef CONTEXT_DEF_HH
 #define CONTEXT_DEF_HH
 
+#include "std-vector.hh"
 #include "lily-proto.hh"
 #include "smobs.hh"
 #include "input.hh"
@@ -31,30 +31,31 @@ private:
   SCM context_name_;
   SCM context_aliases_;
   SCM translator_group_type_;
-  
+  SCM default_child_;
+
 public:
   void add_context_mod (SCM);
-  SCM default_child_context_name ();
+  SCM get_default_child (SCM user_mods) const;
   SCM get_context_name () const;
-  SCM get_accepted (SCM) const;
+  SCM get_accepted (SCM user_mods) 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_context (SCM type_string,
-                                                     Output_def*) const;
-  Context * instantiate (SCM extra_ops, Object_key const*);
+  vector<Context_def*> path_to_acceptable_context (SCM type_string,
+                                                     Output_def *) const;
+  Context *instantiate (SCM extra_ops, Object_key const *);
 
   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);
   Context_def ();
-  Context_def (Context_def const&);
+  Context_def (Context_def const &);
 };
 
 DECLARE_UNSMOB (Context_def, context_def);