X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fengraver.hh;h=a2b31181922cf6ec471508f75cc40b029751a734;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=abbeb2eec9ad99500b94e577928b20b48f0f161f;hpb=68f8545bd6a0221ee1100336e4ad49399a7ffaa4;p=lilypond.git

diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh
index abbeb2eec9..a2b3118192 100644
--- a/lily/include/engraver.hh
+++ b/lily/include/engraver.hh
@@ -1,9 +1,20 @@
 /*
-  engraver.hh -- declare Engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1996--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1996--2006 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef ENGRAVER_HH
@@ -18,7 +29,9 @@
 */
 class Engraver : public Translator
 {
-
+  Grob *internal_make_grob (SCM sym, SCM cause, char const *name,
+                            char const *f, int l, char const *fun);
+  friend SCM ly_engraver_make_grob (SCM, SCM, SCM);
   friend class Engraver_group;
 protected:
   /*
@@ -39,18 +52,31 @@ public:
   void announce_grob (Grob *, SCM cause);
   void announce_end_grob (Grob *, SCM cause);
 
+  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);
+  Spanner *internal_make_spanner (SCM sym, SCM cause, char const *name,
+                                  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);
+
   /**
      override other ctor
   */
   TRANSLATOR_DECLARATIONS (Engraver);
+  static Engraver *unsmob (SCM eng) {
+    return dynamic_cast<Engraver *> (Translator::unsmob (eng));
+  }
+  static bool is_smob (SCM eng) {
+    return Translator::is_smob (eng) && unsmob (eng);
+  }
 };
 
-#define make_item(x, cause) make_item_from_properties (this, ly_symbol2scm (x), cause, x)
-#define make_spanner(x, cause) make_spanner_from_properties (this, ly_symbol2scm (x), cause, x)
-#define make_paper_column(x) make_paper_column_from_properties (this, ly_symbol2scm (x), x)
-Grob *make_grob_from_properties (Engraver *tr, SCM symbol, SCM cause, char const *name);
-Item *make_item_from_properties (Engraver *tg, SCM x, SCM cause, char const *name);
-Spanner *make_spanner_from_properties (Engraver *tg, SCM x, SCM cause, char const *name);
-Paper_column *make_paper_column_from_properties (Engraver *tg, SCM x, char const *name);
+#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__)
+
+bool ly_is_grob_cause (SCM obj);
 
 #endif // ENGRAVER_HH