* lily/scores.cc (Input_file_settings): Initalize global_header_.

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

diff --git a/lily/include/translator-group.hh b/lily/include/translator-group.hh
index 1e6174935661529db0a42943e75a75f4cc77560b..c4582238f002e3058e0887c869db1a9dee90869e 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,7 @@
 
 // egcs
 typedef void (Translator::*Method_pointer) (void);
+#define set_property(x,y) internal_set_property(ly_symbol2scm(x),y)
 
 class Scheme_hash_table;
 
@@ -32,35 +33,37 @@ 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);  
   Translator_group *where_defined (SCM name_sym) const;
 
-  String id_str_;
+  String id_string_;
 
   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);
+  void add_used_group_translator (Translator *trans);
   
   /// Score_register = 0, Staff_registers = 1, etc)
-  Translator_group* ancestor_l (int l=1);
-  int depth_i () const;
+  Translator_group* get_ancestor (int l=1);
+  int get_depth () const;
   bool is_bottom_translator_b () const;
   bool removable_b () const;
-  void terminate_translator (Translator*r_l);
-  Translator *remove_translator_p (Translator*trans_l);
+  void terminate_translator (Translator*r);
+  Translator *remove_translator (Translator*trans);
   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);
+  Translator_group *find_existing_translator (String n, String id);
+  Translator_group *find_create_translator (String n, String id);
   Link_array<Translator_group> path_to_acceptable_translator (String alias, Music_output_def*) const;
   Translator_group*get_default_interpreter ();
 
@@ -68,7 +71,7 @@ public:
   bool try_music_on_nongroup_children (Music *m);
   
   virtual void do_announces ();
-  virtual bool try_music (Music* req_l);       
+  virtual bool try_music (Music* req);       
   virtual void stop_translation_timestep ();
   virtual void start_translation_timestep ();   
   virtual void initialize ();