Revamp

audition/reference_review.py

@@ -8,12 +8,14 @@ from fractions import Fraction as F
 import xml.etree.ElementTree as ET
 
 
-def read(path, role, form_start=None):
+def read(path, role, form_start=None, pitch_convention='encoded'):
+  if pitch_convention not in ('encoded','guitar-written'):
+    raise ValueError('Unknown reference pitch convention: '+pitch_convention)
   raw=Path(path).read_bytes();tree=ET.fromstring(raw)
   result={'path':str(Path(path).resolve()),'sha256':hashlib.sha256(raw).hexdigest(),'validation_role':role,
-    'pitch_convention':'encoded MusicXML; no inferred guitar octave','part_names':[n.text for n in tree.findall('./part-list/score-part/part-name')],
+    'pitch_convention':pitch_convention,'part_names':[n.text for n in tree.findall('./part-list/score-part/part-name')],
     'measures':[],'notes':[],'harmonies':[],'annotations':[],'discrepancies':[]}
-  divisions=F(1);absolute=F();nominal=F(4);pending={};active=None
+  divisions=F(1);absolute=F();nominal=F(4);pending={};active=None;transpose=F()
   for index,m in enumerate(tree.findall('./part/measure')):
     cursor=F();extent=F();last_start=F();last_duration=F()
     if (value:=m.findtext('attributes/divisions')) is not None:divisions=F(value)
@@ -22,7 +24,9 @@ def read(path, role, form_start=None):
       nominal=sum((F(v) for v in meter.findtext('beats').split('+')),F())*4/F(meter.findtext('beat-type'))
     for item in m:
       offset=F(item.findtext('offset','0'))/divisions
-      if item.tag=='backup':cursor-=F(item.findtext('duration'))/divisions
+      if item.tag=='attributes' and item.find('transpose') is not None:
+        transpose=F(item.findtext('transpose/chromatic','0'))+12*F(item.findtext('transpose/octave-change','0'))
+      elif item.tag=='backup':cursor-=F(item.findtext('duration'))/divisions
       elif item.tag=='forward':cursor+=F(item.findtext('duration'))/divisions;extent=max(extent,cursor)
       elif item.tag=='harmony':
         active={'time':str(absolute+cursor+offset),'measure':index+1,'offset':str(cursor+offset),
@@ -42,6 +46,8 @@ def read(path, role, form_start=None):
         kinds={t.get('type') for t in item.findall('tie')} | {t.get('type') for t in item.findall('notations/tied')}
         event={'start':str(absolute+start),'end':str(absolute+end),'measure':index+1,'offset':str(start),'pitch':encoded,'rest':item.find('rest') is not None,
           'written_type':item.findtext('type'),'dots':len(item.findall('dot')),'voice':voice,'ties':sorted(kinds),
+          'sounding_transposition':str(-12 if pitch_convention=='guitar-written' else transpose),
+          'tablature':{'string':int(item.findtext('notations/technical/string')),'fret':int(item.findtext('notations/technical/fret'))} if item.find('notations/technical/string') is not None and item.find('notations/technical/fret') is not None else None,
           'time_modification':ET.tostring(item.find('time-modification'),encoding='unicode') if item.find('time-modification') is not None else None,
           'tuplets':[dict(t.attrib) for t in item.findall('notations/tuplet')],'grace':item.find('grace') is not None,'new_attack':'stop' not in kinds and p is not None}
         key=(voice,json.dumps(encoded,sort_keys=True))
@@ -59,6 +65,7 @@ def read(path, role, form_start=None):
     result['measures'].append({'number':m.get('number'),'start':str(absolute),'duration':str(extent),'implicit':m.get('implicit'),'initial_harmony_known':any(F(h['time'])<=absolute for h in result['harmonies'])})
     absolute+=extent
   if pending:result['discrepancies'].append({'issue':'unterminated ties retained'})
+  result['harmonies'].sort(key=lambda h:F(h['time']))
   # Do not run the strict score importer over these references: annotations,
   # unusual timing and high encoded pitches are evidence, not repair requests.
   from generator import harmony, model, fretboard
@@ -69,7 +76,9 @@ def read(path, role, form_start=None):
     if not event['pitch']:continue
     p=event['pitch'];number=12*(p['octave']+1)+model.NATURAL[p['step'].lower()]+F(p['alter'])
     event['encoded_midi']=str(number)
+    event['sounding_midi']=str(number+F(event['sounding_transposition']))
     event['legal_positions_at_encoded_pitch']=len(fretboard.single_positions_for_pitch(number))
+    event['legal_positions_at_sounding_pitch']=len(fretboard.single_positions_for_pitch(F(event['sounding_midi'])))
     event['harmonic_spans']=[]
     start,end=F(event['start']),F(event['end'])
     changes=[F(h['time']) for h in result['harmonies'] if start<F(h['time'])<end]
@@ -93,7 +102,8 @@ def read(path, role, form_start=None):
     if previous is not None and previous in tie_roots:
       root=tie_roots[previous];sounded[root]['end']=n['end'];sounded[root]['notation_events'].append(i);tie_roots[i]=root
     else:
-      tie_roots[i]=len(sounded);sounded.append({'start':n['start'],'end':n['end'],'pitch':n['pitch'],'notation_events':[i]})
+      tie_roots[i]=len(sounded);sounded.append({'start':n['start'],'end':n['end'],'pitch':n['pitch'],
+        'encoded_midi':n['encoded_midi'],'sounding_midi':n['sounding_midi'],'measure':n['measure'],'notation_events':[i]})
   result['sounding_events']=sounded
   first=form_start or next((h['measure'] for h in result['harmonies']),None)
   offset=F(result['measures'][first-1]['start']) if first else None
@@ -119,8 +129,9 @@ def main():
   p.add_argument('--reference',action='append',default=[],metavar='ROLE=PATH')
   p.add_argument('--form-start',action='append',default=[],metavar='ROLE=MEASURE')
   p.add_argument('--output',type=Path,required=True)
+  p.add_argument('--reference-pitch',choices=('encoded','guitar-written'),default='encoded')
   args=p.parse_args(); starts={k:int(v) for k,v in (x.split('=',1) for x in args.form_start)}
-  results=[read(path,role,starts.get(role)) for role,path in (x.split('=',1) for x in args.reference)]
+  results=[read(path,role,starts.get(role),args.reference_pitch) for role,path in (x.split('=',1) for x in args.reference)]
   args.output.parent.mkdir(parents=True,exist_ok=True)
   args.output.write_text(json.dumps({'optional_validation_only':True,'references':results},indent=2))