X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-name-engraver.cc;h=363ba3e22e9a215f10aa6a13dbfeffdd987d30af;hb=b6a3535923f893b4c593203c3421361ae02eba7c;hp=4c57efac7ed3628ef990829fa371b6c795b67b32;hpb=43c708d5857fd1a15f0ebcf41d04f5a24441dc9a;p=lilypond.git diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc index 4c57efac7e..363ba3e22e 100644 --- a/lily/chord-name-engraver.cc +++ b/lily/chord-name-engraver.cc @@ -3,107 +3,160 @@ source file of the GNU LilyPond music typesetter - (c) 1998--1999 Jan Nieuwenhuizen + (c) 1998--2005 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" +#include "pitch.hh" -ADD_THIS_TRANSLATOR (Chord_name_engraver); +class Chord_name_engraver : public Engraver +{ + TRANSLATOR_DECLARATIONS (Chord_name_engraver); +protected: + void stop_translation_timestep (); + void process_music (); + virtual bool try_music (Music *); + virtual void finalize (); + virtual void derived_mark () const; +private: + void add_note (Music *); -Chord_name_engraver::Chord_name_engraver () + Item *chord_name_; + Link_array notes_; + + SCM last_chord_; +}; + +void +Chord_name_engraver::finalize () { - tonic_req_ = 0; - // bass_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; - } -#if 0 - if (Bass_req* b = dynamic_cast (m)) - { - bass_req_ = b; - return true; - } -#endif - - 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; - Chord chord (pitch_arr_); - Musical_pitch* inversion = 0; - SCM chord_inversion = get_property ("chordInversion", 0); - if (gh_boolean_p (chord_inversion) && gh_scm2bool (chord_inversion)) + SCM bass = SCM_EOL; + SCM inversion = SCM_EOL; + SCM pitches = SCM_EOL; + + Music *inversion_event = 0; + for (int i = 0; i < notes_.size (); 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_event = n; + inversion = p; + } + else if (n->get_property ("bass") == SCM_BOOL_T) + bass = p; + else + pitches = scm_cons (p, pitches); + } + + if (inversion_event) { - int tonic_i = tonic_req_ - ? chord.find_notename_i (tonic_req_->pitch_) : chord.find_tonic_i (); - - if (tonic_i) + SCM oct = inversion_event->get_property ("octavation"); + if (scm_is_number (oct)) { - inversion = &pitch_arr_[0]; - chord.rebuild_insert_inversion (tonic_i); + 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"); } - - Text_item* item_p = new Text_item; + + 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 ()); /* - TODO: - - switch on property, add american (?) chordNameStyle: - Chord::american_str (...) - - SCM chordNameStyle = get_property ("chordNameStyle", 0); - if (chordNameStyle == "Banter") - item_p->text_str_ = chord.banter_str (inversion); - */ - - item_p->text_str_ = chord.banter_str (inversion); - - text_p_arr_.push (item_p); - announce_element (Score_element_info (item_p, 0)); + 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; } -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. +*/ +#include "translator.icc" + +ADD_TRANSLATOR (Chord_name_engraver, + /* doc */ "Catch note-events " + "and generate the appropriate chordname.", + /* create */ "ChordName", + /* accept */ "note-event", + /* read */ "chordChanges chordNameExceptions chordNameFunction " + "chordNoteNamer chordRootNamer chordNameExceptions majorSevenSymbol", + /* write */ "");