diff --git a/src/build/SharedDeps.zig b/src/build/SharedDeps.zig index c77a8ba0b..66563d173 100644 --- a/src/build/SharedDeps.zig +++ b/src/build/SharedDeps.zig @@ -25,7 +25,8 @@ pub fn init(b: *std.Build, cfg: *const Config) !SharedDeps { const uucode = b.dependency("uucode", .{ .build_config_path = b.path("src/build/uucode_config.zig"), }); - @import("uucode_x").connectBuild(b.dependency("uucode_x", .{}), uucode); + const uucode_x = b.dependency("uucode_x", .{}); + @import("uucode_x").connectBuild(uucode_x, uucode); break :blk uucode.namedLazyPath("tables.zig"); }; diff --git a/src/build/uucode_config.zig b/src/build/uucode_config.zig index bbc833158..1c102fbd0 100644 --- a/src/build/uucode_config.zig +++ b/src/build/uucode_config.zig @@ -9,6 +9,7 @@ pub const tables = [_]config.Table{ x.wcwidth.field("wcwidth"), d.field("general_category"), d.field("has_emoji_presentation"), + d.field("block"), }, }, }; diff --git a/src/renderer/cell.zig b/src/renderer/cell.zig index 708f3b743..7de61e9b3 100644 --- a/src/renderer/cell.zig +++ b/src/renderer/cell.zig @@ -1,7 +1,6 @@ const std = @import("std"); const Allocator = std.mem.Allocator; const assert = std.debug.assert; -const ziglyph = @import("ziglyph"); const uucode = @import("uucode"); const font = @import("../font/main.zig"); const terminal = @import("../terminal/main.zig"); @@ -238,7 +237,7 @@ pub fn constraintWidth(cell_pin: terminal.Pin) u2 { // If not a Co (Private Use) and not a Dingbats, use grid width. if (uucode.get("general_category", cp) != .Co and - !ziglyph.blocks.isDingbats(cp)) + uucode.get("block", cp) != .dingbats) { return cell.gridWidth(); }