* configure.in: Test for and accept lmodern if EC fonts not found.

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

diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh
index 9ca18d94a598ad5d0429c1b9b2f44b9e3b7215cb..39a5b1f8ee8cf89aeb0106076c10fc58bb47eefe 100644 (file)
--- a/lily/include/engraver.hh
+++ b/lily/include/engraver.hh
@@ -3,20 +3,17 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1996--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.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. 
@@ -25,10 +22,6 @@ class Engraver : public virtual Translator {
     
   friend class Engraver_group_engraver;
 protected:
-  /*
-    Call this when you're finished with ELEM_P.
-   */
-  virtual void typeset_grob (Grob*elem);
   /*
     take note of item/spanner
     put item in spanner. Adjust local key; etc.
@@ -42,30 +35,29 @@ protected:
      
    */
   virtual void process_acknowledged_grobs () {}
+
+  virtual void announce_grob (Grob_info);
+  Engraver_group_engraver*get_daddy_engraver () const;
+  
+public:
   /**
     Announce element. Default: pass on to daddy. Utility
     */
-  virtual void announce_grob (Grob*, SCM cause);
-  virtual void announce_grob (Grob_info);
-  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;
+  void announce_grob (Grob*, SCM cause);
+  
+  Score_engraver * get_score_engraver () const;
   /**
     override other ctor
    */
   TRANSLATOR_DECLARATIONS(Engraver);
 };
 
-#define make_item(x) internal_make_item (ly_symbol2scm (x))
-#define make_spanner(x) internal_make_spanner (ly_symbol2scm (x))
+#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);
 
 
 
-#endif // ENGRAVER_HH
 
+#endif // ENGRAVER_HH