Cleanup

generator/arrange/ending.py

@@ -4,44 +4,30 @@ import fractions
 
 import generator.accompaniment
 import generator.acoustic_voicing
+import generator.arrange.ending_plan
 import generator.comping
 import generator.fretboard
 import generator.model
 import generator.parts
 import generator.score
-
-BARS = 3
-
-def template(source):
-  result = copy.deepcopy(source[-1])
-  # An ending is three full bars in the final active meter, never a pickup.
-  for change in result.get('attributes', []):
-    for key in ('meter', 'key', 'clef', 'transpose', 'staff_details'):
-      if key in change:
-        result[key] = copy.deepcopy(change[key])
-  result.update(duration=generator.model.rational(generator.model.meter_length(result['meter'])), implicit=False,
-    attributes=[], harmonies=[], voices=[], tempos=[], section_label='')
-  result['time_signature'] = generator.model.meter_label(result['meter'])
-  return result
-
-def duration(source):
-  return BARS * generator.model.fraction(template(source)['duration']) if source else fractions.Fraction()
+import generator.vocabulary
 
 def chord(source):
   effective = [{**m, 'harmonies': [h for h in m['harmonies'] if not h.get('chord_optional')]} for m in source]
   prior = generator.accompaniment.carried_chords(effective)[-1]
   return generator.accompaniment.active_chord(effective[-1], generator.model.fraction(effective[-1]['duration']), prior)
 
-def append(source, output, part, *, sounding=False, center=55):
+def append(source, output, part, *, sounding=False, center=55, composition=None):
+  composition = composition or generator.vocabulary.current()
   if not source or not output:
     return
-  model = template(source)
+  model = generator.arrange.ending_plan.template(source)
   harmony = chord(source)
   grip = ()
   if sounding:
     if harmony is None:
       raise ValueError('Ending: final performed harmony is missing or N.C.; cannot invent a closing chord')
-    options = generator.comping.voicings(generator.comping.semantic_key(harmony), part)
+    options = generator.comping.voicings(generator.comping.semantic_key(harmony), part, composition=composition)
     recent = {}
     for m in reversed(output):
       for n in sorted(generator.score.measure_notes(m), key=lambda n: generator.model.fraction(n['onset']), reverse=True):
@@ -55,10 +41,10 @@ def append(source, output, part, *, sounding=False, center=55):
     if part == 'acoustic':
       bass = next((recent[s] for s in (5, 6) if s in recent), None)
       previous = generator.acoustic_voicing.Voicing(bass, *(recent[s] for s in (4, 3, 2))) if bass and all(s in recent for s in (4, 3, 2)) else ()
-    grip = min(options, key=lambda v: (generator.comping.local_cost(part, generator.comping.semantic_key(harmony), v, center).moved(generator.comping.movement(part, previous, v)), v))
+    grip = min(options, key=lambda v: (generator.comping.local_cost(part, generator.comping.semantic_key(harmony), v, center, composition=composition).moved(generator.comping.movement(part, previous, v)), v))
   length = generator.model.fraction(model['duration'])
   previous = None
-  for index in range(BARS):
+  for index in range(generator.arrange.ending_plan.BARS):
     measure = generator.parts.build_measure(model, f'measure_{len(output) + 1}', 'rest', part, None, 'Ending' if index == 0 else '')
     measure['ending_sustain'] = True
     if index == 0 and harmony:
@@ -77,4 +63,4 @@ def append(source, output, part, *, sounding=False, center=55):
         cursor += duration
       measure['voices'] = [{'id': 'voice_arranged', 'notes': notes}]
     output.append(measure)
-  generator.score.reidentify(output[-BARS:], [])
+  generator.score.reidentify(output[-generator.arrange.ending_plan.BARS:], [])