Sepearate Generation

generator/solo/notation.py

@@ -60,20 +60,28 @@ def measures(sources: list[dict], notes: tuple[generator.solo.types.Note, ...],
   return result
 
 def tuplets(measures):
-  spans = []
-  for measure in measures:
-    for ratio, values in itertools.groupby(generator.score.measure_notes(measure), key=lambda n: generator.model.fraction(n['written'].get('ratio', generator.model.rational(1)))):
-      notes = list(values)
-      if ratio == 1:
-        continue
-      for first in range(0, len(notes), ratio.denominator):
-        members = notes[first:first + ratio.denominator]
-        identifier = members[0]['id'] + '_tuplet'
-        spans.append({'id': identifier, 'voice': 'voice_arranged', 'start': members[0]['id'], 'end': members[-1]['id'], 'note_count': ratio.denominator, 'space_count': ratio.numerator, 'depth': 0, 'bracket': 'auto', 'show_number': 'actual'})
-        for note in members:
-          note['tuplet_ids'] = [identifier]
+  # Group by sounding duration, including notation fragments across barlines.
+  spans=[]
+  events=[n for m in measures for n in generator.score.measure_notes(m)]
+  for ratio,values in itertools.groupby(events,key=lambda n:generator.model.fraction(n['written'].get('ratio',generator.model.rational(1)))):
+    if ratio==1:continue
+    members=[];elapsed=fractions.Fraction();length=None
+    for note in values:
+      if not members:
+        length=generator.model.TYPE_LENGTHS[note['written']['type']]*ratio.numerator
+      members.append(note);elapsed+=generator.model.fraction(note['duration'])
+      if elapsed>=length:
+        identifier=members[0]['id']+'_tuplet'
+        spans.append({'id':identifier,'voice':'voice_arranged','start':members[0]['id'],'end':members[-1]['id'],'note_count':ratio.denominator,'space_count':ratio.numerator,'depth':0,'bracket':'auto','show_number':'actual'})
+        for n in members:n['tuplet_ids']=[identifier]
+        members=[];elapsed=fractions.Fraction()
+    if members:
+      identifier=members[0]['id']+'_tuplet'
+      spans.append({'id':identifier,'voice':'voice_arranged','start':members[0]['id'],'end':members[-1]['id'],'note_count':ratio.denominator,'space_count':ratio.numerator,'depth':0,'bracket':'auto','show_number':'actual'})
+      for n in members:n['tuplet_ids']=[identifier]
   return spans
 
+
 def replace_region(document: dict, first: int, replacement: list[dict]) -> None:
   staff = document['staves'][0]
   replacement = copy.deepcopy(replacement)