renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #136 from houqp/master

Browse Source 
workaround for broken font setting in crereader.
This commit is contained in:
Dobrica Pavlinušić
2012-04-24 01:35:10 -07:00
parent 1c98aef6a1 c961fbd515
commit cb54c09c31
4 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -138,6 +138,10 @@ fetchthirdparty:
# CREngine patch: disable fontconfig
grep USE_FONTCONFIG $(CRENGINEDIR)/crengine/include/crsetup.h && grep -v USE_FONTCONFIG $(CRENGINEDIR)/crengine/include/crsetup.h > /tmp/new && mv /tmp/new $(CRENGINEDIR)/crengine/include/crsetup.h || echo "USE_FONTCONFIG already disabled"
test -f mupdf-thirdparty.zip || wget http://www.mupdf.com/download/mupdf-thirdparty.zip
# CREngine patch: change child nodes' type face
# @TODO replace this dirty hack 24.04 2012 (houqp)
cd kpvcrlib/crengine/crengine/src && \
patch -N -p0 < ../../../lvrend_node_type_face.patch
unzip mupdf-thirdparty.zip -d mupdf
# dirty patch in MuPDF's thirdparty liby for CREngine
cd mupdf/thirdparty/jpeg-*/ && \

3
cre.cpp
View File

@@ -269,6 +269,7 @@ static int setFontFace(lua_State *L) {
const char *face = luaL_checkstring(L, 2);
doc->text_view->setDefaultFontFace(lString8(face));
//fontMan->SetFallbackFontFace(lString8(face));
return 0;
}
@@ -364,6 +365,7 @@ static int cursorRight(lua_State *L) {
//LVDocView *tv = doc->text_view;
//ldomXPointer p = tv->getCurrentPageMiddleParagraph();
//lString16 s = p.getText();
//lString16 s = p.toString();
//printf("~~~~~~~~~~%s\n", UnicodeToLocal(s).c_str());
@@ -378,7 +380,6 @@ static int cursorRight(lua_State *L) {
//LVPageWordSelector sel(doc->text_view);
//doc->text_view->doCommand(DCMD_SELECT_FIRST_SENTENCE);
//sel.moveBy(DIR_RIGHT, 2);
//sel.updateSelection();
//printf("---------------- %s\n", UnicodeToLocal(sel.getSelectedWord()->getText()).c_str());
return 0;

2
kpvcrlib/crengine

Submodule kpvcrlib/crengine updated: 73805ee9b0...7a73d16665

12
kpvcrlib/lvrend_node_type_face.patch Normal file
View File

@@ -0,0 +1,12 @@
--- lvrend.cpp 2012-04-24 10:27:33.000000000 +0800
+++ lvrend-patched.cpp 2012-04-24 10:27:28.000000000 +0800
@@ -1902,7 +1902,8 @@
UPDATE_STYLE_FIELD( font_style, css_fs_inherit );
UPDATE_STYLE_FIELD( font_weight, css_fw_inherit );
UPDATE_STYLE_FIELD( font_family, css_ff_inherit );
- UPDATE_STYLE_FIELD( font_name, "" );
+ //UPDATE_STYLE_FIELD( font_name, "" );
+ pstyle->font_name = parent_font.get()->getTypeFace();
UPDATE_LEN_FIELD( font_size );
//UPDATE_LEN_FIELD( text_indent );
spreadParent( pstyle->text_indent, parent_style->text_indent );