Merged
Conversation
Alternative code to size, split lines and draw text with the help of the xtext Lua C module. Enabled by default (can be disabled via an added menu item in "Developer options"). New properties can be specified by calling widgets, only used when xtext is used: - lang: use specified language instead of the UI language - para_direction_rtl: true/false to override the default direction for the UI language - auto_para_direction: detect direction of each paragraph in text - alignment_strict: prevent the inversion of the specified alignment= that is done when a paragraph direction is set or detected as RTL. Also: fix possible memory leak (present even when not using xtext) by calling :free() in onCloseWidget() like it's done in ImageWidget.
- height_adjust: if true, reduce height to a multiple of line_height (for nicer centering) - height_overflow_show_ellipsis: if height overflow, append ellipsis to last shown line (Implemented in both use_xtext and legacy code path.) Use them in Menu.lua to clean up/shorten the code used for multiline menu items by delegating the work to TextBoxWidget, or using TextWidget when we end up needing only a single line.
It's rejected anyway by crengine, this just avoids an error from being logged.
Avoid a few truncated text, as some fit when allowed to bite a bit on the (large) left padding.
As per @NiLuJe's suggestions from <#5598 (comment)>. I'm not super happy with this but being able to easily run the emulator is the most important thing.
* Tap goes to next activated keyboard. * Hold opens a selection popup.
Option to synchronize files in local koreader folder with folder on Dropbox. All files that aren't on the local disk will be downloaded. Files with different sizes will also be downloaded and overwritten. The download process can be paused or stopped at any time (similar to downloading images in Wikipedia). Synchronize and settings are available after long press in dropbox account in Cloud storage. Limitations: Only one folder (without subfolders) can be synchronize with one folder on local storage.
Follow-up to #5583. * Add separate Cyrillic/Russian keyboard * And remove that from English * Update French keyboard (is easy) * Remove yahzhert, that was just a double of QWERTY * Update Spanish keyboard * Reduce Japanese to 4 layers and add globe * Reduce Korean to 4 layers * Reduce Greek to 8 layers
* Overwrite confirmbox order * Restore confirmbox option to read the downloaded book
closes #5612 the change in `ReaderView:recalculate()` causes the viewable page size to be calculated by not including the footer, causing the text not to get cut off. since the page area was not drawing under the footer `ReaderView:drawPageSurround()` had to be fixed to draw the margin under the footer so when tapping the footer off the area should be dran the background color.
* [chore] thirdparty patch file dependencies koreader/koreader-base#1012 * Revert "[fix] MuPDF Android font dir patch update koreader/koreader-base#1013 Fixes #5617.
* Rewrite unicodeCodepointToUtf8 w/ bitopt Avoids costly divs & modulos
Includes: - Fonts: round FT metrics instead of floor'ing them - Fonts: switch to no hinting when native hinting fails - Fonts: fix issue with Harfbuzz fallback font drawing - Text: split measuring and word drawing by unicode script - Page splitting: fix small memory leak - Fix "background-color: black" ignored on inline elements - Fix decoding of recent MOBI files - Hardcoded elements list: add <font> base/xtext.cpp: small cleanup, no logic change
* Resync fixUtf8 w/ upstream * Fix lastIndexOf desc * Drop unichar usage, it's a crappier unicodeCodepointToUtf8 ;).
For eink: more devices koreader/android-luajit-launcher#197
* Switch the last few remaining icons to true glyphs (Del/Backspace & Enter). Also, allow a glyph to be rendered in (fake) bold, and use it for Enter. * Update fonts Pickup the tweaked nerdfonts for the backspace symbol
- fix incorrectly shown awake, sleeping, charging and discharging, - remove unneeded debug mode and logging to external file, - prevent showing values like inf, -inf, nan in estimated times (we now show "n/a"), and values below zero, - show extra confirm box when we want to reset data, - show time in format xxhxxm instead of only pure minutes, - check at initialization that the device was charging when it was turned off (battery level larger than at the time of exit).
#5928) Also use a var in place of a long function name
Because dismissing it by tapping outside would have "not for this book" selected, which is the least welcome action.
* Update cURL to 7.69.0 (koreader-base#1059) * Parentheses in awk call (koreader-base#1060)
Fixes #5939 Also includes Update LodePNG to 20200306 and Update FBInk to 1.22.0 koreader/koreader-base#1061
Only one style was supported. Fixes <#5941>. See <#5941 (comment)> for discussion.
added a few new mime types to the OPDS browser as a temporary workaround for #5478
Apply the same crappy workaround as for BR. Fix #5948
Dictionary download window: combine the first two titles to save space and fit 3x complete dictionary selections on one page (Kindle PW3) Closes #5955
Includes: - FB2 footnotes: disable hardcoded handling as in-page 2 - CSS: also support gray colors spelled "grey" - Text: move past floats when wide image or inlineBox does not fit - Fix list item marker clipping check - Ensure nodeDisplayStyleHash change when boxing prevented by cache - Text: adds LFormattedText.is_reusable - Handle block elements inside inline element - Fix getBookmark() on multi-pages embedded block - (Upstream) Support raw picture in RTF - (Upstream) Fixed integer overflow in cache size calculations - Add libCURL's CA bundle to the ignore list - FB2 footnotes: fix setBoxingWishedButPreventedByCache() - fb2.css: handle body[name="comments"] as footnotes Also: Update base/thirdparty/turbo to v2.1.3.
- Add some style tweaks to allow displaying FB2 end notes in-page too - and to allow showing them without a smaller font size. - Show footnote number in bold in popup footnotes.
* Unbreak nightmode on Cervantes Regression after koreader/koreader-base#1047 (I thought it was already implemented). Fix #5963 * make luacheck happy
+ new Boyue model
Includes: - FB2: merge other metadata in returned keywords and description - CSS: adds support for font-variant Also: - Rebase MD5 module against upstream - Update cURL to 7.69.1
More generally: switch to the page that contains the highlight edge that we are currently moving.
- Show output in a TextViewer with a monospace font. - Include stderr, so errors are shown - Use Trapper to allow interrupting command (and to fix some refresh issues)
* Kindle FL shenanigans Either fix #5986, or break a whole crapload of weird corner-cases. Possibly the insane AutoFrontLight checks. * Make fl step 0 usable on devices where 0 doesn't turn the light off. By fudging an extra step on our own side. * Also, add some debug logging around wmctrl to try to figure out what's happening there...
bump crengine: support for EPUB3 nav toc and page maps Includes: - Fix lvRect:isRectInside(rc) with 0-width or 0-height rect - TOC: parse EPUB3 nav toc, fallback to spine when no toc - Parse and cache various hardcopy page list maps - epub.css: hide EPUB3 <span epub:type="pagebreak"> content cre.cpp: add a few PageMap helper functions. Adds ReaderPageMap which will add a new menu (under TOC and Bookmarks) that will allow: - to list source page numbers (like a TOC) - to show visible page labels in the right margin - to use these source page numbers in the footer, the TOC, the GoTo and SkimTo widgets, and to use the source page number in the standard bookmark and highlight initial text.
mwoz123
pushed a commit
that referenced
this pull request
Mar 29, 2020
It will introduce some minor noise, but too much stuff is simply not seen otherwise, for example:
*:E
```
02-09 12:45:53.359 2580 2609 E IconLoader: Unexpected null component name or activity info: ComponentInfo{org.koreader.launcher/org.koreader.launcher.MainActivity}, null
```
*:F
```
--------- beginning of system
--------- beginning of main
--------- beginning of crash
02-09 12:47:31.275 4985 5003 F libc : /home/frans/src/kobo/koreader/base/thirdparty/filemq/build/i686-linux-android-debug/filemq-prefix/src/filemq/src/fmq_client.c:170: fmq_client_set_resync: assertion "self" failed
02-09 12:47:31.275 4985 5003 F libc : Fatal signal 6 (SIGABRT), code -6 (SI_TKILL) in tid 5003 (Thread-37), pid 4985 (reader.launcher)
02-09 12:47:31.512 5085 5085 F DEBUG : *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
02-09 12:47:31.512 5085 5085 F DEBUG : Build fingerprint: 'Android/sdk_phone_x86_64/generic_x86_64:9/PSR1.180720.012/4923214:userdebug/test-keys'
02-09 12:47:31.512 5085 5085 F DEBUG : Revision: '0'
02-09 12:47:31.513 5085 5085 F DEBUG : ABI: 'x86'
02-09 12:47:31.513 5085 5085 F DEBUG : pid: 4985, tid: 5003, name: Thread-37 >>> org.koreader.launcher <<<
02-09 12:47:31.513 5085 5085 F DEBUG : signal 6 (SIGABRT), code -6 (SI_TKILL), fault addr --------
02-09 12:47:31.513 5085 5085 F DEBUG : Abort message: '/home/frans/src/kobo/koreader/base/thirdparty/filemq/build/i686-linux-android-debug/filemq-prefix/src/filemq/src/fmq_client.c:170: fmq_client_set_resync: assertion "self" failed'
02-09 12:47:31.513 5085 5085 F DEBUG : eax 00000000 ebx 00001379 ecx 0000138b edx 00000006
02-09 12:47:31.513 5085 5085 F DEBUG : edi 00000000 esi 00000000
02-09 12:47:31.513 5085 5085 F DEBUG : ebp 33167a17 esp de3e9528 eip f70d8b59
02-09 12:47:31.515 5085 5085 F DEBUG :
02-09 12:47:31.515 5085 5085 F DEBUG : backtrace:
02-09 12:47:31.515 5085 5085 F DEBUG : #00 pc 00000b59 [vdso:f70d8000] (__kernel_vsyscall+9)
02-09 12:47:31.515 5085 5085 F DEBUG : #1 pc 0001fc08 /system/lib/libc.so (syscall+40)
02-09 12:47:31.515 5085 5085 F DEBUG : #2 pc 000321f3 /system/lib/libc.so (abort+115)
02-09 12:47:31.515 5085 5085 F DEBUG : #3 pc 00032681 /system/lib/libc.so (__assert2+49)
02-09 12:47:31.515 5085 5085 F DEBUG : #4 pc 000046b0 /data/data/org.koreader.launcher/files/libs/libfmq.so.1
02-09 12:47:31.515 5085 5085 F DEBUG : #5 pc 00008e54 /data/app/org.koreader.launcher-u3tYrWEK7wgvoJGvd1pTrA==/lib/x86/libluajit.so
02-09 12:47:31.515 5085 5085 F DEBUG : #6 pc 00056a61 /data/app/org.koreader.launcher-u3tYrWEK7wgvoJGvd1pTrA==/lib/x86/libluajit.so
02-09 12:47:31.515 5085 5085 F DEBUG : #7 pc 0006ed92 /data/app/org.koreader.launcher-u3tYrWEK7wgvoJGvd1pTrA==/lib/x86/libluajit.so
02-09 12:47:31.515 5085 5085 F DEBUG : #8 pc 00006fc9 /data/app/org.koreader.launcher-u3tYrWEK7wgvoJGvd1pTrA==/lib/x86/libluajit.so
02-09 12:47:31.515 5085 5085 F DEBUG : #9 pc 00061f73 /data/app/org.koreader.launcher-u3tYrWEK7wgvoJGvd1pTrA==/lib/x86/libluajit.so
02-09 12:47:31.515 5085 5085 F DEBUG : #10 pc 00006fc9 /data/app/org.koreader.launcher-u3tYrWEK7wgvoJGvd1pTrA==/lib/x86/libluajit.so
02-09 12:47:31.515 5085 5085 F DEBUG : #11 pc 00061f73 /data/app/org.koreader.launcher-u3tYrWEK7wgvoJGvd1pTrA==/lib/x86/libluajit.so
02-09 12:47:31.515 5085 5085 F DEBUG : #12 pc 00006fc9 /data/app/org.koreader.launcher-u3tYrWEK7wgvoJGvd1pTrA==/lib/x86/libluajit.so
02-09 12:47:31.515 5085 5085 F DEBUG : #13 pc 0001c470 /data/app/org.koreader.launcher-u3tYrWEK7wgvoJGvd1pTrA==/lib/x86/libluajit.so (lua_pcall+80)
02-09 12:47:31.515 5085 5085 F DEBUG : #14 pc 0000571a /data/app/org.koreader.launcher-u3tYrWEK7wgvoJGvd1pTrA==/lib/x86/libluajit.so (android_main+458)
02-09 12:47:31.515 5085 5085 F DEBUG : koreader#15 pc 00070a38 /data/app/org.koreader.launcher-u3tYrWEK7wgvoJGvd1pTrA==/lib/x86/libluajit.so
02-09 12:47:31.515 5085 5085 F DEBUG : koreader#16 pc 0009cce5 /system/lib/libc.so (__pthread_start(void*)+53)
02-09 12:47:31.515 5085 5085 F DEBUG : koreader#17 pc 00033c1b /system/lib/libc.so (__start_thread+75)
```
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.