Archives/koreader
2
0
Fork 0
mirror of https://github.com/koreader/koreader synced 2024-10-31 21:20:20 +00:00
Code Issues Projects Releases Wiki Activity
4,172 Commits 1 Branch 262 Tags 936 MiB
8661194b79
Commit Graph

243 Commits

Author SHA1 Message Date
chrox
71cb2d3f93 fix looking up wrong word in reflowed page 
that has a text layer underneath.

For multi-column page reflowing usually fits individual column to
page width and no finner word boxes are available to map reflowed
word box onto native word box. Now the relative position of a reflowed
word center is calculated as portion of the width and height of a larger
block it belongs. This relative position is also considered in
reflow-to-native position transform so that dictionary lookup now works
on multi-column pages in reflowing mode.

This should fix #376.
 2013-11-30 18:18:16 +08:00
chrox
5bf56cbf4c check position nullity in getTextFromBoxes 2013-10-28 21:49:54 +08:00
chrox
2590cc7ca5 highlight text from scratch instead of reusing rectmaps in reflowing mode 2013-10-25 13:22:49 +08:00
chrox
184a6f5d21 highlight word from scratch instead of reusing rectmaps in reflowing mode 
Totally revert the OCR in reflowed page to build 545.
And this should fix #309.
 2013-10-24 23:45:09 +08:00
chrox
90d55cbde4 set auto detect word gap in reflowing by default 2013-10-24 23:45:09 +08:00
chrox
4cfdce6105 fix several local calls of Math.round 2013-10-23 22:37:55 +08:00
HW
09cd5c4104 Make DEBUG a require()d local 2013-10-22 20:51:29 +02:00
HW
748a443cd5 Merge remote-tracking branch 'upstream/master' 
resolved conflicts with refactored structure
 2013-10-22 17:19:08 +02:00
HW
2154e7e852 Further refactoring 
This should finish the work to make all globals to local variables.
That allows LuaJIT to properly compile things by interning the
references to the relevant parts (rather than looking up globals
all the time which stops a trace).
 2013-10-22 17:11:31 +02:00
HW
ef111b99c6 Refactored to use strictly locals 2013-10-18 22:38:07 +02:00
Qingping Hou
bc91b932d1 style cleanup in document.lua 2013-10-17 17:37:53 -04:00
Qingping Hou
a59723c053 add pic document type 2013-10-17 17:35:05 -04:00
Qingping Hou
10bf048d77 move configurable to Document class 
since every document type is depend on it now
 2013-10-17 17:28:20 -04:00
chrox
c86bb46ef7 add gotoLocation for credocument 2013-10-17 23:53:29 +08:00
chrox
506dbed865 save cre3.ini on closing each credocument 
and page margin settings will be restored before rendering.
This patch should fix #299.
 2013-10-16 23:21:20 +08:00
chrox
32ffacdf77 adjust font sizes in credocument according to screen dpi 
and font sizes list is moved to defaults.lua
 2013-10-16 17:06:28 +08:00
chrox
9f42289226 use pixels from reflowed page when doing OCR in reflowing mode 
I hope it will get back OCR accuracy as in build 545.
 2013-10-14 23:06:05 +08:00
chrox
2cd5a083ae fix getAutoBBox failed bug 
If getAutoBBox is fed with a blank page the returned bbox will be
much smaller than the native page dimensions. The problem is that
in zoom to 'content*' mode document renderer will try to render
the whole page at a zoom level that can cover the screen with the
bbox region of the page. That's if the blank page size is 3000*4000
and the returned autobbox is 300*400, the screen size is 600*800,
then the page will be rendered in 3000*(600/300)*4000*(800/400)
which is so large that the cache manager will not accept.

This patch just check if the returned autobbox is considerablely
much smaller than the native page dimensions. If so it will return
the manual bbox.

This patch should fix #293. And it's tested with the case provided
by @Markismus in #291.
 2013-10-14 14:21:08 +08:00
chrox
1ee6d5a9c5 add DEBUGBT function to traceback certain location 2013-10-13 21:59:24 +08:00
chrox
39da1251ec free blitbuffer as soon as tile is kicked out from cache 
other than waiting for the lazy garbage collector of lua
 2013-10-13 15:30:48 +08:00
