source file of the GNU LilyPond music typesetter
- (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
Modified 2001--2002 by Rune Zedeler <rz@daimi.au.dk>
*/
void create_accidental (Accidental_entry *entry, bool, bool);
Grob *make_standard_accidental (Music *note, Grob *note_head, Engraver *trans);
Grob *make_suggested_accidental (Music *note, Grob *note_head, Engraver *trans);
-
+
protected:
TRANSLATOR_DECLARATIONS (Accidental_engraver);
- PRECOMPUTED_VIRTUAL void process_music ();
- virtual void acknowledge_grob (Grob_info);
- PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
+ void process_music ();
+
+ void acknowledge_tie (Grob_info);
+ void acknowledge_arpeggio (Grob_info);
+ void acknowledge_rhythmic_head (Grob_info);
+ void acknowledge_finger (Grob_info);
+
+ void stop_translation_timestep ();
virtual void initialize ();
- PRECOMPUTED_VIRTUAL void process_acknowledged ();
+ void process_acknowledged ();
virtual void finalize ();
virtual void derived_mark () const;
Array<Accidental_entry> accidentals_;
Link_array<Spanner> ties_;
-
-
};
/*
those.
*/
-static void
-set_property_on_children (Context *trans, char const *sym, SCM val)
-{
- trans->set_property (sym, ly_deep_copy (val));
- for (SCM p = trans->children_contexts (); scm_is_pair (p); p = scm_cdr (p))
- {
- Context *trg = unsmob_context (scm_car (p));
- set_property_on_children (trg, sym, ly_deep_copy (val));
- }
-}
Accidental_engraver::Accidental_engraver ()
{
Accidental_engraver::update_local_key_signature ()
{
last_keysig_ = get_property ("keySignature");
- set_property_on_children (context (), "localKeySignature", last_keysig_);
+ set_context_property_on_children (context (),
+ ly_symbol2scm ("localKeySignature"),
+ last_keysig_);
Context *trans = context ()->get_parent_context ();
/* Huh. Don't understand what this is good for. --hwn. */
- while (trans && trans->where_defined (ly_symbol2scm ("localKeySignature")))
+
+ SCM val;
+ while (trans && trans->where_defined (ly_symbol2scm ("localKeySignature"), &val))
{
trans->set_property ("localKeySignature", ly_deep_copy (last_keysig_));
trans = trans->get_parent_context ();
SCM previous_alteration = SCM_BOOL_F;
- SCM from_same_octave = ly_assoc_get (scm_cons (scm_int2num (o),
- scm_int2num (n)), sig, SCM_BOOL_F);
- SCM from_key_signature = ly_assoc_get (scm_int2num (n), sig, SCM_BOOL_F);
+ SCM from_same_octave = ly_assoc_get (scm_cons (scm_from_int (o),
+ scm_from_int (n)), sig, SCM_BOOL_F);
+ SCM from_key_signature = ly_assoc_get (scm_from_int (n), sig, SCM_BOOL_F);
SCM from_other_octaves = SCM_BOOL_F;
for (SCM s = sig; scm_is_pair (s); s = scm_cdr (s))
{
SCM entry = scm_car (s);
if (scm_is_pair (scm_car (entry))
- && scm_cdar (entry) == scm_int2num (n))
+ && scm_cdar (entry) == scm_from_int (n))
from_other_octaves = scm_cdr (entry);
}
if (from_same_octave != SCM_BOOL_F
&& recent_enough (bar_number, from_same_octave, laziness))
- {
- previous_alteration = from_same_octave;
- }
+ previous_alteration = from_same_octave;
else if (ignore_octave
&& from_other_octaves != SCM_BOOL_F
&& recent_enough (bar_number, from_other_octaves, laziness))
- {
- previous_alteration = from_other_octaves;
- }
+ previous_alteration = from_other_octaves;
else if (from_key_signature != SCM_BOOL_F)
- {
- previous_alteration = from_key_signature;
- }
+ previous_alteration = from_key_signature;
int num = 1;
if (is_tied (previous_alteration))
if (alter == prev)
num = 0;
- else if ((abs (alter) < abs (prev) || prev * alter < 0) && alter != 0)
+ else if ((abs (alter) < abs (prev)
+ || prev * alter < 0) && alter != 0)
num = 2;
*different = (alter != prev);
}
/* Cannot look for ties: it's not guaranteed that they reach
us before the notes. */
if (num)
- {
- create_accidental (&accidentals_[i], num > 1, cautionary);
- }
+ create_accidental (&accidentals_[i], num > 1, cautionary);
}
}
}
Music *note = entry->melodic_;
Grob *support = entry->head_;
Pitch *pitch = unsmob_pitch (note->get_property ("pitch"));
-
-
- bool as_suggestion = get_property ("suggestAccidentals");
+
+ bool as_suggestion = to_boolean (entry->origin_->get_property ("suggestAccidentals"));
Grob *a = 0;
if (as_suggestion)
a = make_suggested_accidental (note, support, entry->origin_engraver_);
else
a = make_standard_accidental (note, support, entry->origin_engraver_);
-
- SCM accs = scm_cons (scm_int2num (pitch->get_alteration ()),
+
+ SCM accs = scm_cons (scm_from_int (pitch->get_alteration ()),
SCM_EOL);
if (restore_natural)
{
if (to_boolean (get_property ("extraNatural")))
- accs = scm_cons (scm_int2num (0), accs);
+ accs = scm_cons (scm_from_int (0), accs);
}
-
+
/* TODO: add cautionary option in accidental. */
if (cautionary)
a->set_property ("cautionary", SCM_BOOL_T);
-
a->set_property ("accidentals", accs);
entry->accidental_ = a;
}
Grob *support,
Engraver *trans)
{
-
+
/*
We construct the accidentals at the originating Voice
level, so that we get the property settings for
accidental_placement_ = make_item ("AccidentalPlacement",
a->self_scm ());
Accidental_placement::add_accidental (accidental_placement_, a);
-
+
support->set_object ("accidental-grob", a->self_scm ());
return a;
}
-
Grob *
Accidental_engraver::make_suggested_accidental (Music *note,
- Grob *note_head, Engraver *trans)
+ Grob *note_head, Engraver *trans)
{
-
+
Grob *a
= make_grob_from_properties (trans,
ly_symbol2scm ("AccidentalSuggestion"),
note->self_scm (),
"AccidentalSuggestion");
-
Side_position_interface::add_support (a, note_head);
if (Grob *stem = unsmob_grob (a->get_object ("stem")))
- {
- Side_position_interface::add_support (a, stem);
- }
+ Side_position_interface::add_support (a, stem);
a->set_parent (note_head, X_AXIS);
return a;
}
-
void
Accidental_engraver::finalize ()
{
int n = pitch->get_notename ();
int o = pitch->get_octave ();
int a = pitch->get_alteration ();
- SCM key = scm_cons (scm_int2num (o), scm_int2num (n));
+ SCM key = scm_cons (scm_from_int (o), scm_from_int (n));
+ SCM localsig = SCM_EOL;
while (origin
- && origin->where_defined (ly_symbol2scm ("localKeySignature")))
+ && origin->where_defined (ly_symbol2scm ("localKeySignature"), &localsig))
{
- /*
- huh? we set props all the way to the top?
- */
- SCM localsig = origin->get_property ("localKeySignature");
bool change = false;
if (accidentals_[i].tied_)
{
that of the tied note and of the key signature.
*/
localsig = ly_assoc_front_x
- (localsig, key, scm_cons (SCM_BOOL_T, scm_int2num (barnum)));
+ (localsig, key, scm_cons (SCM_BOOL_T, scm_from_int (barnum)));
change = true;
}
noteheads with the same notename.
*/
localsig = ly_assoc_front_x (localsig, key,
- scm_cons (scm_int2num (a),
- scm_int2num (barnum)));
+ scm_cons (scm_from_int (a),
+ scm_from_int (barnum)));
change = true;
}
}
void
-Accidental_engraver::acknowledge_grob (Grob_info info)
+Accidental_engraver::acknowledge_rhythmic_head (Grob_info info)
{
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"))
{
/*
String harmonics usually don't have accidentals.
- */
+ */
if (to_boolean (get_property ("harmonicAccidentals"))
|| !ly_is_equal (info.grob ()->get_property ("style"),
- ly_symbol2scm ("harmonic")))
+ ly_symbol2scm ("harmonic")))
{
Accidental_entry entry;
entry.head_ = info.grob ();
accidentals_.push (entry);
}
}
- else if (Tie::has_interface (info.grob ()))
- ties_.push (dynamic_cast<Spanner *> (info.grob ()));
- else if (Arpeggio::has_interface (info.grob ()))
- left_objects_.push (info.grob ());
- else if (info.grob ()
- ->internal_has_interface (ly_symbol2scm ("finger-interface")))
- left_objects_.push (info.grob ());
+}
+
+void
+Accidental_engraver::acknowledge_tie (Grob_info info)
+{
+ ties_.push (dynamic_cast<Spanner *> (info.grob ()));
+}
+
+void
+Accidental_engraver::acknowledge_arpeggio (Grob_info info)
+{
+ left_objects_.push (info.grob ());
+}
+
+void
+Accidental_engraver::acknowledge_finger (Grob_info info)
+{
+ left_objects_.push (info.grob ());
}
void
update_local_key_signature ();
}
+ADD_ACKNOWLEDGER (Accidental_engraver, arpeggio);
+ADD_ACKNOWLEDGER (Accidental_engraver, finger);
+ADD_ACKNOWLEDGER (Accidental_engraver, rhythmic_head);
+ADD_ACKNOWLEDGER (Accidental_engraver, tie);
+
ADD_TRANSLATOR (Accidental_engraver,
"Make accidentals. "
"Catch note heads, ties and notices key-change events. "
"Accidental AccidentalSuggestion",
"",
-
- /* acks */
- "arpeggio-interface "
- "finger-interface "
- "rhythmic-head-interface "
- "tie-interface ",
"autoAccidentals "
"autoCautionaries "
projects / lilypond.git / blobdiff