@schemd/core 0.2.0 → 0.3.0

package/dist/renderer.js

@@ -1,8 +1,10 @@
-import { classicalGateHeight, componentTextAnchors, distributedCoordinate, enumerateComponentPorts, positionIcPin, PORT_HOTSPOT_RADIUS, routeConnections, validateDocumentGeometry } from './layout.js';
+import { classicalGateHeight, componentTextAnchors, distributedCoordinate, enumerateComponentPorts, PORT_HOTSPOT_RADIUS, quantumGateDimensions, routeConnections, validateDocumentGeometry } from './layout.js';
 import { MAX_SCHEMATIC_SVG_OUTPUT_BYTES, utf8ByteLength } from './limits.js';
 import { assertParsedSchematicDocument } from './parser.js';
-import { CLASSICAL_GATE_KINDS, SCHEMD_OUTPUT_MODES, SCHEMD_SEMANTIC_HOOKS, UML_COMPONENT_KINDS, SchematicSyntaxError } from './types.js';
+import { parsedSchematicRoutes } from './route-cache.js';
+import { CLASSICAL_GATE_KINDS, DIGITAL_COMPONENT_KINDS, QUANTUM_GATE_KINDS, QUANTUM_SPECIAL_KINDS, SCHEMD_OUTPUT_MODES, SCHEMD_SEMANTIC_HOOKS, UML_COMPONENT_KINDS, SchematicSyntaxError } from './types.js';
 import { mathLabelTextWidth, renderMathLabelTspans } from './math-label.js';
+import { escapeXml } from './xml.js';
 export const MAX_SVG_OUTPUT_BYTES = MAX_SCHEMATIC_SVG_OUTPUT_BYTES;
 const STATIC_SVG_STYLES = '.schematic-token{fill:none;stroke:var(--schematic-vector,var(--schematic-vector-fallback,currentColor));stroke-linecap:round;stroke-linejoin:round;stroke-width:var(--schematic-stroke-width,1.65);vector-effect:non-scaling-stroke}.schematic-node-fill{fill:var(--schematic-vector,var(--schematic-vector-fallback,currentColor))}.schematic-designator,.schematic-label,.schematic-gate-symbol,.schematic-quantum-detail,.schematic-pin-label,.schematic-uml-text,.schematic-connection-label{fill:currentColor}.schematic-uml-row{font-size:12px}.schematic-uml-stereotype{font-size:11px}.schematic-connection-label{font-size:11px;paint-order:stroke;stroke:var(--schematic-surface,#fff);stroke-width:4;stroke-linejoin:round}.schematic-surface{fill:var(--schematic-surface,transparent)}.schematic-grid-line{fill:none;stroke:var(--schematic-grid,currentColor);stroke-width:1;opacity:.12;vector-effect:non-scaling-stroke}';
 const HOOK_SVG_STYLES = '.schematic-port-hotspot{fill:transparent!important;stroke:transparent!important;stroke-width:8;vector-effect:non-scaling-stroke;pointer-events:all;outline:none}.schematic-port-hotspot:focus-visible{fill:var(--schematic-vector,var(--schematic-vector-fallback,currentColor))!important;fill-opacity:.22!important;stroke:var(--schematic-vector,var(--schematic-vector-fallback,currentColor))!important;stroke-width:2}';
@@ -17,31 +19,6 @@ function semanticHookBit(hook) {
         return PORT_HOOK;
     return WIRE_HOOK;
 }
