release: 1.3.83

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

diff --git a/lily/include/translator-group.hh b/lily/include/translator-group.hh
index b907c452b5b6e0b52c4daf2e0ad988d2cd1f326d..4701c48bbb29678b0d58a4b21b0d9cfc4b41726f 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--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -14,47 +14,57 @@
 #include "lily-proto.hh"
 #include "virtual-methods.hh"
 #include "translator.hh"
-#include "cons.hh"
 #include "parray.hh"
+#include "smobs.hh"
 
 // egcs
 typedef void (Translator::*Method_pointer)(void);
-typedef void (Translator::*Const_method_pointer)(void) const; 
 
-/** Make some kind of #Element#s from Requests. Elements are made by
-  hierarchically grouped #Translator#s
+class Scheme_hash_table;
+
+/*
+  should make a struct out of this, and move SCM list stuff in here.
+ */
+struct Translator_group_initializer {
+  static SCM modify_definition (SCM, SCM, bool);
+
+  static void set_acceptor (Translator*,SCM accepts, bool add);
+  static void add_element (Translator*,SCM name);
+  static void remove_element (Translator*,SCM name);
+  static void add_last_element (Translator*,SCM name);
+  static void apply_pushpop_property (Translator*trans, SCM syms, SCM eprop, SCM val);
+  static void add_push_property (Translator*, SCM,SCM,SCM);
+  static void add_pop_property (Translator*, SCM,SCM);  
+  
+};
+
+/** 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> consists_end_str_arr_;
-  Array<String> accepts_str_arr_;
-  Dictionary<Scalar> properties_dict_;
 
+  Scheme_hash_table *properties_dict () const;
   int iterator_count_;
-  friend class Interpretation_context_handle;
 
-  Cons_list<Translator> trans_p_list_;
 
+  friend class Interpretation_context_handle;
+protected:
+  ~Translator_group ();
 public:
-  Scalar get_property (String type_str, Translator_group  **where_found_l) const;
-  void set_property (String var_name, Scalar value);
+  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 set_property (SCM var_sym, SCM value);  
+  Translator_group *where_defined (SCM name_sym) const;
 
   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 (Translator *trans_p);
-  
-  Link_array<Translator> nongroup_l_arr () const;
-  Link_array<Translator_group> group_l_arr () const;
-  
-  virtual Global_translator *global_l() { return 0; }
+  void add_group_translator (Translator *trans_p);
+
   
   /// Score_register = 0, Staff_registers = 1, etc)
   Translator_group* ancestor_l (int l=1);
@@ -64,18 +74,18 @@ public:
   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) const;
+  Link_array<Translator_group> path_to_acceptable_translator (String alias, Music_output_def*) const;
 
   Translator_group*get_default_interpreter();
+  
 protected:
-  virtual ~Translator_group ();
+  bool try_music_on_nongroup_children (Music *m);
+  
   virtual void do_print () const;
-  virtual void do_process_requests ();
+  virtual void do_process_music ();
   virtual void do_add_processing ();
   virtual bool do_try_music (Music* req_l);       
   virtual void do_pre_move_processing();
@@ -83,7 +93,7 @@ protected:
   virtual void do_creation_processing();
   virtual void do_removal_processing();
   virtual void each (Method_pointer);
-  virtual void each (Const_method_pointer) const;
+
 };
 
 #endif // TRANSLATOR_GROUP_HH