Skip to content

Commit

Permalink
bump crengine: ODT support, added/updated hyphenation (#1190)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
poire-z committed Sep 18, 2020
1 parent 3fdf18c commit 50a965c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
4 changes: 3 additions & 1 deletion cre.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,9 @@ static int getHyphDictList(lua_State *L) {

static int getSelectedHyphDict(lua_State *L) {
lua_pushstring(L, UnicodeToLocal(HyphMan::getSelectedDictionary()->getId()).c_str());
return 1;
lua_pushnumber(L, TextLangMan::getMainLangHyphMethod()->getLeftHyphenMin());
lua_pushnumber(L, TextLangMan::getMainLangHyphMethod()->getRightHyphenMin());
return 3;
}

static int setHyphDictionary(lua_State *L) {
Expand Down
2 changes: 2 additions & 0 deletions thirdparty/kpvcrlib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,8 @@ set (CRENGINE_SOURCES
${CRE_DIR}/src/wordfmt.cpp
${CRE_DIR}/src/lvopc.cpp
${CRE_DIR}/src/docxfmt.cpp
${CRE_DIR}/src/odtfmt.cpp
${CRE_DIR}/src/odxutil.cpp
${CRE_DIR}/src/fb3fmt.cpp
${CRE_DIR}/src/lvstsheet.cpp
${CRE_DIR}/src/txtselector.cpp
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/kpvcrlib/crengine
Submodule crengine updated 38 files
+1 −2 cr3gui/data/epub.css
+2 −1 cr3gui/data/fb2.css
+199 −0 cr3gui/data/hyph/Basque.pattern
+6,889 −6,625 cr3gui/data/hyph/Bulgarian.pattern
+1,482 −0 cr3gui/data/hyph/Croatian.pattern
+40 −0 cr3gui/data/hyph/Dutch.pattern
+2,012 −0 cr3gui/data/hyph/Esperanto.pattern
+3,698 −0 cr3gui/data/hyph/Estonian.pattern
+2,117 −0 cr3gui/data/hyph/Georgian.pattern
+4,360 −2,558 cr3gui/data/hyph/German.pattern
+48 −0 cr3gui/data/hyph/Irish.pattern
+11,590 −0 cr3gui/data/hyph/Latvian.pattern
+1,553 −0 cr3gui/data/hyph/Lithuanian.pattern
+732 −0 cr3gui/data/hyph/Macedonian.pattern
+110 −0 cr3gui/data/hyph/Norwegian.pattern
+255 −0 cr3gui/data/hyph/Occitan.pattern
+2 −0 cr3gui/data/hyph/Portuguese.pattern
+0 −0 cr3gui/data/hyph/Romanian.pattern
+7 −0 cr3gui/data/hyph/Slovak.pattern
+1,488 −425 cr3gui/data/hyph/Spanish.pattern
+0 −0 cr3gui/data/hyph/Ukrainian.pattern
+6,735 −0 cr3gui/data/hyph/Welsh.pattern
+94 −5 cr3gui/data/hyph/languages.json
+2 −1 crengine/include/bookformats.h
+2 −0 crengine/include/hyphman.h
+1 −0 crengine/include/lvrend.h
+1 −1 crengine/include/lvtinydom.h
+11 −0 crengine/include/odtfmt.h
+70 −1,029 crengine/src/docxfmt.cpp
+35 −0 crengine/src/lvdocview.cpp
+126 −1 crengine/src/lvrend.cpp
+13 −11 crengine/src/lvstsheet.cpp
+49 −9 crengine/src/lvtinydom.cpp
+18 −1 crengine/src/lvxml.cpp
+1,025 −0 crengine/src/odtfmt.cpp
+540 −0 crengine/src/odxutil.cpp
+497 −0 crengine/src/odxutil.h
+32 −18 crengine/src/textlang.cpp

0 comments on commit 50a965c

Please sign in to comment.