-function validXmlCodePoint(codePoint) {
-    if (codePoint === 0x09 || codePoint === 0x0a || codePoint === 0x0d)
-        return true;
-    if (codePoint >= 0x20 && codePoint <= 0xd7ff)
-        return true;
-    if (codePoint >= 0xe000 && codePoint <= 0xfffd)
-        return true;
-    return codePoint >= 0x10000 && codePoint <= 0x10ffff;
-}
-function replaceInvalidXmlCharacters(value) {
-    let normalized = '';
-    for (const character of value) {
-        const codePoint = character.codePointAt(0);
-        normalized += validXmlCodePoint(codePoint) ? character : '\ufffd';
-    }
-    return normalized;
-}
-function escapeXml(value) {
-    return replaceInvalidXmlCharacters(value)
-        .replaceAll('&', '&amp;')
-        .replaceAll('<', '&lt;')
-        .replaceAll('>', '&gt;')
-        .replaceAll('"', '&quot;')
-        .replaceAll("'", '&#39;');
-}
 export class BoundedSvgWriter {
     #chunks = [];
     #bytes = 0;
@@ -128,6 +105,29 @@ function stableHash(value) {
 function isClassicalGate(component) {
     return CLASSICAL_GATE_KINDS.includes(component.kind);
 }
+function isDigitalComponent(component) {
+    return DIGITAL_COMPONENT_KINDS.includes(component.kind);
+}
+function isQuantumSpecial(component) {
+    return QUANTUM_SPECIAL_KINDS.includes(component.kind);
+}
+function isQuantumGate(component) {
+    return QUANTUM_GATE_KINDS.includes(component.kind);
+}
+function componentRotation(component) {
+    if (!('orientation' in component))
+        return 0;
+    switch (component.orientation) {
+        case 'down':
+            return 90;
+        case 'left':
+            return 180;
+        case 'up':
+            return 270;
+        default:
+            return 0;
+    }
+}
 function isUmlComponent(component) {
     return UML_COMPONENT_KINDS.includes(component.kind);
 }
@@ -146,7 +146,7 @@ function colorAttributes(color, extraClass = '') {
 function orInputBoundaryX(kind, y, height) {
     const halfHeight = height / 2;
     const progress = (1 - y / halfHeight) / 2;
-    const start = kind === 'xor' ? -38 : -32;
+    const start = kind === 'xor' || kind === 'xnor' ? -38 : -32;
     return start + 40 * progress * (1 - progress);
 }
 function orOutputBoundaryX(y, height) {
@@ -160,7 +160,7 @@ function gateBoundaryX(component, direction, y) {
         return direction === 'input' ? -32 : 32;
     const height = classicalGateHeight(component);
     if (direction === 'input') {
-        if (component.kind === 'or' || component.kind === 'nor' || component.kind === 'xor') {
+        if (component.kind === 'or' || component.kind === 'nor' || component.kind === 'xor' || component.kind === 'xnor') {
             return orInputBoundaryX(component.kind, y, height);
         }
         return component.kind === 'not' ? -30 : -32;
@@ -169,13 +169,13 @@ function gateBoundaryX(component, direction, y) {
         const normalized = y / (height / 2);
         return 32 * Math.sqrt(Math.max(0, 1 - normalized * normalized));
     }
-    if (component.kind === 'or' || component.kind === 'nor' || component.kind === 'xor') {
+    if (component.kind === 'or' || component.kind === 'nor' || component.kind === 'xor' || component.kind === 'xnor') {
         return orOutputBoundaryX(y, height);
     }
     return 30 - 60 * (Math.abs(y) / (height / 2));
 }
 function hasOutputInversion(component) {
-    return component.kind === 'nand' || component.kind === 'nor' || component.kind === 'not';
+    return component.kind === 'nand' || component.kind === 'nor' || component.kind === 'xnor' || component.kind === 'not';
 }
 function gateStubs(component, paint) {
     const height = classicalGateHeight(component);
@@ -209,6 +209,7 @@ function iecGate(component, paint) {
         or: '≥1',
         nor: '≥1',
         xor: '=1',
+        xnor: '=1',
         not: '1'
     };
     return `<rect ${paint} x="-32" y="${-height / 2}" width="64" height="${height}" rx="2" /><text class="schematic-gate-symbol" fill="currentColor" stroke="none" x="0" y="4" text-anchor="middle" font-size="14">${symbol[component.kind]}</text>${inversionBubbles(component, paint)}${gateStubs(component, paint)}`;
@@ -225,19 +226,30 @@ function ieeeGate(component, paint) {
         contour = `<path ${paint} d="M -32 ${top} H 0 A 32 ${height / 2} 0 0 1 0 ${bottom} H -32 Z" />`;
     }
     else {
-        const xorArc = component.kind === 'xor' ? `<path ${paint} d="M -38 ${top} Q -18 0 -38 ${bottom}" />` : '';
+        const xorArc = component.kind === 'xor' || component.kind === 'xnor' ? `<path ${paint} d="M -38 ${top} Q -18 0 -38 ${bottom}" />` : '';
         contour = `<path ${paint} d="M -32 ${top} Q 3 ${top} 32 0 Q 3 ${bottom} -32 ${bottom} Q -12 0 -32 ${top} Z" />${xorArc}`;
     }
     return `${contour}${inversionBubbles(component, paint)}${gateStubs(component, paint)}`;
 }
 function quantumText(component) {
+    const symbols = {
+        qgate: '', cnot: '⊕',
+        hadamard: 'H', xgate: 'X', ygate: 'Y', zgate: 'Z', sgate: 'S', sdg: 'S†',
+        tgate: 'T', tdg: 'T†', sx: '√X', phase: 'P', rx: 'Rx', ry: 'Ry', rz: 'Rz', ugate: 'U'
+    };
     const details = [component.parameter, component.phase, component.matrix].filter((value) => value !== undefined && value !== '');
-    const rows = [component.label, ...details];
-    const start = -((rows.length - 1) * 12) / 2 + 4;
+    const rows = [component.kind === 'qgate' ? component.label : symbols[component.kind], ...details];
+    const { bodyWidth } = quantumGateDimensions(component);
+    const start = -((rows.length - 1) * 15) / 2 + 4;
     return rows
-        .map((value, index) => `<text class="${index === 0 ? 'schematic-gate-symbol' : 'schematic-quantum-detail'}" fill="currentColor" stroke="none" x="0" y="${start + index * 12}" text-anchor="middle" font-size="${index === 0 ? 14 : 10}" textLength="${fittedTextLength(value, 56, index === 0 ? 7 : 5)}" lengthAdjust="spacingAndGlyphs">${renderMathLabelTspans(value)}</text>`)
+        .map((value, index) => `<text class="${index === 0 ? 'schematic-gate-symbol' : 'schematic-quantum-detail'}" fill="currentColor" stroke="none" x="0" y="${start + index * 15}" text-anchor="middle" font-size="${index === 0 ? 14 : 10}" textLength="${fittedTextLength(value, bodyWidth - 12, index === 0 ? 7 : 5)}" lengthAdjust="spacingAndGlyphs">${renderMathLabelTspans(value)}</text>`)
         .join('');
 }
+function quantumGateShell(component, paint) {
+    const { bodyWidth, bodyHeight, stubExtent } = quantumGateDimensions(component);
+    const halfWidth = bodyWidth / 2;
+    return `<rect ${paint} x="${svgNumber(-halfWidth)}" y="${svgNumber(-bodyHeight / 2)}" width="${svgNumber(bodyWidth)}" height="${svgNumber(bodyHeight)}" rx="3" /><path ${paint} d="M ${svgNumber(-stubExtent)} 0 H ${svgNumber(-halfWidth)} M ${svgNumber(halfWidth)} 0 H ${svgNumber(stubExtent)}" />`;
+}
 function diodeShape(component, paint) {
     const junction = `<path ${paint} d="M -42 0 H -14 M -14 -16 L 10 0 L -14 16 Z M 10 -16 V 16 M 10 0 H 42" />`;
     switch (component.diodeType) {
@@ -249,6 +261,14 @@ function diodeShape(component, paint) {
             return `${junction}<path ${paint} d="M 4 -20 L 10 -16 M 10 16 L 16 20" />`;
         case 'led':
             return `${junction}<path ${paint} d="M -1 -18 L 11 -30 M 6 -30 H 11 V -25 M 8 -14 L 20 -26 M 15 -26 H 20 V -21" />`;
+        case 'photodiode':
+            return `${junction}<path ${paint} d="M 18 -30 L 6 -18 M 6 -18 H 11 V -23 M 27 -22 L 15 -10 M 15 -10 H 20 V -15" />`;
+        case 'varactor':
+            return `${junction}<path ${paint} d="M 16 -16 V 16" />`;
+        case 'scr':
+            return `${junction}<path ${paint} d="M 10 10 L 24 22 H 34" />`;
+        case 'triac':
+            return `<path ${paint} d="M -42 0 H -15 L 9 -15 V 15 L -15 0 M 42 0 H 15 L -9 15 V -15 L 15 0 M 5 12 L 23 25 H 34" />`;
     }
 }
 function bjtShape(component, paint) {
@@ -256,12 +276,18 @@ function bjtShape(component, paint) {
     return `<circle ${paint} cx="0" cy="0" r="30" /><path ${paint} d="M -42 0 H -9 M -9 -18 V 18 M -9 -10 L 20 -22 H 42 M -9 10 L 20 22 H 42 ${emitterArrow}" />`;
 }
 function mosfetShape(component, paint) {
-    const pChannel = component.transistorType === 'pmos';
+    const pChannel = component.transistorType.startsWith('p');
+    const jfet = component.transistorType.endsWith('jfet');
+    const igbt = component.transistorType.endsWith('igbt');
+    if (jfet) {
+        const arrow = pChannel ? 'M -5 -5 L 5 0 L -5 5' : 'M 5 -5 L -5 0 L 5 5';
+        return `<circle ${paint} cx="0" cy="0" r="30" /><path ${paint} d="M -42 0 H 4 M 4 -18 V 18 M 4 -12 L 20 -22 H 42 M 4 12 L 20 22 H 42 ${arrow}" />`;
+    }
     const control = pChannel
         ? `<path ${paint} d="M -42 0 H -16" /><circle ${paint} cx="-11" cy="0" r="5" />`
         : `<path ${paint} d="M -42 0 H -10" />`;
     const arrow = pChannel ? 'M 16 -3 L 5 3 L 16 9' : 'M 5 -3 L 16 3 L 5 9';
-    return `<circle ${paint} cx="0" cy="0" r="30" />${control}<path ${paint} d="M -10 -19 V 19 M 4 -17 V 17 M 4 -11 L 20 -22 H 42 M 4 11 L 20 22 H 42 ${arrow}" />`;
+    return `<circle ${paint} cx="0" cy="0" r="30" />${control}<path ${paint} d="M -10 -19 V 19 M 4 -17 V 17 M 4 -11 L 20 -22 H 42 M 4 11 L 20 22 H 42 ${arrow}${igbt ? ' M 9 -11 V 11' : ''}" />`;
 }
 function transistorShape(component, paint) {
     return component.transistorType === 'npn' || component.transistorType === 'pnp'
@@ -283,9 +309,13 @@ function icPinMarkup(component, side, paint) {
     const pins = component.pins[side];
     return pins
         .map((pin, index) => {
-        const point = positionIcPin(component, side, index);
-        const x = point.x - component.x;
-        const y = point.y - component.y;
+        const vertical = side === 'left' || side === 'right';
+        const x = vertical
+            ? (side === 'left' ? -1 : 1) * (component.bodyWidth / 2 + 16)
+            : distributedCoordinate(index, pins.length, component.bodyWidth);
+        const y = vertical
+            ? distributedCoordinate(index, pins.length, component.bodyHeight)
+            : (side === 'top' ? -1 : 1) * (component.bodyHeight / 2 + 16);
         const horizontalTextLength = fittedTextLength(pin, Math.max(8, component.bodyWidth / 2 - 10), 4);
         const verticalTextLength = fittedTextLength(pin, Math.max(8, component.bodyHeight / 2 - 10), 4);
         if (side === 'left') {
@@ -306,10 +336,12 @@ function icPinMarkup(component, side, paint) {
 function integratedCircuitShape(component, paint) {
     const left = -component.bodyWidth / 2;
     const top = -component.bodyHeight / 2;
-    return `<rect ${paint} x="${left}" y="${top}" width="${component.bodyWidth}" height="${component.bodyHeight}" rx="3" />${icPinMarkup(component, 'left', paint)}${icPinMarkup(component, 'right', paint)}${icPinMarkup(component, 'top', paint)}${icPinMarkup(component, 'bottom', paint)}<text class="schematic-gate-symbol" fill="currentColor" stroke="none" x="0" y="4" text-anchor="middle" font-size="12" textLength="${fittedTextLength(component.label, component.bodyWidth - 12, 7)}" lengthAdjust="spacingAndGlyphs">${renderMathLabelTspans(component.label)}</text>`;
+    const rotation = componentRotation(component);
+    const label = `<text class="schematic-gate-symbol" fill="currentColor" stroke="none" x="0" y="4" text-anchor="middle" font-size="12" textLength="${fittedTextLength(component.label, component.bodyWidth - 12, 7)}" lengthAdjust="spacingAndGlyphs">${renderMathLabelTspans(component.label)}</text>`;
+    return `<rect ${paint} x="${left}" y="${top}" width="${component.bodyWidth}" height="${component.bodyHeight}" rx="3" />${icPinMarkup(component, 'left', paint)}${icPinMarkup(component, 'right', paint)}${icPinMarkup(component, 'top', paint)}${icPinMarkup(component, 'bottom', paint)}${rotation === 0 ? label : `<g transform="rotate(${-rotation})">${label}</g>`}`;
 }
 function umlRow(value, x, y) {
-    return `<text class="schematic-uml-text schematic-uml-row" fill="currentColor" stroke="none" x="${svgNumber(x)}" y="${svgNumber(y)}" font-size="12">${escapeXml(value)}</text>`;
+    return `<text class="schematic-uml-text schematic-uml-row" fill="currentColor" stroke="none" x="${svgNumber(x)}" y="${svgNumber(y)}" font-size="12">${renderMathLabelTspans(value)}</text>`;
 }
 function umlClassShape(component, paint) {
     const left = -component.bodyWidth / 2;
@@ -320,7 +352,7 @@ function umlClassShape(component, paint) {
     const operationSeparator = attributeSeparator + attributeHeight;
     const stereotype = component.stereotype === undefined
         ? ''
-        : `<text class="schematic-uml-text schematic-uml-stereotype" fill="currentColor" stroke="none" x="0" y="${svgNumber(top + 13)}" text-anchor="middle" font-size="11">«${escapeXml(component.stereotype)}»</text>`;
+        : `<text class="schematic-uml-text schematic-uml-stereotype" fill="currentColor" stroke="none" x="0" y="${svgNumber(top + 13)}" text-anchor="middle" font-size="11">«${renderMathLabelTspans(component.stereotype)}»</text>`;
     const nameY = top + (component.stereotype === undefined ? 23 : 32);
     const attributes = component.attributes
         .map((row, index) => umlRow(row, left + 8, attributeSeparator + 17 + index * 16))
@@ -340,7 +372,8 @@ function umlStateShape(component, paint) {
     return `<rect ${paint} x="${svgNumber(left)}" y="${svgNumber(top)}" width="${svgNumber(component.bodyWidth)}" height="${svgNumber(component.bodyHeight)}" rx="10" />${component.details.length === 0 ? '' : `<path ${paint} d="M ${svgNumber(left)} ${svgNumber(separator)} H ${svgNumber(-left)}" />`}<text class="schematic-uml-text" fill="currentColor" stroke="none" x="0" y="${svgNumber(top + 21)}" text-anchor="middle" font-size="13" font-weight="600">${renderMathLabelTspans(component.label)}</text>${rows}`;
 }
 function umlComponentShape(component, paint, nodePaint) {
-    if (component.kind === 'class')
+    if (component.kind === 'class' || component.kind === 'interface' ||
+        component.kind === 'enumeration' || component.kind === 'datatype' || component.kind === 'object')
         return umlClassShape(component, paint);
     if (component.kind === 'state')
         return umlStateShape(component, paint);
@@ -365,25 +398,230 @@ function umlComponentShape(component, paint, nodePaint) {
             const top = -component.bodyHeight / 2;
             return `<path ${paint} d="M ${svgNumber(left)} ${svgNumber(top + 12)} V ${svgNumber(-top)} H ${svgNumber(-left)} V ${svgNumber(top)} H ${svgNumber(left + Math.min(54, component.bodyWidth / 2))} L ${svgNumber(left + Math.min(64, component.bodyWidth / 2 + 10))} ${svgNumber(top + 12)} Z" /><text class="schematic-uml-text" fill="currentColor" stroke="none" x="0" y="4" text-anchor="middle" font-size="13">${renderMathLabelTspans(component.label)}</text>`;
         }
+        case 'component':
+        case 'artifact':
+        case 'node':
+        case 'device':
+        case 'execution':
+        case 'system':
+        case 'action':
+        case 'object-node':
+        case 'partition':
+        case 'activation':
+        case 'fragment':
+        case 'interaction':
+        case 'region': {
+            const left = -component.bodyWidth / 2;
+            const top = -component.bodyHeight / 2;
+            const right = -left;
+            const bottom = -top;
+            if (component.kind === 'activation')
+                return `<rect ${paint} x="${svgNumber(left)}" y="${svgNumber(top)}" width="${svgNumber(component.bodyWidth)}" height="${svgNumber(component.bodyHeight)}" />`;
+            if (component.kind === 'fragment' || component.kind === 'interaction') {
+                return `<rect ${paint} x="${svgNumber(left)}" y="${svgNumber(top)}" width="${svgNumber(component.bodyWidth)}" height="${svgNumber(component.bodyHeight)}" /><path ${paint} d="M ${svgNumber(left)} ${svgNumber(top + 20)} H ${svgNumber(left + 58)} L ${svgNumber(left + 68)} ${svgNumber(top + 10)} V ${svgNumber(top)}" /><text class="schematic-uml-text" fill="currentColor" stroke="none" x="${svgNumber(left + 6)}" y="${svgNumber(top + 14)}" font-size="11">${component.kind === 'interaction' ? 'ref' : 'alt'}</text><text class="schematic-uml-text" fill="currentColor" stroke="none" x="0" y="4" text-anchor="middle" font-size="12">${renderMathLabelTspans(component.label)}</text>`;
+            }
+            const rx = component.kind === 'action' ? 10 : 1;
+            const dash = component.kind === 'region' ? ' stroke-dasharray="6 4"' : '';
+            const icon = component.kind === 'component'
+                ? `<path ${paint} d="M ${svgNumber(right - 22)} ${svgNumber(top + 10)} h 14 v 10 h -14 z M ${svgNumber(right - 22)} ${svgNumber(top + 25)} h 14 v 10 h -14 z" />`
+                : component.kind === 'artifact'
+                    ? `<path ${paint} d="M ${svgNumber(right - 16)} ${svgNumber(top)} v 16 h 16" />`
+                    : component.kind === 'node' || component.kind === 'device' || component.kind === 'execution'
+                        ? `<path ${paint} d="M ${svgNumber(left)} ${svgNumber(top + 10)} l 12 -10 h ${svgNumber(component.bodyWidth)} l -12 10 M ${svgNumber(right)} ${svgNumber(top)} v ${svgNumber(component.bodyHeight - 10)} l -12 10" />`
+                        : component.kind === 'partition' ? `<path ${paint} d="M ${svgNumber(left + 28)} ${svgNumber(top)} V ${svgNumber(bottom)}" />` : '';
+            return `<rect ${paint}${dash} x="${svgNumber(left)}" y="${svgNumber(top)}" width="${svgNumber(component.bodyWidth)}" height="${svgNumber(component.bodyHeight)}" rx="${rx}" />${icon}<text class="schematic-uml-text" fill="currentColor" stroke="none" x="0" y="4" text-anchor="middle" font-size="12">${renderMathLabelTspans(component.label)}</text>`;
+        }
+        case 'provided-interface':
+            return `<circle ${paint} cx="0" cy="0" r="10" />`;
+        case 'required-interface':
+            return `<path ${paint} d="M 0 -10 A 10 10 0 0 0 0 10" />`;
+        case 'component-port':
+            return `<rect ${paint} x="-7" y="-7" width="14" height="14" />`;
+        case 'decision':
+        case 'merge':
+        case 'choice':
+            return `<path ${paint} d="M 0 -17 L 17 0 0 17 -17 0 Z" />`;
+        case 'fork':
+        case 'join':
+            return `<rect ${nodePaint} x="-38" y="-4" width="76" height="8" rx="1" />`;
+        case 'activity-final':
+            return `<circle ${paint} cx="0" cy="0" r="11" /><circle ${nodePaint} cx="0" cy="0" r="6" />`;
+        case 'flow-final':
+            return `<circle ${paint} cx="0" cy="0" r="11" /><path ${paint} d="M -7 -7 L 7 7 M 7 -7 L -7 7" />`;
+        case 'send-signal':
+            return `<path ${paint} d="M -21 -14 H 5 L 21 0 5 14 H -21 Z" />`;
+        case 'receive-signal':
+            return `<path ${paint} d="M -21 -14 H 21 L 5 0 21 14 H -21 Z" />`;
+        case 'destruction':
+            return `<path ${paint} d="M -10 -10 L 10 10 M 10 -10 L -10 10" />`;
+        case 'gate':
+        case 'found':
+        case 'lost':
+            return `<circle ${component.kind === 'lost' ? paint : nodePaint} cx="0" cy="0" r="5" />`;
+        case 'state-junction':
+            return `<circle ${nodePaint} cx="0" cy="0" r="7" />`;
+        case 'history':
+            return `<circle ${paint} cx="0" cy="0" r="11" /><text class="schematic-uml-text" fill="currentColor" stroke="none" x="0" y="4" text-anchor="middle" font-size="11">H${component.variant === 'deep' ? '*' : ''}</text>`;
+        case 'entry':
+        case 'exit':
+            return `<circle ${paint} cx="0" cy="0" r="10" />${component.kind === 'exit' ? `<path ${paint} d="M -6 -6 L 6 6 M 6 -6 L -6 6" />` : ''}`;
+        case 'terminate':
+            return `<path ${paint} d="M -9 -9 L 9 9 M 9 -9 L -9 9" />`;
         case 'initial':
             return `<circle ${nodePaint} cx="0" cy="0" r="10" />`;
         case 'final':
             return `<circle ${paint} cx="0" cy="0" r="11" /><circle ${nodePaint} cx="0" cy="0" r="6" />`;
     }
 }
+function passiveShape(component, paint) {
+    const variant = component.passiveType ?? 'fixed';
+    if (component.kind === 'resistor') {
+        const base = `<path ${paint} d="M -42 0 H -26 L -20 -12 L -10 12 L 0 -12 L 10 12 L 20 -12 L 26 0 H 42" />`;
+        if (variant === 'variable' || variant === 'rheostat' || variant === 'potentiometer')
+            return `${base}<path ${paint} d="M -18 20 L 18 -20 M 11 -20 H 18 V -13${variant === 'potentiometer' ? ' M 0 28 V 12' : ''}" />`;
+        if (variant === 'thermistor')
+            return `${base}<path ${paint} d="M -18 19 L 18 -19 M 10 -19 H 18 V -11" />`;
+        if (variant === 'ldr')
+            return `${base}<path ${paint} d="M 15 -27 L 4 -16 M 4 -16 H 9 V -21 M 27 -20 L 16 -9 M 16 -9 H 21 V -14" />`;
+        return base;
+    }
+    if (component.kind === 'capacitor') {
+        const rightPlate = variant === 'polarized' ? 'M 7 -18 Q 13 0 7 18' : 'M 7 -18 V 18';
+        const variable = variant === 'variable' ? `<path ${paint} d="M -18 20 L 18 -20 M 11 -20 H 18 V -13" />` : '';
+        const positive = variant === 'polarized' ? `<path ${paint} d="M -17 -12 H -9 M -13 -16 V -8" />` : '';
+        return `<path ${paint} d="M -42 0 H -7 M -7 -18 V 18 ${rightPlate} M 7 0 H 42" />${variable}${positive}`;
+    }
+    const base = `<path ${paint} d="M -42 0 H -28 C -28 -16 -14 -16 -14 0 C -14 -16 0 -16 0 0 C 0 -16 14 -16 14 0 C 14 -16 28 -16 28 0 H 42" />`;
+    return variant === 'fixed' ? base : `${base}<path ${paint} d="M -28 12 C -28 28 -14 28 -14 12 C -14 28 0 28 0 12 C 0 28 14 28 14 12 C 14 28 28 28 28 12${variant === 'transformer' ? ' M -33 5 H 33 M -33 8 H 33' : ''}" />`;
+}
+function electricalShape(component, paint, nodePaint) {
+    const variant = component.variant ?? '';
+    switch (component.kind) {
+        case 'junction':
+            return `<circle ${nodePaint} cx="0" cy="0" r="4" />`;
+        case 'testpoint':
+            return `<circle ${paint} cx="0" cy="0" r="9" /><circle ${nodePaint} cx="0" cy="0" r="2" />`;
+        case 'connector':
+            return `<path ${paint} d="M -32 0 H -9 M 9 0 H 32" /><circle ${paint} cx="0" cy="0" r="9" />`;
+        case 'source': {
+            if (variant === 'battery')
+                return `<path ${paint} d="M -42 0 H -8 M -8 -16 V 16 M 8 -10 V 10 M 8 0 H 42" />`;
+            const dependent = ['vcvs', 'vccs', 'ccvs', 'cccs'].includes(variant);
+            const body = dependent ? `<path ${paint} d="M -24 0 L 0 -24 24 0 0 24 Z" />` : `<circle ${paint} cx="0" cy="0" r="24" />`;
+            const controls = dependent ? `<path ${paint} d="M 0 -34 V -24 M 0 24 V 34" />` : '';
+            const current = variant.startsWith('current') || variant.endsWith('cs');
+            const glyph = variant.endsWith('ac')
+                ? `<path ${paint} d="M -13 0 C -8 -12 -4 -12 0 0 C 4 12 8 12 13 0" />`
+                : variant === 'voltage-pulse'
+                    ? `<path ${paint} d="M -14 8 H -7 V -8 H 7 V 8 H 14" />`
+                    : current ? `<path ${paint} d="M 0 12 V -12 M -6 -5 L 0 -12 6 -5" />` : `<path ${paint} d="M -7 -8 H 7 M 0 -15 V -1 M -7 9 H 7" />`;
+            return `<path ${paint} d="M -42 0 H -24 M 24 0 H 42" />${body}${controls}${glyph}`;
+        }
+        case 'power':
+            return `<path ${paint} d="M -32 0 H 0 M 0 -13 V 13 M 0 -13 L 15 0 0 13" />`;
+        case 'switch': {
+            const relay = variant === 'relay' ? `<path ${paint} d="M -12 34 C -12 18 12 18 12 34 M 0 19 V 8" />` : '';
+            const throw2 = variant === 'spdt' ? `<path ${paint} d="M 26 12 H 42" />` : '';
+            return `<path ${paint} d="M -42 0 H -24 M -24 0 L 22 -12 M 26 -12 H 42" />${throw2}${relay}`;
+        }
+        case 'protection':
+            return variant === 'breaker'
+                ? `<path ${paint} d="M -42 0 H -18 M -18 0 L 18 -12 M 18 0 H 42" />`
+                : `<path ${paint} d="M -42 0 H -24 M 24 0 H 42" /><rect ${paint} x="-24" y="-9" width="48" height="18" rx="4" />`;
+        case 'amplifier':
+            return `<path ${paint} d="M -48 -13 H -30 M -48 13 H -30 M -30 -30 L 30 0 -30 30 Z M 30 0 H 48 M 0 -36 V -15 M 0 15 V 36 M -25 -17 H -17 M -21 -21 V -13 M -25 13 H -17" />`;
+        case 'resonator':
+            return `<path ${paint} d="M -42 0 H -12 M -12 -18 V 18 M 12 -18 V 18 M 12 0 H 42" /><rect ${paint} x="-7" y="-14" width="14" height="28" />`;
+        case 'meter':
+        case 'load':
+            return `<path ${paint} d="M -42 0 H -24 M 24 0 H 42" /><circle ${paint} cx="0" cy="0" r="24" />${variant === 'lamp' ? `<path ${paint} d="M -15 -15 L 15 15 M 15 -15 L -15 15" />` : variant === 'speaker' ? `<path ${paint} d="M -12 -9 H -3 L 8 -19 V 19 L -3 9 H -12 Z M 13 -10 Q 22 0 13 10" />` : variant === 'buzzer' ? `<path ${paint} d="M -12 -9 H -3 L 8 -18 V 18 L -3 9 H -12 Z M 13 -8 L 20 -14 M 15 0 H 24 M 13 8 L 20 14" />` : ''}`;
+    }
+}
+function digitalShape(component, paint) {
+    if (component.kind === 'buffer') {
+        const bubble = component.variant === 'tristate-inverter' || component.variant === 'schmitt-inverter';
+        return `<path ${paint} d="M -44 0 H -28 M -28 -22 L 24 0 -28 22 Z M ${bubble ? 32 : 24} 0 H 44${component.variant?.startsWith('schmitt') === true ? ' M -17 -8 H -6 V 8 H 5' : ''}" />${bubble ? `<circle ${paint} cx="28" cy="0" r="4" />` : ''}${component.variant?.startsWith('tristate') === true ? `<path ${paint} d="M 0 34 V 12" />` : ''}`;
+    }
+    const left = -component.bodyWidth / 2;
+    const right = -left;
+    const top = -component.bodyHeight / 2;
+    const stubs = `${Array.from({ length: component.inputs }, (_, index) => `<path ${paint} d="M ${svgNumber(left - 16)} ${svgNumber(distributedCoordinate(index, Math.max(1, component.inputs), component.bodyHeight))} H ${svgNumber(left)}" />`).join('')}${Array.from({ length: component.outputs }, (_, index) => `<path ${paint} d="M ${svgNumber(right)} ${svgNumber(distributedCoordinate(index, component.outputs, component.bodyHeight))} H ${svgNumber(right + 16)}" />`).join('')}`;
+    return `<rect ${paint} x="${svgNumber(left)}" y="${svgNumber(top)}" width="${component.bodyWidth}" height="${component.bodyHeight}" rx="3" />${stubs}`;
+}
+function quantumSpecialShape(component, paint, nodePaint) {
+    if (component.kind === 'measure')
+        return `<path ${paint} d="M -40 0 H -22 M 22 0 H 40 M 0 22 V 34" /><rect ${paint} x="-22" y="-22" width="44" height="44" rx="3" /><path ${paint} d="M -12 8 A 15 15 0 0 1 12 8 M 0 8 L 11 -9" />`;
+    if (component.kind === 'prepare')
+        return `<path ${paint} d="M 0 0 H 40 M -10 -10 L 10 0 -10 10 Z" />`;
+    if (component.kind === 'reset')
+        return `<path ${paint} d="M -40 0 H -18 M 18 0 H 40" /><rect ${paint} x="-18" y="-18" width="36" height="36" rx="3" /><path ${paint} d="M 9 -8 A 12 12 0 1 0 10 7 M 9 -8 H 1 M 9 -8 V 0" />`;
+    if (component.kind === 'control')
+        return `<path ${paint} d="M -42 0 H 42" />${component.controlType === 'negative' ? `<circle ${paint} cx="0" cy="0" r="5" />` : `<circle ${nodePaint} cx="0" cy="0" r="5" />`}`;
+    if (component.kind === 'classical-bit' || component.kind === 'classical-register')
+        return `<path ${paint} d="M -40 -2 H 40 M -40 2 H 40" />`;
+    const tracks = Math.max(component.wires, component.controls + component.targets);
+    const span = Math.max(16, (tracks - 1) * 18);
+    const lines = Array.from({ length: tracks }, (_, index) => `<path ${paint} d="M -42 ${svgNumber(distributedCoordinate(index, tracks, span))} H 42" />`).join('');
+    if (component.kind === 'barrier')
+        return `${lines}<path ${paint} stroke-dasharray="4 3" d="M 0 ${svgNumber(-span / 2 - 8)} V ${svgNumber(span / 2 + 8)}" />`;
+    if (component.kind === 'delay')
+        return `${lines}<rect ${paint} x="-12" y="${svgNumber(-span / 2 - 7)}" width="24" height="${svgNumber(span + 14)}" rx="2" />`;
+    const marks = Array.from({ length: tracks }, (_, index) => {
+        const y = distributedCoordinate(index, tracks, span);
+        if (component.kind === 'swap')
+            return `<path ${paint} d="M -6 ${svgNumber(y - 6)} L 6 ${svgNumber(y + 6)} M 6 ${svgNumber(y - 6)} L -6 ${svgNumber(y + 6)}" />`;
+        if (component.kind === 'cz')
+            return `<circle ${nodePaint} cx="0" cy="${svgNumber(y)}" r="4" />`;
+        if (index < component.controls) {
+            if (component.controlType === 'negative')
+                return `<circle ${paint} cx="0" cy="${svgNumber(y)}" r="5" />`;
+            if (component.controlType === 'classical')
+                return `<rect ${nodePaint} x="-5" y="${svgNumber(y - 5)}" width="10" height="10" />`;
+            return `<circle ${nodePaint} cx="0" cy="${svgNumber(y)}" r="4" />`;
+        }
+        if (component.kind === 'controlled' || component.kind === 'cphase')
+            return `<rect ${paint} x="-10" y="${svgNumber(y - 10)}" width="20" height="20" rx="2" />`;
+        return `<circle ${paint} cx="0" cy="${svgNumber(y)}" r="10" /><path ${paint} d="M -7 ${svgNumber(y)} H 7 M 0 ${svgNumber(y - 7)} V ${svgNumber(y + 7)}" />`;
+    }).join('');
+    return `${lines}<path ${paint} d="M 0 ${svgNumber(-span / 2)} V ${svgNumber(span / 2)}" />${marks}`;
+}
+function componentInnerText(component) {
+    if (isQuantumGate(component) && component.kind !== 'cnot') {
+        return `<g ${colorAttributes(component.color)}>${quantumText(component)}</g>`;
+    }
+    if (isDigitalComponent(component)) {
+        const labels = {
+            buffer: '', logic: component.variant === 'high' ? '1' : component.variant === 'low' ? '0' : component.variant === 'high-z' ? 'Z' : 'X',
+            clock: 'CLK', flipflop: String(component.variant).toUpperCase(), mux: component.variant === 'demux' ? 'DEMUX' : 'MUX',
+            encoder: 'ENC', decoder: 'DEC', register: 'REG', counter: 'CTR', adder: component.variant === 'full' ? 'FA' : 'HA', comparator: 'CMP', bus: String(component.variant).toUpperCase()
+        };
+        const value = labels[component.kind];
+        return value === '' ? '' : `<text ${colorAttributes(component.color, 'schematic-gate-symbol')} stroke="none" x="0" y="4" text-anchor="middle" font-size="11">${value}</text>`;
+    }
+    if ((component.kind === 'meter' || component.kind === 'load') && component.variant !== 'lamp' && component.variant !== 'speaker' && component.variant !== 'buzzer') {
+        const value = component.variant === 'voltmeter' ? 'V' : component.variant === 'ammeter' ? 'A' : 'M';
+        return `<text ${colorAttributes(component.color, 'schematic-gate-symbol')} stroke="none" x="0" y="5" text-anchor="middle" font-size="14">${value}</text>`;
+    }
+    if (isQuantumSpecial(component) && component.kind === 'controlled' && component.operator !== undefined) {
+        return `<text ${colorAttributes(component.color, 'schematic-gate-symbol')} stroke="none" x="0" y="4" text-anchor="middle" font-size="11">${renderMathLabelTspans(component.operator)}</text>`;
+    }
+    return '';
+}
 function componentShape(component, paint = colorAttributes(component.color), nodePaint = colorAttributes(component.color, 'schematic-node-fill')) {
     if (isClassicalGate(component)) {
         return component.standard === 'iec' ? iecGate(component, paint) : ieeeGate(component, paint);
     }
+    if (isDigitalComponent(component))
+        return digitalShape(component, paint);
+    if (isQuantumSpecial(component))
+        return quantumSpecialShape(component, paint, nodePaint);
     if (isUmlComponent(component))
         return umlComponentShape(component, paint, nodePaint);
     switch (component.kind) {
         case 'resistor':
-            return `<path ${paint} d="M -42 0 H -26 L -20 -12 L -10 12 L 0 -12 L 10 12 L 20 -12 L 26 0 H 42" />`;
         case 'capacitor':
-            return `<path ${paint} d="M -42 0 H -7 M -7 -18 V 18 M 7 -18 V 18 M 7 0 H 42" />`;
         case 'inductor':
-            return `<path ${paint} d="M -42 0 H -28 C -28 -16 -14 -16 -14 0 C -14 -16 0 -16 0 0 C 0 -16 14 -16 14 0 C 14 -16 28 -16 28 0 H 42" />`;
+            return passiveShape(component, paint);
         case 'diode':
             return diodeShape(component, paint);
         case 'transistor':
@@ -393,28 +631,66 @@ function componentShape(component, paint = colorAttributes(component.color), nod
         case 'ground':
             return groundShape(component, paint);
         case 'hadamard':
-            return `<rect ${paint} x="-25" y="-25" width="50" height="50" rx="3" /><path ${paint} d="M -48 0 H -25 M 25 0 H 48 M -9 -13 V 13 M 9 -13 V 13 M -9 0 H 9" />`;
+        case 'qgate':
+        case 'xgate':
+        case 'ygate':
+        case 'zgate':
+        case 'sgate':
+        case 'sdg':
+        case 'tgate':
+        case 'tdg':
+        case 'sx':
+        case 'phase':
+        case 'rx':
+        case 'ry':
+        case 'rz':
+        case 'ugate':
+            return quantumGateShell(component, paint);
         case 'cnot':
             return `<path ${paint} d="M -42 0 H 42 M 0 -26 V 26 M -8 16 H 8 M 0 8 V 24" /><circle ${nodePaint} cx="0" cy="-16" r="4" /><circle ${paint} cx="0" cy="16" r="10" />`;
-        case 'qgate':
-            return `<rect ${paint} x="-34" y="-30" width="68" height="60" rx="4" /><path ${paint} d="M -48 0 H -34 M 34 0 H 48" />${quantumText(component)}`;
         case 'ic':
             return integratedCircuitShape(component, paint);
+        case 'source':
+        case 'junction':
+        case 'testpoint':
+        case 'connector':
+        case 'power':
+        case 'switch':
+        case 'protection':
+        case 'amplifier':
+        case 'resonator':
+        case 'meter':
+        case 'load':
+            return electricalShape(component, paint, nodePaint);
     }
 }
 function reusableSymbolKey(component) {
     if (isClassicalGate(component) ||
         isUmlComponent(component) ||
-        component.kind === 'qgate' ||
         component.kind === 'ic') {
         return undefined;
     }
+    if (isQuantumGate(component) && component.kind !== 'cnot') {
+        const dimensions = quantumGateDimensions(component);
+        return `quantum-shell-${dimensions.bodyWidth}-${dimensions.bodyHeight}`;
+    }
+    if (isDigitalComponent(component))
+        return `digital-${component.kind}-${component.variant ?? ''}-${component.inputs}-${component.outputs}-${component.bodyWidth}-${component.bodyHeight}`;
+    if (isQuantumSpecial(component))
+        return `quantum-${component.kind}-${component.controlType ?? ''}-${component.controls}-${component.targets}-${component.wires}`;
     if (component.kind === 'diode')
         return `diode-${component.diodeType}`;
     if (component.kind === 'transistor')
         return `transistor-${component.transistorType}`;
     if (component.kind === 'ground')
         return `ground-${component.groundStyle}`;
+    if (component.kind === 'resistor' || component.kind === 'capacitor' || component.kind === 'inductor')
+        return component.passiveType === undefined ? component.kind : `${component.kind}-${component.passiveType}`;
+    if (component.kind === 'source' || component.kind === 'junction' || component.kind === 'testpoint' ||
+        component.kind === 'connector' || component.kind === 'power' || component.kind === 'switch' ||
+        component.kind === 'protection' || component.kind === 'amplifier' || component.kind === 'resonator' ||
+        component.kind === 'meter' || component.kind === 'load')
+        return `${component.kind}-${component.variant ?? ''}`;
     return component.kind;
 }
 function reusableSymbolDefinition(component, symbolId) {
@@ -427,7 +703,9 @@ function connectionMarkup(connection, routed, index, idPrefix, glowId) {
     const source = escapeXml(`${connection.from.componentId}.${connection.from.port}`);
     const target = escapeXml(`${connection.to.componentId}.${connection.to.port}`);
     const traceId = `${idPrefix}-wire-${index}-vector`;
-    const dataAttributes = ` data-wire-source="${source}" data-wire-target="${target}"`;
+    const signalKind = connection.signalKind ?? 'electrical';
+    const signalClass = connection.signalKind === undefined ? '' : ` schematic-signal--${signalKind}`;
+    const dataAttributes = ` data-wire-source="${source}" data-wire-target="${target}" data-source-line="${connection.line}"${connection.signalKind === undefined ? '' : ` data-signal-kind="${signalKind}"`}${connection.width === undefined ? '' : ` data-bus-width="${connection.width}"`}`;
     const relation = connection.relation ?? 'signal';
     const accessibility = ` tabindex="0" role="group" aria-label="${escapeXml(relation)} from ${source} to ${target}"`;
     const vectorId = ` id="${traceId}"`;
@@ -436,7 +714,7 @@ function connectionMarkup(connection, routed, index, idPrefix, glowId) {
     const endpoint = relation === 'signal' && connection.markerEnd === 'none'
         ? `<circle ${colorAttributes(connection.color, 'schematic-node-fill')} cx="${svgNumber(end.x)}" cy="${svgNumber(end.y)}" r="3" />`
         : '';
-    return `<g class="schematic-wire"${dataAttributes}${accessibility}><path${vectorId} ${colorAttributes(connection.color, 'schematic-trace')} d="${routed.d}"${markerAttributes} />${glow}${endpoint}${connectionLabelMarkup(connection, routed)}</g>`;
+    return `<g class="schematic-wire${signalClass}"${dataAttributes}${accessibility}><path${vectorId} ${colorAttributes(connection.color, `schematic-trace${signalClass}`)} d="${routed.d}"${markerAttributes} />${glow}${endpoint}${connectionLabelMarkup(connection, routed)}</g>`;
 }
 function connectionMarkerAttributes(connection, idPrefix) {
     const start = connection.markerStart;
@@ -486,10 +764,11 @@ function compactConnectionMarkup(connections, routes, idPrefix, embedVisuals, gl
     const batches = new Map();
     for (const [index, connection] of connections.entries()) {
         const markerAttributes = connectionMarkerAttributes(connection, idPrefix);
-        const key = `${colorKey(connection.color)}|${markerAttributes}`;
+        const signalKind = connection.signalKind ?? 'electrical';
+        const key = `${colorKey(connection.color)}|${markerAttributes}|${signalKind}|${connection.width ?? 1}`;
         let batch = batches.get(key);
         if (batch === undefined) {
-            batch = { color: connection.color, markerAttributes, traces: [], endpoints: [], labels: [] };
+            batch = { color: connection.color, markerAttributes, signalKind, traces: [], endpoints: [], labels: [] };
             batches.set(key, batch);
         }
         const routed = routes[index];
@@ -503,7 +782,7 @@ function compactConnectionMarkup(connections, routes, idPrefix, embedVisuals, gl
             batch.labels.push(label);
     }
     return Array.from(batches.values(), (batch, index) => {
-        const tracePaint = colorAttributes(batch.color, 'schematic-trace');
+        const tracePaint = colorAttributes(batch.color, `schematic-trace${batch.signalKind === 'electrical' ? '' : ` schematic-signal--${batch.signalKind}`}`);
         const nodePaint = colorAttributes(batch.color, 'schematic-node-fill');
         const traceId = `${idPrefix}-wire-batch-${index}-vector`;
         const trace = `<path${embedVisuals ? ` id="${traceId}"` : ''} ${tracePaint} d="${batch.traces.join(' ')}"${batch.markerAttributes} />`;
@@ -515,15 +794,43 @@ function compactConnectionMarkup(connections, routes, idPrefix, embedVisuals, gl
     }).join('');
 }
 function componentMetadata(component) {
+    if (isDigitalComponent(component)) {
+        return [component.variant, component.width > 1 ? `${component.width} bit` : undefined]
+            .filter(Boolean)
+            .join(', ');
+    }
+    if (isQuantumSpecial(component)) {
+        return [
+            component.operator,
+            component.controlType,
+            component.controls > 0 ? `${component.controls} controls` : undefined,
+            component.targets > 0 ? `${component.targets} targets` : undefined,
+            component.width > 1 ? `${component.width} bit` : undefined
+        ].filter(Boolean).join(', ');
+    }
+    if (isQuantumGate(component)) {
+        return [component.parameter, component.phase, component.matrix].filter(Boolean).join(', ');
+    }
     switch (component.kind) {
-        case 'qgate':
-            return [component.parameter, component.phase, component.matrix].filter(Boolean).join(', ');
+        case 'resistor':
+        case 'capacitor':
+        case 'inductor':
+            return component.passiveType ?? 'fixed';
         case 'diode':
             return component.diodeType;
         case 'transistor':
             return component.transistorType;
         case 'ground':
             return component.groundStyle;
+        case 'source':
+        case 'power':
+        case 'switch':
+        case 'protection':
+        case 'amplifier':
+        case 'resonator':
+        case 'meter':
+        case 'load':
+            return String(component.variant);
         case 'ic':
             return `${Object.values(component.pins).reduce((total, pins) => total + pins.length, 0)} pins`;
         default:
@@ -547,15 +854,17 @@ function componentMarkup(component, index, idPrefix, glowId, mode, nodeHooks, po
     const anchors = componentTextAnchors(component);
     const id = escapeXml(component.id);
     const vectorId = `${idPrefix}-node-${index}-vector`;
+    const rotation = componentRotation(component);
+    const vectorTransform = rotation === 0 ? '' : ` transform="rotate(${rotation})"`;
     const styles = mode === 'embedded-css' || mode === 'full';
     const dataAttributes = nodeHooks
-        ? ` data-node-id="${id}" data-node-kind="${component.kind}" data-node-label="${label}" data-component="${id}" data-kind="${component.kind}"`
+        ? ` data-node-id="${id}" data-node-kind="${component.kind}" data-node-label="${label}" data-component="${id}" data-kind="${component.kind}" data-source-line="${component.line}"${'orientation' in component && component.orientation !== undefined ? ` data-orientation="${component.orientation}"` : ''}`
         : '';
     let accessibility = '';
     if (styles) {
         const metadata = componentMetadata(component);
         const ariaLabel = escapeXml(`${component.id}, ${component.kind}, ${component.label}${metadata === '' ? '' : `, ${metadata}`}`);
-        accessibility = ` tabindex="0" role="group" aria-label="${ariaLabel}"`;
+        accessibility = `${portHooks ? '' : ' tabindex="0"'} role="group" aria-label="${ariaLabel}"`;
     }
     const vectorIdAttribute = styles ? ` id="${vectorId}"` : '';
     const glow = styles
@@ -563,18 +872,20 @@ function componentMarkup(component, index, idPrefix, glowId, mode, nodeHooks, po
         : '';
     const hotspots = portHooks ? componentPortMarkup(component) : '';
     const vector = symbolId === undefined
-        ? `<g${vectorIdAttribute} class="schematic-component-vector">${componentShape(component)}</g>`
-        : `<use${vectorIdAttribute} ${colorAttributes(component.color, 'schematic-component-vector')} href="#${symbolId}" />`;
+        ? `<g${vectorIdAttribute} class="schematic-component-vector"${vectorTransform}>${componentShape(component)}</g>`
+        : `<use${vectorIdAttribute} ${colorAttributes(component.color, 'schematic-component-vector')} href="#${symbolId}"${vectorTransform} />`;
+    const innerText = componentInnerText(component);
     const externalLabels = isUmlComponent(component)
         ? ''
         : `<text class="schematic-designator" fill="currentColor" stroke="none" x="0" y="${anchors.designatorY}" text-anchor="middle" font-size="12" textLength="${anchors.designatorWidth}" lengthAdjust="spacingAndGlyphs">${id}</text><text class="schematic-label" fill="currentColor" stroke="none" x="0" y="${anchors.labelY}" text-anchor="middle" font-size="12" textLength="${anchors.labelWidth}" lengthAdjust="spacingAndGlyphs">${renderedLabel}</text>`;
-    return `<g class="schematic-component"${dataAttributes} transform="translate(${svgNumber(component.x)} ${svgNumber(component.y)})"${accessibility}>${vector}${glow}${externalLabels}${hotspots}</g>`;
+    return `<g class="schematic-component"${dataAttributes} transform="translate(${svgNumber(component.x)} ${svgNumber(component.y)})"${accessibility}>${vector}${glow}${innerText}${externalLabels}${hotspots}</g>`;
 }
 export function renderSchematic(document, options) {
     assertParsedSchematicDocument(document);
     const normalized = normalizeCompileOptions(options);
     const components = new Map(document.components.map((component) => [component.id, component]));
-    const routedConnections = routeConnections(document.connections, components, normalized.bounds);
+    const routedConnections = parsedSchematicRoutes(document, normalized.bounds) ??
+        routeConnections(document.connections, components, normalized.bounds);
     validateDocumentGeometry(document, normalized, routedConnections);
     const signature = `${normalized.bounds.width}x${normalized.bounds.height}:${normalized.title}:${JSON.stringify(document)}`;
     const candidatePrefix = (normalized.idPrefix ?? `schematic-${stableHash(signature)}`).replace(/[^A-Za-z0-9_-]/g, '-');
@@ -613,7 +924,8 @@ export function renderSchematic(document, options) {
         ? `<style>${STATIC_SVG_STYLES}${hookStyles}${interactionStyles}</style><pattern id="${gridId}" width="20" height="20" patternUnits="userSpaceOnUse"><path class="schematic-grid-line" d="M20 0H0V20" /></pattern>${glowFilter}`
         : '';
     const definitions = `${embeddedDefinitions}${markerDefinitions}${symbolDefinitions}`;
-    writer.append(`<figure class="schematic-frame"${hooks ? ' data-schematic' : ''}><svg class="schematic-svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 ${normalized.bounds.width} ${normalized.bounds.height}" width="${normalized.bounds.width}" height="${normalized.bounds.height}" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" role="img" aria-labelledby="${titleId} ${descriptionId}" preserveAspectRatio="xMidYMid meet"><title id="${titleId}">${title}</title><desc id="${descriptionId}">${description}</desc>${definitions === '' ? '' : `<defs>${definitions}</defs>`}${styles ? `<rect class="schematic-surface" width="100%" height="100%" /><rect class="schematic-grid" width="100%" height="100%" fill="url(#${gridId})" />` : ''}<g class="schematic-vectors">`);
+    const svgRole = portHooks ? 'group' : 'img';
+    writer.append(`<figure class="schematic-frame"${hooks ? ' data-schematic' : ''}><svg class="schematic-svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 ${normalized.bounds.width} ${normalized.bounds.height}" width="${normalized.bounds.width}" height="${normalized.bounds.height}" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" role="${svgRole}" aria-labelledby="${titleId} ${descriptionId}" preserveAspectRatio="xMidYMid meet"><title id="${titleId}">${title}</title><desc id="${descriptionId}">${description}</desc>${definitions === '' ? '' : `<defs>${definitions}</defs>`}${styles ? `<rect class="schematic-surface" width="100%" height="100%" /><rect class="schematic-grid" width="100%" height="100%" fill="url(#${gridId})" />` : ''}<g class="schematic-vectors">`);
     if (wireHooks) {
         for (const [index, connection] of document.connections.entries()) {
             writer.append(connectionMarkup(connection, routedConnections[index], index, safePrefix, glowId));