release: 1.3.25

[lilypond.git] / lily / include / chord-name-engraver.hh

diff --git a/lily/include/chord-name-engraver.hh b/lily/include/chord-name-engraver.hh
index 72b221fe1ea7dc97773350df1d536ff471ba2ea9..c9a9886f6cef029a63e8f70cc5491bc807bc48f3 100644 (file)
--- a/lily/include/chord-name-engraver.hh
+++ b/lily/include/chord-name-engraver.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef CHORD_NAME_ENGRAVER_HH
@@ -12,28 +12,26 @@
 #include "engraver.hh"
 #include "array.hh"
 #include "musical-pitch.hh"
-
 #include "lily-proto.hh"
 
 class Chord_name_engraver : public Engraver 
 {
+public:
+  Chord_name_engraver ();
+  VIRTUAL_COPY_CONS (Translator);
+
 protected:
   virtual void do_pre_move_processing ();
   virtual void acknowledge_element (Score_element_info i);
   virtual void do_process_requests ();
   virtual bool do_try_music (Music* m);
 
-public:
-  Chord_name_engraver ();
-  VIRTUAL_COPY_CONS (Translator);
-
 private:
   Array<Musical_pitch> pitch_arr_;
-  Link_array<Item> text_p_arr_;
-
-  String banter_str (Array<Musical_pitch> pitch_arr, int tonic_i, Musical_pitch inversion) const;
-  int find_tonic_i () const;
-  Array<Musical_pitch> rebuild_pitch_arr (int tonic_i) const;
+  Chord_name* chord_name_p_;
+  Tonic_req* tonic_req_;
+  Inversion_req* inversion_req_;
+  Bass_req* bass_req_;
 };
 
 #endif // CHORD_NAME_ENGRAVER_HH