crengine: add markdown support using md4c

koreader · Nov 30, 2024 · a0f1a5f · a0f1a5f
1 parent 4d3396f
commit a0f1a5f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -159,6 +159,7 @@ declare_project(
     libunibreak
     libwebp
     lunasvg
+    md4c
     utf8proc
     zlib
     zstd

diff --git a/thirdparty/cmake_modules/koreader_thirdparty_libs.cmake b/thirdparty/cmake_modules/koreader_thirdparty_libs.cmake
@@ -46,6 +46,7 @@ target_link_libraries(
     libpng::png16
     libwebp::webpdemux
     lunasvg::lunasvg
+    md4c::html
     srell::srell
     utf8proc::utf8proc
     zlib::z
@@ -155,7 +156,7 @@ endif()
 declare_dependency(lunasvg::lunasvg MONOLIBTIC lunasvg)
 
 # md4c
-declare_dependency(md4c::html STATIC md4c md4c-html)
+declare_dependency(md4c::html STATIC md4c-html md4c)
 
 # mupdf
 set(LIBRARIES m)

diff --git a/thirdparty/kpvcrlib/CMakeLists.txt b/thirdparty/kpvcrlib/CMakeLists.txt
@@ -55,6 +55,7 @@ add_library(crengine STATIC
     ${CRE_DIR}/src/lvtinydom.cpp
     ${CRE_DIR}/src/lvxml.cpp
     ${CRE_DIR}/src/mathml.cpp
+    ${CRE_DIR}/src/mdfmt.cpp
     ${CRE_DIR}/src/odtfmt.cpp
     ${CRE_DIR}/src/odxutil.cpp
     ${CRE_DIR}/src/pdbfmt.cpp

diff --git a/thirdparty/kpvcrlib/crsetup.h.cmake b/thirdparty/kpvcrlib/crsetup.h.cmake
@@ -20,6 +20,7 @@
 #define CHM_SUPPORT_ENABLED                  1
 #define CR3_ANTIWORD_PATCH                   1
 #define ENABLE_ANTIWORD                      1
+#define USE_MD4C                             1
 
 /// I18N
 #define CR_EMULATE_GETTEXT                   1
-Original file line number
+Diff line change
@@ Expand Up / @@ -159,6 +159,7 @@ declare_project( @@
         libunibreak
         libwebp
         lunasvg
+        md4c
         utf8proc
         zlib
         zstd
@@ Expand Down @@