Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh
index 04fc21baa5f1e4314fb566380943e0a61b1fdf9e..04a7623e3f47e2ae6adb1aa2588e4e8f3e2839a3 100644 (file)
--- a/lily/include/engraver.hh
+++ b/lily/include/engraver.hh
@@ -3,77 +3,55 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996,  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef ENGRAVER_HH
 #define ENGRAVER_HH
 
-#include "lily-proto.hh"
-#include "array.hh"
-#include "request.hh"
-#include "score-element-info.hh"
-#include "staff-info.hh"
+#include "music.hh"
+#include "grob-info.hh"
 #include "translator.hh"
 
-
 /**
-  a struct which processes requests, and creates the #Score_element#s.
-  It may use derived classes. Hungarian postfix: grav
-  
-  */
-class Engraver : public virtual Translator {
-    
-  friend class Engraver_group_engraver;
+   a struct which processes events, and creates the #Grob#s.
+   It may use derived classes.
+*/
+class Engraver : public Translator
+{
 
+  friend class Engraver_group;
 protected:
-    
-
-  /// utility
-  Paper_def * paper() const;
-  /**
-    Invoke walker method to typeset element. Default: pass on to daddy.
-    */
-  virtual void typeset_element (Score_element*elem_p);
-  virtual void typeset_element (Graphical_lisp_element*);
-    
-  /**
+  /*
     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 acknowledge_grob (Grob_info) {}
+  virtual void announce_grob (Grob_info);
+  virtual void announce_end_grob (Grob_info);
+  Engraver_group *get_daddy_engraver () const;
 
 public:
-  TRANSLATOR_CLONE(Engraver);
-  Engraver_group_engraver * daddy_grav_l() const;
   /**
-    override other ctor
-   */
-  Engraver () {}
+     Announce element. Default: pass on to daddy. Utility
+  */
+  void announce_grob (Grob *, SCM cause);
+  void announce_end_grob (Grob *, SCM cause);
 
-  DECLARE_MY_RUNTIME_TYPEINFO;
-  virtual Engraver * access_Engraver () { return this; }
+  /**
+     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)
+#define make_paper_column(x) make_paper_column_from_properties (this, ly_symbol2scm (x), x)
+Grob *make_grob_from_properties (Engraver *tr, SCM symbol, SCM cause, char const *name);
+Item *make_item_from_properties (Engraver *tg, SCM x, SCM cause, char const *name);
+Spanner *make_spanner_from_properties (Engraver *tg, SCM x, SCM cause, char const *name);
+Paper_column *make_paper_column_from_properties (Engraver *tg, SCM x, char const *name);
 
 #endif // ENGRAVER_HH
-