Skip to content

fix multi footnotes parse problem #2

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
microjo wants to merge 2 commits into
base: footnotes
Choose a base branch
from
Open

fix multi footnotes parse problem #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
866d6e0
fix compile error in VC++ 2008
microjo Nov 20, 2012
523bf13
fix multi footnotes parse problem.
microjo Nov 20, 2012
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
24 changes: 9 additions & 15 deletions src/markdown.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -977,12 +977,12 @@ char_link(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t offset

/* footnote link */
if (rndr->ext_flags & MKDEXT_FOOTNOTES && data[1] == '^') {
if (txt_e < 3)
goto cleanup;

struct buf id = { 0, 0, 0, 0 };
struct footnote_ref *fr;

if (txt_e < 3)
goto cleanup;

id.data = data + 2;
id.size = txt_e - 2;

Expand Down Expand Up @@ -2447,13 +2447,6 @@ is_footnote(const uint8_t *data, size_t beg, size_t end, size_t *last, struct fo
i++;
if (i >= end || data[i] != ':') return 0;
i++;
while (i < end && data[i] == ' ') i++;
if (i < end && (data[i] == '\n' || data[i] == '\r')) {
i++;
if (i < end && data[i] == '\n' && data[i - 1] == '\r') i++;
}
while (i < end && data[i] == ' ') i++;
if (i >= end || data[i] == '\n' || data[i] == '\r') return 0;

/* getting content buffer */
contents = bufnew(64);
Expand Down Expand Up @@ -2483,10 +2476,11 @@ is_footnote(const uint8_t *data, size_t beg, size_t end, size_t *last, struct fo
/* joining only indented stuff after empty lines;
* note that now we only require 1 space of indentation
* to continue, just like lists */
if (in_empty && ind == 0) {
break;
if (ind == 0) {
if (start == id_end + 2 && data[start] == '\t') {}
else break;
}
else if (in_empty) {
if (in_empty) {
bufputc(contents, '\n');
}

Expand Down Expand Up @@ -2735,6 +2729,8 @@ sd_markdown_render(struct buf *ob, const uint8_t *document, size_t doc_size, str
struct buf *text;
size_t beg, end;

int footnotes_enabled = md->ext_flags & MKDEXT_FOOTNOTES;

text = bufnew(64);
if (!text)
return;
Expand All @@ -2745,8 +2741,6 @@ sd_markdown_render(struct buf *ob, const uint8_t *document, size_t doc_size, str
/* reset the references table */
memset(&md->refs, 0x0, REF_TABLE_SIZE * sizeof(void *));

int footnotes_enabled = md->ext_flags & MKDEXT_FOOTNOTES;

/* reset the footnotes lists */
if (footnotes_enabled) {
memset(&md->footnotes_found, 0x0, sizeof(md->footnotes_found));
Expand Down