Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/font/SharedGridSet.zig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 6 additions & 5 deletions src/font/embedded.zig
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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
Expand Down
Binary file added src/font/res/JetBrainsMono-Bold.ttf
Binary file not shown.
Binary file added src/font/res/JetBrainsMono-BoldItalic.ttf
Binary file not shown.
Binary file added src/font/res/JetBrainsMono-Italic.ttf
Binary file not shown.
Binary file removed src/font/res/JetBrainsMonoNerdFont-Bold.ttf
Binary file not shown.
Binary file removed src/font/res/JetBrainsMonoNerdFont-BoldItalic.ttf
Binary file not shown.
Binary file removed src/font/res/JetBrainsMonoNerdFont-Italic.ttf
Binary file not shown.
Binary file added src/font/res/SymbolsNerdFontMono-Regular.ttf
Binary file not shown.