source file of the GNU LilyPond music typesetter
- (c) 1998--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "engraver.hh"
#include "chord-name.hh"
-#include "event.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
#include "font-interface.hh"
-#include "paper-def.hh"
-#include "main.hh"
+#include "output-def.hh"
#include "dimensions.hh"
#include "item.hh"
-#include "pitch.hh"
#include "protected-scm.hh"
-#include "translator-group.hh"
+#include "context.hh"
#include "warn.hh"
+#include "pitch.hh"
-class Chord_name_engraver : public Engraver
+class Chord_name_engraver : public Engraver
{
- TRANSLATOR_DECLARATIONS( Chord_name_engraver);
+ TRANSLATOR_DECLARATIONS (Chord_name_engraver);
protected:
- virtual void stop_translation_timestep ();
- virtual void process_music ();
+ void stop_translation_timestep ();
+ void process_music ();
virtual bool try_music (Music *);
-
+ virtual void finalize ();
+ virtual void derived_mark () const;
private:
void add_note (Music *);
-
- Item* chord_name_;
- Link_array<Music> notes_;
-
- Protected_scm last_chord_;
+
+ Item *chord_name_;
+ vector<Music*> notes_;
+
+ SCM last_chord_;
};
+void
+Chord_name_engraver::finalize ()
+{
+}
+void
+Chord_name_engraver::derived_mark () const
+{
+ scm_gc_mark (last_chord_);
+}
Chord_name_engraver::Chord_name_engraver ()
{
}
void
-Chord_name_engraver::add_note (Music * n)
+Chord_name_engraver::add_note (Music *n)
{
- notes_.push (n);
+ notes_.push_back (n);
}
void
Chord_name_engraver::process_music ()
{
- if (!notes_.size() )
+ if (!notes_.size ())
return;
-
+
SCM bass = SCM_EOL;
SCM inversion = SCM_EOL;
SCM pitches = SCM_EOL;
- Music* inversion_event = 0;
- for (int i =0 ; i < notes_.size (); i++)
+ Music *inversion_event = 0;
+ for (vsize i = 0; i < notes_.size (); i++)
{
Music *n = notes_[i];
- SCM p = n->get_mus_property ("pitch");
+ SCM p = n->get_property ("pitch");
if (!unsmob_pitch (p))
continue;
-
- if (n->get_mus_property ("inversion") == SCM_BOOL_T)
+
+ if (n->get_property ("inversion") == SCM_BOOL_T)
{
inversion_event = n;
inversion = p;
}
- else if (n->get_mus_property ("bass") == SCM_BOOL_T)
+ else if (n->get_property ("bass") == SCM_BOOL_T)
bass = p;
else
- pitches = gh_cons (p, pitches);
+ pitches = scm_cons (p, pitches);
}
if (inversion_event)
{
- SCM oct = inversion_event->get_mus_property ("octavation");
- if (gh_number_p (oct))
+ SCM oct = inversion_event->get_property ("octavation");
+ if (scm_is_number (oct))
{
- Pitch *p = unsmob_pitch (inversion_event->get_mus_property ("pitch"));
- int octavation = gh_scm2int (oct);
- Pitch orig = p->transposed (Pitch (-octavation, 0,0));
-
- pitches= gh_cons (orig.smobbed_copy (), pitches);
+ Pitch *p = unsmob_pitch (inversion_event->get_property ("pitch"));
+ int octavation = scm_to_int (oct);
+ Pitch orig = p->transposed (Pitch (-octavation, 0, 0));
+
+ 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 name_proc = get_property ("chordNameFunction");
SCM markup = scm_call_4 (name_proc, pitches, bass, inversion,
- daddy_trans_->self_scm());
+ context ()->self_scm ());
/*
- Ugh.
- */
- SCM chord_as_scm = gh_cons (pitches, gh_cons (bass, inversion));
-
- chord_name_ = new Item (get_property ("ChordName"));
- chord_name_->set_grob_property("text", markup);
- announce_grob(chord_name_, SCM_EOL);
+ Ugh.
+ */
+ SCM chord_as_scm = scm_cons (pitches, scm_cons (bass, inversion));
+
+ chord_name_ = make_item ("ChordName", notes_[0]->self_scm ());
+ chord_name_->set_property ("text", markup);
+
SCM s = get_property ("chordChanges");
- if (to_boolean (s) && gh_pair_p (last_chord_)
- && gh_equal_p (chord_as_scm, last_chord_))
- chord_name_->set_grob_property ("begin-of-line-visible", SCM_BOOL_T);
+ if (to_boolean (s) && scm_is_pair (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)
+Chord_name_engraver::try_music (Music *m)
{
/*
- hmm. Should check?
- */
+ hmm. Should check?
+ */
if (m->is_mus_type ("note-event"))
{
add_note (m);
void
Chord_name_engraver::stop_translation_timestep ()
{
- if (chord_name_)
- {
- typeset_grob (chord_name_);
- }
chord_name_ = 0;
notes_.clear ();
}
The READs description is not strictly accurate:
which properties are read depend on the chord naming function active.
*/
-ENTER_DESCRIPTION(Chord_name_engraver,
-/* descr */ "Catch note-events "
-"and generate the appropriate chordname.",
-/* creats*/ "ChordName",
-/* accepts */ "note-event",
-/* acks */ "",
-/* reads */ "chordChanges chordNameExceptions chordNameFunction "
-"chordRootNamer chordNameExceptions majorSevenSymbol",
-/* write */ "");
+#include "translator.icc"
+
+ADD_TRANSLATOR (Chord_name_engraver,
+ /* doc */ "Catch note-events "
+ "and generate the appropriate chordname.",
+ /* create */ "ChordName",
+ /* accept */ "note-event",
+ /* read */ "chordChanges chordNameExceptions chordNameFunction "
+ "chordNoteNamer chordRootNamer chordNameExceptions majorSevenSymbol",
+ /* write */ "");
projects / lilypond.git / blobdiff