Cleanup

generator/solo/export.py

@@ -53,6 +53,8 @@ def write_role(result, path):
   part = role.split('_')[0]
   document = result['document']
   first, count = region(document, part)
+  leadin=int(result.get('details',{}).get('allocation',{}).get('lead_in_measures',0))
+  first-=leadin;count+=leadin
   selected = excerpt(document, first, count)
   numbers = [m['number'] for m in selected['staves'][0]['measures']]
   for i, measure in enumerate(selected['staves'][0]['measures'], 1):
@@ -60,7 +62,7 @@ def write_role(result, path):
   path = Path(path)
   path.parent.mkdir(parents=True, exist_ok=True)
   musicxml_writer.write_musicxml(path, selected, tablature=True)
-  return {'role': role, 'file': path.name, 'form_start_measure': 1,
+  return {'role': role, 'file': path.name, 'form_start_measure': 1+leadin,
     'measure_count': count, 'arrangement_measures': numbers,
     'arrangement_start_beat': str(sum((model.fraction(m['duration']) for m in document['staves'][0]['measures'][:first]), F())),
     'pitch_convention': 'guitar-written; explicit octave transposition -1',