diff --git a/src/font/SharedGridSet.zig b/src/font/SharedGridSet.zig index ca535eaf8..8e7a7d540 100644 --- a/src/font/SharedGridSet.zig +++ b/src/font/SharedGridSet.zig @@ -291,6 +291,15 @@ fn collection( load_options.faceOptions(), ) }, ); + _ = try c.add( + self.alloc, + .regular, + .{ .fallback_loaded = try Face.init( + self.font_lib, + font.embedded.symbols, + load_options.faceOptions(), + ) }, + ); // On macOS, always search for and add the Apple Emoji font // as our preferred emoji font for fallback. We do this in case diff --git a/src/font/embedded.zig b/src/font/embedded.zig index 31b07ff31..aea4f6813 100644 --- a/src/font/embedded.zig +++ b/src/font/embedded.zig @@ -6,12 +6,13 @@ //! redistribution and include their license as necessary. /// Default fonts that we prefer for Ghostty. -pub const regular = @embedFile("res/JetBrainsMonoNerdFont-Regular.ttf"); -pub const bold = @embedFile("res/JetBrainsMonoNerdFont-Bold.ttf"); -pub const italic = @embedFile("res/JetBrainsMonoNerdFont-Italic.ttf"); -pub const bold_italic = @embedFile("res/JetBrainsMonoNerdFont-BoldItalic.ttf"); +pub const regular = @embedFile("res/JetBrainsMono-Regular.ttf"); +pub const bold = @embedFile("res/JetBrainsMono-Bold.ttf"); +pub const italic = @embedFile("res/JetBrainsMono-Italic.ttf"); +pub const bold_italic = @embedFile("res/JetBrainsMono-BoldItalic.ttf"); pub const emoji = @embedFile("res/NotoColorEmoji.ttf"); pub const emoji_text = @embedFile("res/NotoEmoji-Regular.ttf"); +pub const symbols = @embedFile("res/SymbolsNerdFontMono-Regular.ttf"); /// Fonts with general properties pub const arabic = @embedFile("res/KawkabMono-Regular.ttf"); @@ -24,7 +25,7 @@ pub const nerd_font = @embedFile("res/JetBrainsMonoNerdFont-Regular.ttf"); pub const code_new_roman = @embedFile("res/CodeNewRoman-Regular.otf"); pub const inconsolata = @embedFile("res/Inconsolata-Regular.ttf"); pub const geist_mono = @embedFile("res/GeistMono-Regular.ttf"); -pub const jetbrains_mono = @embedFile("res/JetBrainsMonoNoNF-Regular.ttf"); +pub const jetbrains_mono = @embedFile("res/JetBrainsMono-Regular.ttf"); pub const julia_mono = @embedFile("res/JuliaMono-Regular.ttf"); /// Cozette is a unique font because it embeds some emoji characters diff --git a/src/font/res/JetBrainsMono-Bold.ttf b/src/font/res/JetBrainsMono-Bold.ttf new file mode 100644 index 000000000..8c93043de Binary files /dev/null and b/src/font/res/JetBrainsMono-Bold.ttf differ diff --git a/src/font/res/JetBrainsMono-BoldItalic.ttf b/src/font/res/JetBrainsMono-BoldItalic.ttf new file mode 100644 index 000000000..1ddf216d1 Binary files /dev/null and b/src/font/res/JetBrainsMono-BoldItalic.ttf differ diff --git a/src/font/res/JetBrainsMono-Italic.ttf b/src/font/res/JetBrainsMono-Italic.ttf new file mode 100644 index 000000000..ccc9d6a5b Binary files /dev/null and b/src/font/res/JetBrainsMono-Italic.ttf differ diff --git a/src/font/res/JetBrainsMonoNoNF-Regular.ttf b/src/font/res/JetBrainsMono-Regular.ttf similarity index 100% rename from src/font/res/JetBrainsMonoNoNF-Regular.ttf rename to src/font/res/JetBrainsMono-Regular.ttf diff --git a/src/font/res/JetBrainsMonoNerdFont-Bold.ttf b/src/font/res/JetBrainsMonoNerdFont-Bold.ttf deleted file mode 100644 index b82ccbcb8..000000000 Binary files a/src/font/res/JetBrainsMonoNerdFont-Bold.ttf and /dev/null differ diff --git a/src/font/res/JetBrainsMonoNerdFont-BoldItalic.ttf b/src/font/res/JetBrainsMonoNerdFont-BoldItalic.ttf deleted file mode 100644 index 35f0080ef..000000000 Binary files a/src/font/res/JetBrainsMonoNerdFont-BoldItalic.ttf and /dev/null differ diff --git a/src/font/res/JetBrainsMonoNerdFont-Italic.ttf b/src/font/res/JetBrainsMonoNerdFont-Italic.ttf deleted file mode 100644 index a341a3758..000000000 Binary files a/src/font/res/JetBrainsMonoNerdFont-Italic.ttf and /dev/null differ diff --git a/src/font/res/SymbolsNerdFontMono-Regular.ttf b/src/font/res/SymbolsNerdFontMono-Regular.ttf new file mode 100644 index 000000000..fbd5e1538 Binary files /dev/null and b/src/font/res/SymbolsNerdFontMono-Regular.ttf differ