Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation

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

diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh
index 162724b808cb4980f9a6ae0ba87b64d8f3e47090..928f6a969dbddad717c25856351b53b9fba4f5d5 100644 (file)
--- a/lily/include/engraver.hh
+++ b/lily/include/engraver.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1996--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1996--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -20,6 +20,8 @@
 #ifndef ENGRAVER_HH
 #define ENGRAVER_HH
 
+#include "callback.hh"
+#include "grob.hh"
 #include "grob-info.hh"
 #include "translator.hh"
 
@@ -30,7 +32,7 @@
 class Engraver : public Translator
 {
   Grob *internal_make_grob (SCM sym, SCM cause, char const *name,
-                           char const *f, int l, char const *fun);
+                            char const *f, int l, char const *fun);
   friend SCM ly_engraver_make_grob (SCM, SCM, SCM);
   friend class Engraver_group;
 protected:
@@ -41,11 +43,22 @@ protected:
     Default: ignore the info
   */
   virtual void acknowledge_grob (Grob_info) {}
-  virtual void announce_grob (Grob_info);
-  virtual void announce_end_grob (Grob_info);
+  virtual void announce_grob (Grob_info, Context *reroute_context = 0);
+  virtual void announce_end_grob (Grob_info, Context *reroute_context = 0);
   Engraver_group *get_daddy_engraver () const;
 
 public:
+  template <class T, void (T::*callback)(Grob_info)>
+  static SCM ack_trampoline (SCM target, SCM grob, SCM source_engraver)
+  {
+    T *t = LY_ASSERT_SMOB (T, target, 1);
+    Grob *g = LY_ASSERT_SMOB (Grob, grob, 2);
+    Engraver *e = LY_ASSERT_SMOB (Engraver, source_engraver, 3);
+
+    (t->*callback) (Grob_info (e, g));
+    return SCM_UNSPECIFIED;
+  }
+
   /**
      Announce element. Default: pass on to daddy. Utility
   */
@@ -55,23 +68,24 @@ public:
   Grob_info make_grob_info (Grob *, SCM cause);
 
   Item *internal_make_item (SCM sym, SCM cause, char const *name,
-                           char const *f, int l, char const *fun);
+                            char const *f, int l, char const *fun);
   Spanner *internal_make_spanner (SCM sym, SCM cause, char const *name,
-                                 char const *f, int l, char const *fun);
+                                  char const *f, int l, char const *fun);
   Paper_column *internal_make_column (SCM sym, char const *name,
-                                     char const *f, int l, char const *fun);
+                                      char const *f, int l, char const *fun);
 
   /**
      override other ctor
   */
-  TRANSLATOR_DECLARATIONS (Engraver);
+  DECLARE_CLASSNAME (Engraver);
+  DECLARE_TRANSLATOR_CALLBACKS (Engraver);
+  Engraver ();
 };
 
 #define make_item(x, cause) internal_make_item (ly_symbol2scm (x), cause, x, __FILE__, __LINE__, __FUNCTION__)
 #define make_spanner(x, cause) internal_make_spanner (ly_symbol2scm (x), cause, x, __FILE__, __LINE__, __FUNCTION__)
 #define make_paper_column(x) internal_make_column (ly_symbol2scm (x), x, __FILE__, __LINE__, __FUNCTION__)
 
-Engraver* unsmob_engraver (SCM eng);
 bool ly_is_grob_cause (SCM obj);
 
 #endif // ENGRAVER_HH