X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fengraver.cc;h=59c91306ef39496f5f729273686c0d58def2ab68;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=25ae579bd7dbcd59f844b28c05b51d1db54e9d4a;hpb=6316d6cdcc9ca46c2b72ecb5ff8cce92b5f38305;p=lilypond.git diff --git a/lily/engraver.cc b/lily/engraver.cc index 25ae579bd7..59c91306ef 100644 --- a/lily/engraver.cc +++ b/lily/engraver.cc @@ -81,7 +81,8 @@ Engraver::announce_end_grob (Grob *e, SCM cause) announce_end_grob (make_grob_info (e, cause)); } -Engraver::Engraver () +Engraver::Engraver (Context *c) + : Translator (c) { } @@ -106,7 +107,6 @@ LY_DEFINE (ly_set_grob_creation_callback, "ly:set-grob-creation-callback", Grob * Engraver::internal_make_grob (SCM symbol, SCM cause, - char const * /* name */, char const *file, int line, char const *fun) @@ -146,26 +146,24 @@ Engraver::internal_make_grob (SCM symbol, Item * Engraver::internal_make_item (SCM x, SCM cause, - char const *name, char const *file, int line, char const *fun) { - Item *it = dynamic_cast (internal_make_grob (x, cause, name, file, line, fun)); + Item *it = dynamic_cast (internal_make_grob (x, cause, file, line, fun)); assert (it); return it; } Paper_column * -Engraver::internal_make_column (SCM x, char const *name, - char const *file, int line, char const *fun) +Engraver::internal_make_column (SCM x, char const *file, int line, char const *fun) { - return dynamic_cast (internal_make_grob (x, SCM_EOL, name, file, line, fun)); + return dynamic_cast (internal_make_grob (x, SCM_EOL, file, line, fun)); } Spanner * -Engraver::internal_make_spanner (SCM x, SCM cause, char const *name, +Engraver::internal_make_spanner (SCM x, SCM cause, char const *file, int line, char const *fun) { - Spanner *sp = dynamic_cast (internal_make_grob (x, cause, name, file, line, fun)); + Spanner *sp = dynamic_cast (internal_make_grob (x, cause, file, line, fun)); assert (sp); return sp; } @@ -175,20 +173,3 @@ ly_is_grob_cause (SCM obj) { return unsmob (obj) || unsmob (obj) || scm_is_null (obj); } - -#include "translator.icc" - -ADD_TRANSLATOR (Engraver, - /* doc */ - "Base class for engravers. Does nothing, so it is not used.", - - /* create */ - "", - - /* read */ - "", - - /* write */ - "" - ); -