Skip to content

Commit

Permalink
bump crengine: various text and CSS fixes
Browse files Browse the repository at this point in the history
Includes:
- ldomXRange/ldomMarkedRange: update enhanced drawing flag
- Hardcoded elements list: add <script>
- CSS: ensure selectors are applied in the order met
- elementFromPoint(): fix some floats not being visited
- Fix getPageDocumentRange() on bidi text
- Text: fix: allow wrap on space around images
- CSS/Text: adds "-cr-hint: strut-confined"
- Rename mispelled 'ident' and field 'margin' to 'indent"
- text-indent: some fixes, handle negative & hanging indent
- (Upstream) Minor cleanup and ifdef wraps
- lvtextfm: avoid possible segfault when hyphenating
- lvtextfm: avoid spurious spaces when hyphenating
- lvtextfm: dont adjust space after initial quotation mark/dash
- lvtextfm: ensure page-break:avoid on inline-block and images
- (Upstream) lvtinydom.cpp: fix old minor typo
- Fix internal/footnote links not working on some books

cre.cpp: also use enhanced selection drawing when highlighting
the footnote link with footnote popups.
  • Loading branch information
poire-z committed Jan 30, 2020
1 parent 90a58f0 commit 26bb2a8
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
6 changes: 4 additions & 2 deletions cre.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1420,7 +1420,7 @@ static int getTextFromPositions(lua_State *L) {

int rangeFlags = 0;
if (drawSelection) // have crengine do native highlight of selection
rangeFlags = drawSegmentedSelection ? 2 : 1;
rangeFlags = drawSegmentedSelection ? 0x11 : 0x01;
r.setFlags(rangeFlags);
tv->selectRange(r);

Expand Down Expand Up @@ -2631,7 +2631,9 @@ static int highlightXPointer(lua_State *L) {
ldomNode * node = nodep.getNode();
if (node->isNull())
return 0;
sel.add( new ldomXRange(node, true) ); // highlight
ldomXRange * fullNodeRange = new ldomXRange(node, true);
fullNodeRange->setFlags(0x11); // draw segmented adjusted selection
sel.add( fullNodeRange ); // highlight it
lua_pushboolean(L, true);
return 1;
}
Expand Down
1 change: 1 addition & 0 deletions thirdparty/kpvcrlib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ add_definitions(
-DUSE_HARFBUZZ=1
-DUSE_FRIBIDI=1
-DUSE_UTF8PROC=1
-DUSE_NANOSVG=1
-DALLOW_KERNING=1
-DCR3_PATCH=1
)
Expand Down

0 comments on commit 26bb2a8

Please sign in to comment.