patch::: 1.3.96.jcn7

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

diff --git a/lily/include/chord-name.hh b/lily/include/chord-name.hh
index fa9cba3a871cbb67d5b683ff3ad6e581e98b0c0e..d0f620a2c4bc0e84eb7a7952f219fa97b4f231f6 100644 (file)
--- a/lily/include/chord-name.hh
+++ b/lily/include/chord-name.hh
@@ -9,38 +9,20 @@
 #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;
-};
-
 /**
    elt_properties:
    pitches: list of musical-pitch
    inversion(optional): musical-pitch
    bass(optional): musical-pitch
  */
-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;
-
-protected:
-  virtual Molecule do_brew_molecule () const;
+  DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM ));
+  DECLARE_SCHEME_CALLBACK(after_line_breaking, (SCM ));
 };
 
 #endif // CHORD_NAME_HH