From ec5c784d689ceab3270e3858fb6b8618ca0dbfe0 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 19 Dec 2006 10:37:22 +0100 Subject: [PATCH] Revert "Fix #106 and problems with 'modern accidental style." This reverts commit e28a36acef7ccdd93ae444cd49fe6fd0fd0d993a. --- input/regression/accidentals-modern.ly | 16 ---------------- lily/accidental-engraver.cc | 10 ++++------ 2 files changed, 4 insertions(+), 22 deletions(-) delete mode 100644 input/regression/accidentals-modern.ly diff --git a/input/regression/accidentals-modern.ly b/input/regression/accidentals-modern.ly deleted file mode 100644 index 9f749aed2c..0000000000 --- a/input/regression/accidentals-modern.ly +++ /dev/null @@ -1,16 +0,0 @@ -\header { - - texidoc = "In 'modern accidental style, the last note should -have an accidental sign. " - -} -\version "2.10.3" - -\score { - \new Staff { - \relative c' { - #(set-accidental-style 'modern) - d4 dis'4 d,2^"this should have accidental" - } - } -} diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc index 00cf1de97e..9d671c11e6 100644 --- a/lily/accidental-engraver.cc +++ b/lily/accidental-engraver.cc @@ -122,7 +122,8 @@ Accidental_engraver::update_local_key_signature () /* Huh. Don't understand what this is good for. --hwn. */ - while (trans) + SCM val; + while (trans && trans->where_defined (ly_symbol2scm ("localKeySignature"), &val)) { trans->set_property ("localKeySignature", ly_deep_copy (last_keysig_)); trans = trans->get_parent_context (); @@ -192,14 +193,11 @@ 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)) { + && scm_cdar (entry) == scm_from_int (n)) from_other_octaves = scm_cdr (entry); - break; - } } - if (!ignore_octave - && from_same_octave != SCM_BOOL_F + if (from_same_octave != SCM_BOOL_F && recent_enough (bar_number, from_same_octave, laziness)) previous_alteration = from_same_octave; else if (ignore_octave -- 2.39.5