chrox
4660a3532b synchronize hightlights in non-/reflowing modes 
and there is no need to OCR word if we can extract text from
original page in reflowing mode thanks to the rect maps between
normal page and reflowed page.
 2013-10-12 23:07:13 +08:00
chrox
ffd31613a5 estimate cache size of koptcontext 
This should fix #285.
 2013-09-26 14:51:33 +08:00
chrox
f2cf10a015 refactoring koptcontext creation function 2013-09-14 12:56:10 +08:00
Qingping Hou
a8a589c27b only set two pages mode for crengine in kindle dxg 2013-07-28 02:35:46 -04:00
chrox
aefb58f5bf bugfix: fix invalid auto page cropping 2013-07-20 02:51:17 +08:00
chrox
1808c7e5c3 add document language option in config dialog 
Document language setting is used for better text extraction and OCR.
 2013-07-20 02:46:51 +08:00
chrox
2e5d2b9930 add semi-auto bbox option in page crop dialog 2013-07-13 11:18:49 +08:00
{Qingping,Dave} Hou
c423c031b3 Merge pull request #146 from chrox/master 
semi-automatic bbox finding
 2013-07-09 21:16:18 -07:00
chrox
9cb9999865 semi-automatic bbox finding 
Semi-automatic cropping is implemented with a initial
manual cropping that exclude the obvious decorating line or
the spine part in scanned books and then an automatic cropping
ie. background/foreground pixel detection restricted within
the manual cropping area.
This PR is a candidate for the solution of issue #141.
 2013-07-09 19:15:45 +08:00
Giorgio Micotti
98a2e50652 Add cbz to the supported extensions of pdf viewer. 2013-07-09 12:32:21 +02:00
Deyuan Deng
9528f4a95b when open document, check if provider is nil 2013-07-08 23:17:06 -07:00
Qingping Hou
18122fe067 add defaults.lua 2013-07-01 02:41:33 -04:00
chrox
94526fa26d add page margin options in CREOptions 2013-06-28 17:12:04 +08:00
chrox
7c78e83e49 add hightlight/dictionary lookup in scanned pdf/djvu 2013-05-01 23:43:53 +08:00
chrox
cb873ee528 init/free OCR engine when necessary 2013-04-30 13:52:10 +08:00
chrox
1a8bd4ca8c try to drop cache before OCR 2013-04-27 17:48:59 +08:00
chrox
936dfc6fd1 add text highlight in both reflow and non-reflow mode 2013-04-24 06:59:52 +08:00
Qingping Hou
1783b16d69 credoc fix: load metadata info after document is rendered 2013-04-21 05:54:20 +08:00
chrox
ac548d768c don't bother to consume background context 
since now each context is independent and has its own dst bitmap.
 2013-04-20 16:12:43 +08:00
chrox
fb05f9a428 add auto page crop 2013-04-14 15:16:42 +08:00
chrox
22b650d0c7 move kopt/cre options into ui/data directory & wrap strings in config options 2013-04-08 22:26:54 +08:00
Qingping Hou
09e1c0af06 add gettext to document modules 2013-04-08 15:38:04 +08:00
Qingping Hou
f12ff20c37 discard bbox with zero area 2013-04-03 13:03:55 +08:00
chrox
b2c23c6f4f cleanup: use lowercase option name && better reflow for vertical text 2013-03-19 21:57:30 +08:00
chrox
607c4baf2e add fine tuning of font size in koptinterface 2013-03-19 21:36:11 +08:00
Qingping Hou
c5ff50abdf remove trailing spaces 2013-03-13 10:43:15 +08:00
chrox
ef68ccebfe add background hinting in koptinterface 2013-03-12 20:26:02 +08:00
chrox
591a27ddfe log reflow duration for benchmarking 2013-03-11 16:24:27 +08:00
chrox
a2dc5e00a2 bugfix: reset page scroll states when switching reflow on/off 2013-03-10 14:27:42 +08:00
chrox
63e5e7e577 add scroll mode for pdf/djvu reader 2013-03-10 14:23:26 +08:00
chrox
6561475cf7 return bbox immediately to save several CPU cycles 2013-03-10 13:15:00 +08:00
chrox
8c01b59776 clamp used bbox to page dimension 2013-03-05 16:50:04 +08:00
chrox
87eec1b539 save/restore view mode and embedded css mode 2013-03-04 23:23:37 +08:00
chrox
4c1fc6be5c make larger default page margin 2013-02-25 22:18:31 +08:00
chrox
86a65003d1 set manual cropping if bbox exists 2013-02-25 21:29:41 +08:00
chrox
c5b4d958bb add reading progress bar at the bottom of ReaderView for pdf/djvu reader 
And there is also a toggle full screen option to turn on/off the progress bar.
 2013-02-24 02:25:57 +08:00
