From e87b54dcad5e37133bc0f4cfc8039e9fd0dd1b4e Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Thu, 16 May 2019 21:39:03 -0700 Subject: JATS writer: properly handle footnotes. "Best Practice: When footnotes are grouped at the end of an article, wrap them in a `` and use an `` element in the text, as usual, to tie each footnote in the list to a particular location in the text." Closes #5511. --- test/Tests/Writers/JATS.hs | 4 +--- test/writer.jats | 52 +++++++++++++++++++++++++++------------------- 2 files changed, 32 insertions(+), 24 deletions(-) (limited to 'test') diff --git a/test/Tests/Writers/JATS.hs b/test/Tests/Writers/JATS.hs index 669220eea..6de058701 100644 --- a/test/Tests/Writers/JATS.hs +++ b/test/Tests/Writers/JATS.hs @@ -86,9 +86,7 @@ tests = [ testGroup "inline code" headerWith ("foo",["unnumbered"],[]) 1 (text "Header 1" <> note (plain $ text "note")) =?> "\n\ - \ Header 1<fn>\n\ - \ <p>note</p>\n\ - \ </fn>\n\ + \ Header 1<xref ref-type=\"fn\" rid=\"fn1\">1</xref>\n\ \" , "unnumbered sub header" =: headerWith ("foo",["unnumbered"],[]) 1 diff --git a/test/writer.jats b/test/writer.jats index a4d604607..99cb3230b 100644 --- a/test/writer.jats +++ b/test/writer.jats @@ -844,38 +844,48 @@ These should not be escaped: \$ \\ \> \[ \{ Footnotes -

Here is a footnote reference, +

Here is a footnote reference,1 and + another.2 This should + not be a footnote reference, because it contains a + space.[^my note] Here is an inline + note.3

+ +

Notes can go in quotes.4

+ + + +

And in list items.5

+ + +

This paragraph should not be part of the note, as it is not indented.

+ + + + +

Here is the footnote. It can go anywhere after the footnote reference. It need not be placed at the end of the document.

- and another. + +

Here’s the long note. This one contains multiple blocks.

Subsequent blocks are indented to show that they belong to the footnote (as with list items).

{ <code> }

If you want, you can indent every line, but you can also be lazy and just indent the first line of each block.

- This should not be a footnote reference, because it - contains a space.[^my note] Here is an inline note. + +

This is easier to type. Inline notes may contain links and ] verbatim characters, as well as [bracketed text].

-

- -

Notes can go in quotes. -

In quote.

-

- - - -

And in list items. -

In list.

-

- - -

This paragraph should not be part of the note, as it is not indented.

- - - + + +

In quote.

+ + +

In list.

+ + -- cgit v1.2.3