Comping

generator/production.py

@@ -26,6 +26,7 @@ import generator.parts
 import generator.score
 import generator.vocabulary
 import generator.arrange.accompaniment
+import generator.arrange.ending
 import generator.arrange.form
 import generator.arrange.generate
 import generator.arrange.pickup
@@ -94,6 +95,7 @@ def windows(document, part):
       result[-1] = (a, start, old)
     result.append((start, end, part + '_' + role))
     cursor = end
+  result.append((cursor, cursor + generator.arrange.ending.duration(source), part + ('_accompaniment' if part != 'vocal' else '_rest')))
   return tuple(result)
 
 def dependencies(role, resources):
@@ -254,6 +256,8 @@ def _generate_role(source, role, data_dir, settings=None, cache_dir=None):
       result = generator.arrange.generate._arrange_document(document, part, {}, owned={'vocal' if part == 'vocal' else 'melody'})
   allowed = tuple((a, b) for a, b, r in windows(document, part) if r == role)
   _mask(result, allowed)
+  if role == "acoustic_accompaniment":
+    generator.acoustic.validate_comping(result)
   staff = result['staves'][0]
   for measure in staff['measures']:
     measure['id'] = role + '_' + measure['id']