chrox
14bcec4b81 remove arguments of RestoreZoomMode events defined in KoptOptions 
Now zoom mode restoration is handled by ReaderKoptListener
 2013-02-20 19:29:14 +08:00
chrox
9efdefb22f add gamma correction for pdf/djvu reader 2013-02-20 14:32:51 +08:00
chrox
df7f7714e4 remove default options in KoptOptions and CreOptions 2013-02-20 13:01:52 +08:00
{Qingping,Dave} Hou
e6e561ce52 Merge pull request #760 from chrox/restore_zoom_mode 
restore zoom mode when toggling reflow on/off
 2013-02-19 07:11:20 -08:00
chrox
666bb3d8ae restore zoom mode when toggling reflow on/off 2013-02-19 19:16:42 +08:00
chrox
78f8ca9029 cleanup: remove debug info on bbox 2013-02-19 13:28:04 +08:00
Qingping Hou
f3452234ea add math.lua, move all math related helpers in to it 2013-02-19 11:57:14 +08:00
chrox
c53f866a93 cleanup: use screen size in page hash explicitly 2013-02-12 01:15:19 +08:00
chrox
7af80f63f6 check screen mode in koptinterface 2013-02-11 00:51:55 +08:00
chrox
1f511757c5 bugfix: calculate current config value or arg at runtime 2013-02-10 20:52:44 +08:00
{Qingping,Dave} Hou
85b4d60efc Merge pull request #735 from chrox/ui-tweaks 
set menu font size according to screen dpi
 2013-02-05 19:40:54 -08:00
chrox
21c972a786 hide DPI dependency in Font module 2013-02-05 18:15:45 +08:00
Qingping Hou
ae6c4bd03a Merge branch 'new_ui_code' of github.com:hwhw/kindlepdfviewer into rotate 
Conflicts:
	frontend/ui/reader/readerconfig.lua
 2013-02-04 15:00:17 +08:00
chrox
0ed5d05bc0 hash current bbox explicitly 2013-02-03 22:58:30 +08:00
chrox
4675a220d8 add current bbox in page rendering hash 
So that changing bbox could take effect on current page.
 2013-02-03 21:36:11 +08:00
Qingping Hou
f91c913530 set default_arg for screen_mode option on runtime 2013-02-03 13:17:02 +08:00
Qingping Hou
0dba667937 rename setScreenViewMode to setScreenMode 2013-02-03 13:13:46 +08:00
Qingping Hou
03b73712bc Merge branch 'new_ui_code' of github.com:hwhw/kindlepdfviewer into rotate 
Conflicts:
	frontend/document/koptinterface.lua
 2013-02-03 12:34:55 +08:00
chrox
1be80d15ae code cleanup 2013-02-03 11:28:50 +08:00
chrox
1c40d127cd add icon option items in config dialog 2013-02-03 11:26:14 +08:00
chrox
25bcbfa53a set menu font size according to screen dpi 2013-02-03 05:16:19 +08:00
chrox
a1aa41136c add manual page crop for pdf/djvu documents 2013-02-03 04:42:59 +08:00
Qingping Hou
2d9534e092 add screen rotate to readerconfig 2013-02-02 17:02:36 +08:00
chrox
563fd50dc3 add toggle switch widget in config option 2013-01-25 23:53:00 +08:00
Qingping Hou
6d8ebb4126 adapt credocument to new changes in cre.cpp 2013-01-22 06:27:22 +08:00
Qingping Hou
65910b2017 add default_css to credocument 2013-01-17 17:12:20 -05:00
Qingping Hou
6c4da43dbf add setStyleSheet method to credocument 2013-01-17 16:59:40 -05:00
{Qingping,Dave} Hou
55b2d4f993 Merge pull request #714 from chrox/config_ui 
some config UI changes
 2013-01-15 13:39:26 -08:00
