2
0
mirror of https://github.com/koreader/koreader synced 2024-11-02 15:40:16 +00:00
Commit Graph

1337 Commits

Author SHA1 Message Date
Dobrica Pavlinušić
581be526df Merge pull request #517 from houqp/new_ui_code
merge latest changes from master branch
2012-11-01 02:10:43 -07:00
Qingping Hou
e2abd32606 gitignore cleanup 2012-10-31 23:01:36 -04:00
Qingping Hou
625de9b260 update pic.c from latest code
after lots of cherry-pick I found that for some strange reason,
pic.c is not updated and I cannot find out which commit I missed.
So I simply copied the latest pic.c from the master branch here.
2012-10-31 22:54:36 -04:00
Qingping Hou
6f6cb3c1a9 build: create libs-emu dir if not found 2012-10-31 22:54:19 -04:00
Tigran Aivazian
d4642a5df1 Build djvulibre as a shared library 2012-10-31 22:39:58 -04:00
chrox
0b2f89d830 add screen rotation in koptconfig
Conflicts:

	koptconfig.lua
	koptreader.lua
2012-10-31 22:37:15 -04:00
chrox
2c3b4fa968 add auto straighten option for scanned pages
Conflicts:

	koptconfig.lua
	koptreader.lua
2012-10-31 22:36:29 -04:00
chrox
148dc48556 add column detection in koptconfig
Conflicts:

	koptconfig.lua
	koptreader.lua
2012-10-31 22:36:13 -04:00
chrox
06f3c382ac add font size option in koptconfig dialog
Conflicts:

	koptconfig.lua
	koptreader.lua
2012-10-31 22:35:44 -04:00
chrox
8424011286 cleanup: dst_justify is assigned according to both justification and
full_just
2012-10-31 22:35:05 -04:00
chrox
ddb46eeb41 merge justification and full justification to one option
Conflicts:

	koptconfig.lua
	koptreader.lua
2012-10-31 22:34:55 -04:00
Qingping Hou
75b1e716fe rm koptconfig.lua for new ui branch 2012-10-31 22:34:19 -04:00
chrox
5294d178a0 add justification option in koptconfig dialog
Conflicts:

	koptconfig.lua
	koptreader.lua
2012-10-31 22:34:12 -04:00
chrox
72aeb42441 default dst_mar in k2pdfopt should be 0.06 2012-10-31 22:33:25 -04:00
chrox
ad4deb26be add page margin and text wrap and contrast option in koptconfig
Conflicts:

	koptconfig.lua
	koptreader.lua
2012-10-31 22:32:45 -04:00
chrox
ce0b3acd6b add config dialog for koptreader
For now only line spaceing and word spaceing are configurable with
'F'/'Aa' commands. And device size are passed to k2pdfopt in place of
the hard-coded default width and height(via @dpavlin).
Conflicts:

	koptreader.lua
2012-10-31 22:29:48 -04:00
Tigran Aivazian
5c0201d3e3 Makefile: extr depends on MUPDFLIBS/THIRDPARTYLIBS 2012-10-31 22:29:31 -04:00
Tigran Aivazian
c0cd31be6d Adjust the error message as well. 2012-10-31 22:29:23 -04:00
Tigran Aivazian
8245017078 Cleanups to extr.c and pdfattach
1. In extr.c the error message should use the correct full pathname, not
the base filename.
2. In pdfattach the check for existence of input files should be
replaced with the check for read access to them.
2012-10-31 22:29:10 -04:00
Tigran Aivazian
9348b5c553 Escape ampersand & in the filename also.
I am amazed what stupid filenames some people come up with, instead of
abiding by old good [a-zA-Z0-9] character set and 8.3 filename length...
2012-10-31 22:29:02 -04:00
Tigran Aivazian
ed76aa78f4 More enhancements to pdfattach
1. Emit the list of attached files first and then emit each individual
attachment one per page.
2. Use hyperlinks in the list of attached files so one can jump directly
to the file which he wants to extract.
2012-10-31 22:27:56 -04:00
Tigran Aivazian
6d02aaaa7b Enhance pdfattach script
1. Set the page size to 9x12cm as appropriate for Kindle 3
2. Together with each attachment print its base filename and file size
in bytes.
3. Print the total size of all attachments (so one can estimate whether
it is safe to extract the attachments or not).
2012-10-31 22:27:47 -04:00
chrox
a86e2ece23 bugfix: dpi should be multiplied by shrink_factor not zoom
Conflicts:

	koptreader.lua
2012-10-31 22:27:34 -04:00
Tigran Aivazian
52e7bb867e Use tabs not spaces for indenting. 2012-10-31 22:21:25 -04:00
Tigran Aivazian
543e7cc98e Make the pdfattach utility more robust
1. Handle filenames with spaces
2. Check if pdflatex and attachfile packages are installed before trying
to use them.
3. Use a more intuitive interface "pdfattach -o file.pdf file1.djvu
[file2.djvu]..." instead of forcing the user to specify "-i" option for
every input file.
2012-10-31 22:21:16 -04:00
chrox
ae950ccf32 feedback zoom value used by page reflow
So that when zoom value exceed the upper limit of reflowable page size
user will notice that zoom value cannot be increased.
Conflicts:

	koptreader.lua
