From 661c7e7b1da0af7132767f5522c56fb8ae370ee9 Mon Sep 17 00:00:00 2001 From: fiddlosopher Date: Tue, 19 Dec 2006 23:13:03 +0000 Subject: Merged changes to footnotes branch r219-r240. git-svn-id: https://pandoc.googlecode.com/svn/trunk@241 788f1e2b-df1e-0410-8736-df70ead52e1b --- tests/s5.inserts.html | 5 ----- tests/testsuite.native | 14 +++++++++----- tests/testsuite.txt | 16 ++++++++++------ tests/writer.html | 22 +++++++++------------- tests/writer.latex | 6 ++++-- tests/writer.markdown | 18 ++++++++++++------ tests/writer.native | 14 +++++++++----- tests/writer.rst | 22 +++++++++++++++------- tests/writer.rtf | 11 ++++++++--- tests/writer.smart.html | 22 +++++++++------------- 10 files changed, 85 insertions(+), 65 deletions(-) (limited to 'tests') diff --git a/tests/s5.inserts.html b/tests/s5.inserts.html index 4f998c573..7be33a2c8 100644 --- a/tests/s5.inserts.html +++ b/tests/s5.inserts.html @@ -4,11 +4,6 @@ - STUFF INSERTED diff --git a/tests/testsuite.native b/tests/testsuite.native index 340e11a5c..910de1f39 100644 --- a/tests/testsuite.native +++ b/tests/testsuite.native @@ -318,12 +318,16 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane , Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "movie",Space,Image [Str "movie"] (Src "movie.jpg" ""),Space,Str "icon."] , HorizontalRule , Header 1 [Str "Footnotes"] -, Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "footnote",Space,Str "reference",NoteRef "1",Str ",",Space,Str "and",Space,Str "another",NoteRef "longnote",Str ".",Space,Str "This",Space,Str "should",Space,Emph [Str "not"],Space,Str "be",Space,Str "a",Space,Str "footnote",Space,Str "reference,",Space,Str "because",Space,Str "it",Space,Str "contains",Space,Str "a",Space,Str "space",Str "[",Str "^",Str "my",Space,Str "note",Str "]",Str "."] +, Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "footnote",Space,Str "reference,",NoteRef "1",Space,Str "and",Space,Str "another.",NoteRef "2",Space,Str "This",Space,Str "should",Space,Emph [Str "not"],Space,Str "be",Space,Str "a",Space,Str "footnote",Space,Str "reference,",Space,Str "because",Space,Str "it",Space,Str "contains",Space,Str "a",Space,Str "space.",Str "[",Str "^",Str "my",Space,Str "note",Str "]",Space,Str "Here",Space,Str "is",Space,Str "an",Space,Str "inline",Space,Str "note.",NoteRef "3"] +, Para [Str "This",Space,Str "paragraph",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "part",Space,Str "of",Space,Str "the",Space,Str "note,",Space,Str "as",Space,Str "it",Space,Str "is",Space,Str "not",Space,Str "indented."] , Note "1" - [ Para [Str "Here",Space,Str "is",Space,Str "the",Space,Str "footnote.",Space,Str "It",Space,Str "can",Space,Str "go",Space,Str "anywhere",Space,Str "in",Space,Str "the",Space,Str "document,",Space,Str "not",Space,Str "just",Space,Str "at",Space,Str "the",Space,Str "end."] ] + [ Para [Str "Here",Space,Str "is",Space,Str "the",Space,Str "footnote.",Space,Str "It",Space,Str "can",Space,Str "go",Space,Str "anywhere",Space,Str "after",Space,Str "the",Space,Str "footnote",Space,Str "reference.",Space,Str "It",Space,Str "need",Space,Str "not",Space,Str "be",Space,Str "placed",Space,Str "at",Space,Str "the",Space,Str "end",Space,Str "of",Space,Str "the",Space,Str "document."] ] -, Note "longnote" - [ Para [Str "Here's",Space,Str "the",Space,Str "other",Space,Str "note.",Space,Str "This",Space,Str "one",Space,Str "contains",Space,Str "multiple",Space,Str "blocks."] +, Note "2" + [ Para [Str "Here's",Space,Str "the",Space,Str "long",Space,Str "note.",Space,Str "This",Space,Str "one",Space,Str "contains",Space,Str "multiple",Space,Str "blocks."] , Para [Str "Subsequent",Space,Str "blocks",Space,Str "are",Space,Str "indented",Space,Str "to",Space,Str "show",Space,Str "that",Space,Str "they",Space,Str "belong",Space,Str "to",Space,Str "the",Space,Str "footnote",Space,Str "(as",Space,Str "with",Space,Str "list",Space,Str "items)."] , CodeBlock " { }" - , Para [Str "If",Space,Str "you",Space,Str "want,",Space,Str "you",Space,Str "can",Space,Str "indent",Space,Str "every",Space,Str "line,",Space,Str "but",Space,Str "you",Space,Str "can",Space,Str "also",Space,Str "be",Space,Str "lazy",Space,Str "and",Space,Str "just",Space,Str "indent",Space,Str "the",Space,Str "first",Space,Str "line",Space,Str "of",Space,Str "each",Space,Str "block."] ] ] + , Para [Str "If",Space,Str "you",Space,Str "want,",Space,Str "you",Space,Str "can",Space,Str "indent",Space,Str "every",Space,Str "line,",Space,Str "but",Space,Str "you",Space,Str "can",Space,Str "also",Space,Str "be",Space,Str "lazy",Space,Str "and",Space,Str "just",Space,Str "indent",Space,Str "the",Space,Str "first",Space,Str "line",Space,Str "of",Space,Str "each",Space,Str "block."] ] +, Note "3" + [ Para [Str "This",Space,Str "is",Space,Emph [Str "easier"],Space,Str "to",Space,Str "type.",Space,Str "Inline",Space,Str "notes",Space,Str "may",Space,Str "contain",Space,Link [Str "links"] (Src "http://google.com" ""),Space,Str "and",Space,Code "]",Space,Str "verbatim",Space,Str "characters."] ] + ] diff --git a/tests/testsuite.txt b/tests/testsuite.txt index 1beb7aaac..9d6481126 100644 --- a/tests/testsuite.txt +++ b/tests/testsuite.txt @@ -590,14 +590,13 @@ Here is a movie ![movie](movie.jpg) icon. # Footnotes -Here is a footnote reference[^1], and another[^longnote]. +Here is a footnote reference,[^1] and another.[^longnote] This should *not* be a footnote reference, because it -contains a space[^my note]. +contains a space.[^my note] Here is an inline note.^[This +is *easier* to type. Inline notes may contain +[links](http://google.com) and `]` verbatim characters.] -[^1]: Here is the footnote. It can go anywhere in the document, -not just at the end. - -[^longnote]: Here's the other note. This one contains multiple +[^longnote]: Here's the long note. This one contains multiple blocks. Subsequent blocks are indented to show that they belong to the @@ -607,3 +606,8 @@ footnote (as with list items). If you want, you can indent every line, but you can also be lazy and just indent the first line of each block. + +This paragraph should not be part of the note, as it is not indented. + +[^1]: Here is the footnote. It can go anywhere after the footnote +reference. It need not be placed at the end of the document. diff --git a/tests/writer.html b/tests/writer.html index 37920383b..e8d7c228f 100644 --- a/tests/writer.html +++ b/tests/writer.html @@ -4,11 +4,6 @@ - Pandoc Test Suite @@ -438,18 +433,19 @@ Cat & 1 \\ \hline

