#include "accidental-placement.hh"
#include "arpeggio.hh"
+#include "spanner.hh"
#include "context.hh"
+#include "item.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 "stream-event.hh"
#include "tie.hh"
#include "warn.hh"
{
public:
bool done_;
- Music *melodic_;
+ Stream_event *melodic_;
Grob *accidental_;
Context *origin_;
Engraver *origin_engraver_;
int get_bar_number ();
void update_local_key_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);
+ Grob *make_suggested_accidental (Stream_event *note, Grob *note_head, Engraver *trans);
protected:
TRANSLATOR_DECLARATIONS (Accidental_engraver);
void acknowledge_finger (Grob_info);
void stop_translation_timestep ();
- virtual void initialize ();
void process_acknowledged ();
+
virtual void finalize ();
virtual void derived_mark () const;
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->where_defined (ly_symbol2scm ("localKeySignature"), &val)==trans)
{
trans->set_property ("localKeySignature", 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)
return (bar_number <= scm_to_int (scm_cdr (alteration_def)) + scm_to_int (laziness));
}
-static int
+static Rational
extract_alteration (SCM alteration_def)
{
if (scm_is_number (alteration_def))
- return scm_to_int (alteration_def);
+ return ly_scm2rational (alteration_def);
else if (scm_is_pair (alteration_def))
- return scm_to_int (scm_car (alteration_def));
+ return ly_scm2rational (scm_car (alteration_def));
else if (alteration_def == SCM_BOOL_F)
- return 0;
+ return Rational (0);
else
assert (0);
- return 0;
+ return Rational (0);
}
bool
SCM entry = scm_car (s);
if (scm_is_pair (scm_car (entry))
&& scm_cdar (entry) == scm_from_int (n))
- from_other_octaves = scm_cdr (entry);
+ {
+ from_other_octaves = scm_cdr (entry);
+ break;
+ }
}
- if (from_same_octave != SCM_BOOL_F
+ if (!ignore_octave
+ && from_same_octave != SCM_BOOL_F
&& recent_enough (bar_number, from_same_octave, laziness))
previous_alteration = from_same_octave;
else if (ignore_octave
}
else
{
- int prev = extract_alteration (previous_alteration);
- int alter = pitch->get_alteration ();
+ Rational prev = extract_alteration (previous_alteration);
+ Rational alter = pitch->get_alteration ();
if (alter == prev)
num = 0;
- else if ((abs (alter) < abs (prev)
- || prev * alter < 0) && alter != 0)
+ else if ((alter.abs () < prev.abs ()
+ || (prev * alter).sign () < 0) && alter.sign ())
num = 2;
*different = (alter != prev);
}
int
Accidental_engraver::get_bar_number ()
{
- SCM barnum = get_property ("currentBarNumber");
+ SCM barnum = get_property ("internalBarNumber");
SCM smp = get_property ("measurePosition");
int bn = robust_scm2int (barnum, 0);
continue;
accidentals_[i].done_ = true;
- Music *note = accidentals_[i].melodic_;
+ Stream_event *note = accidentals_[i].melodic_;
Context *origin = accidentals_[i].origin_;
Pitch *pitch = unsmob_pitch (note->get_property ("pitch"));
pitch, origin,
cautionaries, barnum);
- bool cautionary = to_boolean (note->get_property ("cautionary"));
+ bool cautionary = to_boolean (note->get_property ("cautionary"));
if (num_caut > num)
{
num = num_caut;
cautionary = true;
}
- if (num == 0 && to_boolean (note->get_property ("force-accidental")))
+ bool forced = to_boolean (note->get_property ("force-accidental"));
+ if (num == 0 && forced)
num = 1;
/* Cannot look for ties: it's not guaranteed that they reach
us before the notes. */
- if (num)
+ if (num
+ && !note->in_event_class ("trill-span-event"))
create_accidental (&accidentals_[i], num > 1, cautionary);
+
+ if (forced || cautionary)
+ accidentals_[i].accidental_->set_property ("forced", SCM_BOOL_T);
}
}
}
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"));
else
a = make_standard_accidental (note, support, entry->origin_engraver_);
- SCM accs = scm_cons (scm_from_int (pitch->get_alteration ()),
+ SCM accs = scm_cons (scm_from_int (pitch->get_alteration () * Rational (4)),
SCM_EOL);
if (restore_natural)
{
}
Grob *
-Accidental_engraver::make_standard_accidental (Music *note,
+Accidental_engraver::make_standard_accidental (Stream_event *note,
Grob *note_head,
Engraver *trans)
{
-
(void)note;
+
/*
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_head->self_scm (),
- "Accidental");
+ Grob *a = trans->make_item ("Accidental", note_head->self_scm ());
/*
We add the accidentals to the support of the arpeggio,
}
Grob *
-Accidental_engraver::make_suggested_accidental (Music *note,
+Accidental_engraver::make_suggested_accidental (Stream_event *note,
Grob *note_head,
Engraver *trans)
{
(void) note;
- Grob *a
- = make_grob_from_properties (trans,
- ly_symbol2scm ("AccidentalSuggestion"),
- note_head->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")))
{
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 n = pitch->get_notename ();
int o = pitch->get_octave ();
- int a = pitch->get_alteration ();
+ Rational a = pitch->get_alteration ();
SCM key = scm_cons (scm_from_int (o), scm_from_int (n));
SCM localsig = SCM_EOL;
noteheads with the same notename.
*/
localsig = ly_assoc_front_x (localsig, key,
- scm_cons (scm_from_int (a),
+ scm_cons (ly_rational2scm (a),
scm_from_int (barnum)));
change = true;
}
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->is_mus_type ("trill-span-event")))
+ && (note->in_event_class ("note-event")
+ || note->in_event_class ("trill-span-event")))
{
/*
string harmonics usually don't have accidentals.
"so you can @code{\\override} them at @code{Voice}. ",
"Accidental AccidentalSuggestion",
- "",
-
"autoAccidentals "
"autoCautionaries "
+ "internalBarNumber "
"extraNatural "
"harmonicAccidentals "
- "localKeySignature",
- "localKeySignature");
+ "localKeySignature ",
+ "localKeySignature "
+ );
projects / lilypond.git / blobdiff