chrox
494585ce41 rename 'screen rotation' option in koptinterface to 'vertical text' 2013-01-15 19:53:57 +08:00
chrox
6ed1a9012b show more options 2013-01-15 19:11:16 +08:00
Qingping Hou
93d3aea905 pass filename properly for zipped fb2 in CreDocument:init() 2013-01-13 12:17:43 +08:00
Qingping Hou
874890aaec save and restore gamma_index for crengine 2013-01-13 12:07:20 +08:00
Qingping Hou
02ea5f1fbf read header font from config 2013-01-13 11:23:30 +08:00
Qingping Hou
687aabc173 adapt ui to loadDocument before setFont 2013-01-13 10:22:33 +08:00
Qingping Hou
789b5d57e2 read page information for crerengine 2013-01-09 16:41:42 +08:00
Qingping Hou
79839021ed Merge branch 'new_ui_code' into hint_page_fix 
Conflicts:
	frontend/ui/reader/readerview.lua
 2013-01-09 12:19:46 +08:00
{Qingping,Dave} Hou
b04b1e8b58 Merge pull request #690 from houqp/new_ui_houqp 
font size, line space, font weight, font gamma and viewmode support for crengine
 2013-01-08 20:16:11 -08:00
Qingping Hou
c8dce5f351 Merge branch 'new_ui_code' of github.com:hwhw/kindlepdfviewer into hint_page_fix 
Conflicts:
	frontend/document/document.lua
 2013-01-09 11:38:49 +08:00
Qingping Hou
93cad1428c add render_mode into render hash 2013-01-09 06:06:53 +08:00
Qingping Hou
1fa0d886bd add render mode to hint page 2013-01-09 05:51:53 +08:00
chrox
c8b699c068 bugfix: check renderpg hash before hinting page 2013-01-08 17:00:18 +08:00
Qingping Hou
59a424203b add font gamma to readerconfig 2013-01-07 16:42:50 -05:00
Qingping Hou
5ce4f24c37 move CreOptions to credocument.lua 2013-01-07 12:32:33 -05:00
Qingping Hou
2fa919e1b6 add CreDocument:toggleFontBolder 2013-01-07 12:16:17 -05:00
Qingping Hou
ac1cf212d1 add setViewMode to CreDocument 2013-01-07 06:53:35 -05:00
Qingping Hou
fdc05b066c add readerconfig to document supported by crengine 
* now font size can be changed by readerconfig
 2013-01-06 23:21:11 -05:00
chrox
aa152a8a51 make readerconfig independent of koptoptions 
So that other readers could reuse readerconfig
 2013-01-06 14:01:34 +08:00
{Qingping,Dave} Hou
3ec818a3cd Merge pull request #684 from chrox/koptreader-new-ui 
add reflow mode in pdf/djvu readers
 2013-01-04 00:28:57 -08:00
chrox
349bcb996e use koptinterface to reflow text in pdf/djvu readers 2013-01-03 22:33:49 +08:00
chrox
e525264b01 save/restore koptconfig to setting files 2012-12-24 17:36:52 +08:00
chrox
a649301e69 make pdfreader and djvureader the defaults 2012-12-24 08:19:34 +08:00
chrox
074522a36b first usable koptreader for new UI 2012-12-24 08:16:41 +08:00
chrox
138def10c3 Demo version of koptreader config dialog. 2012-12-24 08:16:17 +08:00
Qingping Hou
93abd2fee7 add page status to readerrolling for better page view_mode support 
* now when rendering in page view mode, we only keep track of page
number instead of pos inside document. Because using pos inside
document for page view mode is really a bad idea and will lead to
many unsovlabe bugs...
 2012-12-22 13:27:46 +08:00
Qingping Hou
5ab98420bd use predefined variable instead of magic number for view_mode 2012-12-21 09:10:16 +08:00
Qingping Hou
efa37c97ab bug fix in readerfont 
After set font in ReaderFont:onReadSettings, we have to send UpdatePos
event in order to set m_is_rendered(member of LVDocView) to true.

Otherwise position inside document will be reset to 0 on first view
render, this makes the first page of document is always displayed on
document open.

So far, I don't know why this call will alter the value of m_is_rendered.
It just works...
 2012-12-21 06:00:51 +08:00
