From: Fletcher T. Penney Date: Sat, 29 Apr 2017 20:21:51 +0000 (-0400) Subject: CHANGED: Change HTML output for footnotes and citations X-Git-Tag: 6.0.5^2~6 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e78bd8743df413f21393461e50522a563ac4aec9;p=multimarkdown CHANGED: Change HTML output for footnotes and citations --- diff --git a/Sources/libMultiMarkdown/html.c b/Sources/libMultiMarkdown/html.c index d8baea8..69c0be5 100644 --- a/Sources/libMultiMarkdown/html.c +++ b/Sources/libMultiMarkdown/html.c @@ -1239,11 +1239,11 @@ void mmd_export_token_html(DString * out, const char * source, token * t, scratc if (temp_short2 == scratch->used_citations->size) { // This is a re-use of a previously used note - printf("[%d]", + printf("(%d)", temp_short, LC("see citation"), temp_short); } else { // This is the first time this note was used - printf("[%d]", + printf("(%d)", temp_short, temp_short, LC("see citation"), temp_short); } } else { @@ -1251,11 +1251,11 @@ void mmd_export_token_html(DString * out, const char * source, token * t, scratc if (temp_short2 == scratch->used_citations->size) { // This is a re-use of a previously used note - printf("[%s, %d]", + printf("(%s, %d)", temp_short, LC("see citation"), temp_char, temp_short); } else { // This is the first time this note was used - printf("[%s, %d]", + printf("(%s, %d)", temp_short, temp_short, LC("see citation"), temp_char, temp_short); } } @@ -1301,7 +1301,7 @@ void mmd_export_token_html(DString * out, const char * source, token * t, scratc temp_short3 = temp_short; } - printf("[%d]", + printf("%d", temp_short3, LC("see footnote"), temp_short); } else { // This is the first time this note was used @@ -1313,7 +1313,7 @@ void mmd_export_token_html(DString * out, const char * source, token * t, scratc temp_short3 = temp_short; } - printf("[%d]", + printf("%d", temp_short3, temp_short3, LC("see footnote"), temp_short); } } else { diff --git a/tests/MMD6Tests/Citations.html b/tests/MMD6Tests/Citations.html index b41cdac..4f8cc6a 100644 --- a/tests/MMD6Tests/Citations.html +++ b/tests/MMD6Tests/Citations.html @@ -8,31 +8,31 @@

citep

-

[1]

+

(1)

-

[1][]

+

(1)[]

-

[p. 123, 1]

+

(p. 123, 1)

-

[1]

+

(1)

-

[foo\]\[bar, 1]

+

(foo\]\[bar, 1)

-

[1][2]

+

(1)(2)

citet

-

[1]

+

(1)

-

[1][]

+

(1)[]

-

[p. 123, 1]

+

(p. 123, 1)

-

[1]

+

(1)

-

[foo\]\[bar, 1]

+

(foo\]\[bar, 1)

-

[1][2]

+

(1)(2)

diff --git a/tests/MMD6Tests/Dutch.html b/tests/MMD6Tests/Dutch.html index 4157180..2b1ec51 100644 --- a/tests/MMD6Tests/Dutch.html +++ b/tests/MMD6Tests/Dutch.html @@ -20,9 +20,9 @@

foo…

-

[1]

+

1

-

[1]

+

(1)

diff --git a/tests/MMD6Tests/English.html b/tests/MMD6Tests/English.html index 69bb642..62dddf4 100644 --- a/tests/MMD6Tests/English.html +++ b/tests/MMD6Tests/English.html @@ -20,9 +20,9 @@

foo…

-

[1]

+

1

-

[1]

+

(1)

diff --git a/tests/MMD6Tests/French.html b/tests/MMD6Tests/French.html index daaa861..9808b43 100644 --- a/tests/MMD6Tests/French.html +++ b/tests/MMD6Tests/French.html @@ -20,9 +20,9 @@

foo…

-

[1]

+

1

-

[1]

+

(1)

diff --git a/tests/MMD6Tests/German Guillemets.html b/tests/MMD6Tests/German Guillemets.html index f31baec..99bac49 100644 --- a/tests/MMD6Tests/German Guillemets.html +++ b/tests/MMD6Tests/German Guillemets.html @@ -20,9 +20,9 @@

foo…

-

[1]

+

1

-

[1]

+

(1)

diff --git a/tests/MMD6Tests/German.html b/tests/MMD6Tests/German.html index c0ee276..64f5c64 100644 --- a/tests/MMD6Tests/German.html +++ b/tests/MMD6Tests/German.html @@ -20,9 +20,9 @@

foo…

-

[1]

+

1

-

[1]

+

(1)

diff --git a/tests/MMD6Tests/Inline Footnotes.html b/tests/MMD6Tests/Inline Footnotes.html index 9c07f17..994877c 100644 --- a/tests/MMD6Tests/Inline Footnotes.html +++ b/tests/MMD6Tests/Inline Footnotes.html @@ -6,11 +6,11 @@ -

Inline.[1]

+

Inline.1

-

Inline.[2]

+

Inline.2

-

Inline.[3]

+

Inline.3

diff --git a/tests/MMD6Tests/Integrated.html b/tests/MMD6Tests/Integrated.html index 4b12ab6..3ad5e36 100644 --- a/tests/MMD6Tests/Integrated.html +++ b/tests/MMD6Tests/Integrated.html @@ -48,13 +48,13 @@ code

Footnotes

-

Foo.[1]

+

Foo.1

-

Bar.[2]

+

Bar.2

-

Cite.[1]

+

Cite.(1)

-

Cite.[2]

+

Cite.(2)

Links and Images

diff --git a/tests/MMD6Tests/Reference Footnotes.html b/tests/MMD6Tests/Reference Footnotes.html index 23c93a6..2398902 100644 --- a/tests/MMD6Tests/Reference Footnotes.html +++ b/tests/MMD6Tests/Reference Footnotes.html @@ -6,13 +6,13 @@ -

foo.[1]

+

foo.1

-

foo.[2]

+

foo.2

-

foo.[3]

+

foo.3

-

foo.[3]

+

foo.3

diff --git a/tests/MMD6Tests/Spanish.html b/tests/MMD6Tests/Spanish.html index 55fd08a..d17d5f6 100644 --- a/tests/MMD6Tests/Spanish.html +++ b/tests/MMD6Tests/Spanish.html @@ -20,9 +20,9 @@

foo…

-

[1]

+

1

-

[1]

+

(1)

diff --git a/tests/MMD6Tests/Swedish.html b/tests/MMD6Tests/Swedish.html index d1d9e09..cb52d6c 100644 --- a/tests/MMD6Tests/Swedish.html +++ b/tests/MMD6Tests/Swedish.html @@ -20,9 +20,9 @@

foo…

-

[1]

+

1

-

[1]

+

(1)