Cleanupf

generator/engraving/layout.py

@@ -1,12 +1,13 @@
 from __future__ import annotations
 
 from dataclasses import replace
+from bisect import bisect_left, bisect_right
 from fractions import Fraction
 import math
 
 from generator import harmony
 from generator.engraving import tablature
-from generator.model import fraction, validate_document
+from generator.model import validate_document
 from generator.engraving.attributes import barline, staff_attributes, tempo
 from generator.engraving.fonts import Fonts
 from generator.engraving.notation import ScoreIndex
@@ -19,7 +20,7 @@ def lyric_text(verse: dict) -> str:
 
 def column(index: ScoreIndex, time: Fraction, start: Fraction, end: Fraction, fonts: Fonts, style: Style) -> tuple[list[Primitive], list[Anchor], list[Fragment]]:
   items, anchors, fragments = [], [], []
-  events = [e for e in index.events if e.start == time or (time == start and e.start < start < e.end)]
+  events = index.events_at(time, include_sustained=time == start)
   grace_width = 0
   occupied = []
   for event in events:
@@ -47,48 +48,45 @@ def column(index: ScoreIndex, time: Fraction, start: Fraction, end: Fraction, fo
         text = lyric_text(verse)
         if text:
           items.append(fonts.text(text, x + style.space / 2, lane * 23, 18, 'lyric', (event.value['id'] + ':lyric:' + verse['number'], event.value['id']), True))
-  for measure_start, measure_end, measure in index.measures:
-    if not measure_start <= time < measure_end:
-      continue
-    for item in measure['harmonies']:
-      if measure_start + fraction(item['onset']) == time:
-        label = harmony.symbol(item)
-        items.append(fonts.text(label, 0, 0, 21, 'harmony', (item['id'],)))
-    for i, value in enumerate(measure.get('tempos', [])):
-      if measure_start + fraction(value['onset']) == time:
-        items.extend(tempo(value, fonts, 0, 0, style.space, measure['id'] + f':tempo:{i}'))
-    if time == measure_start:
-      items.append(fonts.text(str(measure['number']), 0, -style.space * (index.state(time)['staff_details']['lines'] + 0.5), 12, 'measure-number', (measure['id'],)))
-      if label := measure.get('section_label'):
-        items.append(fonts.text(label, 0, 0, 19, 'section', (measure['id'] + ':section',)))
+  measure_start, _, measure = index.measure_at(time)
+  for owner, _, item in index.harmonies_by_onset.get(time, []):
+    if owner is measure:
+      items.append(fonts.text(harmony.symbol(item), 0, 0, 21, 'harmony', (item['id'],)))
+  for owner, i, value in index.tempos_by_onset.get(time, []):
+    if owner is measure:
+      items.extend(tempo(value, fonts, 0, 0, style.space, measure['id'] + f':tempo:{i}'))
+  if time == measure_start:
+    items.append(fonts.text(str(measure['number']), 0, -style.space * (index.state(time)['staff_details']['lines'] + 0.5), 12, 'measure-number', (measure['id'],)))
+    if label := measure.get('section_label'):
+      items.append(fonts.text(label, 0, 0, 19, 'section', (measure['id'] + ':section',)))
   return items, anchors, fragments
 
 def make_system(index: ScoreIndex, start: Fraction, end: Fraction, fonts: Fonts, style: Style, justify: bool = False) -> System:
   items, anchors, fragments = [], [], []
   state = index.state(start)
-  measure = next(m for a, b, m in index.measures if a <= start < b)
+  measure = index.measure_at(start)[2]
   header = staff_attributes(index, state, start, fonts, style.space, measure['id'] + ':initial', ('clef', 'key', 'meter', 'staff_details'))
   items.extend(header)
   cursor = max((p.box.right for p in header), default=0) + 22
   content_left = cursor - 9
-  times = sorted({start} | {t for t in index.columns if start < t < end})
+  times = [start] + index.column_times[bisect_right(index.column_times, start):bisect_left(index.column_times, end)]
   placements = []
   groups = []
   for ti, time in enumerate(times):
     item_start, anchor_start = len(items), len(anchors)
     drawn, placed, pieces = column(index, time, start, end, fonts, style)
     leading = []
-    for measure_start, measure_end, m in index.measures:
-      if time == measure_start and time > start:
-        previous = next(previous for a, b, previous in index.measures if b == time)
-        leading.extend(barline(previous.get('barlines', {}).get('right', 'regular'), 0, -style.space * (index.state(time)['staff_details']['lines'] - 1), previous['id']))
-        old_state = index.state(time, before=True)
-        fields = tuple(k for k in ('clef', 'key', 'meter', 'staff_details') if old_state[k] != index.state(time)[k])
-        leading.extend(p.moved(12, 0) for p in staff_attributes(index, index.state(time), time, fonts, style.space, m['id'] + ':initial', fields))
-      for ci, change in enumerate(m.get('attributes', [])):
-        if measure_start + fraction(change['onset']) == time and time > start:
-          extra = staff_attributes(index, index.state(time), time, fonts, style.space, m['id'] + f':attributes:{ci}', tuple(change))
-          leading.extend(p.moved(max((p.box.right for p in leading), default=0) + 10, 0) for p in extra)
+    measure_start, _, m = index.measure_at(time)
+    if time == measure_start and time > start:
+      previous = index.measure_at(time, before=True)[2]
+      leading.extend(barline(previous.get('barlines', {}).get('right', 'regular'), 0, -style.space * (index.state(time)['staff_details']['lines'] - 1), previous['id']))
+      old_state = index.state(time, before=True)
+      fields = tuple(k for k in ('clef', 'key', 'meter', 'staff_details') if old_state[k] != index.state(time)[k])
+      leading.extend(p.moved(12, 0) for p in staff_attributes(index, index.state(time), time, fonts, style.space, m['id'] + ':initial', fields))
+    if time > start:
+      for owner, ci, change in index.attributes_by_onset.get(time, []):
+        extra = staff_attributes(index, index.state(time), time, fonts, style.space, owner['id'] + f':attributes:{ci}', tuple(change))
+        leading.extend(p.moved(max((p.box.right for p in leading), default=0) + 10, 0) for p in extra)
     if leading:
       width = bounds(leading).right - bounds(leading).left + 14
       items.extend(p.moved(cursor - bounds(leading).left, 0) for p in leading)
@@ -113,7 +111,7 @@ def make_system(index: ScoreIndex, start: Fraction, end: Fraction, fonts: Fonts,
     placements = [(time, x + i * stretch) for i, (time, x) in enumerate(placements)]
     width = available
   right = width - 5
-  last_measure = next(m for a, b, m in index.measures if a < end <= b)
+  last_measure = index.measure_at(end, before=True)[2]
   tab_items = [p for p in items if p.role.startswith('tab')]
   items = [p for p in items if not p.role.startswith('tab')]
   items = draw_beams(index, anchors, items, start, end, content_left, right, style)
@@ -200,7 +198,7 @@ def layout_score(document: dict, style: Style, fonts: Fonts) -> LayoutDocument:
   start = Fraction()
   available = style.width - style.margin_x * 2
   while start < index.end:
-    candidates = sorted(b for b in index.boundaries if b > start)
+    candidates = index.boundary_times[bisect_right(index.boundary_times, start):]
     selected = None
     # Reserve the same title/credit and footer bands when considering a split,
     # so a wide pitch range can break vertically as well as horizontally.
@@ -212,7 +210,7 @@ def layout_score(document: dict, style: Style, fonts: Fonts) -> LayoutDocument:
       selected = trial
     if selected is None:
       measure_end = candidates[0]
-      for end in sorted(t for t in index.columns if start < t < measure_end):
+      for end in index.column_times[bisect_right(index.column_times, start):bisect_left(index.column_times, measure_end)]:
         trial = make_system(index, start, end, fonts, style)
         if trial.box.right - trial.box.left <= available and trial.box.bottom - trial.box.top <= height_limit:
           selected = trial