renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ReaderFont: fix "new" fonts in generated font test document (#12646)

Browse Source 
New fonts were not rendering in their own font because
the font names were modified directly in the face_list table.
This commit is contained in:
jonnyl2
2024-10-18 16:46:57 +02:00
committed by GitHub
parent 716ed1f19d
commit a4dcfd2d52
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
frontend/apps/reader/modules/readerfont.lua
View File

@@ -903,26 +903,33 @@ a { color: black; }
<h1>%s</h1>
]], _("Available fonts test document"), _("AVAILABLE FONTS")))
local face_list = cre.getFontFaces()
local new_font_idx = 1
if next(newly_added_fonts) then
-- Sort alphabetically, with new fonts first (as done in sortFaceList())
local move_idx = 1
for i=1, #face_list do
if newly_added_fonts[face_list[i]] then
face_list[i] = face_list[i] .. " [NEW]"
table.insert(face_list, move_idx, table.remove(face_list, i))
move_idx = move_idx + 1
table.insert(face_list, new_font_idx, table.remove(face_list, i))
new_font_idx = new_font_idx + 1
end
end
end
f:write("<div style='margin: 2em'>\n")
for _, font_name in ipairs(face_list) do
for i, font_name in ipairs(face_list) do
local font_id = font_name:gsub(" ", "_"):gsub("'", "_")
f:write(string.format(" <div><a href='#%s'>%s</a></div>\n", font_id, font_name))
if i < new_font_idx then -- New fonts prepended with NEW on summary page
f:write(string.format(" <div><a href='#%s'>NEW: %s</a></div>\n", font_id, font_name))
else
f:write(string.format(" <div><a href='#%s'>%s</a></div>\n", font_id, font_name))
end
end
f:write("</div>\n\n")
for _, font_name in ipairs(face_list) do
for i, font_name in ipairs(face_list) do
local font_id = font_name:gsub(" ", "_"):gsub("'", "_")
f:write(string.format("<h1 id='%s'>%s</h1>\n", font_id, font_name))
if i < new_font_idx then -- New fonts prepended with NEW in titles and TOC
f:write(string.format("<h1 id='%s'>NEW: %s</h1>\n", font_id, font_name))
else
f:write(string.format("<h1 id='%s'>%s</h1>\n", font_id, font_name))
end
f:write(string.format("<div style='font-family: %s'>\n", font_name))
f:write(html_sample)
f:write("\n</div>\n\n")