X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-name-engraver.cc;h=a9a2744c9f3507de6c24aea19a156e7f07c22408;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=619b51a639323d312a6362d2629fd748e5cd19ae;hpb=145376509af3f2caf35122d257d24eb7edcb7092;p=lilypond.git diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc index 619b51a639..a9a2744c9f 100644 --- a/lily/chord-name-engraver.cc +++ b/lily/chord-name-engraver.cc @@ -3,139 +3,132 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2003 Jan Nieuwenhuizen + (c) 1998--2008 Jan Nieuwenhuizen */ -#include "engraver.hh" #include "chord-name.hh" -#include "event.hh" -#include "paper-def.hh" -#include "font-interface.hh" -#include "paper-def.hh" -#include "main.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 "translator-group.hh" +#include "stream-event.hh" #include "warn.hh" -class Chord_name_engraver : public Engraver +#include "translator.icc" + +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 (); - 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 notes_; - - Protected_scm last_chord_; + Item *chord_name_; + vector notes_; + + SCM last_chord_; }; -Chord_name_engraver::Chord_name_engraver () +void +Chord_name_engraver::finalize () { - chord_name_ = 0; - last_chord_ = SCM_EOL; } void -Chord_name_engraver::add_note (Music * n) +Chord_name_engraver::derived_mark () const +{ + scm_gc_mark (last_chord_); +} + +Chord_name_engraver::Chord_name_engraver () { - notes_.push (n); + chord_name_ = 0; + last_chord_ = SCM_EOL; } 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++) + Stream_event *inversion_event = 0; + for (vsize i = 0; i < notes_.size (); i++) { - Music *n = notes_[i]; - SCM p = n->get_mus_property ("pitch"); + Stream_event *n = notes_[i]; + 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_, notes_[0]->self_scm ()); + 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) +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 Chord_name_engraver::stop_translation_timestep () { - if (chord_name_) - { - typeset_grob (chord_name_); - } chord_name_ = 0; notes_.clear (); } @@ -144,12 +137,22 @@ Chord_name_engraver::stop_translation_timestep () 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 " -"chordNoteNamer chordRootNamer chordNameExceptions majorSevenSymbol", -/* write */ ""); +ADD_TRANSLATOR (Chord_name_engraver, + /* doc */ + "Catch note events and generate the appropriate chordname.", + + /* create */ + "ChordName ", + + /* read */ + "chordChanges " + "chordNameExceptions " + "chordNameFunction " + "chordNoteNamer " + "chordRootNamer " + "chordNameExceptions " + "majorSevenSymbol ", + + /* write */ + "" + );