* Another grand 2003 update.

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

diff --git a/lily/include/translator.hh b/lily/include/translator.hh
index 1e1109d99cdc12dc6e0bee75b0accf363365bccf..64a7aba4ecf4e144a806a7f701a21275885e01dd 100644 (file)
--- a/lily/include/translator.hh
+++ b/lily/include/translator.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--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -15,7 +15,6 @@
 #include "lily-proto.hh"
 #include "virtual-methods.hh"
 #include "lily-guile.hh"
-#include "parray.hh"
 #include "input.hh"
 #include "smobs.hh"
 
@@ -30,14 +29,15 @@ public:                                                     \
   virtual SCM static_translator_description () const;  \
   virtual SCM translator_description () const;
 
-/** Make some kind of #Element#s from Requests. Elements are made by
-  hierarchically grouped #Translator#s
-  */
-class Translator : public Input {
+/*
+  Translate music into grobs.
+*/
+class Translator
+{
   void init ();
 public:
-  Music_output_def * output_def_l_;
-  String type_str_;
+  Music_output_def * output_def_;
+  String type_string_;
   
   bool is_alias_b (String) const;
     
@@ -45,16 +45,12 @@ public:
   Translator (Translator const &);
 
   
-  Translator_group * daddy_trans_l_ ;
-  DECLARE_SCHEME_CALLBACK(name, (SCM trans));
-  DECLARE_SCHEME_CALLBACK(description,(SCM trans));
-  void announces ();
-
+  Translator_group * daddy_trans_ ;
   void removal_processing ();
   /**
     ask daddy for a feature
     */
-  Music_output_def *output_def_l () const;
+  Music_output_def *get_output_def () const;
 
   SCM internal_get_property (SCM symbol) const;
   
@@ -70,18 +66,11 @@ public:
   SCM properties_scm_;
   DECLARE_SMOBS (Translator, dummy);
 
+
 public:
+  Global_translator * top_translator () const;
   TRANSLATOR_DECLARATIONS(Translator);
-    /**
-    try to fit the request in this engraver
-
-    @return
-    false: not noted,  not taken.
-
-    true: request swallowed. Don't try to put the request elsewhere.
-
-    */
-  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 do_announces () ;
@@ -99,7 +88,7 @@ static void  _ ## T ## _adder () {\
       T *t = new T;\
       T::static_description_ = t->static_translator_description ();\
       scm_permanent_object (T::static_description_);\
-      t->type_str_ = classname (t);\
+      t->type_string_ = classname (t);\
       add_translator (t);\
 }\
 SCM T::translator_description() const\
@@ -111,7 +100,7 @@ ADD_GLOBAL_CTOR (_ ## T ## _adder);
 
 
 
-#define ENTER_DESCRIPTION(classname,desc,grobs,acked,read,write)                                               \
+#define ENTER_DESCRIPTION(classname,desc,grobs,accepted,acked,read,write)                                              \
 ADD_THIS_TRANSLATOR (classname);\
 SCM                                                                                            \
 classname::static_translator_description () const \
@@ -124,10 +113,12 @@ classname::static_translator_description () const \
                              parse_symbol_list (grobs), static_properties);    \
                                                                                                \
   static_properties= scm_acons (ly_symbol2scm ("description"),                                 \
-                             ly_str02scm (desc), static_properties);                           \
+                             scm_makfrom0str (desc), static_properties);                               \
                                                                                                \
   static_properties= scm_acons (ly_symbol2scm ("interfaces-acked"),                            \
                              parse_symbol_list (acked), static_properties);                    \
+  static_properties= scm_acons (ly_symbol2scm ("events-accepted"),                             \
+                             parse_symbol_list (accepted), static_properties);                 \
                                                                                                \
   static_properties= scm_acons (ly_symbol2scm ("properties-read"),                             \
                              parse_symbol_list (read), static_properties);                     \
@@ -140,9 +131,9 @@ classname::static_translator_description () const \
 
 
 
-extern Dictionary<Translator*> *global_translator_dict_p;
-void add_translator (Translator*trans_p);
+extern Dictionary<Translator*> *global_translator_dict;
+void add_translator (Translator*trans);
 
-Translator*get_translator_l (String s);
+Translator*get_translator (String s);
 DECLARE_UNSMOB(Translator,translator);
 #endif // TRANSLATOR_HH