X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fchord-name-engraver.cc;h=7a78ed2443848e6ea80a15b054f126d342547253;hb=f4ff2e488239d66830ac8b3ae5771358a917b58f;hp=133f91ae6423607948bcd85ff75da6376dac9507;hpb=ee0dca4cea06f2d354cb33d935033116e88a3dba;p=lilypond.git diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc index 133f91ae64..7a78ed2443 100644 --- a/lily/chord-name-engraver.cc +++ b/lily/chord-name-engraver.cc @@ -3,135 +3,162 @@ source file of the GNU LilyPond music typesetter - (c) 1998 Jan Nieuwenhuizen + (c) 1998--2004 Jan Nieuwenhuizen */ -#include "chord-name-engraver.hh" -#include "musical-request.hh" -#include "text-item.hh" -#include "paper-def.hh" -#include "lookup.hh" -#include "paper-def.hh" -#include "main.hh" +#include "engraver.hh" +#include "chord-name.hh" +#include "event.hh" +#include "output-def.hh" +#include "font-interface.hh" +#include "output-def.hh" #include "dimensions.hh" +#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 (); + 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 () { } 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; - } - 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 ()) - return; - - /* - Banter style chord names (almost). - TODO: - - don't print inclusive scale (i.e. no "9" in c 9/11) - - handle c7 / cmaj7 - - use #,b iso -es -is on tonica - - switch on property, add american (?) chordNameStyle + notes_.push (n); +} - Scalar chordNameStyle = get_property ("chordNameStyle"); - if (chordNameStyle == "Banner") - chord = pitches_to_banner (pitch_arr_.size ()); +void +Chord_name_engraver::process_music () +{ + 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++) + { + 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); + } - Scalar style = get_property ("textstyle"); - Scalar alignment = get_property ("textalignment"); - Text_def* text_p = new Text_def; - text_p->align_dir_ = LEFT; - if (style.length_i ()) - text_p->style_str_ = style; - if (alignment.isnum_b()) - text_p->align_dir_= (Direction)(int)alignment; - - Musical_pitch tonic = pitch_arr_[0]; - - Array scale; - scale.push (Musical_pitch (0)); // c - scale.push (Musical_pitch (1)); // d - scale.push (Musical_pitch (2)); // e - scale.push (Musical_pitch (3)); // f - scale.push (Musical_pitch (4)); // g - scale.push (Musical_pitch (5)); // a - // 7 always means 7-... - scale.push (Musical_pitch (6, -1)); // b - - for (int i = 0; i < scale.size (); i++) - scale[i].transpose (tonic); - - //urg, should do translation in scheme. - char const *acc[] = {"\\textflat\\textflat ", "\\textflat ", "", "\\textsharp " , "\\textsharp\\textsharp "}; - String tonic_str = tonic.str (); - tonic_str = tonic_str.left_str (1).upper_str () - + acc[tonic.accidental_i_ + 2]; - - String add_str; - String sep_str; - for (int i=1; i < pitch_arr_.size (); i++) + if (inversion_event) { - Musical_pitch p = pitch_arr_[i]; - int trap = p.notename_i_ - tonic.notename_i_ - + (p.octave_i_ - tonic.octave_i_) * 7 + 1; - int accidental = p.accidental_i_ - scale[(trap - 1) % 7].accidental_i_; - if ((trap == 3) && (accidental == -1)) - tonic_str += "m"; // hmm - else if (accidental || (!(trap % 2) || ((i + 1 == pitch_arr_.size ()) && (trap > 5)))) - { - add_str += sep_str; - if ((trap == 7) && (accidental == 1)) - add_str += "maj7"; - else - { - add_str += to_str (trap); - if (accidental) - add_str += accidental < 0 ? "-" : "+"; - } - sep_str = "/"; + 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."); } - text_p->text_str_ = tonic_str + "$^{" + add_str + "}$"; - Text_item* item_p = new Text_item (text_p); - item_p->dir_ = DOWN; - item_p->fat_b_ = true; - text_p_arr_.push (item_p); - announce_element (Score_element_info (item_p, 0)); + 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 ()); + + /* + 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_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 (); + 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. +*/ +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 */ "");