From 62e12ddfba049886a4039c7e868676158a5acf2f Mon Sep 17 00:00:00 2001
From: chrox <chrox.huang@gmail.com>
Date: Tue, 31 Dec 2013 13:12:56 +0800
Subject: [PATCH] import document module on-demand

---
 frontend/document/credocument.lua   | 1 +
 frontend/document/djvudocument.lua  | 3 ++-
 frontend/document/document.lua      | 1 +
 frontend/document/koptinterface.lua | 2 +-
 frontend/document/pdfdocument.lua   | 3 ++-
 frontend/document/picdocument.lua   | 5 +++--
 koreader-base                       | 2 +-
 reader.lua                          | 2 +-
 8 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/frontend/document/credocument.lua b/frontend/document/credocument.lua
index e8724aec2..83335a216 100644
--- a/frontend/document/credocument.lua
+++ b/frontend/document/credocument.lua
@@ -69,6 +69,7 @@ function CreDocument:engineInit()
 end
 
 function CreDocument:init()
+	require "libs/libkoreader-cre"
 	self:engineInit()
 	self.configurable:loadDefaults(self.options)
 
diff --git a/frontend/document/djvudocument.lua b/frontend/document/djvudocument.lua
index ab2260c7e..31c80d87e 100644
--- a/frontend/document/djvudocument.lua
+++ b/frontend/document/djvudocument.lua
@@ -5,7 +5,7 @@ local KoptOptions = require("ui/data/koptoptions")
 local KoptInterface = require("document/koptinterface")
 local Document = require("document/document")
 local Configurable = require("ui/reader/configurable")
--- TBD: DrawContext
+local DrawContext = require("ffi/drawcontext")
 
 local DjvuDocument = Document:new{
 	_document = false,
@@ -27,6 +27,7 @@ local function validDjvuFile(filename)
 end
 
 function DjvuDocument:init()
+	require "libs/libkoreader-djvu"
 	self.configurable:loadDefaults(self.options)
 	if not validDjvuFile(self.file) then
 		self.error_message = "Not a valid DjVu file"
diff --git a/frontend/document/document.lua b/frontend/document/document.lua
index 05fad0aab..ab547f520 100644
--- a/frontend/document/document.lua
+++ b/frontend/document/document.lua
@@ -1,3 +1,4 @@
+local DrawContext = require("ffi/drawcontext")
 local Cache = require("cache")
 local CacheItem = require("cacheitem")
 local TileCacheItem = require("document/tilecacheitem")
diff --git a/frontend/document/koptinterface.lua b/frontend/document/koptinterface.lua
index 3f0353923..c382d45e9 100644
--- a/frontend/document/koptinterface.lua
+++ b/frontend/document/koptinterface.lua
@@ -5,7 +5,7 @@ local Screen = require("ui/screen")
 local Geom = require("ui/geometry")
 local TileCacheItem = require("document/tilecacheitem")
 local DEBUG = require("dbg")
--- TBD: KOPTContext
+local KOPTContext = require("ffi/koptcontext")
 
 local KoptInterface = {
 	ocrengine = "ocrengine",
diff --git a/frontend/document/pdfdocument.lua b/frontend/document/pdfdocument.lua
index 6b536f948..3b081a502 100644
--- a/frontend/document/pdfdocument.lua
+++ b/frontend/document/pdfdocument.lua
@@ -4,7 +4,7 @@ local KoptOptions = require("ui/data/koptoptions")
 local KoptInterface = require("document/koptinterface")
 local Document = require("document/document")
 local Configurable = require("ui/reader/configurable")
--- TBD: DrawContext
+local DrawContext = require("ffi/drawcontext")
 
 local PdfDocument = Document:new{
 	_document = false,
@@ -16,6 +16,7 @@ local PdfDocument = Document:new{
 }
 
 function PdfDocument:init()
+	require "libs/libkoreader-pdf"
 	self.configurable:loadDefaults(self.options)
 	local ok
 	ok, self._document = pcall(pdf.openDocument, self.file, self.mupdf_cache_size)
diff --git a/frontend/document/picdocument.lua b/frontend/document/picdocument.lua
index fa0d329ed..dd98684c0 100644
--- a/frontend/document/picdocument.lua
+++ b/frontend/document/picdocument.lua
@@ -1,12 +1,13 @@
 local Document = require("document/document")
--- DrawContext
+local DrawContext = require("ffi/drawcontext")
 
 local PicDocument = Document:new{
 	_document = false,
-	dc_null = DrawContext.new(),
+	dc_null = DrawContext.new()
 }
 
 function PicDocument:init()
+	require "libs/libkoreader-pic"
 	ok, self._document = pcall(pic.openDocument, self.file)
 	if not ok then
 		self.error_message = "failed to open jpeg image"
diff --git a/koreader-base b/koreader-base
index ffec35674..8a8204cc9 160000
--- a/koreader-base
+++ b/koreader-base
@@ -1 +1 @@
-Subproject commit ffec35674a11d13750224ce1b00704dea0f3f762
+Subproject commit 8a8204cc9520a17979c12e2295e9eb4b1b24632d
diff --git a/reader.lua b/reader.lua
index e8bff0787..f2ef5b5e0 100755
--- a/reader.lua
+++ b/reader.lua
@@ -2,7 +2,7 @@
 
 require "defaults"
 package.path = "./frontend/?.lua;./?.lua"
-package.cpath = "/usr/lib/lua/?.so"
+package.cpath = "?.so;/usr/lib/lua/?.so"
 local UIManager = require("ui/uimanager")
 local Menu = require("ui/widget/menu")
 local InfoMessage = require("ui/widget/infomessage")