Merge pull request #714 from redstrate/cmark

launcher/ui/dialogs/AboutDialog.cpp

@@ -39,12 +39,11 @@
 #include <QIcon>
 #include "Application.h"
 #include "BuildConfig.h"
+#include "Markdown.h"
 
 #include <net/NetJob.h>
 #include <qobject.h>
 
-#include "HoeDown.h"
-
 namespace {
 QString getLink(QString link, QString name) {
     return QString("&lt;<a href='%1'>%2</a>&gt;").arg(link).arg(name);
@@ -114,10 +113,9 @@ QString getCreditsHtml()
 
 QString getLicenseHtml()
 {
-    HoeDown hoedown;
     QFile dataFile(":/documents/COPYING.md");
     dataFile.open(QIODevice::ReadOnly);
-    QString output = hoedown.process(dataFile.readAll());
+    QString output = markdownToHTML(dataFile.readAll());
     return output;
 }
 

launcher/ui/dialogs/ModUpdateDialog.cpp

@@ -7,6 +7,7 @@
 
 #include "FileSystem.h"
 #include "Json.h"
+#include "Markdown.h"
 
 #include "tasks/ConcurrentTask.h"
 
@@ -17,7 +18,6 @@
 #include "modplatform/flame/FlameCheckUpdate.h"
 #include "modplatform/modrinth/ModrinthCheckUpdate.h"
 
-#include <HoeDown.h>
 #include <QTextBrowser>
 #include <QTreeWidgetItem>
 
@@ -369,14 +369,7 @@ void ModUpdateDialog::appendMod(CheckUpdateTask::UpdatableMod const& info)
     QString text = info.changelog;
     switch (info.provider) {
         case ModPlatform::Provider::MODRINTH: {
-            HoeDown h;
-            // HoeDown bug?: \n aren't converted to <br>
-            text = h.process(info.changelog.toUtf8());
-
-            // Don't convert if there's an HTML tag right after (Qt rendering weirdness)
-            text.remove(QRegularExpression("(\n+)(?=<)"));
-            text.replace('\n', "<br>");
-
+            text = markdownToHTML(info.changelog.toUtf8());
             break;
         }
         default:

launcher/ui/dialogs/UpdateDialog.cpp

@@ -41,7 +41,7 @@
 #include <Json.h>
 
 #include "BuildConfig.h"
-#include "HoeDown.h"
+#include "Markdown.h"
 
 UpdateDialog::UpdateDialog(bool hasUpdate, QWidget *parent) : QDialog(parent), ui(new Ui::UpdateDialog)
 {
@@ -89,8 +89,7 @@ void UpdateDialog::loadChangelog()
 
 QString reprocessMarkdown(QByteArray markdown)
 {
-    HoeDown hoedown;
-    QString output = hoedown.process(markdown);
+    QString output = markdownToHTML(markdown);
 
     // HACK: easier than customizing hoedown
     output.replace(QRegularExpression("GH-([0-9]+)"), "<a href=\"https://github.com/PrismLauncher/PrismLauncher/issues/\\1\">GH-\\1</a>");

launcher/ui/pages/instance/ManagedPackPage.cpp

@@ -9,14 +9,13 @@
 #include <QProxyStyle>
 #include <QStyleFactory>
 
-#include <HoeDown.h>
-
 #include "Application.h"
 #include "BuildConfig.h"
 #include "InstanceImportTask.h"
 #include "InstanceList.h"
 #include "InstanceTask.h"
 #include "Json.h"
+#include "Markdown.h"
 
 #include "modplatform/modrinth/ModrinthPackManifest.h"
 
@@ -263,8 +262,7 @@ void ModrinthManagedPackPage::suggestVersion()
     auto index = ui->versionsComboBox->currentIndex();
     auto version = m_pack.versions.at(index);
 
-    HoeDown md_parser;
-    ui->changelogTextBrowser->setHtml(md_parser.process(version.changelog.toUtf8()));
+    ui->changelogTextBrowser->setHtml(markdownToHTML(version.changelog.toUtf8()));
 
     ManagedPackPage::suggestVersion();
 }

launcher/ui/pages/modplatform/ModPage.cpp

@@ -43,13 +43,11 @@
 #include <QRegularExpression>
 #include <memory>
 
-#include <HoeDown.h>
-
 #include "minecraft/MinecraftInstance.h"
 #include "minecraft/PackProfile.h"
 #include "ui/dialogs/ModDownloadDialog.h"
 #include "ui/widgets/ProjectItem.h"
-
+#include "Markdown.h"
 
 ModPage::ModPage(ModDownloadDialog* dialog, BaseInstance* instance, ModAPI* api)
     : QWidget(dialog)
@@ -427,11 +425,6 @@ void ModPage::updateUi()
 
     text += "<hr>";
 
-    HoeDown h;
-
-    // hoedown bug: it doesn't handle markdown surrounded by block tags (like center, div) so strip them
-    current.extraData.body.remove(QRegularExpression("<[^>]*(?:center|div)\\W*>"));
-
-    ui->packDescription->setHtml(text + (current.extraData.body.isEmpty() ? current.description : h.process(current.extraData.body.toUtf8())));
+    ui->packDescription->setHtml(text + (current.extraData.body.isEmpty() ? current.description : markdownToHTML(current.extraData.body)));
     ui->packDescription->flush();
 }

launcher/ui/pages/modplatform/ftb/FtbPage.cpp

@@ -43,7 +43,7 @@
 #include "ui/dialogs/NewInstanceDialog.h"
 #include "modplatform/modpacksch/FTBPackInstallTask.h"
 
-#include "HoeDown.h"
+#include "Markdown.h"
 
 FtbPage::FtbPage(NewInstanceDialog* dialog, QWidget *parent)
         : QWidget(parent), ui(new Ui::FtbPage), dialog(dialog)
@@ -175,8 +175,7 @@ void FtbPage::onSelectionChanged(QModelIndex first, QModelIndex second)
 
     selected = filterModel->data(first, Qt::UserRole).value<ModpacksCH::Modpack>();
 
-    HoeDown hoedown;
-    QString output = hoedown.process(selected.description.toUtf8());
+    QString output = markdownToHTML(selected.description.toUtf8());
     ui->packDescription->setHtml(output);
 
     // reverse foreach, so that the newest versions are first

launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp

@@ -42,11 +42,10 @@
 #include "BuildConfig.h"
 #include "InstanceImportTask.h"
 #include "Json.h"
+#include "Markdown.h"
 
 #include "ui/widgets/ProjectItem.h"
 
-#include <HoeDown.h>
-
 #include <QComboBox>
 #include <QKeyEvent>
 #include <QPushButton>
@@ -280,8 +279,7 @@ void ModrinthPage::updateUI()
 
     text += "<hr>";
 
-    HoeDown h;
-    text += h.process(current.extra.body.toUtf8());
+    text += markdownToHTML(current.extra.body.toUtf8());
 
     ui->packDescription->setHtml(text + current.description);
     ui->packDescription->flush();