2003 -> 2004

[lilypond.git] / lily / include / engraver.hh

diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh
index 6712a339bb19471f7ca190f39a0895de125a2d2d..f0dce7d6c721e989d0184b37abf4b8155564e702 100644 (file)
--- a/lily/include/engraver.hh
+++ b/lily/include/engraver.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -12,13 +12,13 @@
 
 #include "lily-proto.hh"
 #include "array.hh"
-#include "request.hh"
+#include "event.hh"
 #include "grob-info.hh"
 #include "translator.hh"
 
 
 /**
-  a struct which processes requests, and creates the #Grob#s.
+  a struct which processes events, and creates the #Grob#s.
   It may use derived classes. 
   */
 class Engraver : public virtual Translator {
@@ -50,6 +50,10 @@ protected:
   virtual void process_music ();
 
   Score_engraver * top_engraver () const;
+
+  Item * internal_make_item (SCM);
+  Spanner * internal_make_spanner (SCM);
+
 public:
   Engraver_group_engraver * get_daddy_grav () const;
   /**
@@ -58,6 +62,10 @@ public:
   TRANSLATOR_DECLARATIONS(Engraver);
 };
 
+#define make_item(x) internal_make_item (ly_symbol2scm (x))
+#define make_spanner(x) internal_make_spanner (ly_symbol2scm (x))
+
+
 
 #endif // ENGRAVER_HH