X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftranslator.icc;h=2a7eeccc235e2884a96acbc37e29f39bf19e3369;hb=8c0213576d4f811c826a828c38fe418ab50b66ce;hp=462a287f55465deab43e977b4d890e5252f8f5fe;hpb=2c22efe5a46a37065b10c3f51c5d7db00d07d318;p=lilypond.git

diff --git a/lily/include/translator.icc b/lily/include/translator.icc
index 462a287f55..2a7eeccc23 100644
--- a/lily/include/translator.icc
+++ b/lily/include/translator.icc
@@ -3,18 +3,25 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef TRANSLATOR_ICC
 #define TRANSLATOR_ICC
 
-#include "array.hh"
+#include "listener.hh"
+#include "std-vector.hh"
+#include "translator.hh"
+
+/*
+  TODO: derive "foo-bar-interface" from Foo_bar classname.
+ */
 
 /**
    A macro to automate administration of translators.
 */
 #define ADD_THIS_TRANSLATOR(T)						\
+  translator_listener_record *T::listener_list_;			\
   SCM T::static_description_ = SCM_EOL;					\
   static void _ ## T ## _adder ()					\
   {									\
@@ -29,38 +36,24 @@
   }									\
   ADD_GLOBAL_CTOR (_ ## T ## _adder);
 
-#define ADD_TRANSLATOR(classname, desc, grobs, accepted, read, write)	\
-  Array<Acknowledge_information> classname::acknowledge_static_array_;	\
+#define ADD_TRANSLATOR(classname, desc, grobs, read, write)		\
+  Drul_array< vector<Acknowledge_information> > classname::acknowledge_static_array_drul_;	\
   IMPLEMENT_FETCH_PRECOMPUTABLE_METHODS (classname);			\
   ADD_THIS_TRANSLATOR (classname);					\
   Engraver_void_function_engraver_grob_info				\
   classname::static_get_acknowledger (SCM sym)				\
   {									\
-    return generic_get_acknowledger (sym, &acknowledge_static_array_);	\
+    return generic_get_acknowledger (sym, &acknowledge_static_array_drul_[START]);	\
+  }									\
+  Engraver_void_function_engraver_grob_info				\
+  classname::static_get_end_acknowledger (SCM sym)				\
+  {									\
+    return generic_get_acknowledger (sym, &acknowledge_static_array_drul_[STOP]);	\
   }									\
   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 ("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;						\
+    return Translator::static_translator_description (grobs, desc, listener_list_, read, write); \
   }
 
 #define IMPLEMENT_FETCH_PRECOMPUTABLE_METHODS(T)			\
@@ -91,20 +84,54 @@
 
 void add_acknowledger (Engraver_void_function_engraver_grob_info ptr,
 		       char const *func_name,
-		       Array<Acknowledge_information> *ack_array);
+		       vector<Acknowledge_information> *ack_array);
 
 Engraver_void_function_engraver_grob_info
 generic_get_acknowledger (SCM sym,
-			  Array<Acknowledge_information> const *ack_array);
+			  vector<Acknowledge_information> const *ack_array);
 
 #define ADD_ACKNOWLEDGER(CLASS, NAME)					\
   void CLASS ## NAME ## _ack_adder ()					\
   {									\
-    add_acknowledger ((Engraver_void_function_engraver_grob_info) & CLASS::acknowledge_ ## NAME, #NAME, &CLASS::acknowledge_static_array_); \
+    add_acknowledger ((Engraver_void_function_engraver_grob_info) & CLASS::acknowledge_ ## NAME, #NAME, &CLASS::acknowledge_static_array_drul_[START]); \
   }									\
   ADD_SCM_INIT_FUNC (CLASS ## NAME ## _ack_adder_initclass, CLASS ## NAME ## _ack_adder);
 
+#define ADD_END_ACKNOWLEDGER(CLASS, NAME)					\
+  void CLASS ## NAME ## _end_ack_adder ()					\
+  {									\
+    add_acknowledger ((Engraver_void_function_engraver_grob_info) & CLASS::acknowledge_end_ ## NAME, #NAME, &CLASS::acknowledge_static_array_drul_[STOP]); \
+  }									\
+  ADD_SCM_INIT_FUNC (CLASS ## NAME ## _end_ack_adder_initclass, CLASS ## NAME ## _end_ack_adder);
 
+/*
+  Implement the method cl::listen_##m, and make it listen to stream 
+  events of class m.
+ */
+#define IMPLEMENT_TRANSLATOR_LISTENER(cl, m)		\
+void							\
+cl :: _internal_declare_ ## m ()			\
+{							\
+  static translator_listener_record r;			\
+  add_translator_listener (&listener_list_, &r, _get_ ## m ## _listener, #m); \
+}							\
+							\
+ADD_SCM_INIT_FUNC (cl ## _declare_event_ ## m, cl::_internal_declare_ ## m);	\
+							\
+Listener						\
+cl :: _get_ ## m ## _listener (void *me)		\
+{							\
+  cl *obj = (cl *) me;					\
+  return obj->GET_LISTENER (_listen_scm_ ## m);		\
+}							\
+							\
+IMPLEMENT_LISTENER (cl, _listen_scm_ ## m)		\
+void							\
+cl::_listen_scm_ ## m (SCM sev)				\
+{							\
+  Stream_event *ev = unsmob_stream_event (sev);		\
+  protect_event (sev);					\
+  listen_ ## m (ev);					\
+}
 
 #endif /* TRANSLATOR_ICC */
-