Qingping Hou
5d1c98e90a add setFontSize to credocument.lua 2012-12-17 14:50:50 +08:00
Qingping Hou
1675d8667b add cre view mode support in frontend 2012-12-13 12:41:48 +08:00
Qingping Hou
683c7eee2c handle corrupted usedbbox in Document:getUsedBBoxDimensions() 2012-12-07 16:42:27 -05:00
{Qingping,Dave} Hou
5cbbfaceff Merge pull request #649 from chrox/koptreader-new-ui 
move page reflowing code to getPageDimensions method
 2012-12-04 01:08:12 -08:00
chrox
fd461e4f3e move page reflowing code to getPageDimensions method 2012-12-04 10:36:36 +08:00
Qingping Hou
7b707ab367 add usedbbox support 2012-12-02 17:09:32 +08:00
Qingping Hou
7e04c97b70 bug fix for PdfDocument:getUsedBBox 
when cache found, we should return cache.ubbox
not cache.data
 2012-12-02 15:14:02 +08:00
chrox
aa9fe4b01c cache page size after page is reflowed 
So that when page dimension is recalculated right page size
other than screen size is returned.
 2012-11-29 21:58:12 +08:00
chrox
c462090600 add koptreader demo 2012-11-27 20:43:49 +08:00
Qingping Hou
e3617676a1 fix deprecated debug call in credocument.lua 2012-11-23 01:10:34 -05:00
Qingping Hou
36a4ead630 update document.lua according to API change in cre.cpp 2012-11-11 14:29:56 +08:00
Qingping Hou
ea022b651f add rendermode support for djvu documents 2012-10-09 18:26:01 -04:00
Qingping Hou
8ccbfba6cc Djvu Validate patch from tigran123 
refer to commit in master(kpv) tree:
64b6ef4afd
 2012-10-09 16:15:13 -04:00
Tigran Aivazian
d551e7fb63 Cleanup crereader fonts initialization. 
Don't try to register the two fonts Dingbats.cff and StandardSymL.cff
with crengine because it will reject them anyway. But we cannot simply
remove these two fonts because they are used internally by mupdf to
emulate "builtin" fonts which are mandated by Adobe PDF specification to
be present in every valid implementation.
 2012-10-03 13:08:27 -04:00
Qingping Hou
eb79e1c95c handle file with no extension in filechooser 2012-09-17 20:36:39 -04:00
Qingping Hou
25af917170 call cre.initCache() in CreDocument:engineInit() 2012-09-17 20:12:33 -04:00
Qingping Hou
c1ccff70ad minor adjustment for Makefile and document.lua 2012-08-25 22:52:12 +08:00
Qingping Hou
bad329811d add line space control feature for credocument 2012-06-12 21:12:04 +08:00
Qingping Hou
b3cdbeee19 add font size control feature for credocument 
also rename getFont to getFontFace
 2012-06-12 20:59:56 +08:00
Qingping Hou
acaf8d660e font menu for readerui 2012-06-12 17:42:28 +08:00
Qingping Hou
77761554d9 add CreDocument:engineInit() method 2012-06-12 14:52:35 +08:00
Qingping Hou
d89cbc43f9 replace getProvider with openDocument 
now getProvider only returns the provider
 2012-06-12 14:38:00 +08:00
Qingping Hou
2b39ba8b83 register all the supported formats for crengine 2012-06-11 23:50:11 +08:00
HW
ce5614ef6f cleanup, also removal of G_* constants 
a bit of cleanup, switched width/height combo over to use
Geom() objects, moved framebuffer handling to Screen object,
callback syntax sanitizing, lots of small changes
 2012-06-10 17:36:19 +02:00
Qingping Hou
e7d16de4e2 first demo for credocument 2012-06-05 15:23:36 +08:00
Qingping Hou
b40a748a78 move duplicate codes to document.lua 2012-06-03 22:26:16 +08:00
Qingping Hou
7f6773dc6f demo for djvu support 
wait for code clean up
 2012-06-03 11:11:15 +08:00
HW
60ccd7441e fixed menu info displaying, replaced debug() by DEBUG() 
the replacement of debug() was necessary to be able to access the lua library "debug" (for backtraces etc.)
 2012-05-28 18:59:16 +02:00
Qingping Hou
cf048e286d add toc menu support for readerui 2012-05-27 19:47:22 +08:00
HW
d5c7e6ccb5 factored out pdfdocument implementation 2012-05-19 01:13:53 +02:00
HW
9e531fc2db file reorganisation 
all lua frontend files are now in the frontend/ directory.
all old code is cleaned up.
 2012-05-19 01:10:57 +02:00