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>
*/
#include "arpeggio.hh"
#include "context.hh"
#include "engraver.hh"
+#include "international.hh"
+#include "music.hh"
+#include "pitch.hh"
#include "protected-scm.hh"
#include "rhythmic-head.hh"
#include "side-position-interface.hh"
#include "tie.hh"
#include "warn.hh"
-#include "music.hh"
-#include "pitch.hh"
#include "translator.icc"
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);
void process_music ();
void acknowledge_arpeggio (Grob_info);
void acknowledge_rhythmic_head (Grob_info);
void acknowledge_finger (Grob_info);
-
+
void stop_translation_timestep ();
virtual void initialize ();
void process_acknowledged ();
to store all information before we can really create the
accidentals.
*/
- Link_array<Grob> left_objects_;
- Link_array<Grob> right_objects_;
+ vector<Grob*> left_objects_;
+ vector<Grob*> right_objects_;
Grob *accidental_placement_;
- Array<Accidental_entry> accidentals_;
- Link_array<Spanner> ties_;
-
-
+ vector<Accidental_entry> accidentals_;
+ vector<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 ();
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);
}
*different = false;
if (scm_is_pair (accidentals) && !scm_is_symbol (scm_car (accidentals)))
warning (_f ("accidental typesetting list must begin with context-name: %s",
- ly_scm2string (scm_car (accidentals)).to_str0 ()));
+ ly_scm2string (scm_car (accidentals)).c_str ()));
for (; scm_is_pair (accidentals) && origin;
accidentals = scm_cdr (accidentals))
}
else
warning (_f ("ignoring unknown accidental: %s",
- ly_symbol2string (type).to_str0 ()));
+ ly_symbol2string (type).c_str ()));
}
/* if symbol then it is a context name. Scan parent contexts to
}
else
warning (_f ("pair or context-name expected for accidental rule, found %s",
- ly_scm2string (rule).to_str0 ()));
+ ly_scm2string (rule).c_str ()));
}
return number;
void
Accidental_engraver::process_acknowledged ()
{
- if (accidentals_.size () && !accidentals_.top ().done_)
+ if (accidentals_.size () && !accidentals_.back ().done_)
{
SCM accidentals = get_property ("autoAccidentals");
SCM cautionaries = get_property ("autoCautionaries");
int barnum = get_bar_number ();
- for (int i = 0; i < accidentals_.size (); i++)
+ for (vsize i = 0; i < accidentals_.size (); i++)
{
if (accidentals_[i].done_)
continue;
/* 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 = 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_from_int (pitch->get_alteration ()),
SCM_EOL);
if (restore_natural)
if (to_boolean (get_property ("extraNatural")))
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 *
Accidental_engraver::make_standard_accidental (Music *note,
- Grob *support,
+ Grob *note_head,
Engraver *trans)
{
-
+
+ (void)note;
/*
We construct the accidentals at the originating Voice
level, so that we get the property settings for
Grob *a
= make_grob_from_properties (trans,
ly_symbol2scm ("Accidental"),
- note->self_scm (),
+ note_head->self_scm (),
"Accidental");
/*
We add the accidentals to the support of the arpeggio,
so it is put left of the accidentals.
*/
- 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++)
+ for (vsize i = 0; i < left_objects_.size (); i++)
+ {
+ if (left_objects_[i]->get_property ("side-axis") == scm_from_int (X_AXIS))
+ Side_position_interface::add_support (left_objects_[i], a);
+ }
+
+ /*
+ Hmm. Junkme?
+ */
+ for (vsize i = 0; i < right_objects_.size (); i++)
Side_position_interface::add_support (a, right_objects_[i]);
- a->set_parent (support, Y_AXIS);
+ a->set_parent (note_head, Y_AXIS);
if (!accidental_placement_)
accidental_placement_ = make_item ("AccidentalPlacement",
a->self_scm ());
Accidental_placement::add_accidental (accidental_placement_, a);
-
- support->set_object ("accidental-grob", a->self_scm ());
+
+ note_head->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)
{
-
+ (void) note;
Grob *a
= make_grob_from_properties (trans,
ly_symbol2scm ("AccidentalSuggestion"),
- note->self_scm (),
+ note_head->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 ()
{
void
Accidental_engraver::stop_translation_timestep ()
{
- for (int j = ties_.size (); j--;)
+ for (vsize j = ties_.size (); j--;)
{
Grob *r = Tie::head (ties_[j], RIGHT);
- for (int i = accidentals_.size (); i--;)
+ for (vsize i = accidentals_.size (); i--;)
if (accidentals_[i].head_ == r)
{
if (Grob *g = accidentals_[i].accidental_)
g->set_object ("tie", ties_[j]->self_scm ());
accidentals_[i].tied_ = true;
}
- ties_.del (j);
+ ties_.erase (ties_.begin () + j);
break;
}
}
- for (int i = accidentals_.size (); i--;)
+ for (vsize i = accidentals_.size (); i--;)
{
int barnum = get_bar_number ();
{
Music *note = info.music_cause ();
if (note
- && note->is_mus_type ("note-event"))
+ && (note->is_mus_type ("note-event")
+ || note->is_mus_type ("trill-span-event")))
{
/*
- String harmonics usually don't have accidentals.
- */
+ 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 ();
entry.origin_ = entry.origin_engraver_->context ();
entry.melodic_ = note;
- accidentals_.push (entry);
+ accidentals_.push_back (entry);
}
}
}
void
Accidental_engraver::acknowledge_tie (Grob_info info)
{
- ties_.push (dynamic_cast<Spanner *> (info.grob ()));
+ ties_.push_back (dynamic_cast<Spanner *> (info.grob ()));
}
void
Accidental_engraver::acknowledge_arpeggio (Grob_info info)
{
- left_objects_.push (info.grob ());
+ left_objects_.push_back (info.grob ());
}
void
Accidental_engraver::acknowledge_finger (Grob_info info)
{
- left_objects_.push (info.grob ());
+ left_objects_.push_back (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_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. "
"This engraver usually lives at Staff level, but "
projects / lilypond.git / blobdiff