X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fengraver.hh;h=1f7e31ce40eecc3eb9afd0d0dd9e1509f3b75fac;hb=d061586179ac3febbb53f33734bd53d47498f273;hp=01027fb48a8b53003a2d9490720be36759177e12;hpb=4a964b10c411827584eb720c63cd0d6fc5b65d72;p=lilypond.git

diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh
index 01027fb48a..1f7e31ce40 100644
--- a/lily/include/engraver.hh
+++ b/lily/include/engraver.hh
@@ -1,68 +1,77 @@
 /*
-  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--2004 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 "lily-proto.hh"
-#include "array.hh"
-#include "event.hh"
 #include "grob-info.hh"
 #include "translator.hh"
 
-
 /**
-  a struct which processes events, and creates the #Grob#s.
-  It may use derived classes. 
-  */
-class Engraver : public virtual Translator {
-    
-  friend class Engraver_group_engraver;
+   a struct which processes events, and creates the #Grob#s.
+   It may use derived classes.
+*/
+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:
   /*
     take note of item/spanner
     put item in spanner. Adjust local key; etc.
 
     Default: ignore the info
-    */
+  */
   virtual void acknowledge_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;
 
-  /** 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;
-  
 public:
-  Object_key const * get_grob_key (String name) const;
-  
   /**
-    Announce element. Default: pass on to daddy. Utility
-    */
-  void announce_grob (Grob*, SCM cause);
-  
-  Score_engraver * get_score_engraver () const;
-  /**
-    override other ctor
-   */
-  TRANSLATOR_DECLARATIONS(Engraver);
-};
+     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);
 
-#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);
+  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
+  */
+  DECLARE_CLASSNAME (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__)
 
+bool ly_is_grob_cause (SCM obj);
 
 #endif // ENGRAVER_HH