source file of the GNU LilyPond music typesetter
- (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
*/
-#include "engraver.hh"
#include "chord-name.hh"
-#include "output-def.hh"
-#include "font-interface.hh"
-#include "output-def.hh"
+#include "context.hh"
#include "dimensions.hh"
+#include "engraver.hh"
+#include "font-interface.hh"
#include "item.hh"
+#include "output-def.hh"
+#include "pitch.hh"
#include "protected-scm.hh"
-#include "context.hh"
+#include "stream-event.hh"
#include "warn.hh"
+#include "translator.icc"
+
class Chord_name_engraver : public Engraver
{
TRANSLATOR_DECLARATIONS (Chord_name_engraver);
protected:
- virtual void stop_translation_timestep ();
- virtual void process_music ();
- virtual bool try_music (Music *);
+ void stop_translation_timestep ();
+ void process_music ();
virtual void finalize ();
virtual void derived_mark () const;
+ DECLARE_TRANSLATOR_LISTENER (note);
private:
- void add_note (Music *);
-
Item *chord_name_;
- Link_array<Music> notes_;
+ vector<Stream_event*> notes_;
SCM last_chord_;
};
last_chord_ = SCM_EOL;
}
-void
-Chord_name_engraver::add_note (Music *n)
-{
- notes_.push (n);
-}
-
void
Chord_name_engraver::process_music ()
{
SCM inversion = SCM_EOL;
SCM pitches = SCM_EOL;
- Music *inversion_event = 0;
- for (int i = 0; i < notes_.size (); i++)
+ Stream_event *inversion_event = 0;
+ for (vsize i = 0; i < notes_.size (); i++)
{
- Music *n = notes_[i];
+ Stream_event *n = notes_[i];
SCM p = n->get_property ("pitch");
if (!unsmob_pitch (p))
continue;
pitches = scm_cons (orig.smobbed_copy (), pitches);
}
else
- programming_error ("Inversion does not have original pitch.");
+ programming_error ("inversion does not have original pitch");
}
pitches = scm_sort_list (pitches, Pitch::less_p_proc);
SCM s = get_property ("chordChanges");
if (to_boolean (s) && scm_is_pair (last_chord_)
- && ly_c_equal_p (chord_as_scm, last_chord_))
+ && ly_is_equal (chord_as_scm, last_chord_))
chord_name_->set_property ("begin-of-line-visible", SCM_BOOL_T);
last_chord_ = chord_as_scm;
}
-bool
-Chord_name_engraver::try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Chord_name_engraver, note);
+void
+Chord_name_engraver::listen_note (Stream_event *ev)
{
- /*
- hmm. Should check?
- */
- if (m->is_mus_type ("note-event"))
- {
- add_note (m);
- return true;
- }
- return false;
+ notes_.push_back (ev);
}
void
which properties are read depend on the chord naming function active.
*/
ADD_TRANSLATOR (Chord_name_engraver,
- /* descr */ "Catch note-events "
- "and generate the appropriate chordname.",
- /* creats*/ "ChordName",
- /* accepts */ "note-event",
- /* acks */ "",
- /* reads */ "chordChanges chordNameExceptions chordNameFunction "
- "chordNoteNamer chordRootNamer chordNameExceptions majorSevenSymbol",
- /* write */ "");
+ /* doc */
+ "Catch note events and generate the appropriate chordname.",
+
+ /* create */
+ "ChordName ",
+
+ /* read */
+ "chordChanges "
+ "chordNameExceptions "
+ "chordNameFunction "
+ "chordNoteNamer "
+ "chordRootNamer "
+ "chordNameExceptions "
+ "majorSevenSymbol ",
+
+ /* write */
+ ""
+ );