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: add "Font-family fonts" submenu

Browse Source 
Allow associating a font to each of the generic
font-family names.

Bump crengine:
- CSS parsing: accept (and ignore) namesspaces
- isImage(): more checks for <object> as it can have inner content
- getFontFileNameAndFaceIndex(): returns if font has math support
- getFontFileNameAndFaceIndex(): returns if font has emojis
- CSS/Fonts: add support for font-family to font name mapping
This commit is contained in:
poire-z
2022-10-03 17:28:07 +02:00
parent defd9d1e02
commit 3bd27c3a76
3 changed files with 308 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
frontend/document/credocument.lua
View File

@@ -1019,6 +1019,28 @@ function CreDocument:setupFallbackFontFaces()
self._document:setStringProperty("crengine.font.fallback.faces", s_fallbacks)
end
function CreDocument:setFontFamilyFontFaces(font_family_fonts, ignore_font_names)
if not font_family_fonts then
font_family_fonts = {}
end
-- crengine expects font names concatenated in the order they appear in the
-- enum css_font_family_t (include/cssdef.h) (with css_ff_inherit ignored,
-- the first slot carries ignore_font_names if not empty
local fonts = {}
table.insert(fonts, ignore_font_names and "not-empty" or "")
table.insert(fonts, font_family_fonts["serif"] or "")
table.insert(fonts, font_family_fonts["sans-serif"] or "")
table.insert(fonts, font_family_fonts["cursive"] or "")
table.insert(fonts, font_family_fonts["fantasy"] or "")
table.insert(fonts, font_family_fonts["monospace"] or "")
table.insert(fonts, font_family_fonts["math"] or "")
table.insert(fonts, font_family_fonts["emoji"] or "")
table.insert(fonts, font_family_fonts["fangsong"] or "")
local s_font_family_faces = table.concat(fonts, "|")
logger.dbg("CreDocument: set font-family font faces:", s_font_family_faces)
self._document:setStringProperty("crengine.font.family.faces", s_font_family_faces)
end
-- To use the new crengine language typography facilities (hyphenation, line breaking,
-- OpenType fonts locl letter forms...)
function CreDocument:setTextMainLang(lang)