Shared Catalog

generator/engraving/attributes.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from fractions import Fraction
 
-from generator.model import LETTERS, TYPE_LENGTHS, alteration, fraction
+from generator.model import LETTERS, TYPE_LENGTHS, alteration, fraction, key_from_fifths
 from generator.engraving.fonts import Fonts
 from generator.engraving.notation import ScoreIndex, accidental
 from generator.engraving.types import Primitive, bounds, line
@@ -32,7 +32,8 @@ def staff_attributes(index: ScoreIndex, state: dict, time: Fraction, fonts: Font
     cancellation = key.get('cancel', 0)
     if cancellation:
       order = 'fcgdaeb' if cancellation > 0 else 'beadgcf'
-      steps = [{'letter': c, 'alter': 0} for c in order[:min(7, abs(cancellation))]] + steps
+      old = key_from_fifths(cancellation)['alterations']
+      steps = [{'letter': c, 'alter': 0} for c in order if alteration(old[LETTERS.index(c)]) and alteration(old[LETTERS.index(c)]) != alteration(key['alterations'][LETTERS.index(c)])] + steps
     for step in steps:
       pitch = {'letter': step['letter'], 'octave': step.get('octave', 5), 'id': source}
       position = index.pitch_position(pitch, time)