fix(svg): multiline text in code blocks rendered in a single line

#2 (comment)
TinyTapeout · Mar 14, 2024 · 8488143 · 8488143
1 parent 6fcba4a
commit 8488143
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/src/SVGRenderer.ts b/src/SVGRenderer.ts
@@ -59,8 +59,16 @@ export class SVGRenderer extends EventTarget {
       }
 
       case 'Text': {
+        // attribute substitution
+        const text = item.text.replace(/@([\w#:]+)/g, (match, attrName: string) => {
+          if (attrName.startsWith('#') && attrName.endsWith(':net_name')) {
+            // see https://github.com/TinyTapeout/xschem-viewer/issues/1#issuecomment-1989506966
+            return '';
+          }
+          return properties[attrName] ?? match;
+        });
         // deal with multi-line text
-        const lines = item.text.split('\n');
+        const lines = text.split('\n');
         const layer = item.properties.layer != null ? Number(item.properties.layer) : Layers.Text;
         const hCenter = item.properties.hcenter === 'true';
         const vCenter = item.properties.vcenter === 'true';
@@ -80,13 +88,7 @@ export class SVGRenderer extends EventTarget {
             text.setAttribute('text-anchor', 'middle');
           }
           text.setAttribute('alignment-baseline', vCenter ? 'middle' : 'before-edge');
-          text.textContent = lines[i].replace(/@([\w#:]+)/g, (match, attrName: string) => {
-            if (attrName.startsWith('#') && attrName.endsWith(':net_name')) {
-              // see https://github.com/TinyTapeout/xschem-viewer/issues/1#issuecomment-1989506966
-              return '';
-            }
-            return properties[attrName] ?? match;
-          });
+          text.textContent = lines[i];
           parent.appendChild(text);
         }
         break;