Cleanup

generator/chord_families.py

@@ -1,10 +1,11 @@
 """Transposable guitar families, derived from the written chord and legal grips."""
-import generator.harmony
 import generator.fretboard
+import generator.harmony
 import generator.model
 import generator.vocabulary
 
-def acoustic(chord, grip):
+def acoustic(chord, grip, *, composition=None):
+  composition = composition or generator.vocabulary.current()
   degrees = generator.harmony.degrees(chord)
   root = int(generator.model.NATURAL[chord['root']['letter']] + generator.model.alteration(chord['root']['alter']))
   classes = {d: (root + generator.harmony.degree_semitones(d, a)) % 12 for d, a in degrees.items()}
@@ -14,7 +15,7 @@ def acoustic(chord, grip):
   kind = 'extended' if terminal and color else 'tetrad' if terminal else 'triad'
   bass = next((d for d in (1, 5, 3) if classes.get(d) == grip[0].midi % 12), None)
   slots = {'root': 1, 'fifth': 5, 'guide': guide, 'terminal': terminal, 'color': color}
-  policy = generator.vocabulary.accompaniment('acoustic')['voicing_families']
+  policy = composition.accompaniment('acoustic')['voicing_families']
   orders = policy[kind].get(f'{grip[0].string_number}/{bass}', ())
   upper = tuple(p.midi % 12 for p in grip[1:])
   preferred = any(all(slots[s] in classes for s in order) and tuple(classes[slots[s]] for s in order) == upper for order in orders)
@@ -37,10 +38,11 @@ def electric(grip):
       return 'drop-two'
   return 'close-position' if pitches and pitches[-1] - pitches[0] < 12 else 'compact-open'
 
-def coverage(chord, options, part):
+def coverage(chord, options, part, *, composition=None):
+  composition = composition or generator.vocabulary.current()
   if part == 'electric':
-    return {name: sum(electric(v) == name for v in options) for name in generator.vocabulary.accompaniment('electric')['voicing_families']['rank']}
-  families = [acoustic(chord, v) for v in options]
+    return {name: sum(electric(v) == name for v in options) for name in composition.accompaniment('electric')['voicing_families']['rank']}
+  families = [acoustic(chord, v, composition=composition) for v in options]
   result = []
   for string in (5, 6):
     for degree in (1, 5):