X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-name-engraver.cc;h=a13f527601aa0548c33c1ef70dbe7cce6640dd10;hb=5d057e2673b75417a187d75f09023f6071a81e3e;hp=50ece53329022d8efb8ac5d4816f1282295e27e2;hpb=8da6cef580cce3365b219f6aca429b434cb60fcf;p=lilypond.git diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc index 50ece53329..a13f527601 100644 --- a/lily/chord-name-engraver.cc +++ b/lily/chord-name-engraver.cc @@ -3,150 +3,158 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2004 Jan Nieuwenhuizen */ #include "engraver.hh" #include "chord-name.hh" -#include "chord.hh" -#include "musical-request.hh" +#include "event.hh" #include "paper-def.hh" #include "font-interface.hh" #include "paper-def.hh" -#include "main.hh" #include "dimensions.hh" #include "item.hh" -#include "musical-pitch.hh" +#include "pitch.hh" +#include "protected-scm.hh" +#include "context.hh" +#include "warn.hh" class Chord_name_engraver : public Engraver { -public: - Chord_name_engraver (); - VIRTUAL_COPY_CONS (Translator); - + 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); - + virtual void stop_translation_timestep (); + virtual void process_music (); + virtual bool try_music (Music *); + virtual void finalize (); private: - void create_chord_name (); - - Array pitch_arr_; - Item* chord_name_p_; - Chord* chord_p_; - Chord* last_chord_p_; - Tonic_req* tonic_req_; - Inversion_req* inversion_req_; - Bass_req* bass_req_; + void add_note (Music *); + + Item* chord_name_; + Link_array notes_; + + Protected_scm last_chord_; }; -ADD_THIS_TRANSLATOR (Chord_name_engraver); +void +Chord_name_engraver::finalize () +{ + last_chord_ = SCM_EOL; +} Chord_name_engraver::Chord_name_engraver () { - chord_name_p_ = 0; - tonic_req_ = 0; - inversion_req_ = 0; - bass_req_ = 0; - chord_p_ = 0; - last_chord_p_ = 0; + chord_name_ = 0; + last_chord_ = SCM_EOL; } void -Chord_name_engraver::acknowledge_element (Score_element_info i) +Chord_name_engraver::add_note (Music * n) { - if (Note_req* n = dynamic_cast (i.req_l_)) - pitch_arr_.push (* unsmob_pitch (n->get_mus_property ("pitch"))); + notes_.push (n); } -bool -Chord_name_engraver::do_try_music (Music* m) +void +Chord_name_engraver::process_music () { - if (Note_req* n = dynamic_cast (m)) - { - pitch_arr_.push (* unsmob_pitch (n->get_mus_property ("pitch"))); - return true; - } - if (Tonic_req* t = dynamic_cast (m)) - { - tonic_req_ = t; - return true; - } - if (Inversion_req* i = dynamic_cast (m)) + 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++) { - inversion_req_ = i; - return true; + Music *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 = gh_cons (p, pitches); } - if (Bass_req* b = dynamic_cast (m)) + + if (inversion_event) { - bass_req_ = b; - return true; + SCM oct = inversion_event->get_property ("octavation"); + if (gh_number_p (oct)) + { + Pitch *p = unsmob_pitch (inversion_event->get_property ("pitch")); + int octavation = gh_scm2int (oct); + Pitch orig = p->transposed (Pitch (-octavation, 0,0)); + + pitches= gh_cons (orig.smobbed_copy (), pitches); + } + else + programming_error ("Inversion does not have original pitch."); } - return false; -} - -void -Chord_name_engraver::do_process_music () -{ - if (chord_name_p_) - return; - if (!pitch_arr_.size ()) - return; + pitches = scm_sort_list (pitches, Pitch::less_p_proc); - bool find_inversion_b = false; - SCM chord_inversion = get_property ("chordInversion"); - if (gh_boolean_p (chord_inversion)) - find_inversion_b = gh_scm2bool (chord_inversion); + SCM name_proc = get_property ("chordNameFunction"); + SCM markup = scm_call_4 (name_proc, pitches, bass, inversion, + daddy_context_->self_scm ()); - chord_p_ = new Chord (to_chord (pitch_arr_, - tonic_req_, inversion_req_, bass_req_, - find_inversion_b)); + /* + Ugh. + */ + SCM chord_as_scm = gh_cons (pitches, gh_cons (bass, inversion)); - create_chord_name (); - announce_element (chord_name_p_, 0); - SCM s = get_property ("drarnChords"); //FIXME! - if (to_boolean (s) && last_chord_p_ && !compare (chord_p_, last_chord_p_)) - chord_name_p_->set_elt_property ("begin-of-line-visible", SCM_BOOL_T); + chord_name_ = make_item ("ChordName"); + chord_name_->set_property ("text", markup); + announce_grob (chord_name_, notes_[0]->self_scm ()); + 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_property ("begin-of-line-visible", SCM_BOOL_T); + + last_chord_ = chord_as_scm; } -void -Chord_name_engraver::create_chord_name () +bool +Chord_name_engraver::try_music (Music* m) { - assert (chord_p_); - chord_name_p_ = new Item (get_property ("ChordName")); /* - Hmm, why not represent complete chord as list? - ((tonic third fifth) (inversion bass)) - */ - SCM plist = SCM_EOL; - for (int i= chord_p_->pitch_arr_.size (); i--; ) - plist = gh_cons (chord_p_->pitch_arr_[i].smobbed_copy (), plist); - - chord_name_p_->set_elt_property ("pitches", plist); - if (chord_p_->inversion_b_) - chord_name_p_->set_elt_property ("inversion", - chord_p_->inversion_pitch_.smobbed_copy ()); - if (chord_p_->bass_b_) - chord_name_p_->set_elt_property ("bass", chord_p_->bass_pitch_.smobbed_copy ()); + hmm. Should check? + */ + if (m->is_mus_type ("note-event")) + { + add_note (m); + return true; + } + return false; } void -Chord_name_engraver::do_pre_move_processing () +Chord_name_engraver::stop_translation_timestep () { - if (chord_name_p_) + if (chord_name_) { - typeset_element (chord_name_p_); + typeset_grob (chord_name_); } - pitch_arr_.clear (); - chord_name_p_ = 0; - tonic_req_ = 0; - inversion_req_ = 0; - bass_req_ = 0; - delete last_chord_p_; - last_chord_p_ = chord_p_; - chord_p_ = 0; + 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 " +"chordNoteNamer chordRootNamer chordNameExceptions majorSevenSymbol", +/* write */ "");