Issue 5167/1: Reorganize markup commands to use object properties

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

diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh
index 928f6a969dbddad717c25856351b53b9fba4f5d5..cecc42ce5e8010a4b6550afb95221a5b387c33ad 100644 (file)
--- a/lily/include/engraver.hh
+++ b/lily/include/engraver.hh
@@ -31,7 +31,7 @@
 */
 class Engraver : public Translator
 {
-  Grob *internal_make_grob (SCM sym, SCM cause, char const *name,
+  Grob *internal_make_grob (SCM sym, SCM cause,
                             char const *f, int l, char const *fun);
   friend SCM ly_engraver_make_grob (SCM, SCM, SCM);
   friend class Engraver_group;
@@ -48,8 +48,9 @@ protected:
   Engraver_group *get_daddy_engraver () const;
 
 public:
+  using Translator::trampoline;
   template <class T, void (T::*callback)(Grob_info)>
-  static SCM ack_trampoline (SCM target, SCM grob, SCM source_engraver)
+  static SCM trampoline (SCM target, SCM grob, SCM source_engraver)
   {
     T *t = LY_ASSERT_SMOB (T, target, 1);
     Grob *g = LY_ASSERT_SMOB (Grob, grob, 2);
@@ -67,11 +68,11 @@ public:
 
   Grob_info make_grob_info (Grob *, SCM cause);
 
-  Item *internal_make_item (SCM sym, SCM cause, char const *name,
+  Item *internal_make_item (SCM sym, SCM cause,
                             char const *f, int l, char const *fun);
-  Spanner *internal_make_spanner (SCM sym, SCM cause, char const *name,
+  Spanner *internal_make_spanner (SCM sym, SCM cause,
                                   char const *f, int l, char const *fun);
-  Paper_column *internal_make_column (SCM sym, char const *name,
+  Paper_column *internal_make_column (SCM sym,
                                       char const *f, int l, char const *fun);
 
   /**
@@ -79,12 +80,12 @@ public:
   */
   DECLARE_CLASSNAME (Engraver);
   DECLARE_TRANSLATOR_CALLBACKS (Engraver);
-  Engraver ();
+  Engraver (Context *);
 };
 
-#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__)
+#define make_item(x, cause) internal_make_item (ly_symbol2scm (x), cause, __FILE__, __LINE__, __FUNCTION__)
+#define make_spanner(x, cause) internal_make_spanner (ly_symbol2scm (x), cause, __FILE__, __LINE__, __FUNCTION__)
+#define make_paper_column(x) internal_make_column (ly_symbol2scm (x), __FILE__, __LINE__, __FUNCTION__)
 
 bool ly_is_grob_cause (SCM obj);