X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-name-engraver.cc;h=f8858998a1d963669bc18d37f1ccc3d0aa8b6d43;hb=c74bf739ec32b015c711c460aa831092a08478b3;hp=877d7c988c04c25f6fa3186175b8789a77e28131;hpb=4975901229a1b074f6c93d812e15d653aa8e2952;p=lilypond.git diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc index 877d7c988c..f8858998a1 100644 --- a/lily/chord-name-engraver.cc +++ b/lily/chord-name-engraver.cc @@ -3,148 +3,156 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2009 Jan Nieuwenhuizen */ -#include "engraver.hh" #include "chord-name.hh" -#include "chord.hh" -#include "musical-request.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 "stream-event.hh" +#include "warn.hh" -class Chord_name_engraver : public Engraver -{ -public: - Chord_name_engraver (); - VIRTUAL_COPY_CONS (Translator); +#include "translator.icc" +class Chord_name_engraver : public Engraver +{ + TRANSLATOR_DECLARATIONS (Chord_name_engraver); protected: - virtual void do_pre_move_processing (); - virtual void acknowledge_element (Score_element_info i); - virtual void do_process_music (); - virtual bool do_try_music (Music* m); - + void stop_translation_timestep (); + void process_music (); + virtual void finalize (); + virtual void derived_mark () const; + DECLARE_TRANSLATOR_LISTENER (note); private: - void create_chord_name (); - - Item* chord_name_p_; - Protected_scm pitches_; - - Protected_scm chord_; - Protected_scm last_chord_; + Item *chord_name_; + vector notes_; - Protected_scm tonic_req_; - Protected_scm inversion_req_; - Protected_scm bass_req_; + SCM last_chord_; }; -ADD_THIS_TRANSLATOR (Chord_name_engraver); - -Chord_name_engraver::Chord_name_engraver () +void +Chord_name_engraver::finalize () { - chord_name_p_ = 0; - pitches_ = SCM_EOL; - tonic_req_ = SCM_EOL; - inversion_req_ = SCM_EOL; - bass_req_ = SCM_EOL; - chord_ = SCM_EOL; - last_chord_ = SCM_EOL; } void -Chord_name_engraver::acknowledge_element (Score_element_info i) +Chord_name_engraver::derived_mark () const { - if (Note_req* n = dynamic_cast (i.req_l_)) - pitches_ = gh_cons (n->get_mus_property ("pitch"), pitches_); + scm_gc_mark (last_chord_); } -bool -Chord_name_engraver::do_try_music (Music* m) +Chord_name_engraver::Chord_name_engraver () { - if (Note_req* n = dynamic_cast (m)) - { - pitches_ = gh_cons (n->get_mus_property ("pitch"), pitches_); - return true; - } - if (Tonic_req* t = dynamic_cast (m)) - { - tonic_req_ = t->get_mus_property ("pitch"); - return true; - } - if (Inversion_req* i = dynamic_cast (m)) - { - inversion_req_ = i->get_mus_property ("pitch"); - return true; - } - if (Bass_req* b = dynamic_cast (m)) - { - bass_req_ = b->get_mus_property ("pitch"); - return true; - } - return false; + chord_name_ = 0; + last_chord_ = SCM_EOL; } void -Chord_name_engraver::do_process_music () +Chord_name_engraver::process_music () { - if (!chord_name_p_ && pitches_ != SCM_EOL) + if (!notes_.size ()) + return; + + SCM bass = SCM_EOL; + SCM inversion = SCM_EOL; + SCM pitches = SCM_EOL; + + Stream_event *inversion_event = 0; + for (vsize i = 0; i < notes_.size (); i++) { - bool find_inversion_b = false; - SCM chord_inversion = get_property ("chordInversion"); - if (gh_boolean_p (chord_inversion)) - find_inversion_b = gh_scm2bool (chord_inversion); - - chord_ = Chord::pitches_and_requests_to_chord (pitches_, - tonic_req_, - inversion_req_, - bass_req_, - find_inversion_b); - - create_chord_name (); - announce_element (chord_name_p_, 0); - SCM s = get_property ("drarnChords"); //FIXME! - if (to_boolean (s) && last_chord_ != SCM_EOL && - gh_equal_p (chord_, last_chord_)) - chord_name_p_->set_elt_property ("begin-of-line-visible", SCM_BOOL_T); + Stream_event *n = notes_[i]; + SCM p = n->get_property ("pitch"); + if (!unsmob_pitch (p)) + continue; + + if (n->get_property ("inversion") == SCM_BOOL_T) + { + inversion_event = n; + inversion = p; + } + else if (n->get_property ("bass") == SCM_BOOL_T) + bass = p; + else + pitches = scm_cons (p, pitches); } + + if (inversion_event) + { + SCM oct = inversion_event->get_property ("octavation"); + if (scm_is_number (oct)) + { + 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"); + } + + 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, + context ()->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) && 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; } +IMPLEMENT_TRANSLATOR_LISTENER (Chord_name_engraver, note); void -Chord_name_engraver::create_chord_name () +Chord_name_engraver::listen_note (Stream_event *ev) { - chord_name_p_ = new Item (get_property ("ChordName")); - - SCM pitches = gh_car (chord_); - SCM modifiers = gh_cdr (chord_); - SCM inversion = gh_car (modifiers); - SCM bass = gh_cdr (modifiers); - /* Hmm, maybe chord-name should use (pitches (inversion . base)) too? */ - chord_name_p_->set_elt_property ("pitches", pitches); - chord_name_p_->set_elt_property ("inversion", inversion); - chord_name_p_->set_elt_property ("inversion", bass); + notes_.push_back (ev); } void -Chord_name_engraver::do_pre_move_processing () +Chord_name_engraver::stop_translation_timestep () { - if (chord_name_p_) - { - typeset_element (chord_name_p_); - } - chord_name_p_ = 0; - - pitches_ = SCM_EOL; - tonic_req_ = SCM_EOL; - inversion_req_ = SCM_EOL; - bass_req_ = SCM_EOL; - last_chord_ = chord_; - chord_ = SCM_EOL; + chord_name_ = 0; + notes_.clear (); } +/* + The READs description is not strictly accurate: + which properties are read depend on the chord naming function active. +*/ +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 */ + "" + );