split UI agnostic code from font.lua into fontlist.lua

This commit is contained in:
Qingping Hou
2019-03-02 18:50:05 -08:00
committed by Frans de Jonge
parent 05f62cc4ba
commit 587758939e
3 changed files with 112 additions and 107 deletions

View File

@@ -1,10 +1,10 @@
local Blitbuffer = require("ffi/blitbuffer")
local CanvasContext = require("document/canvascontext")
local DataStorage = require("datastorage")
local Document = require("document/document")
local Font = require("ui/font")
local FontList = require("fontlist")
local Geom = require("ui/geometry")
local RenderImage = require("ui/renderimage")
local CanvasContext = require("document/canvascontext")
local ffi = require("ffi")
local C = ffi.C
local lfs = require("libs/libkoreader-lfs")
@@ -75,7 +75,7 @@ function CreDocument:engineInit()
cre.initHyphDict("./data/hyph/")
-- we need to initialize the CRE font list
local fonts = Font:getFontList()
local fonts = FontList:getFontList()
for _k, _v in ipairs(fonts) do
if not _v:find("/urw/") then
local ok, err = pcall(cre.registerFont, _v)