X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fengraver.hh;h=9dc6594c8eaaca34f5d98830806a7f7e850c57cc;hb=9efbad2d9487a05b04423e7e9f062968e8f8eaf4;hp=320bdd3256af6874829e9e0da76a6d8dfd0f9e35;hpb=a2896b23ce12cc61e9cd4495324c9ca5551cb947;p=lilypond.git

diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh
index 320bdd3256..9dc6594c8e 100644
--- a/lily/include/engraver.hh
+++ b/lily/include/engraver.hh
@@ -1,9 +1,9 @@
 /*
-  engraver.hh -- declare Request_engraver
+  engraver.hh -- declare Engraver
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996,  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -11,148 +11,69 @@
 #define ENGRAVER_HH
 
 #include "lily-proto.hh"
-#include "varray.hh"
+#include "array.hh"
 #include "request.hh"
-#include "score-elem-info.hh"
+#include "score-element-info.hh"
 #include "staff-info.hh"
-
-
+#include "translator.hh"
 
 
 /**
-  a struct which processes requests, and creates the #Score_elem#s.
+  a struct which processes requests, and creates the #Score_element#s.
   It may use derived classes. Hungarian postfix: grav
   
   */
-
-class Request_engraver {
+class Engraver : public virtual Translator {
     
-    friend class Engraver_group_engraver;
-    /**
-      You cannot copy a Request_engraver
-     */
-    Request_engraver(const Request_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;
+  /// utility
+  Paper_def * paper() const;
+  /**
+    Invoke walker method to typeset element. Default: pass on to daddy.
+    */
+  virtual void typeset_element (Score_element*elem_p);
 
     
-    /// 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(){}
+  /**
+    take note of item/spanner
+    put item in spanner. Adjust local key; etc.
+
+    Default: ignore the info
+    */
+  virtual void acknowledge_element (Score_element_info) {}
+
+  /** Do things with stuff found in acknowledge_element. Ugh. Should
+     be looped with acknowledge_element.
+     
+   */
+  virtual void process_acknowledged () {}
+  /**
+    Announce element. Default: pass on to daddy. Utility
+    */
+  virtual void announce_element (Score_element_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 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(Request_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);
 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*);
-
-    void post_move_processing();
-    
-    Engraver_group_engraver * daddy_grav_l_;
-
-    Request_engraver();
-    virtual ~Request_engraver(){}
-    NAME_MEMBERS();
-    void print() const;
+  TRANSLATOR_CLONE(Engraver);
+  Engraver_group_engraver * daddy_grav_l() const;
+  /**
+    override other ctor
+   */
+  Engraver () {}
+
+  DECLARE_MY_RUNTIME_TYPEINFO;
+  virtual Engraver * access_Engraver () { return this; }
 };
 
-/**
-  A macro to automate administration of engravers.
- */
-#define ADD_THIS_ENGRAVER(c)				\
-struct c ## init {					\
-    static Request_engraver * globalctor (){		\
-	return new c;					\
-    }							\
-    c ## init () {					\
-	add_request_engraver(c::static_name(), globalctor);	\
-							\
-    }							\
-} _ ## c ## init;
-
-typedef Request_engraver*(*Grav_ctor)(void);
-void add_request_engraver(String s, Grav_ctor f);
 
 #endif // ENGRAVER_HH