X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fengraver.hh;h=7c59e743f8c1b78883b7e982765d67f567f1bfbe;hb=2745cbd907f8216a4cc1fc5f488ae19efdfdbd10;hp=9752fd75fc0568327228d8c22caf76644fb5f401;hpb=d3190e49a8f73d44b2e11034323b8f3592f288d6;p=lilypond.git

diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh
index 9752fd75fc..7c59e743f8 100644
--- a/lily/include/engraver.hh
+++ b/lily/include/engraver.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1996--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -11,149 +11,53 @@
 #define ENGRAVER_HH
 
 #include "lily-proto.hh"
-#include "varray.hh"
-#include "request.hh"
-#include "score-elem-info.hh"
-#include "staff-info.hh"
-
-
+#include "array.hh"
+#include "event.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
-  
+  a struct which processes events, and creates the #Grob#s.
+  It may use derived classes. 
   */
-
-class Engraver {
+class Engraver : public virtual Translator {
     
-    friend class Engraver_group_engraver;
-    /**
-      You cannot copy a Engraver
-     */
-    Engraver(const Engraver&){}
-
-    enum { 
-	VIRGIN,
-	CREATION_INITED,
-	MOVE_INITED,
-	ACCEPTED_REQS,
-	PROCESSED_REQS,
-	ACKED_REQS,
-	MOVE_DONE
-    } status;
-
+  friend class Engraver_group_engraver;
 protected:
-    
-
-    /// utility
-    virtual Paper_def * paper() const;
-
-    
-    /// make items/spanners with the requests you got
-    virtual void do_process_requests(){}
-
-    /** typeset any items/spanners. Default: do nothing
-     */
-    virtual void do_pre_move_processing(){}
-    /** reset any appropriate data. Default: do nothing
-     */
-    virtual void do_post_move_processing(){}
-   
-
-    virtual void do_creation_processing () {}
-    virtual void do_removal_processing() {}
-
-    /**
-      typeset a "command" item. Default: pass on to daddy.
-      If the column is not breakable, #pre_p# and #post_p# are junked
-      */
-    virtual void typeset_breakable_item(Item * nobreak_p);
-    /**
-      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);
-    /**
-      Set Feature of the engraver(s). Default: ignore Feature.
-     */
-    virtual void set_feature(Feature){}
-    /**
-      ask daddy for a feature
-     */
-    virtual Scalar get_feature(String type_str);
-    /**
-      Does this equal or contain a certain engraver?
-     */
-
-    virtual void sync_features() {}
-   
-    virtual bool contains_b(Engraver*grav_l)const;
-    /**
-      Get information on the staff. Default: ask daddy.
-      */
-    virtual Staff_info get_staff_info()const;
-    virtual void fill_staff_info(Staff_info&);
-
-
-    virtual void do_print()const;  
-    /*    
-	  @see{try_request}
-	  Default: always return false
-      */
-    virtual bool do_try_request(Request *req_l);
+  /*
+    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.
+
+    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 () {}
+  /**
+    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;
 public:
-    void pre_move_processing();
-    void process_requests();
-    /**
-      try to fit the request in this engraver
-
-      @return
-      false: not noted,  not taken.
-
-      true: request swallowed. Don't try to put the request elsewhere.
-
-      */
-    bool try_request(Request*);
-    bool is_bottom_engraver() const;
-
-    void post_move_processing();
-    
-    Engraver_group_engraver * daddy_grav_l_;
-
-    Engraver();
-    virtual ~Engraver(){}
-    NAME_MEMBERS();
-    void print() const;
+  Engraver_group_engraver * get_daddy_grav () const;
+  /**
+    override other ctor
+   */
+  TRANSLATOR_DECLARATIONS(Engraver);
 };
 
-/**
-  A macro to automate administration of engravers.
- */
-#define ADD_THIS_ENGRAVER(c)				\
-struct c ## init {					\
-    static Engraver * globalctor (){		\
-	return new c;					\
-    }							\
-    c ## init () {					\
-	add_Engraver(c::static_name(), globalctor);	\
-							\
-    }							\
-} _ ## c ## init;
-
-typedef Engraver*(*Grav_ctor)(void);
-void add_Engraver(String s, Grav_ctor f);
 
 #endif // ENGRAVER_HH