Skip to content

Cache fontpath #157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ffreyer wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −2
Open

Cache fontpath #157

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 12 additions & 2 deletions src/engine/fonts.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
const FONTS = RelocatableFolders.@path joinpath(@__DIR__, "..", "..", "assets", "fonts")
# joinpath() (and its ispath() check) becomes expensive when repeated for every
# ascender, descender and TeXChar
const FONTNAME_TO_FULLPATH = Dict{String, String}()

function full_fontpath(fontname::String)
isfile(fontname) && return fontname
return get!(FONTNAME_TO_FULLPATH, fontname) do
return joinpath(FONTS, fontname)
end
end

function full_fontpath(fontname::AbstractString)
isfile(fontname) && return fontname
Expand Down Expand Up @@ -92,7 +102,7 @@ function FontFamily(fonts ;
thickness = 0.0375)

fonts = merge(_default_fonts, Dict(fonts))

return FontFamily(
fonts,
font_mapping,
Expand Down Expand Up @@ -235,7 +245,7 @@ scenario.
"""
function texfont(font_desc=:text)
family = FontFamily()

haskey(family.fonts, font_desc) && return load_font(family.fonts[font_desc])
haskey(family.font_mapping, font_desc) && return load_font(family.fonts[family.font_mapping[font_desc]])

Expand Down
Loading