release: 1.1.1

[lilypond.git] / lily / include / translator-group.hh

diff --git a/lily/include/translator-group.hh b/lily/include/translator-group.hh
index 1cc3a0b3c3343eb29d650361f2da9d60dd09742d..fb1c8e2d23c2fd4aaebcefe0fc90e11396eaf3d9 100644 (file)
--- a/lily/include/translator-group.hh
+++ b/lily/include/translator-group.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -25,20 +25,27 @@ typedef void (Translator::*Const_method_pointer)(void) const;
   hierarchically grouped #Translator#s
   */
 class Translator_group : public virtual Translator {
+  Array<String> consists_str_arr_;
+  Array<String> accepts_str_arr_;
+
 public:
   Pointer_list<Translator *> trans_p_list_;
   String id_str_;
-  Array<String> consists_str_arr_;
-  Array<String> accepts_str_arr_;
+
+
   int iterator_count_;
 
   TRANSLATOR_CLONE(Translator_group);
   DECLARE_MY_RUNTIME_TYPEINFO;
 
+  void set_acceptor (String accepts, bool add);
+  void set_element (String accepts, bool add);  
+  
+  
   Translator_group(Translator_group const &);
   Translator_group();
-  void add (Translator *);
-
+  void add_translator (Translator *trans_p);
+  
   Link_array<Translator> nongroup_l_arr () const;
   Link_array<Translator_group> group_l_arr () const;
   
@@ -53,6 +60,8 @@ public:
   Translator *remove_translator_p (Translator*trans_l);
   void check_removal ();
 
+
+  
   Translator *get_simple_translator (char const *type) const;
   Translator_group *find_existing_translator_l (String n, String id);
   Translator_group *find_create_translator_l (String n, String id);
@@ -61,7 +70,6 @@ public:
   Translator_group*get_default_interpreter();
 protected:
   virtual ~Translator_group ();
-  virtual Translator_group * group_l () { return this; }
   virtual void do_print () const;
   virtual void do_process_requests ();
   virtual void do_add_processing ();