X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-name-engraver.cc;h=5ecf45194e5be0e05c91772c3b6e14abd038c52a;hb=a0b072ed070ca6abb36a11e015073b117103e35d;hp=273d9afde3a0a8153b74bd5953ebb90c751527e6;hpb=5101b276acd03f5c315f1e373df7778461f9a322;p=lilypond.git diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc index 273d9afde3..5ecf45194e 100644 --- a/lily/chord-name-engraver.cc +++ b/lily/chord-name-engraver.cc @@ -3,149 +3,120 @@ source file of the GNU LilyPond music typesetter - (c) 1998 Jan Nieuwenhuizen + (c) 1998--2002 Jan Nieuwenhuizen */ -#include "chord-name-engraver.hh" +#include "engraver.hh" +#include "chord-name.hh" +#include "chord.hh" #include "musical-request.hh" -#include "text-item.hh" #include "paper-def.hh" -#include "lookup.hh" +#include "font-interface.hh" #include "paper-def.hh" #include "main.hh" #include "dimensions.hh" +#include "item.hh" +#include "pitch.hh" +#include "protected-scm.hh" + +class Chord_name_engraver : public Engraver +{ + + TRANSLATOR_DECLARATIONS( Chord_name_engraver); + +protected: + virtual void stop_translation_timestep (); + virtual void acknowledge_grob (Grob_info i); + virtual void process_acknowledged_grobs (); + virtual bool try_music (Music *); + +private: + void add_note (Note_req *); + + Item* chord_name_p_; + + Protected_scm chord_; + Protected_scm last_chord_; +}; + -ADD_THIS_TRANSLATOR (Chord_name_engraver); Chord_name_engraver::Chord_name_engraver () { + chord_name_p_ = 0; + chord_ = gh_cons (SCM_EOL, gh_cons (SCM_EOL, SCM_EOL)); + last_chord_ = chord_; } void -Chord_name_engraver::acknowledge_element (Score_element_info i) +Chord_name_engraver::add_note (Note_req* n) { - if (Note_req* n = dynamic_cast (i.req_l_)) - pitch_arr_.push (n->pitch_); + SCM pitches = ly_car (chord_); + SCM modifiers = ly_cdr (chord_); + SCM inversion = modifiers == SCM_EOL ? SCM_EOL : ly_car (modifiers); + SCM bass = modifiers == SCM_EOL ? SCM_EOL : ly_cdr (modifiers); + + if (n->get_mus_property ("inversion") == SCM_BOOL_T) + inversion = n->get_mus_property ("pitch"); + else if (n->get_mus_property ("bass") == SCM_BOOL_T) + bass = n->get_mus_property ("pitch"); + else + pitches = scm_sort_list (gh_cons (n->get_mus_property ("pitch"), pitches), + Pitch::less_p_proc); + chord_ = gh_cons (pitches, gh_cons (inversion, bass)); } bool -Chord_name_engraver::do_try_music (Music* m) +Chord_name_engraver::try_music (Music* m) { if (Note_req* n = dynamic_cast (m)) { - pitch_arr_.push (n->pitch_); + add_note (n); return true; } return false; } void -Chord_name_engraver::do_process_requests () +Chord_name_engraver::acknowledge_grob (Grob_info i) { - 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 - - Scalar chordNameStyle = get_property ("chordNameStyle"); - if (chordNameStyle == "Banner") - chord = pitches_to_banner (pitch_arr_.size ()); - - */ - - /* - 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 - - Scalar chordNameStyle = get_property ("chordNameStyle"); - if (chordNameStyle == "Banner") - chord = pitches_to_banner (pitch_arr_.size ()); - - */ - - 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 (Note_req* n = dynamic_cast (i.music_cause ())) + add_note (n); +} + +void +Chord_name_engraver::process_acknowledged_grobs () +{ + if (!chord_name_p_ && ly_car (chord_) != SCM_EOL) { - 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 = "/"; - } + chord_name_p_ = new Item (get_property ("ChordName")); + chord_name_p_->set_grob_property ("chord", chord_); + announce_grob(chord_name_p_, SCM_EOL); + SCM s = get_property ("chordChanges"); + if (to_boolean (s) && ly_car (last_chord_) != SCM_EOL + && gh_equal_p (chord_, last_chord_)) + chord_name_p_->set_grob_property ("begin-of-line-visible", SCM_BOOL_T); } - - 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)); } void -Chord_name_engraver::do_pre_move_processing () +Chord_name_engraver::stop_translation_timestep () { - for (int i=0; i < text_p_arr_.size (); i++) + if (chord_name_p_) { - typeset_element (text_p_arr_[i]); + typeset_grob (chord_name_p_); } - text_p_arr_.clear (); - pitch_arr_.clear (); + chord_name_p_ = 0; + + if (ly_car (chord_) != SCM_EOL) + last_chord_ = chord_; + chord_ = gh_cons (SCM_EOL, gh_cons (SCM_EOL, SCM_EOL)); } +ENTER_DESCRIPTION(Chord_name_engraver, +/* descr */ "Catch Note_req's, Tonic_reqs, Inversion_reqs, Bass_req +and generate the appropriate chordname.", +/* creats*/ "ChordName", +/* acks */ "grob-interface", +/* reads */ "chordChanges", +/* write */ "");