/*
accidental-engraver.cc -- implement accidental_engraver
- (c) 1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Modified 2001--2002 by Rune Zedeler <rz@daimi.au.dk>
*/
#include "event.hh"
+
#include "item.hh"
#include "tie.hh"
#include "rhythmic-head.hh"
#include "engraver.hh"
#include "arpeggio.hh"
#include "warn.hh"
-#include "translator-group.hh"
+#include "context.hh"
+#include "protected-scm.hh"
/**
-
-FIXME: should not compute vertical positioning of accidentals, but
-get them from the noteheads
-
The algorithm for accidentals should be documented, and made
tweakable.
bool done_;
Music * melodic_;
Grob * accidental_;
- Translator_group *origin_;
+ Context *origin_;
Grob* head_;
Accidental_entry();
};
static void
-set_property_on_children (Translator_group * trans, const char * sym, SCM val)
+set_property_on_children (Context * trans, const char * sym, SCM val)
{
trans->set_property (sym, val);
- for (SCM p = trans -> trans_group_list_; gh_pair_p (p); p = ly_cdr(p)) {
- Translator_group *trg = dynamic_cast<Translator_group*> (unsmob_translator (ly_car (p)));
- set_property_on_children(trg,sym,ly_deep_copy(val));
- }
+ for (SCM p = trans->context_list_; gh_pair_p (p); p = ly_cdr(p))
+ {
+ Context *trg = unsmob_context (ly_car (p));
+ set_property_on_children(trg, sym, ly_deep_copy(val));
+ }
}
Accidental_engraver::Accidental_engraver ()
{
last_keysig_ = get_property ("keySignature");
- Translator_group * trans_ = daddy_trans_;
+ Context * trans_ = daddy_context_;
while (trans_)
{
- trans_ -> set_property ("localKeySignature", ly_deep_copy (last_keysig_));
- trans_ = trans_->daddy_trans_;
+ trans_ -> set_property ("localKeySignature",
+ ly_deep_copy (last_keysig_));
+ trans_ = trans_->daddy_context_;
}
- set_property_on_children (daddy_trans_,"localKeySignature", last_keysig_);
+ set_property_on_children (daddy_context_,"localKeySignature", last_keysig_);
}
/*
*/
static int
-number_accidentals (SCM sig, Music * note, Pitch *pitch, SCM curbarnum, SCM lazyness,
+number_accidentals_from_sig (SCM sig, Music *, Pitch *pitch, SCM curbarnum, SCM lazyness,
bool ignore_octave_b)
{
int n = pitch->get_notename ();
}
static int
-number_accidentals (Music * note, Pitch *pitch, Translator_group * origin,
+number_accidentals (Music * note, Pitch *pitch, Context * origin,
SCM accidentals, SCM curbarnum)
{
int number = 0;
warning (_f ("Accidental typesetting list must begin with context-name: %s",
ly_scm2string (ly_car (accidentals)).to_str0 ()));
- while (gh_pair_p (accidentals) && origin)
+ for (; gh_pair_p (accidentals) && origin; accidentals = gh_cdr (accidentals))
{
// If pair then it is a new accidentals typesetting rule to be checked
- if (gh_pair_p (ly_car (accidentals)))
+ SCM rule = gh_car (accidentals);
+ if (gh_pair_p (rule))
{
- SCM type = gh_caar (accidentals);
- SCM lazyness = gh_cdar (accidentals);
+ SCM type = gh_car (rule);
+ SCM lazyness = gh_cdr (rule);
SCM localsig = origin->get_property ("localKeySignature");
bool same_octave_b =
if (same_octave_b || any_octave_b)
{
- int n = number_accidentals
+ int n = number_accidentals_from_sig
(localsig, note, pitch, curbarnum, lazyness, any_octave_b);
diff = diff || (n < 0);
number = max (number, abs (n));
/*
if symbol then it is a context name. Scan parent contexts to find it.
*/
- else if (gh_symbol_p (ly_car (accidentals)))
+ else if (gh_symbol_p (rule))
{
- String context = ly_symbol2string (ly_car (accidentals));
-
- while (origin && !origin->is_alias_b (context))
- origin = origin->daddy_trans_;
+ Context * dad = origin;
+ while (dad && !dad->is_alias (rule))
+ dad = dad->daddy_context_;
- if (!origin)
- warning (_f ("Symbol is not a parent context: %s. Ignored",
- context.to_str0 ()));
+ if (dad)
+ origin = dad;
}
- else warning (_f ("Accidental typesetting must be pair or context-name: %s",
- ly_scm2string (ly_car (accidentals)).to_str0 ()));
-
- accidentals = ly_cdr (accidentals);
+ else warning (_f ("Accidental rule must be pair or context-name; Found %s",
+ ly_scm2string (rule).to_str0 ()));
}
+
return diff ? -number : number;
}
accidentals_[i].done_ = true;
Grob * support = accidentals_[i].head_;
Music * note = accidentals_[i].melodic_;
- Translator_group * origin = accidentals_[i].origin_;
+ Context * origin = accidentals_[i].origin_;
Pitch * pitch = unsmob_pitch (note->get_mus_property ("pitch"));
+ if (!pitch)
+ continue;
+
int num = number_accidentals (note, pitch, origin, accidentals, barnum);
int num_caut = number_accidentals (note, pitch, origin, cautionaries, barnum);
bool cautionary = to_boolean (note->get_mus_property ("cautionary"));
if (num)
{
- Grob * a = new Item (get_property ("Accidental"));
+ Grob * a = make_item ("Accidental");
a->set_parent (support, Y_AXIS);
if (!accidental_placement_)
{
- accidental_placement_ = new Item (get_property ("AccidentalPlacement"));
+ accidental_placement_ = make_item ("AccidentalPlacement");
announce_grob (accidental_placement_, a->self_scm());
}
(localsig, on_s, gh_cons (scm_int2num (a), barnum));
}
origin->set_property ("localKeySignature", localsig);
- origin = origin->daddy_trans_;
+ origin = origin->daddy_context_;
}
}
}
void
Accidental_engraver::finalize ()
{
-
+ /*
+ Must reset, since Accidental_engraver is GCd.
+ */
+ last_keysig_ = SCM_EOL;
}
void
Music * note = info.music_cause ();
if (note
- && note->is_mus_type("note-event")
- && Rhythmic_head::has_interface (info.grob_))
+ && note->is_mus_type ("note-event")
+ && Rhythmic_head::has_interface (info.grob_)
+ && !gh_equal_p (info.grob_->get_grob_property ("style"), ly_symbol2scm ("harmonic"))
+ )
{
Accidental_entry entry ;
entry.head_ = info.grob_;
- entry.origin_ = info.origin_trans_->daddy_trans_;
+ entry.origin_ = info.origin_trans_->daddy_context_;
entry.melodic_ = note;
accidentals_.push (entry);
*/
if (last_keysig_ != sig)
{
- Translator_group * trans_ = daddy_trans_;
+ Context * trans_ = daddy_context_;
while (trans_)
{
trans_ -> set_property ("localKeySignature", ly_deep_copy (sig));
- trans_ = trans_->daddy_trans_;
+ trans_ = trans_->daddy_context_;
}
- set_property_on_children(daddy_trans_,"localKeySignature", sig);
+ set_property_on_children(daddy_context_,"localKeySignature", sig);
last_keysig_ = sig;
}
projects / lilypond.git / blobdiff