Run `make grand-replace'.

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

diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh
index 3a44301b3ebc23a7afe19650655ffe3cd8f79a03..e5b6aef6a084d7059ea8c77c9b56b68b034cfe99 100644 (file)
--- a/lily/include/engraver.hh
+++ b/lily/include/engraver.hh
@@ -3,13 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef ENGRAVER_HH
 #define ENGRAVER_HH
 
-#include "event.hh"
 #include "grob-info.hh"
 #include "translator.hh"
 
@@ -17,10 +16,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
 {
+  Grob *internal_make_grob (SCM sym, SCM cause, char const *name,
+                           char const *f, int l, char const *fun);
 
-  friend class Engraver_group_engraver;
+  friend class Engraver_group;
 protected:
   /*
     take note of item/spanner
@@ -29,33 +30,33 @@ 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);
+
+  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__)
 
 
 #endif // ENGRAVER_HH