($(outdir)/%.pdf): add DVIPS_FLAGS. This will

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

diff --git a/lily/include/translator-group.hh b/lily/include/translator-group.hh
index 4701c48bbb29678b0d58a4b21b0d9cfc4b41726f..36ac26cf2f874126c4dd2610a278c40fa8753715 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--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -18,82 +18,75 @@
 #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;
 
-/*
-  should make a struct out of this, and move SCM list stuff in here.
- */
-struct Translator_group_initializer {
-  static SCM modify_definition (SCM, SCM, bool);
-
-  static void set_acceptor (Translator*,SCM accepts, bool add);
-  static void add_element (Translator*,SCM name);
-  static void remove_element (Translator*,SCM name);
-  static void add_last_element (Translator*,SCM name);
-  static void apply_pushpop_property (Translator*trans, SCM syms, SCM eprop, SCM val);
-  static void add_push_property (Translator*, SCM,SCM,SCM);
-  static void add_pop_property (Translator*, SCM,SCM);  
-  
-};
 
-/** Make some kind of Elements from Requests. Elements are made by
+/** Make some kind of Elements from Events. Elements are made by
   hierarchically grouped Translators
   */
 class Translator_group : public virtual Translator {
-
-  Scheme_hash_table *properties_dict () const;
+public:
+  String id_string_;
+private:
   int iterator_count_;
-
-
   friend class Interpretation_context_handle;
+
+  Scheme_hash_table *properties_dict () const;
+  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);  
-  Translator_group *where_defined (SCM name_sym) const;
 
-  String id_str_;
+  virtual SCM get_simple_trans_list ();
 
-  VIRTUAL_COPY_CONS(Translator);
-  Translator_group(Translator_group const &);
-  Translator_group();
-  void add_group_translator (Translator *trans_p);
+public:
+  void execute_pushpop_property (SCM prop, SCM sym, SCM val);
+  SCM internal_get_property (SCM name_sym) const;
+  SCM properties_as_alist () const;
+  void unset_property (SCM var_sym);
+  void internal_set_property (SCM var_sym, SCM value);  
 
-  
-  /// Score_register = 0, Staff_registers = 1, etc)
-  Translator_group* ancestor_l (int l=1);
-  int depth_i() const;
-  bool is_bottom_translator_b () const;
-  bool removable_b() const;
-  void terminate_translator (Translator*r_l);
-  Translator *remove_translator_p (Translator*trans_l);
+  Translator_group *where_defined (SCM name_sym) const;
+  String context_name () const;  
+  Translator_group (Translator_group const &);
+  Translator_group ();
+
+  bool is_alias (SCM) const;
+  void add_fresh_group_translator (Translator *trans);
+  void add_used_group_translator (Translator *trans);
+  bool is_bottom_context () const;
+  bool is_removable () const;
+  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);
-  Link_array<Translator_group> path_to_acceptable_translator (String alias, Music_output_def*) const;
-
-  Translator_group*get_default_interpreter();
-  
-protected:
+  Translator_group *find_existing_translator (SCM context_name, String id);
+  Translator_group *find_create_translator (SCM context_name,
+                                           String id, SCM ops);
+  Link_array<Translator_group>
+    path_to_acceptable_translator (SCM alias,
+                                  Music_output_def*) const;
+  Translator_group*get_default_interpreter ();
+  VIRTUAL_COPY_CONS (Translator);
+public:
   bool try_music_on_nongroup_children (Music *m);
   
-  virtual void do_print () const;
-  virtual void do_process_music ();
-  virtual void do_add_processing ();
-  virtual bool do_try_music (Music* req_l);       
-  virtual void do_pre_move_processing();
-  virtual void do_post_move_processing();   
-  virtual void do_creation_processing();
-  virtual void do_removal_processing();
+  virtual void do_announces ();
+  virtual bool try_music (Music* req);       
+  virtual void stop_translation_timestep ();
+  virtual void start_translation_timestep ();   
+  virtual void initialize ();
+  virtual void finalize ();
   virtual void each (Method_pointer);
-
 };
 
+
+bool melisma_busy (Translator* tr); // where to put this? --hwn
+void apply_property_operations (Translator_group*tg, SCM pre_init_ops);
+SCM names_to_translators (SCM namelist, Translator_group*tg);
+void execute_pushpop_property (Translator_group * trg,
+                              SCM prop, SCM eltprop, SCM val);
+SCM updated_grob_properties (Translator_group* tg, SCM sym);
+
 #endif // TRANSLATOR_GROUP_HH