patch::: 1.3.44.jcn1

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

diff --git a/lily/include/lyric-engraver.hh b/lily/include/lyric-engraver.hh
index ec85670f73ce1b7e65d29454e7dccad2507f1d3c..1ef2eb7490c1ea1bdd45bddf27d880452b6626bc 100644 (file)
--- a/lily/include/lyric-engraver.hh
+++ b/lily/include/lyric-engraver.hh
@@ -3,28 +3,36 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #ifndef LYRIC_ENGRAVER_HH
 #define LYRIC_ENGRAVER_HH
-#include "engraver.hh"
-#include "array.hh"
 
 #include "lily-proto.hh"
+#include "engraver.hh"
+#include "array.hh"
 
-class Lyric_engraver : public Engraver {
-    Lyric_req* lreq_l_;
-    Text_item *lyric_item_p_;
+/**
+   Generate texts for lyric syllables.  We only do one lyric at a time.  
+   Multiple copies of this engraver should be used to do multiple voices.
+ */
+class Lyric_engraver : public Engraver 
+{
 protected:
-    virtual void do_pre_move_processing();
-    virtual bool do_try_request (Request*);
-    virtual void do_process_requests();
-    virtual void do_post_move_processing();
+  virtual void do_pre_move_processing();
+  virtual bool do_try_music (Music*);
+  virtual void do_process_music();
+  virtual void do_post_move_processing ();
 public:
-  TRANSLATOR_CLONE(Lyric_engraver);
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    Lyric_engraver();
+  Lyric_engraver ();
+  VIRTUAL_COPY_CONS (Translator);
+
+private:
+  Lyric_req * req_l_;
+  Text_item* text_p_;
 };
+
+
 #endif // LYRIC_ENGRAVER_HH