Here is a movie movie icon.

Footnotes

-

Here is a footnote reference(1), and another(longnote). This should not be a footnote reference, because it contains a space[^my note].

-
-

(1) Here is the footnote. It can go anywhere in the document, not just at the end.

- -
-
-

(longnote) Here's the other note. This one contains multiple blocks.

+

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

+

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

+
+
+
    +

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

    + ↩

  2. 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.

    - + ↩

  3. This is easier to type. Inline notes may contain links and ] verbatim characters.

    + ↩
diff --git a/tests/writer.latex b/tests/writer.latex index e892e12e6..c813f511d 100644 --- a/tests/writer.latex +++ b/tests/writer.latex @@ -567,14 +567,16 @@ Here is a movie \includegraphics{movie.jpg} icon. \section{Footnotes} -Here is a footnote reference\footnote{Here is the footnote. It can go anywhere in the document, not just at the end.}, and another\footnote{Here's the other note. This one contains multiple blocks. +Here is a footnote reference,\footnote{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.\footnote{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). \begin{verbatim} { } \end{verbatim} -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 \emph{not} be a footnote reference, because it contains a space[\^{}my note]. +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 \emph{not} be a footnote reference, because it contains a space.[\^{}my note] Here is an inline note.\footnote{This is \emph{easier} to type. Inline notes may contain \href{http://google.com}{links} and \verb!]! verbatim characters.} + +This paragraph should not be part of the note, as it is not indented. \end{document} diff --git a/tests/writer.markdown b/tests/writer.markdown index f84372797..c91546aaa 100644 --- a/tests/writer.markdown +++ b/tests/writer.markdown @@ -607,14 +607,17 @@ Here is a movie ![movie](movie.jpg) icon. # Footnotes -Here is a footnote reference[^1], and another[^longnote]. This -should *not* be a footnote reference, because it contains a -space[\^my note]. +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] -[^1]: Here is the footnote. It can go anywhere in the document, not just - at the end. +This paragraph should not be part of the note, as it is not +indented. -[^longnote]: Here's the other note. This one contains multiple blocks. +[^1]: Here is the footnote. It can go anywhere after the footnote + reference. It need not be placed at the end of the document. + +[^2]: 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). @@ -624,3 +627,6 @@ space[\^my note]. If you want, you can indent every line, but you can also be lazy and just indent the first line of each block. +[^3]: This is *easier* to type. Inline notes may contain + [links](http://google.com) and `]` verbatim characters. + diff --git a/tests/writer.native b/tests/writer.native index 340e11a5c..910de1f39 100644 --- a/tests/writer.native +++ b/tests/writer.native @@ -318,12 +318,16 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane , Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "movie",Space,Image [Str "movie"] (Src "movie.jpg" ""),Space,Str "icon."] , HorizontalRule , Header 1 [Str "Footnotes"] -, Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "footnote",Space,Str "reference",NoteRef "1",Str ",",Space,Str "and",Space,Str "another",NoteRef "longnote",Str ".",Space,Str "This",Space,Str "should",Space,Emph [Str "not"],Space,Str "be",Space,Str "a",Space,Str "footnote",Space,Str "reference,",Space,Str "because",Space,Str "it",Space,Str "contains",Space,Str "a",Space,Str "space",Str "[",Str "^",Str "my",Space,Str "note",Str "]",Str "."] +, Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "footnote",Space,Str "reference,",NoteRef "1",Space,Str "and",Space,Str "another.",NoteRef "2",Space,Str "This",Space,Str "should",Space,Emph [Str "not"],Space,Str "be",Space,Str "a",Space,Str "footnote",Space,Str "reference,",Space,Str "because",Space,Str "it",Space,Str "contains",Space,Str "a",Space,Str "space.",Str "[",Str "^",Str "my",Space,Str "note",Str "]",Space,Str "Here",Space,Str "is",Space,Str "an",Space,Str "inline",Space,Str "note.",NoteRef "3"] +, Para [Str "This",Space,Str "paragraph",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "part",Space,Str "of",Space,Str "the",Space,Str "note,",Space,Str "as",Space,Str "it",Space,Str "is",Space,Str "not",Space,Str "indented."] , Note "1" - [ Para [Str "Here",Space,Str "is",Space,Str "the",Space,Str "footnote.",Space,Str "It",Space,Str "can",Space,Str "go",Space,Str "anywhere",Space,Str "in",Space,Str "the",Space,Str "document,",Space,Str "not",Space,Str "just",Space,Str "at",Space,Str "the",Space,Str "end."] ] + [ Para [Str "Here",Space,Str "is",Space,Str "the",Space,Str "footnote.",Space,Str "It",Space,Str "can",Space,Str "go",Space,Str "anywhere",Space,Str "after",Space,Str "the",Space,Str "footnote",Space,Str "reference.",Space,Str "It",Space,Str "need",Space,Str "not",Space,Str "be",Space,Str "placed",Space,Str "at",Space,Str "the",Space,Str "end",Space,Str "of",Space,Str "the",Space,Str "document."] ] -, Note "longnote" - [ Para [Str "Here's",Space,Str "the",Space,Str "other",Space,Str "note.",Space,Str "This",Space,Str "one",Space,Str "contains",Space,Str "multiple",Space,Str "blocks."] +, Note "2" + [ Para [Str "Here's",Space,Str "the",Space,Str "long",Space,Str "note.",Space,Str "This",Space,Str "one",Space,Str "contains",Space,Str "multiple",Space,Str "blocks."] , Para [Str "Subsequent",Space,Str "blocks",Space,Str "are",Space,Str "indented",Space,Str "to",Space,Str "show",Space,Str "that",Space,Str "they",Space,Str "belong",Space,Str "to",Space,Str "the",Space,Str "footnote",Space,Str "(as",Space,Str "with",Space,Str "list",Space,Str "items)."] , CodeBlock " { }" - , Para [Str "If",Space,Str "you",Space,Str "want,",Space,Str "you",Space,Str "can",Space,Str "indent",Space,Str "every",Space,Str "line,",Space,Str "but",Space,Str "you",Space,Str "can",Space,Str "also",Space,Str "be",Space,Str "lazy",Space,Str "and",Space,Str "just",Space,Str "indent",Space,Str "the",Space,Str "first",Space,Str "line",Space,Str "of",Space,Str "each",Space,Str "block."] ] ] + , Para [Str "If",Space,Str "you",Space,Str "want,",Space,Str "you",Space,Str "can",Space,Str "indent",Space,Str "every",Space,Str "line,",Space,Str "but",Space,Str "you",Space,Str "can",Space,Str "also",Space,Str "be",Space,Str "lazy",Space,Str "and",Space,Str "just",Space,Str "indent",Space,Str "the",Space,Str "first",Space,Str "line",Space,Str "of",Space,Str "each",Space,Str "block."] ] +, Note "3" + [ Para [Str "This",Space,Str "is",Space,Emph [Str "easier"],Space,Str "to",Space,Str "type.",Space,Str "Inline",Space,Str "notes",Space,Str "may",Space,Str "contain",Space,Link [Str "links"] (Src "http://google.com" ""),Space,Str "and",Space,Code "]",Space,Str "verbatim",Space,Str "characters."] ] + ] diff --git a/tests/writer.rst b/tests/writer.rst index 6a9f3b997..327b780ab 100644 --- a/tests/writer.rst +++ b/tests/writer.rst @@ -695,16 +695,19 @@ Here is a movie |movie| icon. Footnotes ========= -Here is a footnote reference [1]_, and another [longnote]_. This -should *not* be a footnote reference, because it contains a -space[^my note]. +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]_ + +This paragraph should not be part of the note, as it is not +indented. .. [1] - Here is the footnote. It can go anywhere in the document, not just - at the end. + Here is the footnote. It can go anywhere after the footnote + reference. It need not be placed at the end of the document. -.. [longnote] - Here's the other note. This one contains multiple blocks. +.. [2] + 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). @@ -716,6 +719,10 @@ space[^my note]. If you want, you can indent every line, but you can also be lazy and just indent the first line of each block. +.. [3] + This is *easier* to type. Inline notes may contain `links`_ and + ``]`` verbatim characters. + .. _embedded link: /url .. _emphasized link: /url @@ -740,4 +747,5 @@ space[^my note]. .. _nobody@nowhere.net: mailto:nobody@nowhere.net .. |lalune| image:: lalune.jpg .. |movie| image:: movie.jpg +.. _links: http://google.com diff --git a/tests/writer.rtf b/tests/writer.rtf index 0a1d4b5c8..073ec3054 100644 --- a/tests/writer.rtf +++ b/tests/writer.rtf @@ -367,11 +367,16 @@ http://example.com/ {\pard \f0 \sa180 \li0 \fi0 Here is a movie {\cf1 [image: movie.jpg]\cf0} icon.\par} {\pard \f0 \sa180 \li0 \fi0 \qc \emdash\emdash\emdash\emdash\emdash\par} {\pard \f0 \sa180 \li0 \fi0 \b \fs36 Footnotes\par} -{\pard \f0 \sa180 \li0 \fi0 Here is a footnote reference{\super\chftn}{\*\footnote\chftn\~\plain\pard {\pard \f0 \sa180 \li0 \fi0 Here is the footnote. It can go anywhere in the document, not just at the end.\par} -}, and another{\super\chftn}{\*\footnote\chftn\~\plain\pard {\pard \f0 \sa180 \li0 \fi0 Here's the other note. This one contains multiple blocks.\par} +{\pard \f0 \sa180 \li0 \fi0 Here is a footnote reference,{\super\chftn}{\*\footnote\chftn\~\plain\pard {\pard \f0 \sa180 \li0 \fi0 Here is the footnote. It can go anywhere after the footnote reference. It need not be placed at the end of the document.\par} +} and another.{\super\chftn}{\*\footnote\chftn\~\plain\pard {\pard \f0 \sa180 \li0 \fi0 Here's the long note. This one contains multiple blocks.\par} {\pard \f0 \sa180 \li0 \fi0 Subsequent blocks are indented to show that they belong to the footnote (as with list items).\par} {\pard \f0 \sa180 \li0 \fi0 \f1 \{ \}\par} {\pard \f0 \sa180 \li0 \fi0 If you want, you can indent every line, but you can also be lazy and just indent the first line of each block.\par} -}. This should {\i not} be a footnote reference, because it contains a space[^my note].\par} +} This should {\i not} be a footnote reference, because it contains a space.[^my note] Here is an inline note.{\super\chftn}{\*\footnote\chftn\~\plain\pard {\pard \f0 \sa180 \li0 \fi0 This is {\i easier} to type. Inline notes may contain {\field{\*\fldinst{HYPERLINK "http://google.com"}}{\fldrslt{\ul +links +}}} + and {\f1 ]} verbatim characters.\par} +}\par} +{\pard \f0 \sa180 \li0 \fi0 This paragraph should not be part of the note, as it is not indented.\par} } diff --git a/tests/writer.smart.html b/tests/writer.smart.html index a177b05cf..b63e78968 100644 --- a/tests/writer.smart.html +++ b/tests/writer.smart.html @@ -4,11 +4,6 @@ - Pandoc Test Suite @@ -438,18 +433,19 @@ Cat & 1 \\ \hline

Here is a movie movie icon.

Footnotes

-

Here is a footnote reference(1), and another(longnote). This should not be a footnote reference, because it contains a space[^my note].

-
-

(1) Here is the footnote. It can go anywhere in the document, not just at the end.

- -
-
-

(longnote) Here’s the other note. This one contains multiple blocks.

+

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

+

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

+
+
+
    +

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

    + ↩

  2. 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.

    - + ↩

  3. This is easier to type. Inline notes may contain links and ] verbatim characters.

    + ↩
-- cgit v1.2.3