X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faccidental-engraver.cc;h=c7eb79955a827f3061dce6d32d5c38a823cd8846;hb=a1741dc78d0f4a71cd6790b4306fdcd618e5c40a;hp=729f0466612aa5e8a951306cd6ebd5a343e99b3e;hpb=e153c0a662134ebec453ea50a4fad2c82e2b8f27;p=lilypond.git diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc index 729f046661..c7eb79955a 100644 --- a/lily/accidental-engraver.cc +++ b/lily/accidental-engraver.cc @@ -9,14 +9,16 @@ #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" @@ -26,7 +28,7 @@ class Accidental_entry { public: bool done_; - Music *melodic_; + Stream_event *melodic_; Grob *accidental_; Context *origin_; Engraver *origin_engraver_; @@ -51,8 +53,8 @@ class Accidental_engraver : public 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); @@ -64,8 +66,8 @@ protected: void acknowledge_finger (Grob_info); void stop_translation_timestep (); - virtual void initialize (); void process_acknowledged (); + virtual void finalize (); virtual void derived_mark () const; @@ -118,21 +120,17 @@ Accidental_engraver::update_local_key_signature () 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) @@ -153,18 +151,18 @@ recent_enough (int bar_number, SCM alteration_def, SCM laziness) 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 @@ -192,10 +190,14 @@ number_accidentals_from_sig (bool *different, SCM sig, Pitch *pitch, 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 @@ -213,13 +215,13 @@ number_accidentals_from_sig (bool *different, SCM sig, Pitch *pitch, } 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); } @@ -289,7 +291,7 @@ number_accidentals (bool *different, 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); @@ -316,7 +318,7 @@ Accidental_engraver::process_acknowledged () 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")); @@ -333,8 +335,8 @@ Accidental_engraver::process_acknowledged () 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; @@ -342,13 +344,18 @@ Accidental_engraver::process_acknowledged () 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); } } } @@ -358,7 +365,7 @@ Accidental_engraver::create_accidental (Accidental_entry *entry, 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")); @@ -369,7 +376,7 @@ Accidental_engraver::create_accidental (Accidental_entry *entry, 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) { @@ -386,29 +393,32 @@ Accidental_engraver::create_accidental (Accidental_entry *entry, } 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, so it is put left of the accidentals. */ for (vsize i = 0; i < left_objects_.size (); i++) - Side_position_interface::add_support (left_objects_[i], a); + { + 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]); @@ -425,16 +435,13 @@ Accidental_engraver::make_standard_accidental (Music *note, } 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"))) @@ -473,7 +480,7 @@ Accidental_engraver::stop_translation_timestep () { 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")); @@ -482,7 +489,7 @@ Accidental_engraver::stop_translation_timestep () 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; @@ -508,7 +515,7 @@ Accidental_engraver::stop_translation_timestep () 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; } @@ -529,10 +536,10 @@ Accidental_engraver::stop_translation_timestep () 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. @@ -586,6 +593,7 @@ 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 " @@ -593,11 +601,11 @@ ADD_TRANSLATOR (Accidental_engraver, "so you can @code{\\override} them at @code{Voice}. ", "Accidental AccidentalSuggestion", - "", - "autoAccidentals " "autoCautionaries " + "internalBarNumber " "extraNatural " "harmonicAccidentals " - "localKeySignature", - "localKeySignature"); + "localKeySignature ", + "localKeySignature " + );