Skip to content

Commit

Permalink
bump crengine: fix font clipping and hyphenation with HB (#815)
Browse files Browse the repository at this point in the history
Includes:
- Page drawing: don't clip on left and right margins
- Rendering: draw borders before their inner content
- Harfbuzz: fix rendering when hyphenating on a ligature

cre.cpp:
- adds getNextVisibleChar() and getPrevVisibleChar()
- fix getNext/PrevVisibleWordStart/End to return nil
  when reaching end/start of book and moving again
  is not possible
  • Loading branch information
poire-z committed Feb 14, 2019
1 parent dd655e7 commit 3492c1f
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 16 deletions.
62 changes: 47 additions & 15 deletions cre.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1294,10 +1294,11 @@ static int getNextVisibleWordStart(lua_State *L){
ldomXPointerEx nodep = doc->dom_doc->createXPointer(lString16(xp));
if (nodep.isNull())
return 0;
nodep.nextVisibleWordStart();
lua_pushstring(L, UnicodeToLocal(nodep.toString()).c_str());

return 1;
if (nodep.nextVisibleWordStart()) {
lua_pushstring(L, UnicodeToLocal(nodep.toString()).c_str());
return 1;
}
return 0;
}

static int getNextVisibleWordEnd(lua_State *L){
Expand All @@ -1306,10 +1307,11 @@ static int getNextVisibleWordEnd(lua_State *L){
ldomXPointerEx nodep = doc->dom_doc->createXPointer(lString16(xp));
if (nodep.isNull())
return 0;
nodep.nextVisibleWordEnd();
lua_pushstring(L, UnicodeToLocal(nodep.toString()).c_str());

return 1;
if (nodep.nextVisibleWordEnd()) {
lua_pushstring(L, UnicodeToLocal(nodep.toString()).c_str());
return 1;
}
return 0;
}

static int getPrevVisibleWordStart(lua_State *L){
Expand All @@ -1318,10 +1320,11 @@ static int getPrevVisibleWordStart(lua_State *L){
ldomXPointerEx nodep = doc->dom_doc->createXPointer(lString16(xp));
if (nodep.isNull())
return 0;
nodep.prevVisibleWordStart();
lua_pushstring(L, UnicodeToLocal(nodep.toString()).c_str());

return 1;
if (nodep.prevVisibleWordStart()) {
lua_pushstring(L, UnicodeToLocal(nodep.toString()).c_str());
return 1;
}
return 0;
}


Expand All @@ -1331,10 +1334,37 @@ static int getPrevVisibleWordEnd(lua_State *L){
ldomXPointerEx nodep = doc->dom_doc->createXPointer(lString16(xp));
if (nodep.isNull())
return 0;
nodep.prevVisibleWordEnd();
lua_pushstring(L, UnicodeToLocal(nodep.toString()).c_str());
if (nodep.prevVisibleWordEnd()) {
lua_pushstring(L, UnicodeToLocal(nodep.toString()).c_str());
return 1;
}
return 0;
}

static int getNextVisibleChar(lua_State *L){
CreDocument *doc = (CreDocument*) luaL_checkudata(L, 1, "credocument");
const char* xp = luaL_checkstring(L, 2);
ldomXPointerEx nodep = doc->dom_doc->createXPointer(lString16(xp));
if (nodep.isNull())
return 0;
if (nodep.nextVisibleChar()) {
lua_pushstring(L, UnicodeToLocal(nodep.toString()).c_str());
return 1;
}
return 0;
}

return 1;
static int getPrevVisibleChar(lua_State *L){
CreDocument *doc = (CreDocument*) luaL_checkudata(L, 1, "credocument");
const char* xp = luaL_checkstring(L, 2);
ldomXPointerEx nodep = doc->dom_doc->createXPointer(lString16(xp));
if (nodep.isNull())
return 0;
if (nodep.prevVisibleChar()) {
lua_pushstring(L, UnicodeToLocal(nodep.toString()).c_str());
return 1;
}
return 0;
}

static int getWordBoxesFromPositions(lua_State *L) {
Expand Down Expand Up @@ -2675,6 +2705,8 @@ static const struct luaL_Reg credocument_meth[] = {
{"getNextVisibleWordEnd", getNextVisibleWordEnd},
{"getPrevVisibleWordStart", getPrevVisibleWordStart},
{"getPrevVisibleWordEnd", getPrevVisibleWordEnd},
{"getPrevVisibleChar", getPrevVisibleChar},
{"getNextVisibleChar", getNextVisibleChar},
{"getTextFromXPointers", getTextFromXPointers},
/*--- set methods ---*/
{"setIntProperty", setIntProperty},
Expand Down

0 comments on commit 3492c1f

Please sign in to comment.