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 a34dc222b008ebbb90262f2c330058d242fe08e6..00da2cd3917804bd9d78a4d71a2d8cf6ac725649 100644 (file)
--- a/lily/include/translator-group.hh
+++ b/lily/include/translator-group.hh
@@ -16,6 +16,8 @@
 #include "translator.hh"
 #include "cons.hh"
 #include "parray.hh"
+#include "scm-hash.hh"
+
 
 // egcs
 typedef void (Translator::*Method_pointer)(void);
@@ -28,15 +30,16 @@ 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_;
 
   int iterator_count_;
   friend class Interpretation_context_handle;
+
   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 (String type_str, Translator_group  **where_found_l) const;
+  void set_property (String var_name, SCM value);
 
   String id_str_;
 
@@ -65,14 +68,18 @@ public:
   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;
 
   Translator_group*get_default_interpreter();
-protected:
   virtual ~Translator_group ();
+  
+protected:
+  bool try_music_on_nongroup_children (Music *m);
+  
   virtual void do_print () const;
   virtual void do_process_requests ();
   virtual void do_add_processing ();
@@ -81,8 +88,8 @@ protected:
   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