Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-17 09:16:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

font(coretext): tolerate fonts without OS/2 tables

Browse Source 
This creates big problems if we don't, since a lot of symbols end up
falling back to Apple Gothic, which doesn't have an OS/2 table.
This commit is contained in:
Qwerasd
2024-12-16 14:32:04 -05:00
parent cf00d14f4d
commit 5cd214066d
2 changed files with 98 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/macos/text/font.zig
View File

@ -217,6 +217,10 @@ pub const FontOrientation = enum(c_uint) {
pub const FontTableTag = enum(u32) {
svg = c.kCTFontTableSVG,
os2 = c.kCTFontTableOS2,
head = c.kCTFontTableHead,
hhea = c.kCTFontTableHhea,
post = c.kCTFontTablePost,
_,
pub fn init(v: *const [4]u8) FontTableTag {

67
src/font/face/coretext.zig
View File

@ -534,8 +534,6 @@ pub const Face = struct {
CopyTableError,
InvalidHeadTable,
InvalidPostTable,
InvalidOS2Table,
OS2VersionNotSupported,
InvalidHheaTable,
};
@ -569,18 +567,16 @@ pub const Face = struct {
};
};
// Read the 'OS/2' table out of the font data.
const os2: opentype.OS2 = os2: {
// Read the 'OS/2' table out of the font data if it's available.
const maybe_os2: ?opentype.OS2 = os2: {
const tag = macos.text.FontTableTag.init("OS/2");
const data = ct_font.copyTable(tag) orelse return error.CopyTableError;
const data = ct_font.copyTable(tag) orelse break :os2 null;
defer data.release();
const ptr = data.getPointer();
const len = data.getLength();
break :os2 opentype.OS2.init(ptr[0..len]) catch |err| {
return switch (err) {
error.EndOfStream => error.InvalidOS2Table,
error.OS2VersionNotSupported => error.OS2VersionNotSupported,
};
log.warn("Error parsing OS/2 table: {any}", .{err});
break :os2 null;
};
};
@ -603,6 +599,11 @@ pub const Face = struct {
const px_per_unit: f64 = px_per_em / units_per_em;
const ascent: f64, const descent: f64, const line_gap: f64 = vertical_metrics: {
const hhea_ascent: f64 = @floatFromInt(hhea.ascender);
const hhea_descent: f64 = @floatFromInt(hhea.descender);
const hhea_line_gap: f64 = @floatFromInt(hhea.lineGap);
if (maybe_os2) |os2| {
const os2_ascent: f64 = @floatFromInt(os2.sTypoAscender);
const os2_descent: f64 = @floatFromInt(os2.sTypoDescender);
const os2_line_gap: f64 = @floatFromInt(os2.sTypoLineGap);
@ -625,9 +626,6 @@ pub const Face = struct {
// FreeType does to get its generic ascent and descent metrics.
if (hhea.ascender != 0 or hhea.descender != 0) {
const hhea_ascent: f64 = @floatFromInt(hhea.ascender);
const hhea_descent: f64 = @floatFromInt(hhea.descender);
const hhea_line_gap: f64 = @floatFromInt(hhea.lineGap);
break :vertical_metrics .{
hhea_ascent * px_per_unit,
hhea_descent * px_per_unit,
@ -652,6 +650,15 @@ pub const Face = struct {
-win_descent * px_per_unit,
0.0,
};
}
// If our font has no OS/2 table, then we just
// blindly use the metrics from the hhea table.
break :vertical_metrics .{
hhea_ascent * px_per_unit,
hhea_descent * px_per_unit,
hhea_line_gap * px_per_unit,
};
};
// Some fonts have degenerate 'post' tables where the underline
@ -672,30 +679,46 @@ pub const Face = struct {
@as(f64, @floatFromInt(post.underlineThickness)) * px_per_unit;
// Similar logic to the underline above.
const strikethrough_position, const strikethrough_thickness = st: {
if (maybe_os2) |os2| {
const has_broken_strikethrough = os2.yStrikeoutSize == 0;
const strikethrough_position: ?f64 = if (has_broken_strikethrough and os2.yStrikeoutPosition == 0)
const pos: ?f64 = if (has_broken_strikethrough and os2.yStrikeoutPosition == 0)
null
else
@as(f64, @floatFromInt(os2.yStrikeoutPosition)) * px_per_unit;
const strikethrough_thickness: ?f64 = if (has_broken_strikethrough)
const thick: ?f64 = if (has_broken_strikethrough)
null
else
@as(f64, @floatFromInt(os2.yStrikeoutSize)) * px_per_unit;
// We fall back to whatever CoreText does if
// the OS/2 table doesn't specify a cap height.
const cap_height: f64 = if (os2.sCapHeight) |sCapHeight|
break :st .{ pos, thick };
}
break :st .{ null, null };
};
// We fall back to whatever CoreText does if the
// OS/2 table doesn't specify a cap or ex height.
const cap_height: f64, const ex_height: f64 = heights: {
if (maybe_os2) |os2| {
break :heights .{
if (os2.sCapHeight) |sCapHeight|
@as(f64, @floatFromInt(sCapHeight)) * px_per_unit
else
ct_font.getCapHeight();
// Ditto for ex height.
const ex_height: f64 = if (os2.sxHeight) |sxHeight|
ct_font.getCapHeight(),
if (os2.sxHeight) |sxHeight|
@as(f64, @floatFromInt(sxHeight)) * px_per_unit
else
ct_font.getXHeight();
ct_font.getXHeight(),
};
}
break :heights .{
ct_font.getCapHeight(),
ct_font.getXHeight(),
};
};
// Cell width is calculated by calculating the widest width of the
// visible ASCII characters. Usually 'M' is widest but we just take