From 8f989f6bfd44b60cfe492031b3ba247be89dd041 Mon Sep 17 00:00:00 2001
From: Qwerasd <qwerasd205@users.noreply.github.com>
Date: Sun, 6 Jul 2025 11:02:00 -0600
Subject: [PATCH] font: fix nerd font codegen to handle ypadding properly

Previously `ypadding` was effectively ignored, since it's mutually
exclusive with `overlap`. This had a noticeable effect on the heavy
bracket characters U+276C...U+2771, which were much taller than they
should have been.

I also fixed the vertical overlap limit, since negative `overlap` values
are used in the nerd font attributes to create padding on all sides of
the cell, so we don't want to limit the magnitude of the overlap for
vertical padding, we only want to limit it if the value is positive.

That change fixed the vertical padding for a handful of ranges, which
should give more consistent results.
---
 src/font/nerd_font_attributes.zig | 22 ++++++++++++----------
 src/font/nerd_font_codegen.py     | 11 ++++++++++-
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/font/nerd_font_attributes.zig b/src/font/nerd_font_attributes.zig
index dfb11c5a5..a82699b0e 100644
--- a/src/font/nerd_font_attributes.zig
+++ b/src/font/nerd_font_attributes.zig
@@ -28,8 +28,8 @@ pub fn getConstraint(cp: u21) Constraint {
             .align_vertical = .center,
             .pad_left = 0.1,
             .pad_right = 0.1,
-            .pad_top = 0.01,
-            .pad_bottom = 0.01,
+            .pad_top = 0.1,
+            .pad_bottom = 0.1,
         },
         0x276c...0x2771,
         => .{
@@ -37,6 +37,8 @@ pub fn getConstraint(cp: u21) Constraint {
             .size_vertical = .fit,
             .align_horizontal = .center,
             .align_vertical = .center,
+            .pad_top = 0.3,
+            .pad_bottom = 0.3,
         },
         0xe0b0,
         => .{
@@ -204,8 +206,8 @@ pub fn getConstraint(cp: u21) Constraint {
             .align_vertical = .center,
             .pad_left = 0.03,
             .pad_right = 0.03,
-            .pad_top = 0.01,
-            .pad_bottom = 0.01,
+            .pad_top = 0.03,
+            .pad_bottom = 0.03,
             .max_xy_ratio = 0.86,
         },
         0xe0c5,
@@ -216,8 +218,8 @@ pub fn getConstraint(cp: u21) Constraint {
             .align_vertical = .center,
             .pad_left = 0.03,
             .pad_right = 0.03,
-            .pad_top = 0.01,
-            .pad_bottom = 0.01,
+            .pad_top = 0.03,
+            .pad_bottom = 0.03,
             .max_xy_ratio = 0.86,
         },
         0xe0c6,
@@ -228,8 +230,8 @@ pub fn getConstraint(cp: u21) Constraint {
             .align_vertical = .center,
             .pad_left = 0.03,
             .pad_right = 0.03,
-            .pad_top = 0.01,
-            .pad_bottom = 0.01,
+            .pad_top = 0.03,
+            .pad_bottom = 0.03,
             .max_xy_ratio = 0.78,
         },
         0xe0c7,
@@ -240,8 +242,8 @@ pub fn getConstraint(cp: u21) Constraint {
             .align_vertical = .center,
             .pad_left = 0.03,
             .pad_right = 0.03,
-            .pad_top = 0.01,
-            .pad_bottom = 0.01,
+            .pad_top = 0.03,
+            .pad_bottom = 0.03,
             .max_xy_ratio = 0.78,
         },
         0xe0cc,
diff --git a/src/font/nerd_font_codegen.py b/src/font/nerd_font_codegen.py
index 99915c9f2..b62768cc5 100644
--- a/src/font/nerd_font_codegen.py
+++ b/src/font/nerd_font_codegen.py
@@ -6,6 +6,8 @@ attributes and scaling rules.
 
 This does include an `eval` call! This is spooky, but we trust the nerd fonts code to
 be safe and not malicious or anything.
+
+This script requires Python 3.12 or greater.
 """
 
 import ast
@@ -193,13 +195,20 @@ def emit_zig_entry_multikey(codepoints: list[int], attr: PatchSetAttributeEntry)
     if valign is not None:
         s += f"            .align_vertical = {valign},\n"
 
+    # `overlap` and `ypadding` are mutually exclusive,
+    # this is asserted in the nerd fonts patcher itself.
     if overlap:
         pad = -overlap
         s += f"            .pad_left = {pad},\n"
         s += f"            .pad_right = {pad},\n"
-        v_pad = y_padding - math.copysign(min(0.01, abs(overlap)), overlap)
+        # In the nerd fonts patcher, overlap values
+        # are capped at 0.01 in the vertical direction.
+        v_pad = -min(0.01, overlap)
         s += f"            .pad_top = {v_pad},\n"
         s += f"            .pad_bottom = {v_pad},\n"
+    elif y_padding:
+        s += f"            .pad_top = {y_padding},\n"
+        s += f"            .pad_bottom = {y_padding},\n"
 
     if xy_ratio > 0:
         s += f"            .max_xy_ratio = {xy_ratio},\n"