X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftranslator-group.hh;h=edc09238fad7a466d2e13607513ecf40acd3bf41;hb=a2991295b2c1fb36bec19de207161855ca3c1756;hp=47c2ef1135300cfee351aa2fd16971eae30e99ba;hpb=c52973e438ce3490d688860bb71849a7b3c26fef;p=lilypond.git

diff --git a/lily/include/translator-group.hh b/lily/include/translator-group.hh
index 47c2ef1135..edc09238fa 100644
--- 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--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -14,77 +14,69 @@
 #include "lily-proto.hh"
 #include "virtual-methods.hh"
 #include "translator.hh"
-#include "cons.hh"
 #include "parray.hh"
-#include "scm-hash.hh"
-
+#include "smobs.hh"
 
 // egcs
-typedef void (Translator::*Method_pointer)(void);
-typedef void (Translator::*Const_method_pointer)(void) const; 
+typedef void (Translator::*Method_pointer) (void);
+
+class Scheme_hash_table;
+
 
 /** Make some kind of Elements from Requests. Elements are made by
   hierarchically grouped Translators
   */
 class Translator_group : public virtual Translator {
-  Array<String> consists_str_arr_;
-  Array<String> accepts_str_arr_;
-  Array<String> consists_end_str_arr_;
-  Scheme_hash_table properties_dict_;
 
+  Scheme_hash_table *properties_dict () const;
   int iterator_count_;
-  friend class Interpretation_context_handle;
 
+  friend class Interpretation_context_handle;
 protected:
-  Cons_list<Translator> trans_p_list_;
-
+  ~Translator_group ();
 public:
+  SCM add_translator (SCM, Translator*);
+  void execute_single_pushpop_property (SCM prop, SCM sym, SCM val);
   SCM get_property (SCM name_sym) const;
   void set_property (String var_name, SCM value);
+  void unset_property (SCM var_sym);
+  void set_property (SCM var_sym, SCM value);  
   Translator_group *where_defined (SCM name_sym) const;
 
   String id_str_;
-  void add_last_element (String s);
 
-  VIRTUAL_COPY_CONS(Translator);
-  
-  void set_acceptor (String accepts, bool add);
-  void set_element (String elt, bool add);  
-  
-  Translator_group(Translator_group const &);
-  Translator_group();
-  void add_translator (Translator *trans_p);
+  VIRTUAL_COPY_CONS (Translator);
+  Translator_group (Translator_group const &);
+  Translator_group ();
+  void add_group_translator (Translator *trans_p);
+
   
   /// Score_register = 0, Staff_registers = 1, etc)
   Translator_group* ancestor_l (int l=1);
-  int depth_i() const;
+  int depth_i () const;
   bool is_bottom_translator_b () const;
-  bool removable_b() const;
+  bool removable_b () const;
   void terminate_translator (Translator*r_l);
   Translator *remove_translator_p (Translator*trans_l);
   void check_removal ();
-
-  Translator *get_simple_translator (String) const;
+  // Translator *get_simple_translator (String) const;
   Translator_group *find_existing_translator_l (String n, String id);
   Translator_group *find_create_translator_l (String n, String id);
   Link_array<Translator_group> path_to_acceptable_translator (String alias, Music_output_def*) const;
 
-  Translator_group*get_default_interpreter();
-  virtual ~Translator_group ();
+  Translator_group*get_default_interpreter ();
   
-protected:
+public:
   bool try_music_on_nongroup_children (Music *m);
   
-  virtual void do_print () const;
-  virtual void do_process_music ();
-  virtual void do_add_processing ();
-  virtual bool do_try_music (Music* req_l);       
-  virtual void do_pre_move_processing();
-  virtual void do_post_move_processing();   
-  virtual void do_creation_processing();
-  virtual void do_removal_processing();
+  virtual void do_announces ();
+  virtual bool try_music (Music* req_l);       
+  virtual void stop_translation_timestep ();
+  virtual void start_translation_timestep ();   
+  virtual void initialize ();
+  virtual void finalize ();
   virtual void each (Method_pointer);
-  virtual void each (Const_method_pointer) const;
+
 };
 
 #endif // TRANSLATOR_GROUP_HH