X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fengraver.hh;h=5f74491e949fbe75be5e22a5813f91f371af5ca1;hb=9f114c6402fb7cf9c9bf0ea97ee7c16291c48193;hp=dfe333ef781abf714f507b0318e4082b65ab87a2;hpb=5d09d767066abb2f2d53cd18cf0c0a0b1188d1a7;p=lilypond.git

diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh
index dfe333ef78..5f74491e94 100644
--- a/lily/include/engraver.hh
+++ b/lily/include/engraver.hh
@@ -3,64 +3,60 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #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 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) {}
-
-  /** 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);
-  
-  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);
 
-#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
+  */
+  TRANSLATOR_DECLARATIONS (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__)
 
 
 #endif // ENGRAVER_HH