X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faccidental-engraver.cc;h=003b37ff318f56f11638bb099ffbfffe76efb7fc;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=cb33a4545b047577d093cee46d30f8182fddc13f;hpb=058370efc7e9710f149d0f444328bb1fcd7bdec1;p=lilypond.git diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc index cb33a4545b..003b37ff31 100644 --- a/lily/accidental-engraver.cc +++ b/lily/accidental-engraver.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2014 Han-Wen Nienhuys + Copyright (C) 1997--2015 Han-Wen Nienhuys Modified 2001--2002 by Rune Zedeler LilyPond is free software: you can redistribute it and/or modify @@ -99,11 +99,12 @@ public: }; /* - localKeySignature is changed at runtime, which means that references + localAlterations is changed at runtime, which means that references in grobs should always store ly_deep_copy ()s of those. */ -Accidental_engraver::Accidental_engraver () +Accidental_engraver::Accidental_engraver (Context *c) + : Engraver (c) { accidental_placement_ = 0; last_keysig_ = SCM_EOL; @@ -120,7 +121,7 @@ Accidental_engraver::update_local_key_signature (SCM new_sig) { last_keysig_ = new_sig; set_context_property_on_children (context (), - ly_symbol2scm ("localKeySignature"), + ly_symbol2scm ("localAlterations"), new_sig); Context *trans = context ()->get_parent_context (); @@ -131,9 +132,9 @@ Accidental_engraver::update_local_key_signature (SCM new_sig) */ SCM val; - while (trans && trans->where_defined (ly_symbol2scm ("localKeySignature"), &val) == trans) + 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 (); } } @@ -199,10 +200,7 @@ check_pitch_against_rules (Pitch const &pitch, Context *origin, */ else if (scm_is_symbol (rule)) { - Context *dad = origin; - while (dad && !dad->is_alias (rule)) - dad = dad->get_parent_context (); - + Context *dad = find_context_above (origin, rule); if (dad) origin = dad; } @@ -233,7 +231,7 @@ Accidental_engraver::process_acknowledged () Stream_event *note = accidentals_[i].melodic_; Context *origin = accidentals_[i].origin_; - Pitch *pitch = unsmob_pitch (note->get_property ("pitch")); + Pitch *pitch = unsmob (note->get_property ("pitch")); if (!pitch) continue; @@ -317,7 +315,7 @@ Accidental_engraver::make_standard_accidental (Stream_event * /* note */, */ for (vsize i = 0; i < left_objects_.size (); i++) { - if (left_objects_[i]->get_property ("side-axis") == scm_from_int (X_AXIS)) + 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); } @@ -332,7 +330,7 @@ Accidental_engraver::make_standard_accidental (Stream_event * /* note */, Accidental_placement::add_accidental (accidental_placement_, a, - get_property ("accidentalGrouping") == ly_symbol2scm ("voice"), + scm_is_eq (get_property ("accidentalGrouping"), ly_symbol2scm ("voice")), (long) trans); note_head->set_object ("accidental-grob", a->self_scm ()); @@ -348,7 +346,7 @@ Accidental_engraver::make_suggested_accidental (Stream_event * /* note */, 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"))) + if (Grob *stem = unsmob (a->get_object ("stem"))) Side_position_interface::add_support (a, stem); a->set_parent (note_head, X_AXIS); @@ -367,6 +365,18 @@ Accidental_engraver::stop_translation_timestep () for (vsize j = ties_.size (); j--;) { Grob *r = Tie::head (ties_[j], RIGHT); + 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 (l->get_property ("cause")); + Stream_event *re = unsmob (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) { @@ -387,7 +397,7 @@ Accidental_engraver::stop_translation_timestep () int barnum = measure_number (origin); - Pitch *pitch = unsmob_pitch (note->get_property ("pitch")); + Pitch *pitch = unsmob (note->get_property ("pitch")); if (!pitch) continue; @@ -397,12 +407,12 @@ Accidental_engraver::stop_translation_timestep () SCM key = scm_cons (scm_from_int (o), scm_from_int (n)); Moment end_mp = measure_position (context (), - unsmob_duration (note->get_property ("duration"))); + unsmob (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)) + && origin->where_defined (ly_symbol2scm ("localAlterations"), &localsig)) { bool change = false; if (accidentals_[i].tied_ @@ -429,7 +439,7 @@ Accidental_engraver::stop_translation_timestep () } if (change) - origin->set_property ("localKeySignature", localsig); + origin->set_property ("localAlterations", localsig); origin = origin->get_parent_context (); } @@ -452,22 +462,21 @@ Accidental_engraver::acknowledge_rhythmic_head (Grob_info info) Stream_event *note = info.event_cause (); if (note && (note->in_event_class ("note-event") - || note->in_event_class ("trill-span-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 (info.grob ()->get_property ("style") != ly_symbol2scm ("harmonic") - || to_boolean (get_property ("harmonicAccidentals"))) - { - Accidental_entry entry; - entry.head_ = info.grob (); - entry.origin_engraver_ = dynamic_cast (info.origin_translator ()); - entry.origin_ = entry.origin_engraver_->context (); - entry.melodic_ = note; + Accidental_entry entry; + entry.head_ = info.grob (); + entry.origin_engraver_ = dynamic_cast (info.origin_translator ()); + entry.origin_ = entry.origin_engraver_->context (); + entry.melodic_ = note; - accidentals_.push_back (entry); - } + accidentals_.push_back (entry); } } @@ -498,16 +507,21 @@ Accidental_engraver::acknowledge_finger (Grob_info info) void Accidental_engraver::process_music () { - SCM sig = get_property ("keySignature"); - if (last_keysig_ != sig) + 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_END_ACKNOWLEDGER (Accidental_engraver, tie); -ADD_ACKNOWLEDGER (Accidental_engraver, note_column); + +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, /* doc */ @@ -530,9 +544,9 @@ ADD_TRANSLATOR (Accidental_engraver, "extraNatural " "harmonicAccidentals " "accidentalGrouping " - "keySignature " - "localKeySignature ", + "keyAlterations " + "localAlterations ", /* write */ - "localKeySignature " + "localAlterations " );