X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-name-engraver.cc;h=3db792dbe174c3223c7c51a3114bf765d0b822fd;hb=333ec20b00d7e6952cb7d3800a82548957feb803;hp=eb28971785a01cf8fa2e3a56126ced2cbe61676c;hpb=fbb6d20e9f58d691ffe845284cbb4d8bacf9ca60;p=lilypond.git diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc index eb28971785..3db792dbe1 100644 --- a/lily/chord-name-engraver.cc +++ b/lily/chord-name-engraver.cc @@ -3,105 +3,158 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2004 Jan Nieuwenhuizen */ -#include "chord-name-engraver.hh" +#include "engraver.hh" #include "chord-name.hh" -#include "musical-request.hh" +#include "event.hh" #include "paper-def.hh" -#include "lookup.hh" +#include "font-interface.hh" #include "paper-def.hh" -#include "main.hh" #include "dimensions.hh" -#include "text-item.hh" -#include "lily-guile.icc" +#include "item.hh" +#include "pitch.hh" +#include "protected-scm.hh" +#include "context.hh" +#include "warn.hh" -ADD_THIS_TRANSLATOR (Chord_name_engraver); +class Chord_name_engraver : public Engraver +{ + TRANSLATOR_DECLARATIONS ( Chord_name_engraver); +protected: + virtual void stop_translation_timestep (); + virtual void process_music (); + virtual bool try_music (Music *); + virtual void finalize (); +private: + void add_note (Music *); + + Item* chord_name_; + Link_array notes_; + + Protected_scm last_chord_; +}; + +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_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 (n->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 (n->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 = scm_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 (is_number (oct)) + { + Pitch *p = unsmob_pitch (inversion_event->get_property ("pitch")); + int octavation = ly_scm2int (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."); } - 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); + + SCM name_proc = get_property ("chordNameFunction"); + SCM markup = scm_call_4 (name_proc, pitches, bass, inversion, + daddy_context_->self_scm ()); - bool find_inversion_b = false; - SCM chord_inversion = get_property ("chordInversion"); - if (gh_boolean_p (chord_inversion)) - find_inversion_b = gh_scm2bool (chord_inversion); + /* + Ugh. + */ + SCM chord_as_scm = scm_cons (pitches, scm_cons (bass, inversion)); + + 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) && is_pair (last_chord_) + && is_equal (chord_as_scm, last_chord_)) + chord_name_->set_property ("begin-of-line-visible", SCM_BOOL_T); - chord_name_p_ = new Chord_name; - Chord chord = to_chord (pitch_arr_, tonic_req_, inversion_req_, bass_req_, - find_inversion_b); + last_chord_ = chord_as_scm; +} +bool +Chord_name_engraver::try_music (Music* m) +{ /* - Hmm, why not represent complete chord as list? - ((tonic third fifth) (inversion bass)) - */ - chord_name_p_->set_elt_property ("pitches", array_to_scm (chord.pitch_arr_)); - if (chord.inversion_b_) - chord_name_p_->set_elt_property ("inversion", - to_scm (chord.inversion_pitch_)); - if (chord.bass_b_) - chord_name_p_->set_elt_property ("bass", to_scm (chord.bass_pitch_)); - - announce_element (Score_element_info (chord_name_p_, 0)); + 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; + 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 */ "");