X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fchord-name.hh;h=69b6a1ef7c717172a9e0de47cb9a1910cc9fa8e4;hb=86ae245eef3d991483f27f135ded2c9bc29043f3;hp=008944569478c8a904bc3fd9e8ec82ab951c9de5;hpb=8a28f0429e9ce4ce7258156d62261b939edd72d1;p=lilypond.git

diff --git a/lily/include/chord-name.hh b/lily/include/chord-name.hh
index 0089445694..69b6a1ef7c 100644
--- a/lily/include/chord-name.hh
+++ b/lily/include/chord-name.hh
@@ -3,46 +3,22 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef CHORD_NAME_HH
 #define CHORD_NAME_HH
 
-#include "chord.hh"
-#include "item.hh"
+#include "lily-guile.hh"
 #include "molecule.hh"
 
-class Chord_mol
-{
-public:
-  Molecule tonic_mol;
-  Molecule modifier_mol;
-  Molecule addition_mol;
-  Molecule inversion_mol;
-  Molecule bass_mol;
-};
 
-class Chord_name : public Item
+class Chord_name
 {
 public:
-  VIRTUAL_COPY_CONS (Score_element);
-  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_mol* name_p) const;
-  void banter (Array<Musical_pitch> pitch_arr, Chord_mol* name_p) const;
-
-  Chord_name (Chord const& c);
-
-  /*
-    ugh. Junkme, I must be elt property.
-   */
-  
-  Chord chord_;
-
-protected:
-  virtual Molecule* do_brew_molecule_p () const;
+  DECLARE_SCHEME_CALLBACK (brew_molecule, (SCM ));
+  DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM ));
+  static  bool has_interface (Grob*);
 };
 
 #endif // CHORD_NAME_HH