X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftranslator-group.hh;h=74a3490d3cf4840ac0e780f13da219094d2d5ac1;hb=2fc177dc2401903f604f4520c7b59e1544046ed5;hp=dc2e8365eb98a3e7712b6d594b8c589862cb26c1;hpb=2181534bd94587fcac8f1769f2dda7bece693649;p=lilypond.git

diff --git a/lily/include/translator-group.hh b/lily/include/translator-group.hh
index dc2e8365eb..74a3490d3c 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 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -14,61 +14,69 @@
 #include "lily-proto.hh"
 #include "virtual-methods.hh"
 #include "translator.hh"
-#include "plist.hh"
 #include "parray.hh"
+#include "smobs.hh"
 
-typedef void (Translator::*Method_pointer)(void);
+// egcs
+typedef void (Translator::*Method_pointer) (void);
+#define set_property(x,y) internal_set_property(ly_symbol2scm(x),y)
 
-/** Make some kind of #Element#s from Requests. Elements are made by
-  hierarchically grouped #Translator#s
+class Scheme_hash_table;
+
+
+/** Make some kind of Elements from Requests. Elements are made by
+  hierarchically grouped Translators
   */
 class Translator_group : public virtual Translator {
-public:
-  Pointer_list<Translator *> trans_p_list_;
-  String id_str_;
-  Array<String> consists_str_arr_;
-  Array<String> accepts_str_arr_;
+
+  Scheme_hash_table *properties_dict () const;
   int iterator_count_;
 
-  TRANSLATOR_CLONE(Translator_group);
-  DECLARE_MY_RUNTIME_TYPEINFO;
+  friend class Interpretation_context_handle;
+  SCM add_translator (SCM, Translator*);
 
-  Translator_group(Translator_group const &);
-  Translator_group();
-  void add (Translator *);
+protected:
+  ~Translator_group ();
+public:
+  void execute_single_pushpop_property (SCM prop, SCM sym, SCM val);
+  SCM internal_get_property (SCM name_sym) const;
 
-  Link_array<Translator> nongroup_l_arr () const;
-  Link_array<Translator_group> group_l_arr () const;
-  
-  virtual Global_translator *global_l() { return 0; }
+  void unset_property (SCM var_sym);
+  void internal_set_property (SCM var_sym, SCM value);  
+  Translator_group *where_defined (SCM name_sym) const;
+
+  String id_str_;
+
+  VIRTUAL_COPY_CONS (Translator);
+  Translator_group (Translator_group const &);
+  Translator_group ();
+  void add_fresh_group_translator (Translator *trans_p);
+  void add_used_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 (char const *type) 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) const;
+  Link_array<Translator_group> path_to_acceptable_translator (String alias, Music_output_def*) const;
+  Translator_group*get_default_interpreter ();
 
-  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 ();
-  virtual bool do_try_request (Request* req_l);       
-  virtual void do_pre_move_processing();
-  virtual void do_post_move_processing();   
-  virtual void do_creation_processing();
-  virtual void do_removal_processing();
-  void each (Method_pointer) const;
+public:
+  bool try_music_on_nongroup_children (Music *m);
+  
+  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);
 };
 
 #endif // TRANSLATOR_GROUP_HH