@tscircuit/pcb-viewer 1.11.273 → 1.11.275

package/dist/index.js

@@ -9386,52 +9386,97 @@ import { lineAlphabet, svgAlphabet } from "@tscircuit/alphabet";
 // src/lib/convert-text-to-lines.ts
 var LETTER_HEIGHT_TO_WIDTH_RATIO = 0.6;
 var LETTER_HEIGHT_TO_SPACE_RATIO = 0.2;
-var getTextWidth = (text) => {
-  if (text.text.length === 0) return 0;
+var LOWERCASE_BASELINE_OFFSET = (() => {
+  const referenceLetters = ["a", "c", "e", "m", "n", "o", "r", "s", "u", "x"];
+  const offsets = referenceLetters.map((letter) => lineAlphabet[letter]).filter((lines) => lines && lines.length > 0).map(
+    (lines) => Math.min(...lines.map((line) => Math.min(line.y1, line.y2)))
+  );
+  return offsets.length > 0 ? Math.min(...offsets) : 0;
+})();
+var getBaselineOffsetForLetter = (letter) => letter >= "a" && letter <= "z" ? LOWERCASE_BASELINE_OFFSET : 0;
+var getTextGeometry = (text) => {
   const target_height = text.size * 0.7;
   const target_width_char = target_height * LETTER_HEIGHT_TO_WIDTH_RATIO;
   const space_between_chars = target_height * LETTER_HEIGHT_TO_SPACE_RATIO;
-  return text.text.length * target_width_char + (text.text.length - 1) * space_between_chars;
+  const space_between_lines = target_height * LETTER_HEIGHT_TO_SPACE_RATIO;
+  const text_lines = text.text.split(/\r?\n/);
+  const has_text = text.text.length > 0 && target_height > 0;
+  const line_count = has_text ? text_lines.length : 0;
+  const line_widths = has_text ? text_lines.map((line) => {
+    if (line.length === 0) return 0;
+    return line.length * target_width_char + (line.length - 1) * space_between_chars;
+  }) : [];
+  const width = line_widths.length > 0 ? Math.max(...line_widths) : 0;
+  const hasLowercase = /[a-z]/.test(text.text);
+  const baselineOffset = hasLowercase ? LOWERCASE_BASELINE_OFFSET * target_height : 0;
+  const height = line_count > 0 ? line_count * target_height + (line_count - 1) * space_between_lines + baselineOffset : 0;
+  return {
+    text_lines,
+    line_count,
+    target_height,
+    target_width_char,
+    space_between_chars,
+    space_between_lines,
+    width,
+    height
+  };
+};
+var getTextMetrics = (text) => {
+  const geometry = getTextGeometry(text);
+  return {
+    width: geometry.width,
+    height: geometry.height,
+    lineHeight: geometry.target_height,
+    lineSpacing: geometry.space_between_lines,
+    lineCount: geometry.line_count
+  };
 };
 var convertTextToLines = (text) => {
-  const target_height = text.size * 0.7;
-  if (target_height <= 0 || text.text.length === 0) return [];
+  const {
+    text_lines,
+    line_count,
+    target_height,
+    target_width_char,
+    space_between_chars,
+    space_between_lines
+  } = getTextGeometry(text);
+  if (target_height <= 0 || line_count === 0) return [];
   const strokeWidth = target_height / 12;
-  const centerline_span_y = Math.max(0, target_height - strokeWidth);
-  const y_baseline_offset = strokeWidth / 2;
-  const target_width_char = target_height * LETTER_HEIGHT_TO_WIDTH_RATIO;
-  const centerline_span_x = Math.max(0, target_width_char - strokeWidth);
-  const x_char_start_offset = strokeWidth / 2;
-  const space_between_chars = target_height * LETTER_HEIGHT_TO_SPACE_RATIO;
   const lines = [];
-  let current_x_origin_for_char_box = text.x;
-  for (let letterIndex = 0; letterIndex < text.text.length; letterIndex++) {
-    const letter = text.text[letterIndex];
-    const letterLines = lineAlphabet[letter] ?? lineAlphabet[letter.toUpperCase()];
-    if (!letterLines) {
+  for (let lineIndex = 0; lineIndex < line_count; lineIndex++) {
+    const lineYOffset = lineIndex * (target_height + space_between_lines);
+    let current_x_origin_for_char_box = text.x;
+    for (let letterIndex = 0; letterIndex < text_lines[lineIndex].length; letterIndex++) {
+      const letter = text_lines[lineIndex][letterIndex];
+      const letterLines = lineAlphabet[letter] ?? lineAlphabet[letter.toUpperCase()];
+      const baselineOffset = getBaselineOffsetForLetter(letter);
+      if (!letterLines) {
+        current_x_origin_for_char_box += target_width_char + space_between_chars;
+        continue;
+      }
+      for (const {
+        x1: norm_x1,
+        y1: norm_y1,
+        x2: norm_x2,
+        y2: norm_y2
+      } of letterLines) {
+        const adjusted_y1 = norm_y1 - baselineOffset;
+        const adjusted_y2 = norm_y2 - baselineOffset;
+        lines.push({
+          _pcb_drawing_object_id: getNewPcbDrawingObjectId("line"),
+          pcb_drawing_type: "line",
+          x1: current_x_origin_for_char_box + target_width_char * norm_x1,
+          y1: text.y + lineYOffset + target_height * adjusted_y1,
+          x2: current_x_origin_for_char_box + target_width_char * norm_x2,
+          y2: text.y + lineYOffset + target_height * adjusted_y2,
+          width: strokeWidth,
+          layer: text.layer,
+          unit: text.unit,
+          color: text.color
+        });
+      }
       current_x_origin_for_char_box += target_width_char + space_between_chars;
-      continue;
-    }
-    for (const {
-      x1: norm_x1,
-      y1: norm_y1,
-      x2: norm_x2,
-      y2: norm_y2
-    } of letterLines) {
-      lines.push({
-        _pcb_drawing_object_id: getNewPcbDrawingObjectId("line"),
-        pcb_drawing_type: "line",
-        x1: current_x_origin_for_char_box + x_char_start_offset + centerline_span_x * norm_x1,
-        y1: text.y + y_baseline_offset + centerline_span_y * norm_y1,
-        x2: current_x_origin_for_char_box + x_char_start_offset + centerline_span_x * norm_x2,
-        y2: text.y + y_baseline_offset + centerline_span_y * norm_y2,
-        width: strokeWidth,
-        layer: text.layer,
-        unit: text.unit,
-        color: text.color
-      });
     }
-    current_x_origin_for_char_box += target_width_char + space_between_chars;
   }
   return lines;
 };
@@ -9467,8 +9512,7 @@ var drawText = (drawer, text) => {
     layer: text.layer
   });
   let alignOffset = { x: 0, y: 0 };
-  const textWidth = getTextWidth(text);
-  const textHeight = text.size;
+  const { width: textWidth, height: textHeight } = getTextMetrics(text);
   switch (text.align) {
     case "top_left":
       alignOffset.x = 0;
@@ -13261,7 +13305,7 @@ import { css as css3 } from "@emotion/css";
 // package.json
 var package_default = {
   name: "@tscircuit/pcb-viewer",
-  version: "1.11.272",
+  version: "1.11.274",
   main: "dist/index.js",
   type: "module",
   repository: "tscircuit/pcb-viewer",