X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fengraver.hh;h=4a102aa2655289b4a321a1616d7c631ec774fedd;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=8031efebcb85c0004f0d0b906ba5de1b5caf13af;hpb=bdf4ab13203502e7ec7cf9cf5896527643a07c1f;p=lilypond.git

diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh
index 8031efebcb..4a102aa265 100644
--- a/lily/include/engraver.hh
+++ b/lily/include/engraver.hh
@@ -1,15 +1,25 @@
 /*
-  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--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1996--2005 Han-Wen Nienhuys <hanwen@cs.uu.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
 #define ENGRAVER_HH
 
-#include "event.hh"
 #include "grob-info.hh"
 #include "translator.hh"
 
@@ -17,10 +27,12 @@
    a struct which processes events, and creates the #Grob#s.
    It may use derived classes.
 */
-class Engraver : public virtual Translator
+class Engraver : public Translator
 {
-
-  friend class Engraver_group_engraver;
+  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:
   /*
     take note of item/spanner
@@ -29,32 +41,37 @@ protected:
     Default: ignore the info
   */
   virtual void acknowledge_grob (Grob_info) {}
-
-  /** Do things with stuff found in acknowledge_grob. Ugh. Should
-      be looped with acknowledge_grob.
-
-  */
-  virtual void process_acknowledged_grobs () {}
-
   virtual void announce_grob (Grob_info);
-  Engraver_group_engraver *get_daddy_engraver () const;
+  virtual void announce_end_grob (Grob_info);
+  Engraver_group *get_daddy_engraver () const;
 
 public:
   /**
      Announce element. Default: pass on to daddy. Utility
   */
   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);
 
-  Score_engraver *get_score_engraver () const;
   /**
      override other ctor
   */
   TRANSLATOR_DECLARATIONS (Engraver);
 };
 
-#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)
-Item *make_item_from_properties (Engraver *tg, SCM x, SCM cause, const char *name);
-Spanner *make_spanner_from_properties (Engraver *tg, SCM x, SCM cause, const char *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__)
+
+Engraver *unsmob_engraver (SCM eng);
+bool ly_is_grob_cause (SCM obj);
 
 #endif // ENGRAVER_HH