Adom Symbol

@@ -265,14 +265,8 @@ pub fn composite_iso_into_symbol(svg: &str, block: &str, _name: &str, iso_path:         let data = format!("data:image/png;base64,{}", b64(&bytes));         const PX: f64 = 100.0;         const PY: f64 = 100.0;-        let (cx, cy, bw, bh) = match largest_body_rect(block) {-            Some((sx, sy, ex, ey)) => (PX + (sx + ex) / 2.0, PY - (sy + ey) / 2.0, (ex - sx).abs(), (ey - sy).abs()),-            None => match symbol_local_bbox(block) {-                Some((minx, maxx, miny, maxy)) => (PX + (minx + maxx) / 2.0, PY - (miny + maxy) / 2.0, (maxx - minx).abs(), (maxy - miny).abs()),-                None => return Err(anyhow!("no body geometry to place iso")),-            },-        };-        let (w, h) = (bw * frac, bh * frac);+        let (cx_k, cy_k, w, h, _rect) = outline_box(block, frac).ok_or_else(|| anyhow!("no body geometry to place iso"))?;+        let (cx, cy) = (PX + cx_k, PY - cy_k);         let (x, y) = (cx - w / 2.0, cy - h / 2.0);         format!(             "<image x=\"{x:.3}\" y=\"{y:.3}\" width=\"{w:.3}\" height=\"{h:.3}\" \@@ -336,6 +330,61 @@ fn inline_outline_markup(block: &str, overlay_svg: &str, frac: f64) -> Option<St     Some(out) } +/// The rectangle inside the body that is FREE of pin-name text: the body rect+/// pulled in on each side by the longest pin name entering from that side+/// (plus KiCad's 1.016 mm name offset and a small margin). On square layouts+/// names come in from all four sides, so a fixed body fraction collides with+/// the top/bottom names; the chip outline is fitted to this box instead.+/// Returns [left, bottom, right, top] in symbol-local mm (Y-up).+pub fn free_body_rect(block: &str) -> Option<[f64; 4]> {+    let (sx, sy, ex, ey) = largest_body_rect(block)?;+    let (mut l, mut b, mut r, mut t) = (sx.min(ex), sy.min(ey), sx.max(ex), sy.max(ey));+    const CHAR_W: f64 = 1.0; // ~1.27 mm font advance, average glyph+    const OFFSET: f64 = 1.016 + 0.6;+    let re = Regex::new(r#"(?s)\(pin\s+\w+\s+\w+\s*\(at (-?[\d.]+) (-?[\d.]+) (-?[\d.]+)\)\s*\(length (-?[\d.]+)\).*?\(name "((?:[^"\\]|\\.)*)""#).unwrap();+    for c in re.captures_iter(block) {+        let a = c[3].parse::<f64>().unwrap_or(0.0).rem_euclid(360.0);+        let name = c[5].replace("~{", "").replace('}', "");+        let n = name.chars().count() as f64;+        if n == 0.0 { continue; }+        let ext = n * CHAR_W + OFFSET;+        match a as i64 {+            0 => l = l.max(sx.min(ex) + ext),+            180 => r = r.min(sx.max(ex) - ext),+            270 => t = t.min(sy.max(ey) - ext),+            90 => b = b.max(sy.min(ey) + ext),+            _ => {}+        }+    }+    if r - l < 2.0 || t - b < 2.0 {+        // Names meet in the middle: fall back to the body itself.+        return Some([sx.min(ex), sy.min(ey), sx.max(ex), sy.max(ey)]);+    }+    Some([l, b, r, t])+}++/// Where the chip outline goes: centre + box (w, h) in symbol-local mm. The box+/// is `frac` of the body (the historical size) but never wider/taller than the+/// free rectangle between the pin-name extents (minus a 1 mm margin), and it+/// is centred on that free rectangle.+pub fn outline_box(block: &str, frac: f64) -> Option<(f64, f64, f64, f64, [f64; 4])> {+    let rect = match largest_body_rect(block) {+        Some((sx, sy, ex, ey)) => [sx.min(ex), sy.min(ey), sx.max(ex), sy.max(ey)],+        None => {+            let (minx, maxx, miny, maxy) = symbol_local_bbox(block)?;+            [minx, miny, maxx, maxy]+        }+    };+    let (bw, bh) = (rect[2] - rect[0], rect[3] - rect[1]);+    let free = free_body_rect(block).unwrap_or(rect);+    const M: f64 = 1.0;+    let (fw, fh) = ((free[2] - free[0] - 2.0 * M).max(1.0), (free[3] - free[1] - 2.0 * M).max(1.0));+    let w = (bw * frac).min(fw);+    let h = (bh * frac).min(fh);+    let (cx, cy) = ((free[0] + free[2]) / 2.0, (free[1] + free[3]) / 2.0);+    Some((cx, cy, w, h, rect))+}+ /// The fraction of the symbol body the composited 3D-chip outline covers. /// MUST stay in sync with the `frac` used in `composite_iso_into_symbol` — the /// emitted outline contract (mm.svg + sidecar) describes exactly that placement.@@ -429,19 +478,8 @@ pub fn chip_size_frac(size: &str) -> f64 { pub fn outline_placement(block: &str, outline_svg: &str, frac: f64) -> Option<OutlinePlacement> {     const PX: f64 = 100.0;     const PY: f64 = 100.0;-    let (cx_k, cy_k, bw, bh, rect) = match largest_body_rect(block) {-        Some((sx, sy, ex, ey)) => (-            (sx + ex) / 2.0, (sy + ey) / 2.0, (ex - sx).abs(), (ey - sy).abs(),-            [sx.min(ex), sy.min(ey), sx.max(ex), sy.max(ey)],-        ),-        None => {-            let (minx, maxx, miny, maxy) = symbol_local_bbox(block)?;-            ((minx + maxx) / 2.0, (miny + maxy) / 2.0, (maxx - minx).abs(), (maxy - miny).abs(),-             [minx, miny, maxx, maxy])-        }-    };+    let (cx_k, cy_k, w, h, rect) = outline_box(block, frac)?;     let vb = parse_viewbox(outline_svg)?;-    let (w, h) = (bw * frac, bh * frac);     // preserveAspectRatio=meet: the WHOLE source canvas fits, smaller ratio wins.     let scale = (w / vb[2]).min(h / vb[3]);     if !(scale.is_finite() && scale > 0.0) {