release: 1.5.45

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

diff --git a/lily/include/translator-group.hh b/lily/include/translator-group.hh
index edc09238fad7a466d2e13607513ecf40acd3bf41..1b7069e74046a77f2e246460fb34d837c9d1e195 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--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -19,6 +19,8 @@
 
 // egcs
 typedef void (Translator::*Method_pointer) (void);
+#define set_property(x,y) internal_set_property(ly_symbol2scm(x),y)
+#define set_children_property(x,y) internal_set_children_property(ly_symbol2scm(x),y)
 
 class Scheme_hash_table;
 
@@ -32,15 +34,17 @@ class Translator_group : public virtual Translator {
   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);
+  SCM internal_get_property (SCM name_sym) const;
+
   void unset_property (SCM var_sym);
-  void set_property (SCM var_sym, SCM value);  
+  void internal_set_property (SCM var_sym, SCM value);  
+  void internal_set_children_property (SCM var_sym, SCM value);  
   Translator_group *where_defined (SCM name_sym) const;
 
   String id_str_;
@@ -48,8 +52,8 @@ public:
   VIRTUAL_COPY_CONS (Translator);
   Translator_group (Translator_group const &);
   Translator_group ();
-  void add_group_translator (Translator *trans_p);
-
+  void add_fresh_group_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);
@@ -63,9 +67,8 @@ 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 ();
-  
+
 public:
   bool try_music_on_nongroup_children (Music *m);
   
@@ -76,7 +79,6 @@ public:
   virtual void initialize ();
   virtual void finalize ();
   virtual void each (Method_pointer);
-
 };
 
 #endif // TRANSLATOR_GROUP_HH