X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-name-engraver.cc;h=cfa35c26219c2682d79ae60155137f1a54c09b71;hb=d9b43b93f2c885409bafdb157138158f65cc49aa;hp=8729cb57a2a08b420e4544661e000daef6a3edfb;hpb=a0f4b682135cf77e168a7201adbb4d083a1972d4;p=lilypond.git diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc index 8729cb57a2..cfa35c2621 100644 --- a/lily/chord-name-engraver.cc +++ b/lily/chord-name-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2002 Jan Nieuwenhuizen */ #include "engraver.hh" @@ -16,137 +16,107 @@ #include "main.hh" #include "dimensions.hh" #include "item.hh" -#include "musical-pitch.hh" +#include "pitch.hh" +#include "protected-scm.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 acknowledge_grob (Grob_info i); + virtual void create_grobs (); + virtual bool try_music (Music *); private: - void create_chord_name (); - - Array pitch_arr_; + void add_note (Note_req *); + Item* chord_name_p_; - Chord* chord_p_; - Chord* last_chord_p_; - Tonic_req* tonic_req_; - Inversion_req* inversion_req_; - Bass_req* bass_req_; + + Protected_scm chord_; + Protected_scm last_chord_; }; -ADD_THIS_TRANSLATOR (Chord_name_engraver); + 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_ = gh_cons (SCM_EOL, gh_cons (SCM_EOL, SCM_EOL)); + last_chord_ = chord_; } void -Chord_name_engraver::acknowledge_element (Score_element_info i) +Chord_name_engraver::add_note (Note_req* n) { - if (Note_req* n = dynamic_cast (i.req_l_)) - pitch_arr_.push (n->pitch_); + SCM pitches = ly_car (chord_); + SCM modifiers = ly_cdr (chord_); + SCM inversion = modifiers == SCM_EOL ? SCM_EOL : ly_car (modifiers); + SCM bass = modifiers == SCM_EOL ? SCM_EOL : ly_cdr (modifiers); + + if (n->get_mus_property ("inversion") == SCM_BOOL_T) + inversion = n->get_mus_property ("pitch"); + else if (n->get_mus_property ("bass") == SCM_BOOL_T) + bass = n->get_mus_property ("pitch"); + else + pitches = scm_sort_list (gh_cons (n->get_mus_property ("pitch"), pitches), + Pitch::less_p_proc); + chord_ = gh_cons (pitches, gh_cons (inversion, bass)); } bool -Chord_name_engraver::do_try_music (Music* m) +Chord_name_engraver::try_music (Music* m) { if (Note_req* n = dynamic_cast (m)) { - pitch_arr_.push (n->pitch_); - return true; - } - if (Tonic_req* t = dynamic_cast (m)) - { - tonic_req_ = t; - return true; - } - if (Inversion_req* i = dynamic_cast (m)) - { - inversion_req_ = i; - return true; - } - if (Bass_req* b = dynamic_cast (m)) - { - bass_req_ = b; + add_note (n); return true; } return false; } void -Chord_name_engraver::do_process_music () +Chord_name_engraver::acknowledge_grob (Grob_info i) { - if (chord_name_p_) - return; - - if (!pitch_arr_.size ()) - return; - - 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_p_ = new Chord (to_chord (pitch_arr_, - 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_p_ && !compare (chord_p_, last_chord_p_)) - chord_name_p_->set_elt_property ("begin-of-line-visible", SCM_BOOL_T); + if (Note_req* n = dynamic_cast (i.music_cause ())) + add_note (n); } void -Chord_name_engraver::create_chord_name () +Chord_name_engraver::create_grobs () { - assert (chord_p_); - chord_name_p_ = new Item (get_property ("ChordNames")); - /* - 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].to_scm (), 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_.to_scm ()); - if (chord_p_->bass_b_) - chord_name_p_->set_elt_property ("bass", chord_p_->bass_pitch_.to_scm ()); + if (!chord_name_p_ && ly_car (chord_) != SCM_EOL) + { + chord_name_p_ = new Item (get_property ("ChordName")); + chord_name_p_->set_grob_property ("chord", chord_); + announce_grob (chord_name_p_, 0); + SCM s = get_property ("chordChanges"); + if (to_boolean (s) && ly_car (last_chord_) != SCM_EOL + && gh_equal_p (chord_, last_chord_)) + chord_name_p_->set_grob_property ("begin-of-line-visible", SCM_BOOL_T); + } } void -Chord_name_engraver::do_pre_move_processing () +Chord_name_engraver::stop_translation_timestep () { if (chord_name_p_) { - typeset_element (chord_name_p_); + typeset_grob (chord_name_p_); } - 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; + + if (ly_car (chord_) != SCM_EOL) + last_chord_ = chord_; + chord_ = gh_cons (SCM_EOL, gh_cons (SCM_EOL, SCM_EOL)); } +ENTER_DESCRIPTION(Chord_name_engraver, +/* descr */ "Catch Note_req's, Tonic_reqs, Inversion_reqs, Bass_req +and generate the appropriate chordname.", +/* creats*/ "ChordName", +/* acks */ "grob-interface", +/* reads */ "chordChanges", +/* write */ "");