[pim/kdepim-addons] /: Fix discount 3 support we can't use | we need to use mkd_set_flag_num (as in okular)
Laurent Montel <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit d6e14276967863eedc1e84bcc6a8c8ae0e4a0f9d by Laurent Montel.
Committed on 16/08/2026 at 07:39.
Pushed by mlaurent into branch 'master'.
Fix discount 3 support we can't use | we need to use mkd_set_flag_num (as in okular)
M +5 -0 kmail/editorconvertertextplugins/markdown/markdownlib/markdownconverter.cpp
M +6 -1 plugins/messageviewer/bodypartformatter/markdown/markdowndiscount.cpp
https://invent.kde.org/pim/kdepim-addons/-/commit/d6e14276967863eedc1e84bcc6a8c8ae0e4a0f9d
diff --git a/kmail/editorconvertertextplugins/markdown/markdownlib/markdownconverter.cpp b/kmail/editorconvertertextplugins/markdown/markdownlib/markdownconverter.cpp
index fbbc9f09e..8a33deffc 100644
--- a/kmail/editorconvertertextplugins/markdown/markdownlib/markdownconverter.cpp
+++ b/kmail/editorconvertertextplugins/markdown/markdownlib/markdownconverter.cpp
@@ -81,6 +81,11 @@ QString MarkdownConverter::convertTextToMarkdown(const QString &str)
MMIOT *markdownHandle = mkd_string(textArray.constData(), textArray.size(), nullptr);
mkd_flag_t *flags = mkd_flags();
mkd_set_flag_bitmap(flags, MKD_FENCEDCODE | MKD_GITHUBTAGS | MKD_AUTOLINK);
+ // These flags aren't bitflags, so they can't be | together
+ mkd_set_flag_num(flags, MKD_FENCEDCODE);
+ mkd_set_flag_num(flags, MKD_GITHUBTAGS);
+ mkd_set_flag_num(flags, MKD_AUTOLINK);
+
if (mEnableEmbeddedLabel) {
mkd_set_flag_num(flags, MKD_LATEX);
}
diff --git a/plugins/messageviewer/bodypartformatter/markdown/markdowndiscount.cpp b/plugins/messageviewer/bodypartformatter/markdown/markdowndiscount.cpp
index a80efd467..98ecf93b8 100644
--- a/plugins/messageviewer/bodypartformatter/markdown/markdowndiscount.cpp
+++ b/plugins/messageviewer/bodypartformatter/markdown/markdowndiscount.cpp
@@ -33,7 +33,12 @@ QString MarkdownDiscount::toHtml() const
// on discount 3 MKD_NOLINKS is an enum value
MMIOT *markdownHandle = mkd_string(textArray.constData(), textArray.size(), nullptr);
mkd_flag_t *flags = mkd_flags();
- mkd_set_flag_bitmap(flags, MKD_FENCEDCODE | MKD_GITHUBTAGS | MKD_AUTOLINK | MKD_TOC | MKD_IDANCHOR);
+ // These flags aren't bitflags, so they can't be | together
+ mkd_set_flag_num(flags, MKD_FENCEDCODE);
+ mkd_set_flag_num(flags, MKD_GITHUBTAGS);
+ mkd_set_flag_num(flags, MKD_AUTOLINK);
+ mkd_set_flag_num(flags, MKD_TOC);
+ mkd_set_flag_num(flags, MKD_IDANCHOR);
if (!mkd_compile(markdownHandle, flags)) {
qWarning() << "Failed to compile the Markdown document.";
mkd_cleanup(markdownHandle);