#include "musical-request.hh"
#include "command-request.hh"
#include "local-key-item.hh"
-#include "key-item.hh"
+#include "item.hh"
#include "tie.hh"
#include "rhythmic-head.hh"
#include "timing-translator.hh"
#include "staff-symbol-referencer.hh"
#include "side-position-interface.hh"
#include "engraver.hh"
-
+#include "arpeggio.hh"
/**
- Make accidentals. Catches note heads, ties and notices key-change
- events. Due to interaction with ties (which don't come together
- with note heads), this needs to be in a context higher than Tie_engraver.
- (FIXME).
- */
+
+
+ FIXME: should not compute vertical positioning of accidentals, but
+ get them from the noteheads
+
+*/
+
+
struct Local_key_engraver : Engraver {
- Local_key_item *key_item_p_;
+ Item *key_item_p_;
protected:
VIRTUAL_COPY_CONS(Translator);
virtual void do_process_music();
// todo -> property
SCM last_keysig_;
+
+ /*
+ Urgh. Since the accidentals depend on lots of variables, we have to
+ store all information before we can really create the accidentals.
+ */
+ Link_array<Score_element> arpeggios_;
Link_array<Note_req> mel_l_arr_;
Link_array<Score_element> support_l_arr_;
{
SCM localsig = get_property ("localKeySignature");
- SCM f = get_property ("forgetAccidentals");
- bool forget = to_boolean (f);
for (int i=0; i < mel_l_arr_.size(); i++)
{
Score_element * support_l = support_l_arr_[i];
Note_req * note_l = mel_l_arr_[i];
- int n = note_l->pitch_.notename_i_;
- int o = note_l->pitch_.octave_i_;
- int a = note_l->pitch_.accidental_i_;
+ int n = unsmob_pitch (note_l->get_mus_property ("pitch"))->notename_i_;
+ int o = unsmob_pitch (note_l->get_mus_property ("pitch"))->octave_i () ;
+ int a = unsmob_pitch (note_l->get_mus_property ("pitch"))->alteration_i_;
/* see if there's a tie that "changes" the accidental */
/* works because if there's a tie, the note to the left
bool different = prev_acc != a;
bool tie_changes = tied_l_arr_.find_l (support_l) && different;
- if (!forget
- && (note_l->forceacc_b_ || different)
- && !tie_changes)
+ if ((to_boolean (note_l->get_mus_property ("force-accidental"))
+ || different) && !tie_changes)
{
if (!key_item_p_)
{
- key_item_p_ = new Local_key_item (get_property ("basicLocalKeyProperties"));
- Side_position::set_axis (key_item_p_, X_AXIS);
- Side_position::set_direction (key_item_p_, LEFT);
+ key_item_p_ = new Item(get_property ("Accidentals"));
+ Local_key_item::set_interface (key_item_p_);
+
+
Staff_symbol_referencer::set_interface (key_item_p_);
- announce_element (Score_element_info (key_item_p_, 0));
+ announce_element (key_item_p_, 0);
}
sign (prev_acc) * (prev_acc - a) == 1
&& abs(prev_acc) == 2;
- key_item_p_->add_pitch (note_l->pitch_,
- note_l->cautionary_b_,
- extra_natural);
+ Local_key_item::add_pitch (key_item_p_, *unsmob_pitch (note_l->get_mus_property ("pitch")),
+ to_boolean (note_l->get_mus_property ("cautionary")),
+ extra_natural);
Side_position::add_support (key_item_p_,support_l);
}
- if (!forget)
+ /*
+ We should not record the accidental if it is the first
+ note and it is tied from the previous measure.
+
+ Checking whether it is tied also works mostly, but will it
+ always do the correct thing?
+
+ */
+ bool forget = to_boolean (get_property ("forgetAccidentals"));
+ if (!forget && !tie_changes)
{
+ /*
+ not really really correct if there are more than one
+ noteheads with the same notename.
+ */
localsig = scm_assoc_set_x (localsig, gh_cons (gh_int2scm (o),
gh_int2scm (n)),
gh_int2scm (a));
-#if 0
- /*
- TESTME!
- */
- if (!tied_l_arr_.find_l (support_l))
- {
- local_key_.clear_internal_forceacc (note_l->pitch_);
- }
- else if (tie_changes)
- {
- local_key_.set_internal_forceacc (note_l->pitch_);
- }
-#endif
}
}
- daddy_trans_l_->set_property ("localKeySignature", localsig);
+ daddy_trans_l_->set_property ("localKeySignature", localsig);
}
- /*
- */
if (key_item_p_ && grace_align_l_)
{
Side_position::add_support (grace_align_l_,key_item_p_);
grace_align_l_ =0;
}
-
+
+ if (key_item_p_)
+ {
+ /*
+ Hmm. Which one has to be on the left?
+
+ On which left, code or paper?
+
+ (Arpeggios are engraved left of accidentals, of course.)
+ */
+ for (int i=0; i < arpeggios_.size (); i++)
+ Side_position::add_support (arpeggios_[i], key_item_p_);
+
+ arpeggios_.clear ();
+ }
}
void
grace_align_l_ = 0;
mel_l_arr_.clear();
+ arpeggios_.clear ();
tied_l_arr_.clear();
support_l_arr_.clear();
forced_l_arr_.clear();
{
tied_l_arr_.push (Tie::head (info.elem_l_, RIGHT));
}
+ else if (Arpeggio::has_interface (info.elem_l_))
+ {
+ arpeggios_.push (info.elem_l_);
+ }
+
}
/*
Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
SCM sig = get_property ("keySignature");
- if (!mp)
- {
- if (!to_boolean (get_property ("noResetKey")))
- daddy_trans_l_->set_property ("localKeySignature", ly_deep_copy (sig));
- }
- else if (last_keysig_ != sig)
+
+ /*
+ Detect key sig changes. If we haven't found any, check if at start
+ of measure, and set localKeySignature anyhow. */
+ if (last_keysig_ != sig)
{
daddy_trans_l_->set_property ("localKeySignature", ly_deep_copy (sig));
last_keysig_ = sig;
}
+ else if (!mp)
+ {
+ if (!to_boolean (get_property ("noResetKey")))
+ daddy_trans_l_->set_property ("localKeySignature", ly_deep_copy (sig));
+ }
}
projects / lilypond.git / blobdiff