Tab Generation

generator/engraving/audit.py

@@ -34,7 +34,7 @@ def audit_layout(document: dict, layout: LayoutDocument, fonts: Fonts) -> None:
           expected = index.pitch_position(index.tones[anchor.source][1], anchor.time)
           if abs(anchor.y - (baseline - expected * layout.style.space / 2)) > 0.01:
             raise EngravingError(f'{anchor.source}: displayed staff position changed pitch')
-        role = 'tab' if anchor.fragment.kind == 'tone' and index.state(anchor.time)['clef']['sign'] == 'TAB' else 'head' if anchor.fragment.kind == 'tone' else anchor.fragment.kind
+        role = 'head' if anchor.fragment.kind == 'tone' else anchor.fragment.kind
         candidates = [p for p in system.primitives if p.role == role and anchor.source in p.sources and abs(p.points[0][0] - anchor.x) < 0.01]
         if not candidates:
           raise EngravingError(f'{anchor.source}: visible anchor has no corresponding drawing primitive')
@@ -43,6 +43,15 @@ def audit_layout(document: dict, layout: LayoutDocument, fonts: Fonts) -> None:
           expected_glyph = head_glyph({'type': anchor.fragment.written_type}, tone.get('notehead', event.value.get('notehead')))
           if candidates[0].value != expected_glyph:
             raise EngravingError(f'{anchor.source}: notehead changed written duration or shape')
+        if index.staff.get('tablature') and anchor.fragment.kind == 'tone':
+          tone = index.tones[anchor.source][1]
+          tab = tone['tablature']
+          tab_baseline = max(p.points[0][1] for p in system.primitives if p.role == 'tab-staff')
+          expected_y = tab_baseline - (6 - tab['string']) * layout.style.space + 5
+          expected_x = min(a.x for a in system.anchors if a.event == anchor.event and a.time == anchor.time)
+          tabs = [p for p in system.primitives if p.role == 'tab' and anchor.source in p.sources]
+          if len(tabs) != 1 or tabs[0].value != str(tab['fret']) or abs(tabs[0].points[0][1] - expected_y) > 0.01 or abs(tabs[0].points[0][0] - expected_x) > 0.01:
+            raise EngravingError(f'{anchor.source}: tablature changed position or rhythmic alignment')
       for fragment in system.fragments:
         fragments.setdefault(fragment.source, []).append(fragment)
       # Staff, ledger, stem, beam and tie contacts are intentional. Distinct
@@ -50,7 +59,7 @@ def audit_layout(document: dict, layout: LayoutDocument, fonts: Fonts) -> None:
       checked = [p for p in system.primitives if p.role in ('head', 'tab', 'accidental', 'harmony', 'lyric')]
       for i, item in enumerate(checked):
         for other in checked[i + 1:]:
-          if set(item.sources) & set(other.sources):
+          if set(item.sources) & set(other.sources) and (item.role != 'tab' or other.role != 'tab'):
             continue
           if item.role != other.role and {item.role, other.role} - {'head', 'tab', 'accidental'}:
             continue