/*
accidental-engraver.cc -- implement accidental_engraver
- (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
- Modified 2001-2002 by Rune Zedeler <rz@daimi.au.dk>
+ (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ Modified 2001--2002 by Rune Zedeler <rz@daimi.au.dk>
*/
-#include "musical-request.hh"
-#include "command-request.hh"
+#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 "protected-scm.hh"
/**
struct Accidental_entry {
bool done_;
- Note_req * melodic_;
+ Music * melodic_;
Grob * accidental_;
Translator_group *origin_;
Grob* head_;
virtual void finalize ();
public:
- /*
- TODO -> property.
-
- This is not a property, and it is not protected. This poses a
- very small risk of the value being GC'd from under us.
- */
- SCM last_keysig_;
+ Protected_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<Grob> arpeggios_;
+ Link_array<Grob> left_objects_;
+ Link_array<Grob> right_objects_;
Grob * accidental_placement_;
-
/*
The next
*/
Array<Accidental_entry> accidentals_;
-
Link_array<Grob> ties_;
-
-
};
-static void set_property_on_children (Translator_group * trans, const char * sym, SCM val)
+static void
+set_property_on_children (Translator_group * 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)) {
+ 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));
}
*/
static int
-number_accidentals (SCM sig, Note_req * 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->notename_;
- int o = pitch->octave_;
- int a = pitch->alteration_;
+ int n = pitch->get_notename ();
+ int o = pitch->get_octave();
+ int a = pitch->get_alteration ();
int curbarnum_i = gh_scm2int (curbarnum);
int accbarnum_i = 0;
if (ignore_octave_b)
prev = ly_assoc_cdr (scm_int2num (n), sig);
else
- prev = gh_assoc (gh_cons (scm_int2num (o), scm_int2num (n)), sig);
+ prev = scm_assoc (gh_cons (scm_int2num (o), scm_int2num (n)), sig);
/* should really be true unless prev == SCM_BOOL_F */
if (gh_pair_p (prev) && gh_pair_p (ly_cdr (prev)))
/* If an accidental was not found or the accidental was too old */
if (prev == SCM_BOOL_F ||
(gh_number_p (lazyness) && curbarnum_i > accbarnum_i + gh_scm2int (lazyness)))
- prev = gh_assoc (scm_int2num (n), sig);
+ prev = scm_assoc (scm_int2num (n), sig);
SCM prev_acc = (prev == SCM_BOOL_F) ? scm_int2num (0) : ly_cdr (prev);
int p = gh_number_p (prev_acc) ? gh_scm2int (prev_acc) : 0;
int num;
- if (a == p
- && !to_boolean (note->get_mus_property ("force-accidental"))
- && gh_number_p (prev_acc))
+ if (a == p && gh_number_p (prev_acc))
num = 0;
else if ( (abs (a)<abs (p) || p*a<0) && a != 0 )
num = 2;
}
static int
-number_accidentals (Note_req * note, Pitch *pitch, Translator_group * origin,
+number_accidentals (Music * note, Pitch *pitch, Translator_group * 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_;
+ Translator_group * dad = origin;
+ while (dad && !dad->is_alias (rule))
+ dad = dad->daddy_trans_;
- 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;
}
SCM barnum = get_property ("currentBarNumber");
SCM smp = get_property("measurePosition");
Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
- if(mp<0 && gh_number_p(barnum)) barnum = scm_int2num(gh_scm2int(barnum)-1);
+ if(mp.main_part_<Rational(0) && gh_number_p(barnum)) barnum = scm_int2num(gh_scm2int(barnum)-1);
bool extra_natural_b = get_property ("extraNatural") == SCM_BOOL_T;
for (int i = 0; i < accidentals_.size (); i++)
{
continue;
accidentals_[i].done_ = true;
Grob * support = accidentals_[i].head_;
- Note_req * note = accidentals_[i].melodic_;
+ Music * note = accidentals_[i].melodic_;
Translator_group * 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"));
num = num_caut;
cautionary = true;
}
+
+ if(num==0 && to_boolean (note->get_mus_property ("force-accidental")))
+ num=1;
bool different = num < 0;
num = abs (num);
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());
}
announce_grob (a, SCM_EOL);
- SCM accs = gh_cons (scm_int2num (pitch->alteration_), SCM_EOL);
+ SCM accs = gh_cons (scm_int2num (pitch->get_alteration ()), SCM_EOL);
if (num == 2 && extra_natural_b)
accs = gh_cons (scm_int2num (0), accs);
accidentals.
*/
- for (int i = 0; i < arpeggios_.size (); i++)
- Side_position_interface::add_support (arpeggios_[i], a);
+ for (int i = 0; i < left_objects_.size (); i++)
+ Side_position_interface::add_support (left_objects_[i], a);
+ for (int i = 0; i < right_objects_.size (); i++)
+ Side_position_interface::add_support (a, right_objects_[i]);
}
*/
- int n = pitch->notename_;
- int o = pitch->octave_;
- int a = pitch->alteration_;
+ int n = pitch->get_notename ();
+ int o = pitch->get_octave ();
+ int a = pitch->get_alteration ();
SCM on_s = gh_cons (scm_int2num (o), scm_int2num (n));
/*
void
Accidental_engraver::finalize ()
{
-
+ last_keysig_ = SCM_EOL;
}
void
accidental_placement_ = 00;
accidentals_.clear();
- arpeggios_.clear ();
+ left_objects_.clear ();
+ right_objects_.clear ();
ties_.clear ();
}
void
Accidental_engraver::acknowledge_grob (Grob_info info)
{
- Note_req * note = dynamic_cast <Note_req *> (info.music_cause ());
+ Music * note = info.music_cause ();
- if (note && Rhythmic_head::has_interface (info.grob_))
+ if (note
+ && note->is_mus_type("note-event")
+ && Rhythmic_head::has_interface (info.grob_))
{
Accidental_entry entry ;
entry.head_ = info.grob_;
}
else if (Arpeggio::has_interface (info.grob_))
{
- arpeggios_.push (info.grob_);
+ left_objects_.push (info.grob_);
+ }
+ else if (info.grob_->internal_has_interface (ly_symbol2scm("finger-interface")))
+ {
+ left_objects_.push (info.grob_);
}
-
}
void
ENTER_DESCRIPTION (Accidental_engraver,
-"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.",
-
+"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.",
"Accidental",
- "rhythmic-head-interface tie-interface arpeggio-interface",
+/* accepts */ "",
+ "finger-interface rhythmic-head-interface tie-interface arpeggio-interface",
"localKeySignature extraNatural autoAccidentals autoCautionaries",
"localKeySignature");
projects / lilypond.git / blobdiff