X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fengraver.hh;h=e5b6aef6a084d7059ea8c77c9b56b68b034cfe99;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=4efd405f46a74c72597d65a2847782471acf5616;hpb=6a1295eaacbc3e6b5a7ce19f7f942b23f8d7f2ff;p=lilypond.git

diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh
index 4efd405f46..e5b6aef6a0 100644
--- a/lily/include/engraver.hh
+++ b/lily/include/engraver.hh
@@ -3,70 +3,60 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef ENGRAVER_HH
 #define ENGRAVER_HH
 
-#include "lily-proto.hh"
-#include "varray.hh"
-#include "request.hh"
-#include "score-elem-info.hh"
-#include "staff-info.hh"
+#include "grob-info.hh"
 #include "translator.hh"
 
-
 /**
-  a struct which processes requests, and creates the #Score_elem#s.
-  It may use derived classes. Hungarian postfix: grav
-  
-  */
-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:
-    
-
-  /// utility
-  Paper_def * paper() const;
-  /**
-    Invoke walker method to typeset element. Default: pass on to daddy.
-    */
-  virtual void typeset_element (Score_elem*elem_p);
-    
-  /**
+  /*
     take note of item/spanner
     put item in spanner. Adjust local key; etc.
 
     Default: ignore the info
-    */
-  virtual void acknowledge_element (Score_elem_info) {}
-  /**
-    Announce element. Default: pass on to daddy. Utility
-    */
-  virtual void announce_element (Score_elem_info);
-   
-  /**
-    Get information on the staff. Default: ask daddy.
-    */
-  virtual Staff_info get_staff_info() const;
-  virtual void fill_staff_info (Staff_info&);
+  */
+  virtual void acknowledge_grob (Grob_info) {}
+  virtual void announce_grob (Grob_info);
+  virtual void announce_end_grob (Grob_info);
+  Engraver_group *get_daddy_engraver () const;
 
 public:
-  TRANSLATOR_CLONE(Engraver);
-  Engraver_group_engraver * daddy_grav_l() const;
   /**
-    override other ctor
-   */
-  Engraver () {}
+     Announce element. Default: pass on to daddy. Utility
+  */
+  void announce_grob (Grob *, SCM cause);
+  void announce_end_grob (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);
 
-  DECLARE_MY_RUNTIME_TYPEINFO;
-  virtual Engraver * engraver_l () { return this; }
+  /**
+     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
 
+#endif // ENGRAVER_HH