source file of the GNU LilyPond music typesetter
- (c) 1998--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "chord-name-engraver.hh"
-#include "chord.hh"
+#include "chord-name.hh"
#include "musical-request.hh"
#include "paper-def.hh"
#include "lookup.hh"
#include "dimensions.hh"
#include "text-item.hh"
+
ADD_THIS_TRANSLATOR (Chord_name_engraver);
Chord_name_engraver::Chord_name_engraver ()
{
+ chord_name_p_ = 0;
tonic_req_ = 0;
+ inversion_req_ = 0;
+ bass_req_ = 0;
}
void
tonic_req_ = t;
return true;
}
+ if (Inversion_req* i = dynamic_cast<Inversion_req*> (m))
+ {
+ inversion_req_ = i;
+ return true;
+ }
+ if (Bass_req* b = dynamic_cast<Bass_req*> (m))
+ {
+ bass_req_ = b;
+ return true;
+ }
return false;
}
void
-Chord_name_engraver::do_process_requests ()
+Chord_name_engraver::do_process_music ()
{
- if (text_p_arr_.size ())
+ if (chord_name_p_)
return;
if (!pitch_arr_.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))
- {
- int tonic_i = tonic_req_
- ? chord.find_notename_i (tonic_req_->pitch_) : chord.find_tonic_i ();
-
- if (tonic_i)
- {
- inversion = &pitch_arr_[0];
- chord.rebuild_insert_inversion (tonic_i);
- }
- }
-
- Text_item* item_p = new Text_item;
-
- /*
- TODO:
- - switch on property, add american (?) chordNameStyle:
- Chord::american_str (...)
+ 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 chordNameStyle = get_property ("chordNameStyle", 0);
- if (chordNameStyle == "Banter")
- item_p->text_str_ = chord.banter_str (inversion);
- */
+ chord_name_p_ = new Chord_name;
+ Chord chord = to_chord (pitch_arr_, tonic_req_, inversion_req_, bass_req_,
+ find_inversion_b);
- item_p->text_str_ = chord.banter_str (inversion);
+ /*
+ Hmm, why not represent complete chord as list?
+ ((tonic third fifth) (inversion bass))
+ */
+ SCM plist = SCM_EOL;
+ for (int i= chord.pitch_arr_.size (); i--; )
+ plist = gh_cons (chord.pitch_arr_[i].to_scm (), plist);
- text_p_arr_.push (item_p);
- announce_element (Score_element_info (item_p, 0));
+ 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));
}
void
Chord_name_engraver::do_pre_move_processing ()
{
- for (int i=0; i < text_p_arr_.size (); i++)
+ if (chord_name_p_)
{
- typeset_element (text_p_arr_[i]);
+ typeset_element (chord_name_p_);
}
- text_p_arr_.clear ();
pitch_arr_.clear ();
+ chord_name_p_ = 0;
tonic_req_ = 0;
+ inversion_req_ = 0;
+ bass_req_ = 0;
}
+