2012-10-31 22:21:03 -04:00
Tigran Aivazian
622e2959b3 Utility for attaching files inside PDF
This utility creates a PDF file containing specified files embedded into
it as attachments. The attachments can be extracted from the PDF file by
using extr utility.
I placed this in a separate "utils" directory to signify that this is
NOT intended to run on a Kindle (it requires pdfLaTeX to generate the
PDF file) but only on the desktop Linux workstation.
2012-10-31 22:20:44 -04:00
Tigran Aivazian
d90b01dbfd Handle absolute attachment pathnames
We must use only the basename part of the embedded attachment filename,
because the directories used in the path on the machine where the
attachments were created may not even exist on the machine where they
are extracted.
2012-10-31 22:20:24 -04:00
Tigran Aivazian
ff23916940 Correct the comment.
The global variable "doc" is actually shared by ALL functions, so the
old comment was incorrect.
2012-10-31 22:19:54 -04:00
Tigran Aivazian
fc20c0af26 Support for extracting attachments from PDF file
This commit adds Alt-S command which invokes the external utility "extr"
passing it the full pathname of the open PDF file and the current page
number. The utility extracts all attachments on this page (if there are
any) and saves them in the same directory as the PDF file. The file
names given to attachments are decoded from within the PDF file itself,
i.e. they are the same as the original file names of the files embedded
in the PDF.

Conflicts:

	pdfreader.lua
2012-10-31 22:19:39 -04:00
Qingping Hou
75f2c2774f fix getopt module clearance in reader.lua 2012-10-31 22:15:02 -04:00
Tigran Aivazian
fe43ec7976 Fix the leftover from the old name jpg.h 2012-10-31 22:09:48 -04:00
Tigran Aivazian
503c9b077d Initial commit of picviewer.
Conflicts:

	Makefile
	extentions.lua
	pic.c
	reader.lua
2012-10-31 22:09:27 -04:00
Qingping Hou
2b185961e8 remove getopt lua module in reader.lua 2012-10-31 22:02:53 -04:00
Qingping Hou
f70dc54864 update getXPointer method definition 2012-10-31 22:01:52 -04:00
Tigran Aivazian
db3796cd24 Remove alt_getopt.lua module altogether.
Conflicts:

	Makefile
	frontend/alt_getopt.lua
2012-10-31 21:47:41 -04:00
Tigran Aivazian
7f4be723a0 LuaJIT: make distclean -> make clean
Two reasons for this change:

1. The latest LuaJIT has no "distclean" target
2. The "distclean" is MUCH slower
2012-10-31 21:43:52 -04:00
chrox
7fb6f16552 add page size limit in reading pdf/djvu files 2012-10-31 21:43:44 -04:00
chrox
9e8a92862c add koptreader.lua file in customupdate
Conflicts:

	Makefile
2012-10-31 21:34:30 -04:00
chrox
441d061664 add DJVU reflow
Conflicts:

	djvu.c
	koptreader.lua
	reader.lua
2012-10-31 21:30:06 -04:00
chrox
503a76db9a Cleanup: pass globalzoom to reflow in dc
Conflicts:

	pdfreader.lua
2012-10-31 21:20:53 -04:00
chrox
f0c7896bc8 add zoom in/out in reflow mode && PGBCK/PGFWD now work as expect
Conflicts:

	pdfreader.lua
2012-10-31 21:20:12 -04:00
Tigran Aivazian
da88ca7a09 Get rid of unused variable in getCacheSize() 2012-10-31 21:19:54 -04:00
chrox
f3f97b6223 add pdf page reflow
Conflicts:

	pdfreader.lua
2012-10-31 21:17:08 -04:00
Tigran Aivazian
89c5aad77f Mention SDL/SDL-devel requirement on Fedora 2012-10-31 21:15:01 -04:00
Dobrica Pavlinusic
3c19365145 use DEBUG_CRENGINE from enviroment if available
This allows to specify DEBUG_CRENGINE=1 while compiling without editing
source code
2012-10-31 21:11:31 -04:00
Dobrica Pavlinusic
95f6ed5bd6 fix getCurrentPageLinks segfault on links without target 2012-10-31 21:11:16 -04:00
Dobrica Pavlinusic
484d85ab0f getSelections can be 0
This depends on visible selections and not on content of file. So if we
have search results on screen this will be more than 0, but if we don't
we won't get any link shortcuts
2012-10-31 21:11:04 -04:00
Dobrica Pavlinusic
08d26596b8 use CRLog::debug instead of printf, removed unused code 2012-10-31 21:10:55 -04:00
Dobrica Pavlinusic
24d4b82f2d getSelections can return empty ldomXRangeList 2012-10-31 21:10:15 -04:00