X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-name-engraver.cc;h=44c1333d7a383a333261c813594a87ed03e12b8c;hb=e48ad720d23509d883e3fbe946c7264d88467918;hp=e730763fcf20a843b37e8019853c1929924d0cb4;hpb=0d11cc81d96ba3cbe5d3c221aba3ee16e916c4c9;p=lilypond.git diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc index e730763fcf..44c1333d7a 100644 --- a/lily/chord-name-engraver.cc +++ b/lily/chord-name-engraver.cc @@ -3,102 +3,160 @@ source file of the GNU LilyPond music typesetter - (c) 1998--1999, 1999 Jan Nieuwenhuizen + (c) 1998--2004 Jan Nieuwenhuizen */ -#include "chord-name-engraver.hh" -#include "chord.hh" -#include "musical-request.hh" -#include "paper-def.hh" -#include "lookup.hh" -#include "paper-def.hh" -#include "main.hh" +#include "engraver.hh" +#include "chord-name.hh" +#include "output-def.hh" +#include "font-interface.hh" +#include "output-def.hh" #include "dimensions.hh" -#include "text-item.hh" +#include "item.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 (); + virtual void derived_mark () const; +private: + void add_note (Music *); + + Item* chord_name_; + Link_array notes_; + + SCM last_chord_; +}; -Chord_name_engraver::Chord_name_engraver () + + +void +Chord_name_engraver::finalize () { - tonic_req_ = 0; } 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_)) - pitch_arr_.push (n->pitch_); + 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)) - { - pitch_arr_.push (n->pitch_); - return true; - } - if (Tonic_req* t = dynamic_cast (m)) - { - tonic_req_ = t; - return true; - } - return false; + chord_name_ = 0; + last_chord_ = SCM_EOL; } void -Chord_name_engraver::do_process_requests () +Chord_name_engraver::add_note (Music * n) { - if (text_p_arr_.size ()) - return; - if (!pitch_arr_.size ()) + notes_.push (n); +} + +void +Chord_name_engraver::process_music () +{ + if (!notes_.size () ) return; + + SCM bass = SCM_EOL; + SCM inversion = SCM_EOL; + SCM pitches = SCM_EOL; - Chord chord (pitch_arr_); - Musical_pitch* inversion = 0; - Scalar chord_inversion = get_property ("chordInversion", 0); - if (chord_inversion.to_bool ()) + Music* inversion_event = 0; + for (int i = 0 ; i < notes_.size (); i++) { - int tonic_i = tonic_req_ - ? chord.find_notename_i (tonic_req_->pitch_) : chord.find_tonic_i (); - - if (tonic_i) + Music *n = notes_[i]; + SCM p = n->get_property ("pitch"); + if (!unsmob_pitch (p)) + continue; + + if (n->get_property ("inversion") == SCM_BOOL_T) { - inversion = &pitch_arr_[0]; - chord.rebuild_insert_inversion (tonic_i); + inversion_event = n; + inversion = p; } + else if (n->get_property ("bass") == SCM_BOOL_T) + bass = p; + else + pitches = scm_cons (p, pitches); } - - Text_item* item_p = new Text_item; - /* - TODO: - - switch on property, add american (?) chordNameStyle: - Chord::american_str (...) + 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."); + } - Scalar chordNameStyle = get_property ("chordNameStyle", 0); - if (chordNameStyle == "Banter") - item_p->text_str_ = chord.banter_str (inversion); - */ + pitches = scm_sort_list (pitches, Pitch::less_p_proc); - item_p->text_str_ = chord.banter_str (inversion); - - Scalar style = get_property ("textStyle", 0); - if (style.length_i ()) - item_p->style_str_ = style; + 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)); - text_p_arr_.push (item_p); - announce_element (Score_element_info (item_p, 0)); + 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_c_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::do_pre_move_processing () +bool +Chord_name_engraver::try_music (Music* m) { - for (int i=0; i < text_p_arr_.size (); i++) + /* + hmm. Should check? + */ + if (m->is_mus_type ("note-event")) { - typeset_element (text_p_arr_[i]); + add_note (m); + return true; } - text_p_arr_.clear (); - pitch_arr_.clear (); - tonic_req_ = 0; + return false; } + +void +Chord_name_engraver::stop_translation_timestep () +{ + 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, +/* descr */ "Catch note-events " +"and generate the appropriate chordname.", +/* creats*/ "ChordName", +/* accepts */ "note-event", +/* acks */ "", +/* reads */ "chordChanges chordNameExceptions chordNameFunction " +"chordNoteNamer chordRootNamer chordNameExceptions majorSevenSymbol", +/* write */ "");