Data Labels

generator/model.py

@@ -146,9 +146,6 @@ def validate_document(document: dict) -> None:
   staves = document.get('staves', [])
   if len(staves) != 1:
     raise ValueError('exactly one staff is currently supported')
-  if any(m.get('repeats') or m.get('endings') for m in staves[0]['measures']):
-    from generator.repeats import performed_order
-    performed_order(staves[0]['measures'])
   instruments = staves[0].get('instruments', [])
   instrument_ids = {i['id'] for i in instruments}
   if len(instruments) != len(instrument_ids) or any(not isinstance(i, str) or not i for i in instrument_ids):
@@ -159,6 +156,8 @@ def validate_document(document: dict) -> None:
   ownership: dict[str, str] = {}
   absolute = Fraction()
   for measure in staves[0]['measures']:
+    if {'repeats', 'endings', 'initial_attributes'} & measure.keys():
+      raise ValueError('repeat notation is unsupported; regenerate scores from music written out in reading order')
     length = fraction(measure['duration'])
     if length <= 0:
       raise ValueError('measure duration must be positive')
@@ -167,6 +166,8 @@ def validate_document(document: dict) -> None:
       raise ValueError('measure requires uniquely identified voice lanes')
     previous_ends = {v['id']: Fraction() for v in voices}
     for voice, note in ((v, n) for v in voices for n in v['notes']):
+      if any({'sound_ties', 'printed_ties'} & pitch.keys() for pitch in note['pitches']):
+        raise ValueError('pass-specific tie metadata is unsupported; regenerate scores')
       if not note['id'] or note['id'] in ids:
         raise ValueError(f'duplicate event ID: {note["id"]}')
       ids.add(note['id'])