release: 1.3.0

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

diff --git a/lily/include/translator-group.hh b/lily/include/translator-group.hh
index a1613cba607e62247c3a189fae474d265718c0b8..00da2cd3917804bd9d78a4d71a2d8cf6ac725649 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--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -14,8 +14,10 @@
 #include "lily-proto.hh"
 #include "virtual-methods.hh"
 #include "translator.hh"
-#include "plist.hh"
+#include "cons.hh"
 #include "parray.hh"
+#include "scm-hash.hh"
+
 
 // egcs
 typedef void (Translator::*Method_pointer)(void);
@@ -25,20 +27,32 @@ typedef void (Translator::*Const_method_pointer)(void) const;
   hierarchically grouped #Translator#s
   */
 class Translator_group : public virtual Translator {
-public:
-  Pointer_list<Translator *> trans_p_list_;
-  String id_str_;
   Array<String> consists_str_arr_;
+  Array<String> consists_end_str_arr_;
   Array<String> accepts_str_arr_;
+  Scheme_hash_table properties_dict_;
+
   int iterator_count_;
+  friend class Interpretation_context_handle;
 
-  TRANSLATOR_CLONE(Translator_group);
-  DECLARE_MY_RUNTIME_TYPEINFO;
+  Cons_list<Translator> trans_p_list_;
 
+public:
+  SCM get_property (String type_str, Translator_group  **where_found_l) const;
+  void set_property (String var_name, SCM value);
+
+  String id_str_;
+
+  VIRTUAL_COPY_CONS(Translator);
+  
+  void set_acceptor (String accepts, bool add);
+  void set_element (String elt, bool add);  
+  void add_last_element (String elt);  
+  
   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,25 +67,29 @@ public:
   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;
 
   Translator_group*get_default_interpreter();
-protected:
   virtual ~Translator_group ();
-  virtual Translator_group * group_l () { return this; }
+  
+protected:
+  bool try_music_on_nongroup_children (Music *m);
+  
   virtual void do_print () const;
   virtual void do_process_requests ();
   virtual void do_add_processing ();
-  virtual bool do_try_request (Request* req_l);       
+  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();
-  void each (Method_pointer);
-  void each (Const_method_pointer) const;
+  virtual void each (Method_pointer);
+  virtual void each (Const_method_pointer) const;
 };
 
 #endif // TRANSLATOR_GROUP_HH