patch::: 1.3.77.jcn1

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

diff --git a/lily/include/chord.hh b/lily/include/chord.hh
index e568f709854c704ff1f949bbf33df4d83a84b334..ce00613275562e9ad270c4db6fa24093ed95a4b4 100644 (file)
--- a/lily/include/chord.hh
+++ b/lily/include/chord.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef CHORD_HH
@@ -12,23 +12,15 @@
 #include "array.hh"
 #include "musical-pitch.hh"
 #include "lily-proto.hh"
-#include "item.hh"
-#include "molecule.hh"
 
-class Chord_name
-{
-public:
-  Molecule tonic_mol;
-  Molecule modifier_mol;
-  Molecule addition_mol;
-  Molecule inversion_mol;
-  Molecule bass_mol;
-};
 
-class Chord : public Item
+
+/*
+  Slightly on the hairy side? In any case COMMENTME.
+ */
+class Chord
 {
 public:
-  VIRTUAL_COPY_CONS (Score_element);
   static Array<Musical_pitch> base_arr (Musical_pitch p);
   static int find_tonic_i (Array<Musical_pitch> const*);
   static int find_pitch_i (Array<Musical_pitch> const*, Musical_pitch p);
@@ -40,32 +32,24 @@ public:
   static void rebuild_with_bass (Array<Musical_pitch>*, int bass_i);
   static int step_i (Musical_pitch tonic, Musical_pitch p);
 
+
+  Chord ();
   Chord (Array<Musical_pitch> pitch_arr, Musical_pitch* inversion_p, Musical_pitch* bass_p);
   Chord (Chord const&);
-  virtual ~Chord ();
-
 
   Array<Musical_pitch> to_pitch_arr () const;
 
-  void find_additions_and_subtractions(Array<Musical_pitch> pitch_arr, Array<Musical_pitch>* add_arr_p, Array<Musical_pitch>* sub_arr_p) const;
-
-  Molecule ly_word2molecule (SCM scm) const;
-  Molecule ly_text2molecule (SCM scm) const;
-  Molecule pitch2molecule (Musical_pitch p) const;
-  bool user_chord_name (Array<Musical_pitch> pitch_arr, Chord_name* name_p) const;
-  void banter (Array<Musical_pitch> pitch_arr, Chord_name* name_p) const;
-
   Array<Musical_pitch> pitch_arr_;
-  Musical_pitch* inversion_p_;
-  Musical_pitch* bass_p_;
-
-protected:
-  virtual Molecule* do_brew_molecule_p () const;
-  virtual void do_print () const;
+  bool inversion_b_;
+  Musical_pitch inversion_pitch_;
+  bool bass_b_;
+  Musical_pitch bass_pitch_;
 };
 
 Chord to_chord (Musical_pitch tonic, Array<Musical_pitch>* add_arr_p, Array<Musical_pitch>* sub_arr_p, Musical_pitch* inversion_p, Musical_pitch* bass_p);
 
 Chord to_chord (Array<Musical_pitch> pitch_arr, Tonic_req* tonic_req, Inversion_req* inversion_req, Bass_req* bass_req, bool find_inversion_b);
 
+int compare (Chord*, Chord*);
+
 #endif // CHORD_HH