X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Finclude%2Ftranslator.hh;h=81b95bbdf76500f7f5f44b2e2f2c070dc9e35d65;hb=bcdd0abf2410919d2036be984ad4f2f42fd766d3;hp=112c21496f0e02d286b337dfa61de75286170e54;hpb=f02e7db17cd0babaeb7978251ca5809e353ad29a;p=lilypond.git

diff --git a/lily/include/translator.hh b/lily/include/translator.hh
index 112c21496f..81b95bbdf7 100644
--- 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,39 +15,41 @@
 #include "lily-proto.hh"
 #include "virtual-methods.hh"
 #include "lily-guile.hh"
-#include "parray.hh"
 #include "input.hh"
 #include "smobs.hh"
 
-/** Make some kind of #Element#s from Requests. Elements are made by
-  hierarchically grouped #Translator#s
-  */
-class Translator : public Input {
+#define get_property(x) internal_get_property(ly_symbol2scm(x))
+
+
+#define TRANSLATOR_DECLARATIONS(NAME)			\
+public:							\
+  NAME();\
+  VIRTUAL_COPY_CONS (Translator);				\
+  static SCM static_description_;			\
+  virtual SCM static_translator_description () const;	\
+  virtual SCM translator_description () const;
+
+/*
+  Translate music into grobs.
+*/
+class Translator
+{
   void init ();
 public:
-  Music_output_def * output_def_l_;
-  String type_str_;
+  Music_output_def * output_def_;
   
-  virtual const char *name () const;
-  bool is_alias_b (String) const;
-    
-  VIRTUAL_COPY_CONS (Translator);
+  bool is_alias_b (SCM) const;
   Translator (Translator const &);
-  Translator ();
-  
-  Translator_group * daddy_trans_l_ ;
- 
-
-  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 get_property (const char *) const;
-  SCM get_property (SCM symbol) const;
+  SCM internal_get_property (SCM symbol) const;
   
   virtual Moment now_mom () const;  
 
@@ -57,21 +59,14 @@ public:
   SCM simple_trans_list_;
   SCM trans_group_list_;
   SCM definition_;
-  
   SCM properties_scm_;
   DECLARE_SMOBS (Translator, dummy);
-public:
-
-    /**
-    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);
+public:
+  Global_translator * top_translator () const;
+  TRANSLATOR_DECLARATIONS(Translator);
+  virtual bool try_music (Music *req);
   virtual void stop_translation_timestep ();
   virtual void start_translation_timestep ();
   virtual void do_announces () ;
@@ -84,18 +79,55 @@ public:
   A macro to automate administration of translators.
  */
 #define ADD_THIS_TRANSLATOR(T)				\
+SCM T::static_description_ = SCM_EOL;\
 static void  _ ## T ## _adder () {\
       T *t = new T;\
-      t->type_str_ = classname (t);\
+      T::static_description_ = t->static_translator_description ();\
+      scm_permanent_object (T::static_description_);\
       add_translator (t);\
 }\
+SCM T::translator_description() const\
+{ \
+  return static_description_;\
+}\
 ADD_GLOBAL_CTOR (_ ## T ## _adder);
 
 
 
-extern Dictionary<Translator*> *global_translator_dict_p;
-void add_translator (Translator*trans_p);
 
-Translator*get_translator_l (String s);
-Translator *unsmob_translator (SCM);
+#define ENTER_DESCRIPTION(classname,desc,grobs,accepted,acked,read,write)						\
+ADD_THIS_TRANSLATOR (classname);\
+SCM												\
+classname::static_translator_description () const \
+{												\
+  SCM  static_properties= SCM_EOL;								\
+  /*  static_properties= acons (name ,gh_str02scm (Translator::name (self_scm ())),		\
+			      static_properties_);						\
+  */												\
+  static_properties= scm_acons (ly_symbol2scm ("grobs-created"),				\
+			      parse_symbol_list (grobs), static_properties);	\
+			      									\
+  static_properties= scm_acons (ly_symbol2scm ("description"),					\
+			      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);			\
+												\
+  static_properties= scm_acons (ly_symbol2scm ("properties-written"),				\
+				parse_symbol_list (write), static_properties);			\
+												\
+  return static_properties;									\
+}
+
+
+
+void add_translator (Translator*trans);
+
+Translator*get_translator (String s);
+DECLARE_UNSMOB(Translator,translator);
 #endif // TRANSLATOR_HH