release: 1.5.30

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

diff --git a/lily/include/translator-group.hh b/lily/include/translator-group.hh
index ebda8bdfec827f709854d1c518120ccac8fd2b95..6621344a95d78aa81bfb803cf9e9da0f8d184173 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--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -18,7 +18,8 @@
 #include "smobs.hh"
 
 // egcs
-typedef void (Translator::*Method_pointer)(void);
+typedef void (Translator::*Method_pointer) (void);
+#define set_property(x,y) internal_set_property(ly_symbol2scm(x),y)
 
 class Scheme_hash_table;
 
@@ -31,31 +32,33 @@ class Translator_group : public virtual Translator {
   Scheme_hash_table *properties_dict () const;
   int iterator_count_;
 
-
   friend class Interpretation_context_handle;
+  SCM add_translator (SCM, Translator*);
+
 protected:
   ~Translator_group ();
 public:
-  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);  
+  SCM internal_get_property (SCM name_sym) const;
+
+  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_group_translator (Translator *trans_p);
-
+  VIRTUAL_COPY_CONS (Translator);
+  Translator_group (Translator_group const &);
+  Translator_group ();
+  void add_fresh_group_translator (Translator *trans_p);
+  void add_fresh_simple_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 ();
@@ -63,20 +66,18 @@ public:
   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, Music_output_def*) const;
+  Translator_group*get_default_interpreter ();
 
-  Translator_group*get_default_interpreter();
-  
 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 stop_translation_timestep ();
+  virtual void start_translation_timestep ();   
+  virtual void initialize ();
+  virtual void finalize ();
   virtual void each (Method_pointer);
-
 };
 
 #endif // TRANSLATOR_GROUP_HH