X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fchord-name.hh;h=7f062799022df0a48370137288b9161d1bbaa071;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=008944569478c8a904bc3fd9e8ec82ab951c9de5;hpb=8a28f0429e9ce4ce7258156d62261b939edd72d1;p=lilypond.git diff --git a/lily/include/chord-name.hh b/lily/include/chord-name.hh index 0089445694..7f06279902 100644 --- a/lily/include/chord-name.hh +++ b/lily/include/chord-name.hh @@ -3,46 +3,20 @@ source file of the GNU LilyPond music typesetter - (c) 1999 Jan Nieuwenhuizen + (c) 1999--2008 Jan Nieuwenhuizen */ #ifndef CHORD_NAME_HH #define CHORD_NAME_HH -#include "chord.hh" -#include "item.hh" -#include "molecule.hh" +#include "stencil.hh" +#include "grob-interface.hh" -class Chord_mol +class Chord_name { public: - Molecule tonic_mol; - Molecule modifier_mol; - Molecule addition_mol; - Molecule inversion_mol; - Molecule bass_mol; -}; - -class Chord_name : public Item -{ -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 pitch_arr, Chord_mol* name_p) const; - void banter (Array 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 (after_line_breaking, (SCM)); + DECLARE_GROB_INTERFACE(); }; #endif // CHORD_NAME_HH