Skip to content

Commit 50a965c

Browse files
authored
bump crengine: ODT support, added/updated hyphenation (koreader#1190)
Includes: - Update German hyphenation patterns - (Upstream) Adds ODT (ODF) format support - TextLang, hyphenation: add Basque, Croatian, Esperanto, Estonian, Georgian, Latvian, Lithuanian, Macedonian, Occitan, Welsh; update Bulgarian, Irish, Portuguese, Slovak, Dutch, Norwegian, Spanish; update hyphen min for Czech, English, Greek; fix Romanian and Ukrainian pattern file names - HyphMan: adds HyphMethod::getLeft/RightHyphenMin() - epub.css: update HR default style - fb2.css: keep <date> in main text left-aligned - getRenderedWidths(): inline-block and table fixes - CSS: avoid style hash mismatch when serializing content:'' - Tables: re-order row groups when necessary - XML parsing: don't drop trailing text - HTML parser: tweak implicit head/body insertion code - Fix text search failure when blank at start or end
1 parent 3fdf18c commit 50a965c

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

cre.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,9 @@ static int getHyphDictList(lua_State *L) {
614614

615615
static int getSelectedHyphDict(lua_State *L) {
616616
lua_pushstring(L, UnicodeToLocal(HyphMan::getSelectedDictionary()->getId()).c_str());
617-
return 1;
617+
lua_pushnumber(L, TextLangMan::getMainLangHyphMethod()->getLeftHyphenMin());
618+
lua_pushnumber(L, TextLangMan::getMainLangHyphMethod()->getRightHyphenMin());
619+
return 3;
618620
}
619621

620622
static int setHyphDictionary(lua_State *L) {

thirdparty/kpvcrlib/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,8 @@ set (CRENGINE_SOURCES
140140
${CRE_DIR}/src/wordfmt.cpp
141141
${CRE_DIR}/src/lvopc.cpp
142142
${CRE_DIR}/src/docxfmt.cpp
143+
${CRE_DIR}/src/odtfmt.cpp
144+
${CRE_DIR}/src/odxutil.cpp
143145
${CRE_DIR}/src/fb3fmt.cpp
144146
${CRE_DIR}/src/lvstsheet.cpp
145147
${CRE_DIR}/src/txtselector.cpp

0 commit comments

Comments
 (0)