Skip to content

Upgrade hoedown to v3 #270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cloose wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Upgrade hoedown to v3 #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
518cafa
Upgrade hoedown to v3.0.7
cloose Jan 4, 2016
2707aa1
Migrate to hoedown v3 API
cloose Jan 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 3rdparty/hoedown
Open in desktop
Submodule hoedown updated 45 files
+1 −0 .gitignore
+3 −1 .travis.yml
+1 −1 LICENSE
+50 −16 Makefile
+12 −6 Makefile.win
+23 −15 README.md
+108 −0 bin/common.h
+459 −0 bin/hoedown.c
+228 −0 bin/smartypants.c
+0 −59 examples/hoedown.c
+0 −49 examples/smartypants.c
+19 −13 hoedown.def
+6 −4 hoedown.pro
+11 −9 src/autolink.c
+24 −13 src/autolink.h
+173 −63 src/buffer.c
+80 −21 src/buffer.h
+835 −707 src/document.c
+172 −0 src/document.h
+71 −78 src/escape.c
+11 −2 src/escape.h
+203 −256 src/html.c
+58 −27 src/html.h
+13 −3 src/html_smartypants.c
+0 −136 src/markdown.h
+32 −34 src/stack.c
+29 −8 src/stack.h
+9 −0 src/version.c
+33 −0 src/version.h
+6 −0 test/Tests/CommentsInMiddleOfLine.html
+8 −0 test/Tests/CommentsInMiddleOfLine.text
+51 −0 test/Tests/Escape character.html
+51 −0 test/Tests/Escape character.text
+15 −0 test/Tests/Formatting in Table of Contents.html
+5 −0 test/Tests/Formatting in Table of Contents.text
+9 −0 test/Tests/Images.html
+11 −0 test/Tests/Images.text
+31 −0 test/Tests/Math.html
+31 −0 test/Tests/Math.text
+66 −0 test/Tests/Table.html
+21 −0 test/Tests/Table.text
+1 −0 test/Tests/Underline.html
+1 −0 test/Tests/Underline.text
+125 −0 test/config.json
+107 −0 test/runner.py
18 changes: 9 additions & 9 deletions app-static/converter/hoedownmarkdownconverter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
extern "C" {
#ifdef Q_OS_WIN
#include <src/html.h>
#include <src/markdown.h>
#include <src/document.h>
#else
#include <hoedown/html.h>
#include <hoedown/markdown.h>
#include <hoedown/document.h>
#endif
}

Expand Down Expand Up @@ -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));
Expand All @@ -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));
Expand Down