X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-name-engraver.cc;h=3e8228be8a256d018bec463b505046a634f04fef;hb=9fc8eafc925fc7481d1163a43fb02c9b1f28fb9c;hp=b33e0f04ded517c4416c6f88b1e6e6c6da443522;hpb=b0064942493df77833e6e41e05d362850f4874b0;p=lilypond.git diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc index b33e0f04de..3e8228be8a 100644 --- a/lily/chord-name-engraver.cc +++ b/lily/chord-name-engraver.cc @@ -3,109 +3,158 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2005 Jan Nieuwenhuizen */ -#include "chord-name-engraver.hh" +#include "engraver.hh" #include "chord-name.hh" -#include "musical-request.hh" -#include "paper-def.hh" -#include "lookup.hh" -#include "paper-def.hh" -#include "main.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" +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 *); -ADD_THIS_TRANSLATOR (Chord_name_engraver); + Item *chord_name_; + Link_array notes_; -Chord_name_engraver::Chord_name_engraver () + SCM last_chord_; +}; + +void +Chord_name_engraver::finalize () { - chord_name_p_ = 0; - tonic_req_ = 0; - inversion_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 (Inversion_req* i = dynamic_cast (m)) - { - inversion_req_ = i; - return true; - } - if (Bass_req* b = dynamic_cast (m)) - { - bass_req_ = b; - return true; - } - return false; + chord_name_ = 0; + last_chord_ = SCM_EOL; } void -Chord_name_engraver::do_process_music () +Chord_name_engraver::add_note (Music *n) { - if (chord_name_p_) - return; - if (!pitch_arr_.size ()) + notes_.push (n); +} + +void +Chord_name_engraver::process_music () +{ + if (!notes_.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); + SCM bass = SCM_EOL; + SCM inversion = SCM_EOL; + SCM pitches = SCM_EOL; - chord_name_p_ = new Chord_name (get_property ("basicChordNameProperties")); - Chord chord = to_chord (pitch_arr_, tonic_req_, inversion_req_, bass_req_, - find_inversion_b); + 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) + { + 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"); + } + + 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 ()); /* - Hmm, why not represent complete chord as list? - ((tonic third fifth) (inversion bass)) + Ugh. */ - SCM plist = SCM_EOL; - for (int i= chord.pitch_arr_.size (); i--; ) - plist = gh_cons (chord.pitch_arr_[i].to_scm (), plist); - - chord_name_p_->set_elt_property ("pitches", plist); - if (chord.inversion_b_) - chord_name_p_->set_elt_property ("inversion", - chord.inversion_pitch_.to_scm ()); - if (chord.bass_b_) - chord_name_p_->set_elt_property ("bass", chord.bass_pitch_.to_scm ()); - - announce_element (Score_element_info (chord_name_p_, 0)); + 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_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) { - if (chord_name_p_) + /* + hmm. Should check? + */ + if (m->is_mus_type ("note-event")) { - typeset_element (chord_name_p_); + add_note (m); + return true; } - pitch_arr_.clear (); - chord_name_p_ = 0; - tonic_req_ = 0; - inversion_req_ = 0; - bass_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 */ "");