Merge branch 'master' into translation

[lilypond.git] / lily / include / scheme-engraver.hh

diff --git a/lily/include/scheme-engraver.hh b/lily/include/scheme-engraver.hh
index ec3d0756d973ab093f1e98c2293650683d0dfe7c..e22e572c7fe6ec15c07d2728b55970e25b19096a 100644 (file)
--- a/lily/include/scheme-engraver.hh
+++ b/lily/include/scheme-engraver.hh
@@ -26,11 +26,10 @@
 
 class Scheme_engraver : public Engraver
 {
-public:
   void init_from_scheme (SCM definition);
-  TRANSLATOR_DECLARATIONS_NO_LISTENER (Scheme_engraver);
-
-  static Listener get_listener (void *generic_arg, SCM event);
+public:
+  TRANSLATOR_FAMILY_DECLARATIONS (Scheme_engraver);
+  Scheme_engraver (SCM definition);
 
 protected:
   ~Scheme_engraver ();
@@ -43,7 +42,7 @@ protected:
   virtual void initialize ();
   virtual void finalize ();
   virtual void derived_mark () const;
-  virtual translator_listener_record *get_listener_list () const;
+  virtual SCM get_listener_list () const;
   virtual bool must_be_last () const;
 
 private:
@@ -70,9 +69,7 @@ private:
   // Alist of listened-symbol . scheme-function
   SCM listeners_alist_;
 
-  // We dont use this, but need it for the documentation boilerplate.
-  static translator_listener_record *listener_list_;
-  translator_listener_record *per_instance_listeners_;
+  SCM per_instance_listeners_;
 };
 
 #endif /* SCHEME_ENGRAVER_HH */