X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftranslator-group.hh;h=2bfaad8823b449157339d761a81304073448c50b;hb=ee7a5648ebcede3c2775d944dd91e8e33dfeabad;hp=4868940bb86f20924ec54331ba05dd04541c1385;hpb=ad4297de0246935caa4c51f4e152e20009a6f64e;p=lilypond.git

diff --git a/lily/include/translator-group.hh b/lily/include/translator-group.hh
index 4868940bb8..2bfaad8823 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--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -16,46 +16,45 @@
 #include "translator.hh"
 #include "cons.hh"
 #include "parray.hh"
+#include "scm-hash.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
+/** 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_;
+    Array<String> consists_end_str_arr_;
+  Scheme_hash_table properties_dict_;
 
   int iterator_count_;
   friend class Interpretation_context_handle;
 
+protected:
   Cons_list<Translator> trans_p_list_;
 
 public:
-  Scalar get_property (String type_str, Translator_group  **where_found_l) const;
-  void set_property (String var_name, Scalar value);
+  SCM get_property (SCM name_sym) const;
+  void set_property (String var_name, 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);  
-  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; }
-  
   /// Score_register = 0, Staff_registers = 1, etc)
   Translator_group* ancestor_l (int l=1);
   int depth_i() const;
@@ -65,20 +64,19 @@ public:
   Translator *remove_translator_p (Translator*trans_l);
   void check_removal ();
 
-
-
   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();
+  virtual ~Translator_group ();
+  
 protected:
   bool try_music_on_nongroup_children (Music *m);
   
-  virtual ~Translator_group ();
   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();