Tab Generation

generator/engraving/spans.py

@@ -241,8 +241,12 @@ def draw_lyric_spans(index: ScoreIndex, items: list[Primitive], anchors: list[An
       extend = next((s['attributes'].get('type', 'start') for s in verse['syllables'] if s['kind'] == 'extend'), None)
       if syllabic not in ('begin', 'middle') and extend not in ('start', 'continue'):
         continue
+      if 'extend_to' in verse and extend != 'start':
+        continue
       target = following[0].start if following else max(e.end for e in index.events if e.voice == voice)
-      if target < start or event.start >= end:
+      if 'extend_to' in verse:
+        target = fraction(verse['extend_to'])
+      if target <= start or event.start >= end:
         continue
       identifier = event.value['id'] + ':lyric:' + number
       next_id = following[0].value['id'] + ':lyric:' + number if following else ''
@@ -251,6 +255,9 @@ def draw_lyric_spans(index: ScoreIndex, items: list[Primitive], anchors: list[An
       x2 = b.box.left - 5 if b else right
       if b is None and following and following[0].value['id'] in positions:
         x2 = positions[following[0].value['id']].x
+      if 'extend_to' in verse:
+        endpoints = [a.x for a in anchors if a.time >= target]
+        x2 = min(endpoints) - 5 if endpoints else right
       y = lyric_baseline + index.lyric_lanes.index((voice, number)) * 23
       if x2 <= x1:
         continue