release: 1.3.13

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

diff --git a/lily/include/key-engraver.hh b/lily/include/key-engraver.hh
index ce154b12da2496c893b64e29041c218de0be490c..fa5dbc4ff7a5879bd34ee7f46f4d22ccaef7cda2 100644 (file)
--- a/lily/include/key-engraver.hh
+++ b/lily/include/key-engraver.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -23,18 +23,19 @@ class Key_engraver : public Engraver {
 
 public:
   Key_engraver();
-  DECLARE_MY_RUNTIME_TYPEINFO;
-  TRANSLATOR_CLONE(Key_engraver);
+  
+  VIRTUAL_COPY_CONS(Translator);
   Key key_;
   Key_change_req * keyreq_l_;
-  Key_item * kit_p_;
+  Key_item * item_p_;
   Array<Musical_pitch> accidental_idx_arr_;
   Array<Musical_pitch> old_accidental_idx_arr_;
-  bool default_key_b_;
-  bool change_key_b_;
+
+
+  bool key_changed_b() const;
     
 protected:
-  virtual bool do_try_request (Request *req_l);
+  virtual bool do_try_music (Music *req_l);
   virtual void do_process_requests();
   virtual void do_pre_move_processing();
   virtual void do_post_move_processing();