source file of the GNU LilyPond music typesetter
- (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-
+// clean me up
#include "key-engraver.hh"
#include "key-item.hh"
#include "command-request.hh"
#include "musical-request.hh"
#include "local-key-item.hh"
#include "bar.hh"
-#include "time-description.hh"
+#include "timing-translator.hh"
+#include "staff-symbol-referencer.hh"
Key_engraver::Key_engraver ()
{
- kit_p_ = 0;
+ item_p_ = 0;
do_post_move_processing ();
}
+bool
+Key_engraver::key_changed_b () const
+{
+ return keyreq_l_ ;
+}
+
void
Key_engraver::create_key ()
{
- if (!kit_p_)
+ if (!item_p_)
{
- kit_p_ = new Key_item;
- kit_p_->break_priority_i_ = -1; // ugh
- kit_p_->multi_octave_b_ = key_.multi_octave_b_;
- announce_element (Score_element_info (kit_p_,keyreq_l_));
+ item_p_ = new Key_item;
+ Staff_symbol_referencer_interface st (item_p_);
+ st.set_interface ();
+
+ item_p_->set_elt_property ("break-aligned", SCM_BOOL_T); // ugh
+
+ item_p_->set_elt_property ("multi-octave",
+ gh_bool2scm (key_.multi_octave_b_));
+
+ announce_element (Score_element_info (item_p_,keyreq_l_));
for (int i = 0; i < accidental_idx_arr_.size(); i++)
Musical_pitch m_l =accidental_idx_arr_[i];
int a =m_l.accidental_i_;
if (key_.multi_octave_b_)
- kit_p_->add (m_l.steps (), a);
+ item_p_->add (m_l.steps (), a);
else
- kit_p_->add (m_l.notename_i_, a);
+ item_p_->add (m_l.notename_i_, a);
}
- for (int i = 0 ; i< old_accidental_idx_arr_.size(); i++)
+ for (int i = 0 ; i < old_accidental_idx_arr_.size(); i++)
{
Musical_pitch m_l =old_accidental_idx_arr_[i];
int a =m_l.accidental_i_;
if (key_.multi_octave_b_)
- kit_p_->add_old (m_l.steps (), a);
+ item_p_->add_old (m_l.steps (), a);
else
- kit_p_->add_old (m_l.notename_i_, a);
+ item_p_->add_old (m_l.notename_i_, a);
}
}
}
if (Key_change_req *kc = dynamic_cast <Key_change_req *> (req_l))
{
if (keyreq_l_)
- warning ("Fixme: key change merge.");
+ warning (_ ("FIXME: key change merge"));
keyreq_l_ = kc;
read_req (keyreq_l_);
return true;
{
if (dynamic_cast <Clef_change_req *> (info.req_l_))
{
- int i= get_property ("createKeyOnClefChange", 0).length_i ();
- if (i)
+ SCM c = get_property ("createKeyOnClefChange");
+ if (to_boolean (c))
create_key ();
}
else if (dynamic_cast<Bar *> (info.elem_l_)
&& accidental_idx_arr_.size ())
{
- if (!keyreq_l_)
- default_key_b_ = true;
+ bool def = (!item_p_);
create_key ();
+ if (!def)
+ {
+ item_p_->set_elt_property ("visibility-lambda",
+ scm_eval (ly_symbol2scm ("all-visible")));
+ }
}
}
void
-Key_engraver::do_process_requests ()
+Key_engraver::do_process_music ()
{
if (keyreq_l_)
{
void
Key_engraver::do_pre_move_processing ()
{
- if (kit_p_)
+ if (item_p_)
{
- kit_p_->default_b_ = default_key_b_;
- typeset_element (kit_p_);
- kit_p_ = 0;
+ typeset_element (item_p_);
+ item_p_ = 0;
}
}
void
Key_engraver::read_req (Key_change_req const * r)
{
+ if (!r->key_)
+ return;
+
old_accidental_idx_arr_ = accidental_idx_arr_;
key_.clear ();
- Scalar prop = get_property ("keyoctaviation", 0);
- if (prop.length_i () > 0)
- {
- key_.multi_octave_b_ = ! prop.to_bool ();
- }
+ SCM prop = get_property ("keyOctaviation");
+
+ key_.multi_octave_b_ = to_boolean (prop);
accidental_idx_arr_.clear ();
- if (r->ordinary_key_b_)
+ if (r->key_->ordinary_key_b_)
{
- int p;
- if (r->pitch_arr_.size () < 1)
- {
- r->warning (_ ("No key name: assuming `C'"));
- p = 0;
- }
- else
- {
- p = r->pitch_arr_[0].semitone_pitch ();
- p += r->modality_i_;
- }
- /* Solve the equation 7*no_of_acc mod 12 = p, -6 <= no_of_acc <= 5 */
- int no_of_acc = (7*p) % 12;
- no_of_acc = (no_of_acc + 18) % 12 -6;
-
- /* Correct from flats to sharps or vice versa */
- if (no_of_acc * r->pitch_arr_[0].accidental_i_ < 0)
- no_of_acc += 12 * sign (r->pitch_arr_[0].accidental_i_);
+ int no_of_acc = r->key_->ordinary_accidentals_i ();
+ // Hmm, can't these be handled/constructed by Key_change_req?
if (no_of_acc < 0)
{
int accidental = 6 ; // First accidental: bes
}
else // Special key
{
- for (int i = 0; i < r->pitch_arr_.size (); i ++)
+ for (int i = 0; i < r->key_->pitch_arr_.size (); i ++)
{
- Musical_pitch m_l =r->pitch_arr_[i];
+ Musical_pitch m_l =r->key_->pitch_arr_[i];
if (key_.multi_octave_b_)
key_.set (m_l);
else
Key_engraver::do_post_move_processing ()
{
keyreq_l_ = 0;
- default_key_b_ = false;
old_accidental_idx_arr_.clear ();
}
-
-
ADD_THIS_TRANSLATOR (Key_engraver);