X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftranslator-group.hh;h=b0e46d6f7ff90fb7eb1443d428d93121b2473bb6;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=1c8f91ce454370eeb92377949dec337b986d74f6;hpb=862601226f319d2395794fe1175e7f17485b8e19;p=lilypond.git diff --git a/lily/include/translator-group.hh b/lily/include/translator-group.hh index 1c8f91ce45..b0e46d6f7f 100644 --- 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--2006 Han-Wen Nienhuys + (c) 1997--2008 Han-Wen Nienhuys */ #ifndef TRANSLATOR_GROUP_HH @@ -11,7 +11,6 @@ #include "listener.hh" #include "translator.hh" -#include "std-vector.hh" typedef void (Translator:: *Translator_method) (void); typedef void (Translator_group:: *Translator_group_method) (void); @@ -47,22 +46,23 @@ private: Translator_group_void_method precomputed_self_method_bindings_[TRANSLATOR_METHOD_PRECOMPUTE_COUNT]; + SCM protected_events_; + DECLARE_LISTENER (create_child_translator); - DECLARE_LISTENER (eat_event); public: VIRTUAL_COPY_CONSTRUCTOR (Translator_group, Translator_group); - DECLARE_SMOBS (Translator_group, dummy); + DECLARE_SMOBS (Translator_group); public: virtual void connect_to_context (Context *c); virtual void disconnect_from_context (); - virtual Translator_group *get_daddy_translator ()const; virtual SCM get_simple_trans_list (); - virtual bool try_music (Music *req); virtual void initialize (); virtual void finalize (); + void protect_event (SCM ev); + void stop_translation_timestep (); void start_translation_timestep (); @@ -76,7 +76,6 @@ public: Context *context () const { return context_; } protected: SCM simple_trans_list_; - SCM accept_hash_table_; Context *context_; friend class Context_def; @@ -90,7 +89,7 @@ void precomputed_recurse_over_translators (Context *c, Translator_precompute_ind Translator_group *get_translator_group (SCM sym); #define foobar -#define ADD_TRANSLATOR_GROUP(classname, desc, grobs, accepted, read, write) foobar +#define ADD_TRANSLATOR_GROUP(classname, desc, grobs, read, write) foobar DECLARE_UNSMOB (Translator_group, translator_group);