/*
- accidental-engraver.cc -- implement accidental_engraver
+ This file is part of LilyPond, the GNU music typesetter.
- source file of the GNU LilyPond music typesetter
-
- (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
Modified 2001--2002 by Rune Zedeler <rz@daimi.au.dk>
+
+ LilyPond is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ LilyPond is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
*/
#include "accidental-placement.hh"
#include "arpeggio.hh"
#include "context.hh"
+#include "duration.hh"
#include "engraver.hh"
+#include "international.hh"
+#include "item.hh"
+#include "pitch.hh"
#include "protected-scm.hh"
#include "rhythmic-head.hh"
+#include "separation-item.hh"
#include "side-position-interface.hh"
+#include "spanner.hh"
+#include "stream-event.hh"
#include "tie.hh"
#include "warn.hh"
-#include "music.hh"
-#include "pitch.hh"
#include "translator.icc"
{
public:
bool done_;
- Music *melodic_;
+ Stream_event *melodic_;
Grob *accidental_;
Context *origin_;
Engraver *origin_engraver_;
melodic_ = 0;
accidental_ = 0;
origin_ = 0;
+ origin_engraver_ = 0;
head_ = 0;
}
class Accidental_engraver : public Engraver
{
- int get_bar_number ();
- void update_local_key_signature ();
+ void update_local_key_signature (SCM new_signature);
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);
-
+ Grob *make_standard_accidental (Stream_event *note, Grob *note_head, Engraver *trans, bool);
+ Grob *make_suggested_accidental (Stream_event *note, Grob *note_head, Engraver *trans);
+
protected:
TRANSLATOR_DECLARATIONS (Accidental_engraver);
- PRECOMPUTED_VIRTUAL void process_music ();
+ void process_music ();
- void acknowledge_tie (Grob_info);
+ void acknowledge_end_tie (Grob_info);
void acknowledge_arpeggio (Grob_info);
void acknowledge_rhythmic_head (Grob_info);
void acknowledge_finger (Grob_info);
-
- PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
- virtual void initialize ();
- PRECOMPUTED_VIRTUAL void process_acknowledged ();
+ void acknowledge_note_column (Grob_info);
+
+ void stop_translation_timestep ();
+ void process_acknowledged ();
+
virtual void finalize ();
virtual void derived_mark () const;
public:
- SCM last_keysig_; // ugh.
+ 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> 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_;
+ vector<Grob *> note_columns_;
};
/*
- TODO:
-
- ugh, it is not clear what properties are mutable and which
- aren't. eg. localKeySignature is changed at runtime, which means
- that references in grobs should always store ly_deep_copy ()s of
- those.
+ localAlterations is changed at runtime, which means that references
+ in grobs should always store ly_deep_copy ()s of 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::Accidental_engraver (Context *c)
+ : Engraver (c)
{
accidental_placement_ = 0;
last_keysig_ = SCM_EOL;
}
void
-Accidental_engraver::update_local_key_signature ()
+Accidental_engraver::update_local_key_signature (SCM new_sig)
{
- last_keysig_ = get_property ("keySignature");
- set_property_on_children (context (), "localKeySignature", last_keysig_);
+ last_keysig_ = new_sig;
+ set_context_property_on_children (context (),
+ ly_symbol2scm ("localAlterations"),
+ new_sig);
Context *trans = context ()->get_parent_context ();
- /* Huh. Don't understand what this is good for. --hwn. */
+ /*
+ Reset parent contexts so that e.g. piano-accidentals won't remember old
+ cross-staff accidentals after key-sig-changes.
+ */
SCM val;
- while (trans && trans->where_defined (ly_symbol2scm ("localKeySignature"), &val))
+ while (trans && trans->here_defined (ly_symbol2scm ("localAlterations"), &val))
{
- trans->set_property ("localKeySignature", ly_deep_copy (last_keysig_));
+ trans->set_property ("localAlterations", ly_deep_copy (last_keysig_));
trans = trans->get_parent_context ();
}
}
-void
-Accidental_engraver::initialize ()
-{
- update_local_key_signature ();
-}
-
-/** Calculate the number of accidentals on basis of the current local key
- sig (passed as argument)
-
- * First check step+octave (taking into account barnumbers if necessary).
-
- * Then check the global signature (only step).
-
- Return number of accidentals (0, 1 or 2). */
-
-static bool
-recent_enough (int bar_number, SCM alteration_def, SCM laziness)
-{
- if (scm_is_number (alteration_def)
- || laziness == SCM_BOOL_T)
- return true;
-
- return (bar_number <= scm_to_int (scm_cdr (alteration_def)) + scm_to_int (laziness));
-}
-
-static int
-extract_alteration (SCM alteration_def)
-{
- if (scm_is_number (alteration_def))
- return scm_to_int (alteration_def);
- else if (scm_is_pair (alteration_def))
- return scm_to_int (scm_car (alteration_def));
- else if (alteration_def == SCM_BOOL_F)
- return 0;
- else
- assert (0);
- return 0;
-}
-
-bool
-is_tied (SCM alteration_def)
+struct Accidental_result
{
- return (alteration_def == SCM_BOOL_T)
- || (scm_is_pair (alteration_def) && scm_car (alteration_def) == SCM_BOOL_T);
-}
+ bool need_acc;
+ bool need_restore;
+
+ Accidental_result ()
+ {
+ need_restore = need_acc = false;
+ }
+
+ Accidental_result (bool restore, bool acc)
+ {
+ need_restore = restore;
+ need_acc = acc;
+ }
+
+ Accidental_result (SCM scm)
+ {
+ need_restore = to_boolean (scm_car (scm));
+ need_acc = to_boolean (scm_cdr (scm));
+ }
+
+ int score () const
+ {
+ return need_acc ? 1 : 0
+ + need_restore ? 1 : 0;
+ }
+};
-static int
-number_accidentals_from_sig (bool *different, SCM sig, Pitch *pitch,
- int bar_number, SCM laziness, bool ignore_octave)
+static
+Accidental_result
+check_pitch_against_rules (Pitch const &pitch, Context *origin,
+ SCM rules, int bar_number, SCM measurepos)
{
- int n = pitch->get_notename ();
- int o = pitch->get_octave ();
-
- 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_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))
- from_other_octaves = scm_cdr (entry);
- }
+ Accidental_result result;
+ SCM pitch_scm = pitch.smobbed_copy ();
+ SCM barnum_scm = scm_from_int (bar_number);
- if (from_same_octave != SCM_BOOL_F
- && recent_enough (bar_number, from_same_octave, laziness))
- {
- 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;
- }
- else if (from_key_signature != SCM_BOOL_F)
- {
- previous_alteration = from_key_signature;
- }
+ if (scm_is_pair (rules) && !scm_is_symbol (scm_car (rules)))
+ warning (_f ("accidental typesetting list must begin with context-name: %s",
+ ly_scm2string (scm_car (rules)).c_str ()));
- int num = 1;
- if (is_tied (previous_alteration))
- {
- num = 1;
- *different = true;
- }
- else
+ for (; scm_is_pair (rules) && origin; rules = scm_cdr (rules))
{
- int prev = extract_alteration (previous_alteration);
- int alter = pitch->get_alteration ();
-
- if (alter == prev)
- num = 0;
- else if ((abs (alter) < abs (prev) || prev * alter < 0) && alter != 0)
- num = 2;
- *different = (alter != prev);
- }
- return num;
-}
-
-static int
-number_accidentals (bool *different,
- Pitch *pitch, Context *origin,
- SCM accidentals, int bar_number)
-{
- int number = 0;
+ SCM rule = scm_car (rules);
+ if (ly_is_procedure (rule))
+ {
+ SCM rule_result_scm = scm_call_4 (rule, origin->self_scm (),
+ pitch_scm, barnum_scm, measurepos);
+ Accidental_result rule_result (rule_result_scm);
- *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 ()));
+ result.need_acc |= rule_result.need_acc;
+ result.need_restore |= rule_result.need_restore;
+ }
- for (; scm_is_pair (accidentals) && origin;
- accidentals = scm_cdr (accidentals))
- {
- // If pair then it is a new accidentals typesetting rule to be checked
- SCM rule = scm_car (accidentals);
- if (scm_is_pair (rule))
- {
- SCM type = scm_car (rule);
- SCM laziness = scm_cdr (rule);
- SCM localsig = origin->get_property ("localKeySignature");
-
- bool same_octave_b
- = scm_is_eq (ly_symbol2scm ("same-octave"), type);
- bool any_octave_b
- = scm_is_eq (ly_symbol2scm ("any-octave"), type);
-
- if (same_octave_b || any_octave_b)
- {
- bool d = false;
- int n = number_accidentals_from_sig
- (&d, localsig, pitch, bar_number, laziness, any_octave_b);
- *different = *different || d;
- number = max (number, n);
- }
- else
- warning (_f ("ignoring unknown accidental: %s",
- ly_symbol2string (type).to_str0 ()));
- }
-
- /* if symbol then it is a context name. Scan parent contexts to
- find it. */
+ /*
+ If symbol then it is a context name. Scan parent contexts to
+ find it.
+ */
else if (scm_is_symbol (rule))
- {
- Context *dad = origin;
- while (dad && !dad->is_alias (rule))
- dad = dad->get_parent_context ();
-
- if (dad)
- origin = dad;
- }
+ {
+ Context *dad = find_context_above (origin, rule);
+ if (dad)
+ origin = dad;
+ }
else
- warning (_f ("pair or context-name expected for accidental rule, found %s",
- ly_scm2string (rule).to_str0 ()));
+ warning (_f ("procedure or context-name expected for accidental rule, found %s",
+ print_scm_val (rule).c_str ()));
}
- return number;
-}
-
-int
-Accidental_engraver::get_bar_number ()
-{
- SCM barnum = get_property ("currentBarNumber");
- SCM smp = get_property ("measurePosition");
-
- int bn = robust_scm2int (barnum, 0);
-
- Moment mp = robust_scm2moment (smp, Moment (0));
- if (mp.main_part_ < Rational (0))
- bn--;
-
- return bn;
+ return result;
}
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++)
- {
- if (accidentals_[i].done_)
- continue;
- accidentals_[i].done_ = true;
-
- Music *note = accidentals_[i].melodic_;
- Context *origin = accidentals_[i].origin_;
-
- Pitch *pitch = unsmob_pitch (note->get_property ("pitch"));
- if (!pitch)
- continue;
-
- bool different = false;
- bool different_caut = false;
-
- int num = number_accidentals (&different,
- pitch, origin,
- accidentals, barnum);
- int num_caut = number_accidentals (&different_caut,
- pitch, origin,
- cautionaries, barnum);
-
- bool cautionary = to_boolean (note->get_property ("cautionary"));
-
- if (num_caut > num)
- {
- num = num_caut;
- different = different_caut;
- cautionary = true;
- }
-
- if (num == 0 && to_boolean (note->get_property ("force-accidental")))
- num = 1;
-
- /* Cannot look for ties: it's not guaranteed that they reach
- us before the notes. */
- if (num)
- {
- create_accidental (&accidentals_[i], num > 1, cautionary);
- }
- }
+ SCM accidental_rules = get_property ("autoAccidentals");
+ SCM cautionary_rules = get_property ("autoCautionaries");
+ SCM measure_position = get_property ("measurePosition");
+ int barnum = measure_number (context ());
+
+ for (vsize i = 0; i < accidentals_.size (); i++)
+ {
+ if (accidentals_[i].done_)
+ continue;
+ accidentals_[i].done_ = true;
+
+ Stream_event *note = accidentals_[i].melodic_;
+ Context *origin = accidentals_[i].origin_;
+
+ Pitch *pitch = unsmob<Pitch> (note->get_property ("pitch"));
+ if (!pitch)
+ continue;
+
+ Accidental_result acc = check_pitch_against_rules (*pitch, origin, accidental_rules,
+ barnum, measure_position);
+ Accidental_result caut = check_pitch_against_rules (*pitch, origin, cautionary_rules,
+ barnum, measure_position);
+
+ bool cautionary = to_boolean (note->get_property ("cautionary"));
+ if (caut.score () > acc.score ())
+ {
+ acc.need_acc |= caut.need_acc;
+ acc.need_restore |= caut.need_restore;
+
+ cautionary = true;
+ }
+
+ bool forced = to_boolean (note->get_property ("force-accidental"));
+ if (!acc.need_acc && forced)
+ acc.need_acc = true;
+
+ /*
+ Cannot look for ties: it's not guaranteed that they reach
+ us before the notes.
+ */
+ if (!note->in_event_class ("trill-span-event"))
+ {
+ if (acc.need_acc)
+ create_accidental (&accidentals_[i], acc.need_restore, cautionary);
+
+ if (forced || cautionary)
+ accidentals_[i].accidental_->set_property ("forced", SCM_BOOL_T);
+ }
+ }
}
}
void
Accidental_engraver::create_accidental (Accidental_entry *entry,
- bool restore_natural,
- bool cautionary)
+ bool restore_natural,
+ bool cautionary)
{
- Music *note = entry->melodic_;
+ Stream_event *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_int2num (pitch->get_alteration ()),
- SCM_EOL);
+ a = make_standard_accidental (note, support, entry->origin_engraver_, cautionary);
+
if (restore_natural)
{
if (to_boolean (get_property ("extraNatural")))
- accs = scm_cons (scm_int2num (0), accs);
+ a->set_property ("restore-first", SCM_BOOL_T);
}
-
- /* 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,
- Engraver *trans)
+Accidental_engraver::make_standard_accidental (Stream_event * /* note */,
+ Grob *note_head,
+ Engraver *trans,
+ bool cautionary)
{
-
/*
We construct the accidentals at the originating Voice
level, so that we get the property settings for
Accidental from the respective Voice.
*/
- Grob *a
- = make_grob_from_properties (trans,
- ly_symbol2scm ("Accidental"),
- note->self_scm (),
- "Accidental");
+ Grob *a = 0;
+ if (cautionary)
+ a = trans->make_item ("AccidentalCautionary", note_head->self_scm ());
+ else
+ a = trans->make_item ("Accidental", note_head->self_scm ());
/*
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 (ly_is_equal (left_objects_[i]->get_property ("side-axis"), scm_from_int (X_AXIS)))
+ Side_position_interface::add_support (left_objects_[i], a);
+ }
+
+ 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 ());
+ a->self_scm ());
+
+ Accidental_placement::add_accidental
+ (accidental_placement_, a,
+ scm_is_eq (get_property ("accidentalGrouping"), ly_symbol2scm ("voice")),
+ (long) trans);
+
+ note_head->set_object ("accidental-grob", a->self_scm ());
return a;
}
-
Grob *
-Accidental_engraver::make_suggested_accidental (Music *note,
- Grob *note_head, Engraver *trans)
+Accidental_engraver::make_suggested_accidental (Stream_event * /* note */,
+ Grob *note_head,
+ Engraver *trans)
{
-
- Grob *a
- = make_grob_from_properties (trans,
- ly_symbol2scm ("AccidentalSuggestion"),
- note->self_scm (),
- "AccidentalSuggestion");
-
-
+ Grob *a = trans->make_item ("AccidentalSuggestion", note_head->self_scm ());
+
Side_position_interface::add_support (a, note_head);
- if (Grob *stem = unsmob_grob (a->get_object ("stem")))
- {
- Side_position_interface::add_support (a, stem);
- }
+ if (Grob *stem = unsmob<Grob> (a->get_object ("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--;)
- 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);
- break;
- }
+ Grob *l = Tie::head (ties_[j], LEFT);
+ if (l && r)
+ {
+ // Don't mark accidentals as "tied" when the pitch is not
+ // actually the same. This is relevant for enharmonic ties.
+ Stream_event *le = unsmob<Stream_event> (l->get_property ("cause"));
+ Stream_event *re = unsmob<Stream_event> (r->get_property ("cause"));
+ if (le && re
+ && !ly_is_equal (le->get_property ("pitch"), re->get_property ("pitch")))
+ continue;
+ }
+
+ 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_.erase (ties_.begin () + j);
+ break;
+ }
}
- for (int i = accidentals_.size (); i--;)
+ for (vsize i = accidentals_.size (); i--;)
{
- int barnum = get_bar_number ();
-
- Music *note = accidentals_[i].melodic_;
+ Stream_event *note = accidentals_[i].melodic_;
Context *origin = accidentals_[i].origin_;
- Pitch *pitch = unsmob_pitch (note->get_property ("pitch"));
+ int barnum = measure_number (origin);
+
+ Pitch *pitch = unsmob<Pitch> (note->get_property ("pitch"));
if (!pitch)
- continue;
+ continue;
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));
+ Rational a = pitch->get_alteration ();
+ SCM key = scm_cons (scm_from_int (o), scm_from_int (n));
+
+ Moment end_mp = measure_position (context (),
+ unsmob<Duration> (note->get_property ("duration")));
+ SCM position = scm_cons (scm_from_int (barnum), end_mp.smobbed_copy ());
SCM localsig = SCM_EOL;
while (origin
- && origin->where_defined (ly_symbol2scm ("localKeySignature"), &localsig))
- {
- bool change = false;
- if (accidentals_[i].tied_)
- {
- /*
- Remember an alteration that is different both from
- 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)));
-
- change = true;
- }
- else
- {
- /*
- not really really correct if there are more than one
- noteheads with the same notename.
- */
- localsig = ly_assoc_front_x (localsig, key,
- scm_cons (scm_int2num (a),
- scm_int2num (barnum)));
- change = true;
- }
-
- if (change)
- origin->set_property ("localKeySignature", localsig);
-
- origin = origin->get_parent_context ();
- }
+ && origin->where_defined (ly_symbol2scm ("localAlterations"), &localsig))
+ {
+ bool change = false;
+ if (accidentals_[i].tied_
+ && !(to_boolean (accidentals_[i].accidental_->get_property ("forced"))))
+ {
+ /*
+ Remember an alteration that is different both from
+ that of the tied note and of the key signature.
+ */
+ localsig = ly_assoc_prepend_x (localsig, key, scm_cons (ly_symbol2scm ("tied"),
+ position));
+ change = true;
+ }
+ else
+ {
+ /*
+ not really correct if there is more than one
+ note head with the same notename.
+ */
+ localsig = ly_assoc_prepend_x (localsig, key,
+ scm_cons (ly_rational2scm (a),
+ position));
+ change = true;
+ }
+
+ if (change)
+ origin->set_property ("localAlterations", localsig);
+
+ origin = origin->get_parent_context ();
+ }
}
+ if (accidental_placement_)
+ for (vsize i = 0; i < note_columns_.size (); i++)
+ Separation_item::add_conditional_item (note_columns_[i], accidental_placement_);
+
accidental_placement_ = 0;
accidentals_.clear ();
+ note_columns_.clear ();
left_objects_.clear ();
right_objects_.clear ();
}
void
Accidental_engraver::acknowledge_rhythmic_head (Grob_info info)
{
- Music *note = info.music_cause ();
+ Stream_event *note = info.event_cause ();
if (note
- && note->is_mus_type ("note-event"))
+ && (note->in_event_class ("note-event")
+ || note->in_event_class ("trill-span-event"))
+ // option to skip accidentals on string harmonics
+ && (to_boolean (get_property ("harmonicAccidentals"))
+ || !scm_is_eq (info.grob ()->get_property ("style"),
+ ly_symbol2scm ("harmonic")))
+ // ignore accidentals in non-printing voices like NullVoice
+ && !to_boolean (info.context ()->get_property ("nullAccidentals")))
{
- /*
- String harmonics usually don't have accidentals.
- */
- if (to_boolean (get_property ("harmonicAccidentals"))
- || !ly_is_equal (info.grob ()->get_property ("style"),
- ly_symbol2scm ("harmonic")))
- {
- Accidental_entry entry;
- entry.head_ = info.grob ();
- entry.origin_engraver_ = dynamic_cast<Engraver *> (info.origin_translator ());
- entry.origin_ = entry.origin_engraver_->context ();
- entry.melodic_ = note;
-
- accidentals_.push (entry);
- }
+ Accidental_entry entry;
+ entry.head_ = info.grob ();
+ entry.origin_engraver_ = dynamic_cast<Engraver *> (info.origin_translator ());
+ entry.origin_ = entry.origin_engraver_->context ();
+ entry.melodic_ = note;
+
+ accidentals_.push_back (entry);
}
}
void
-Accidental_engraver::acknowledge_tie (Grob_info info)
+Accidental_engraver::acknowledge_end_tie (Grob_info info)
{
- ties_.push (dynamic_cast<Spanner *> (info.grob ()));
+ ties_.push_back (dynamic_cast<Spanner *> (info.grob ()));
+}
+
+void
+Accidental_engraver::acknowledge_note_column (Grob_info info)
+{
+ note_columns_.push_back (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
Accidental_engraver::process_music ()
{
- SCM sig = get_property ("keySignature");
- /* Detect key sig changes.
- Update all parents and children. */
- if (last_keysig_ != sig)
- update_local_key_signature ();
+ SCM sig = get_property ("keyAlterations");
+ if (!scm_is_eq (last_keysig_, sig))
+ update_local_key_signature (sig);
}
-ADD_ACKNOWLEDGER(Accidental_engraver, arpeggio);
-ADD_ACKNOWLEDGER(Accidental_engraver, finger);
-ADD_ACKNOWLEDGER(Accidental_engraver, rhythmic_head);
-ADD_ACKNOWLEDGER(Accidental_engraver, tie);
+void
+Accidental_engraver::boot ()
+{
+ ADD_ACKNOWLEDGER (Accidental_engraver, arpeggio);
+ ADD_ACKNOWLEDGER (Accidental_engraver, finger);
+ ADD_ACKNOWLEDGER (Accidental_engraver, rhythmic_head);
+ ADD_END_ACKNOWLEDGER (Accidental_engraver, tie);
+ ADD_ACKNOWLEDGER (Accidental_engraver, note_column);
+}
ADD_TRANSLATOR (Accidental_engraver,
- "Make accidentals. "
- "Catch note heads, ties and notices key-change events. "
- "This engraver usually lives at Staff level, but "
- "reads the settings for Accidental at @code{Voice} level, "
- "so you can @code{\\override} them at @code{Voice}. ",
- "Accidental AccidentalSuggestion",
-
- "",
-
- "autoAccidentals "
- "autoCautionaries "
- "extraNatural "
- "harmonicAccidentals "
- "localKeySignature",
- "localKeySignature");
+ /* doc */
+ "Make accidentals."
+ " Catch note heads, ties and notices key-change events."
+ " This engraver usually lives at Staff level, but"
+ " reads the settings for Accidental at @code{Voice} level,"
+ " so you can @code{\\override} them at @code{Voice}.",
+
+ /* create */
+ "Accidental "
+ "AccidentalCautionary "
+ "AccidentalPlacement "
+ "AccidentalSuggestion ",
+
+ /* read */
+ "autoAccidentals "
+ "autoCautionaries "
+ "internalBarNumber "
+ "extraNatural "
+ "harmonicAccidentals "
+ "accidentalGrouping "
+ "keyAlterations "
+ "localAlterations ",
+
+ /* write */
+ "localAlterations "
+ );
projects / lilypond.git / blobdiff