From 518cafaae3a09e755349e377180300dfc7938579 Mon Sep 17 00:00:00 2001 From: Christian Loose Date: Mon, 4 Jan 2016 10:16:28 +0100 Subject: [PATCH 1/2] Upgrade hoedown to v3.0.7 --- 3rdparty/hoedown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty/hoedown b/3rdparty/hoedown index 53706105..aae10199 160000 --- a/3rdparty/hoedown +++ b/3rdparty/hoedown @@ -1 +1 @@ -Subproject commit 537061057266d6b73b6f998211e285862cd33a71 +Subproject commit aae101991a8cdeba8354d16fe363cd34f2b0e483 From 2707aa16fde3181daf22c16e8c1cfb111594866b Mon Sep 17 00:00:00 2001 From: Christian Loose Date: Mon, 4 Jan 2016 11:11:45 +0100 Subject: [PATCH 2/2] Migrate to hoedown v3 API --- .../converter/hoedownmarkdownconverter.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app-static/converter/hoedownmarkdownconverter.cpp b/app-static/converter/hoedownmarkdownconverter.cpp index 97808bee..c91c0488 100644 --- a/app-static/converter/hoedownmarkdownconverter.cpp +++ b/app-static/converter/hoedownmarkdownconverter.cpp @@ -34,10 +34,10 @@ extern "C" { #ifdef Q_OS_WIN #include -#include +#include #else #include -#include +#include #endif } @@ -92,12 +92,12 @@ QString HoedownMarkdownConverter::renderAsHtml(MarkdownDocument *document) hoedown_buffer *in = doc->document(); hoedown_buffer *out = hoedown_buffer_new(64); - hoedown_renderer *renderer = hoedown_html_renderer_new(0, 16); - hoedown_markdown *markdown = hoedown_markdown_new(doc->options(), 16, renderer); + hoedown_renderer *renderer = hoedown_html_renderer_new((hoedown_html_flags)0, 16); + hoedown_document *markdown = hoedown_document_new(renderer, (hoedown_extensions)doc->options(), 16); - hoedown_markdown_render(out, in->data, in->size, markdown); + hoedown_document_render(markdown, out, in->data, in->size); - hoedown_markdown_free(markdown); + hoedown_document_free(markdown); hoedown_html_renderer_free(renderer); html = QString::fromUtf8(hoedown_buffer_cstr(out)); @@ -121,11 +121,11 @@ QString HoedownMarkdownConverter::renderAsTableOfContents(MarkdownDocument *docu hoedown_buffer *out = hoedown_buffer_new(64); hoedown_renderer *renderer = hoedown_html_toc_renderer_new(16); - hoedown_markdown *markdown = hoedown_markdown_new(doc->options(), 16, renderer); + hoedown_document *markdown = hoedown_document_new(renderer, (hoedown_extensions)doc->options(), 16); - hoedown_markdown_render(out, in->data, in->size, markdown); + hoedown_document_render(markdown, out, in->data, in->size); - hoedown_markdown_free(markdown); + hoedown_document_free(markdown); hoedown_html_renderer_free(renderer); toc = QString::fromUtf8(hoedown_buffer_cstr(out));