diff options
Diffstat (limited to 'test')
44 files changed, 175 insertions, 22 deletions
diff --git a/test/Tests/Readers/HTML.hs b/test/Tests/Readers/HTML.hs index eedb99029..514b6bb7b 100644 --- a/test/Tests/Readers/HTML.hs +++ b/test/Tests/Readers/HTML.hs @@ -7,6 +7,7 @@ import Data.Text (Text) import qualified Data.Text as T import Test.Tasty import Test.Tasty.QuickCheck +import Test.Tasty.Options (IsOption(defaultValue)) import Tests.Helpers import Text.Pandoc import Text.Pandoc.Arbitrary () @@ -77,5 +78,9 @@ tests = [ testGroup "base tag" , test htmlNativeDivs "<main> followed by text" $ "<main>main content</main>non-main content" =?> doc (divWith ("", [], [("role", "main")]) (plain (text "main content")) <> plain (text "non-main content")) ] - , testProperty "Round trip" (withMaxSuccess 25 roundTrip) + , askOption $ \(QuickCheckTests numtests) -> + testProperty "Round trip" $ + withMaxSuccess (if QuickCheckTests numtests == defaultValue + then 25 + else numtests) roundTrip ] diff --git a/test/Tests/Readers/Muse.hs b/test/Tests/Readers/Muse.hs index 958a74915..bd63236bd 100644 --- a/test/Tests/Readers/Muse.hs +++ b/test/Tests/Readers/Muse.hs @@ -8,6 +8,7 @@ import Data.Text (Text) import qualified Data.Text as T import Test.Tasty import Test.Tasty.QuickCheck +import Test.Tasty.Options (IsOption(defaultValue)) import Tests.Helpers import Text.Pandoc import Text.Pandoc.Arbitrary () @@ -156,6 +157,8 @@ tests = , "One character code" =: "=c=" =?> para (code "c") + , "Code with equal sign" =: "=foo = bar=" =?> para (code "foo = bar") + , "Three = characters is not a code" =: "===" =?> para "===" , "Multiline code markup" =: @@ -260,7 +263,11 @@ tests = ] , testGroup "Blocks" - [ testProperty "Round trip" (withMaxSuccess 25 roundTrip) + [ askOption $ \(QuickCheckTests numtests) -> + testProperty "Round trip" $ + withMaxSuccess (if QuickCheckTests numtests == defaultValue + then 25 + else numtests) roundTrip , "Block elements end paragraphs" =: T.unlines [ "First paragraph" , "----" @@ -891,6 +898,17 @@ tests = [[plain "", plain "Foo"], [plain "", plain ""], [plain "bar", plain ""]] + , "Empty cell in the middle" =: + T.unlines + [ " 1 | 2 | 3" + , " 4 | | 6" + , " 7 | 8 | 9" + ] =?> + table mempty [(AlignDefault, 0.0), (AlignDefault, 0.0), (AlignDefault, 0.0)] + [] + [[plain "1", plain "2", plain "3"], + [plain "4", mempty, plain "6"], + [plain "7", plain "8", plain "9"]] ] , testGroup "Lists" [ "Bullet list" =: diff --git a/test/command/3123.md b/test/command/3123.md new file mode 100644 index 000000000..b71241cdf --- /dev/null +++ b/test/command/3123.md @@ -0,0 +1,13 @@ +``` +% pandoc -f markdown -t native +<?php echo "1" ; ?> +^D +[RawBlock (Format "html") "<?php echo \"1\" ; ?>"] +``` + +``` +% pandoc -f markdown -t native +a<?php echo "1" ; ?> +^D +[Para [Str "a",RawInline (Format "html") "<?php echo \"1\" ; ?>"]] +``` diff --git a/test/command/3494.md b/test/command/3494.md index 249973fb3..7c480fde6 100644 --- a/test/command/3494.md +++ b/test/command/3494.md @@ -25,7 +25,7 @@ <td style="text-align: left;">thank you</td> </tr> <tr class="odd"> -<td style="text-align: right;"><p><em>blah</em></p></td> +<td style="text-align: right;"><em>blah</em></td> <td style="text-align: left;"><em>blah</em></td> <td style="text-align: left;"><em>blah</em></td> </tr> diff --git a/test/command/3577.md b/test/command/3577.md index ca9dba97c..dc88937e9 100644 --- a/test/command/3577.md +++ b/test/command/3577.md @@ -15,11 +15,9 @@ \caption{Subfigure with Subfloat} \end{figure} ^D - <figure> <img src="img1.jpg" alt="Caption 1" /><figcaption>Caption 1</figcaption> </figure> - <figure> <img src="img2.jpg" alt="Caption 2" /><figcaption>Caption 2</figcaption> </figure> diff --git a/test/command/3983.md b/test/command/3983.md index 7eaeb99f0..5d83941e7 100644 --- a/test/command/3983.md +++ b/test/command/3983.md @@ -1,5 +1,5 @@ ``` -pandoc -f latex -t native +pandoc -f latex+raw_tex -t native \def\filename@area{foo:bar:baz} \makeatletter \graphicspath\expandafter{\expandafter{\filename@area}}% @@ -10,7 +10,7 @@ pandoc -f latex -t native ``` ``` -pandoc -f latex -t native +pandoc -f latex+raw_tex -t native \makeatletter \newcommand\urlfootnote@[1]{\footnote{\url@{#1}}} \DeclareRobustCommand{\urlfootnote}{\hyper@normalise\urlfootnote@} @@ -21,7 +21,7 @@ pandoc -f latex -t native ``` ``` -pandoc -f latex -t native +pandoc -f latex+raw_tex -t native \def\foo{bar} \expandafter\bam\foo ^D diff --git a/test/command/4382.md b/test/command/4382.md new file mode 100644 index 000000000..4a840489f --- /dev/null +++ b/test/command/4382.md @@ -0,0 +1,10 @@ +``` +% pandoc -f rst -t native +- + +===== +^D +[BulletList + [[]] +,HorizontalRule] +``` diff --git a/test/command/4527.md b/test/command/4527.md index 984333559..2f54fca60 100644 --- a/test/command/4527.md +++ b/test/command/4527.md @@ -1,7 +1,7 @@ # Raw TeX blocks in CommonMark with and without raw_tex ``` -% pandoc -f latex -t commonmark-raw_tex +% pandoc -f latex+raw_tex -t commonmark-raw_tex \someunknowncommand Hello. @@ -10,7 +10,7 @@ Hello. ``` ``` -% pandoc -f latex -t commonmark+raw_tex +% pandoc -f latex+raw_tex -t commonmark+raw_tex \someunknowncommand Hello. @@ -19,3 +19,18 @@ Hello. Hello. ``` + +``` +% pandoc -f latex -t native +\maketitle +^D +[] +``` + +``` +% pandoc -f latex -t rst +\maketitle +Hello. +^D +Hello. +``` diff --git a/test/command/4635.md b/test/command/4635.md new file mode 100644 index 000000000..320b83956 --- /dev/null +++ b/test/command/4635.md @@ -0,0 +1,31 @@ +``` +% pandoc -f markdown -t native +(cf. +foo) +^D +[Para [Str "(cf.",SoftBreak,Str "foo)"]] +``` + +``` +% pandoc -f markdown -t native +a (cf. +foo) +^D +[Para [Str "a",Space,Str "(cf.",SoftBreak,Str "foo)"]] +``` + +``` +% pandoc -f markdown -t native +cf. +foo +^D +[Para [Str "cf.\160foo"]] +``` + +``` +% pandoc -f markdown -t native +a cf. +foo +^D +[Para [Str "a",SoftBreak,Str "cf.\160foo"]] +``` diff --git a/test/command/4715.md b/test/command/4715.md new file mode 100644 index 000000000..50873c2b5 --- /dev/null +++ b/test/command/4715.md @@ -0,0 +1,16 @@ +``` +% pandoc -f rst -t native +.. toctree:: + :name: tree1 + :class: foo bar + :caption: Indice dei contenuti + :numbered: + :maxdepth: 3 + + premessa.rst + acquisizione-software.rst + riuso-software.rst +^D +[Div ("tree1",["toctree","foo","bar"],[("caption","Indice dei contenuti"),("numbered",""),("maxdepth","3")]) + [Para [Str "premessa.rst",SoftBreak,Str "acquisizione-software.rst",SoftBreak,Str "riuso-software.rst"]]] + ``` diff --git a/test/command/4960.md b/test/command/4960.md new file mode 100644 index 000000000..7253b533a --- /dev/null +++ b/test/command/4960.md @@ -0,0 +1,22 @@ +``` +% pandoc -t latex --biblatex +[@a1;@a2;@a3] +^D +\autocite{a1,a2,a3} +``` + +``` +% pandoc -t latex --biblatex +@a1 [@a2;@a3] +^D +\textcite{a1,a2,a3} +``` + +``` +% pandoc -t latex --biblatex +[@a1, blah; @a2; see @a3] +^D +\autocites[blah]{a1}{a2}[see][]{a3} +``` + + diff --git a/test/command/ifstrequal.md b/test/command/ifstrequal.md index 4ad04d2e1..24ed7ef54 100644 --- a/test/command/ifstrequal.md +++ b/test/command/ifstrequal.md @@ -5,6 +5,5 @@ \h{a} \h{b} ^D -[Para [Emph [Str "no"]] -,Para [Str "\225",SoftBreak,Str "b"]] +[Para [Emph [Str "no"],SoftBreak,Str "\225",SoftBreak,Str "b"]] ``` diff --git a/test/command/macros.md b/test/command/macros.md index d091c2191..0c91944a1 100644 --- a/test/command/macros.md +++ b/test/command/macros.md @@ -4,6 +4,7 @@ $\my+\my$ ^D \newcommand{\my}{\phi} + $\phi+\phi$ ``` @@ -13,6 +14,7 @@ $\phi+\phi$ $\my+\my$ ^D \newcommand{\my}{\phi} + $\my+\my$ ``` @@ -75,6 +77,7 @@ x &= y\\\end{aligned}\] \end{equation} ^D \newcommand{\my}{\phi} + \begin{equation} \phi+\phi \end{equation} @@ -88,6 +91,7 @@ x &= y\\\end{aligned}\] \end{equation} ^D \newcommand{\my}{\phi} + \begin{equation} \my+\my \end{equation} @@ -101,3 +105,21 @@ x &= y\\\end{aligned}\] \newcommand{\my}{\emph{a}} \emph{a} ``` + +<https://tex.stackexchange.com/questions/258/what-is-the-difference-between-let-and-def> + +``` +% pandoc -f latex -t plain +\def\bar{hello} +\let\fooi\bar +\def\fooii{\bar} +\fooi +\fooii + +\def\bar{goodbye} +\fooi +\fooii +^D +hello+hello + +hello+goodbye +``` + diff --git a/test/docx/golden/block_quotes.docx b/test/docx/golden/block_quotes.docx Binary files differindex 28d6f035e..d118a6fb0 100644 --- a/test/docx/golden/block_quotes.docx +++ b/test/docx/golden/block_quotes.docx diff --git a/test/docx/golden/codeblock.docx b/test/docx/golden/codeblock.docx Binary files differindex af85598dc..7068893c1 100644 --- a/test/docx/golden/codeblock.docx +++ b/test/docx/golden/codeblock.docx diff --git a/test/docx/golden/comments.docx b/test/docx/golden/comments.docx Binary files differindex 33831dc06..2cdf4c210 100644 --- a/test/docx/golden/comments.docx +++ b/test/docx/golden/comments.docx diff --git a/test/docx/golden/custom_style_no_reference.docx b/test/docx/golden/custom_style_no_reference.docx Binary files differindex 78f56893c..f7e332963 100644 --- a/test/docx/golden/custom_style_no_reference.docx +++ b/test/docx/golden/custom_style_no_reference.docx diff --git a/test/docx/golden/custom_style_reference.docx b/test/docx/golden/custom_style_reference.docx Binary files differindex dfc2c960b..44900181e 100644 --- a/test/docx/golden/custom_style_reference.docx +++ b/test/docx/golden/custom_style_reference.docx diff --git a/test/docx/golden/definition_list.docx b/test/docx/golden/definition_list.docx Binary files differindex c3f076387..b57686e7d 100644 --- a/test/docx/golden/definition_list.docx +++ b/test/docx/golden/definition_list.docx diff --git a/test/docx/golden/headers.docx b/test/docx/golden/headers.docx Binary files differindex c2b6206a3..a51443929 100644 --- a/test/docx/golden/headers.docx +++ b/test/docx/golden/headers.docx diff --git a/test/docx/golden/image.docx b/test/docx/golden/image.docx Binary files differindex 95a28a098..e1f043ca3 100644 --- a/test/docx/golden/image.docx +++ b/test/docx/golden/image.docx diff --git a/test/docx/golden/inline_code.docx b/test/docx/golden/inline_code.docx Binary files differindex 1d415e411..46a3a6172 100644 --- a/test/docx/golden/inline_code.docx +++ b/test/docx/golden/inline_code.docx diff --git a/test/docx/golden/inline_formatting.docx b/test/docx/golden/inline_formatting.docx Binary files differindex 9e07bd25d..c214c7eda 100644 --- a/test/docx/golden/inline_formatting.docx +++ b/test/docx/golden/inline_formatting.docx diff --git a/test/docx/golden/inline_images.docx b/test/docx/golden/inline_images.docx Binary files differindex 62c5943ba..6ae175e4f 100644 --- a/test/docx/golden/inline_images.docx +++ b/test/docx/golden/inline_images.docx diff --git a/test/docx/golden/link_in_notes.docx b/test/docx/golden/link_in_notes.docx Binary files differindex c86f9aecd..7376966b3 100644 --- a/test/docx/golden/link_in_notes.docx +++ b/test/docx/golden/link_in_notes.docx diff --git a/test/docx/golden/links.docx b/test/docx/golden/links.docx Binary files differindex 652a93569..d5839c517 100644 --- a/test/docx/golden/links.docx +++ b/test/docx/golden/links.docx diff --git a/test/docx/golden/lists.docx b/test/docx/golden/lists.docx Binary files differindex 5e900feb1..bcc5e706d 100644 --- a/test/docx/golden/lists.docx +++ b/test/docx/golden/lists.docx diff --git a/test/docx/golden/lists_continuing.docx b/test/docx/golden/lists_continuing.docx Binary files differindex 278edaa99..bd35f2887 100644 --- a/test/docx/golden/lists_continuing.docx +++ b/test/docx/golden/lists_continuing.docx diff --git a/test/docx/golden/lists_restarting.docx b/test/docx/golden/lists_restarting.docx Binary files differindex 112b824b5..f693fca6f 100644 --- a/test/docx/golden/lists_restarting.docx +++ b/test/docx/golden/lists_restarting.docx diff --git a/test/docx/golden/nested_anchors_in_header.docx b/test/docx/golden/nested_anchors_in_header.docx Binary files differindex c2a10b828..20f83b3ca 100644 --- a/test/docx/golden/nested_anchors_in_header.docx +++ b/test/docx/golden/nested_anchors_in_header.docx diff --git a/test/docx/golden/notes.docx b/test/docx/golden/notes.docx Binary files differindex c6093c18a..197ccff94 100644 --- a/test/docx/golden/notes.docx +++ b/test/docx/golden/notes.docx diff --git a/test/docx/golden/table_one_row.docx b/test/docx/golden/table_one_row.docx Binary files differindex 34de65e2e..ace98df83 100644 --- a/test/docx/golden/table_one_row.docx +++ b/test/docx/golden/table_one_row.docx diff --git a/test/docx/golden/table_with_list_cell.docx b/test/docx/golden/table_with_list_cell.docx Binary files differindex c27f99736..fef0b16f5 100644 --- a/test/docx/golden/table_with_list_cell.docx +++ b/test/docx/golden/table_with_list_cell.docx diff --git a/test/docx/golden/tables.docx b/test/docx/golden/tables.docx Binary files differindex 4fcdd73c3..ec73cfeef 100644 --- a/test/docx/golden/tables.docx +++ b/test/docx/golden/tables.docx diff --git a/test/docx/golden/track_changes_deletion.docx b/test/docx/golden/track_changes_deletion.docx Binary files differindex 7b404dba1..dab2c3170 100644 --- a/test/docx/golden/track_changes_deletion.docx +++ b/test/docx/golden/track_changes_deletion.docx diff --git a/test/docx/golden/track_changes_insertion.docx b/test/docx/golden/track_changes_insertion.docx Binary files differindex 500a7c239..7b5af8ed5 100644 --- a/test/docx/golden/track_changes_insertion.docx +++ b/test/docx/golden/track_changes_insertion.docx diff --git a/test/docx/golden/track_changes_move.docx b/test/docx/golden/track_changes_move.docx Binary files differindex 05705c040..666cd85eb 100644 --- a/test/docx/golden/track_changes_move.docx +++ b/test/docx/golden/track_changes_move.docx diff --git a/test/docx/golden/unicode.docx b/test/docx/golden/unicode.docx Binary files differindex c1626874d..ef9480059 100644 --- a/test/docx/golden/unicode.docx +++ b/test/docx/golden/unicode.docx diff --git a/test/docx/golden/verbatim_subsuper.docx b/test/docx/golden/verbatim_subsuper.docx Binary files differindex d2ada67fa..dc9453430 100644 --- a/test/docx/golden/verbatim_subsuper.docx +++ b/test/docx/golden/verbatim_subsuper.docx diff --git a/test/lhs-test.html b/test/lhs-test.html index 5fce225df..3a3247982 100644 --- a/test/lhs-test.html +++ b/test/lhs-test.html @@ -29,7 +29,7 @@ a.sourceLine { text-indent: -1em; padding-left: 1em; } pre.numberSource a.sourceLine { position: relative; left: -4em; } pre.numberSource a.sourceLine::before - { content: attr(data-line-number); + { content: attr(title); position: relative; left: -1em; text-align: right; vertical-align: baseline; border: none; pointer-events: all; display: inline-block; -webkit-touch-callout: none; -webkit-user-select: none; @@ -82,9 +82,9 @@ code span.wa { color: #60a0b0; font-weight: bold; font-style: italic; } /* Warni <h1 id="lhs-test">lhs test</h1> <p><code>unsplit</code> is an arrow that takes a pair of values and combines them to return a single value:</p> -<div class="sourceCode" id="cb1"><pre class="sourceCode literate haskell"><code class="sourceCode haskell"><a class="sourceLine" id="cb1-1" data-line-number="1"><span class="ot">unsplit ::</span> (<span class="dt">Arrow</span> a) <span class="ot">=></span> (b <span class="ot">-></span> c <span class="ot">-></span> d) <span class="ot">-></span> a (b, c) d</a> -<a class="sourceLine" id="cb1-2" data-line-number="2">unsplit <span class="fu">=</span> arr <span class="fu">.</span> uncurry</a> -<a class="sourceLine" id="cb1-3" data-line-number="3"> <span class="co">-- arr (\op (x,y) -> x `op` y)</span></a></code></pre></div> +<div class="sourceCode" id="cb1"><pre class="sourceCode literate haskell"><code class="sourceCode haskell"><a class="sourceLine" id="cb1-1" title="1"><span class="ot">unsplit ::</span> (<span class="dt">Arrow</span> a) <span class="ot">=></span> (b <span class="ot">-></span> c <span class="ot">-></span> d) <span class="ot">-></span> a (b, c) d</a> +<a class="sourceLine" id="cb1-2" title="2">unsplit <span class="fu">=</span> arr <span class="fu">.</span> <span class="fu">uncurry</span></a> +<a class="sourceLine" id="cb1-3" title="3"> <span class="co">-- arr (\op (x,y) -> x `op` y)</span></a></code></pre></div> <p><code>(***)</code> combines two arrows into a new arrow by running the two arrows on a pair of values (one arrow on the first item of the pair and one arrow on the second item of the pair).</p> diff --git a/test/lhs-test.html+lhs b/test/lhs-test.html+lhs index 78bc1d426..c40f6173f 100644 --- a/test/lhs-test.html+lhs +++ b/test/lhs-test.html+lhs @@ -29,7 +29,7 @@ a.sourceLine { text-indent: -1em; padding-left: 1em; } pre.numberSource a.sourceLine { position: relative; left: -4em; } pre.numberSource a.sourceLine::before - { content: attr(data-line-number); + { content: attr(title); position: relative; left: -1em; text-align: right; vertical-align: baseline; border: none; pointer-events: all; display: inline-block; -webkit-touch-callout: none; -webkit-user-select: none; @@ -82,9 +82,9 @@ code span.wa { color: #60a0b0; font-weight: bold; font-style: italic; } /* Warni <h1 id="lhs-test">lhs test</h1> <p><code>unsplit</code> is an arrow that takes a pair of values and combines them to return a single value:</p> -<div class="sourceCode" id="cb1"><pre class="sourceCode literate literatehaskell"><code class="sourceCode literatehaskell"><a class="sourceLine" id="cb1-1" data-line-number="1"><span class="ot">> unsplit ::</span> (<span class="dt">Arrow</span> a) <span class="ot">=></span> (b <span class="ot">-></span> c <span class="ot">-></span> d) <span class="ot">-></span> a (b, c) d</a> -<a class="sourceLine" id="cb1-2" data-line-number="2"><span class="ot">></span> unsplit <span class="fu">=</span> arr <span class="fu">.</span> uncurry</a> -<a class="sourceLine" id="cb1-3" data-line-number="3"><span class="ot">></span> <span class="co">-- arr (\op (x,y) -> x `op` y)</span></a></code></pre></div> +<div class="sourceCode" id="cb1"><pre class="sourceCode literate literatehaskell"><code class="sourceCode literatehaskell"><a class="sourceLine" id="cb1-1" title="1"><span class="ot">> unsplit ::</span> (<span class="dt">Arrow</span> a) <span class="ot">=></span> (b <span class="ot">-></span> c <span class="ot">-></span> d) <span class="ot">-></span> a (b, c) d</a> +<a class="sourceLine" id="cb1-2" title="2"><span class="ot">></span> unsplit <span class="fu">=</span> arr <span class="fu">.</span> <span class="fu">uncurry</span></a> +<a class="sourceLine" id="cb1-3" title="3"><span class="ot">></span> <span class="co">-- arr (\op (x,y) -> x `op` y)</span></a></code></pre></div> <p><code>(***)</code> combines two arrows into a new arrow by running the two arrows on a pair of values (one arrow on the first item of the pair and one arrow on the second item of the pair).</p> diff --git a/test/lhs-test.latex b/test/lhs-test.latex index ba9d294c0..8379864ec 100644 --- a/test/lhs-test.latex +++ b/test/lhs-test.latex @@ -103,7 +103,7 @@ return a single value: \begin{Shaded} \begin{Highlighting}[] \OtherTok{unsplit ::}\NormalTok{ (}\DataTypeTok{Arrow}\NormalTok{ a) }\OtherTok{=>}\NormalTok{ (b }\OtherTok{->}\NormalTok{ c }\OtherTok{->}\NormalTok{ d) }\OtherTok{->}\NormalTok{ a (b, c) d} -\NormalTok{unsplit }\FunctionTok{=}\NormalTok{ arr }\FunctionTok{.}\NormalTok{ uncurry} +\NormalTok{unsplit }\FunctionTok{=}\NormalTok{ arr }\FunctionTok{.} \FunctionTok{uncurry} \CommentTok{-- arr (\textbackslash{}op (x,y) -> x `op` y)} \end{Highlighting} \end{Shaded} diff --git a/test/markdown-citations.native b/test/markdown-citations.native index c77ccbbfc..3d37dbae4 100644 --- a/test/markdown-citations.native +++ b/test/markdown-citations.native @@ -13,5 +13,5 @@ ,[Para [Str "Citation",Space,Str "with",Space,Str "a",Space,Str "suffix",Space,Str "and",Space,Str "locator",Space,Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [Space,Str "pp.\160\&33,",Space,Str "35-37,",Space,Str "and",Space,Str "nowhere",Space,Str "else"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [Str "[@item1",Space,Str "pp.",Space,Str "33,",Space,Str "35-37,",Space,Str "and",Space,Str "nowhere",Space,Str "else]"],Str "."]] ,[Para [Str "Citation",Space,Str "with",Space,Str "suffix",Space,Str "only",Space,Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [Space,Str "and",Space,Str "nowhere",Space,Str "else"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [Str "[@item1",Space,Str "and",Space,Str "nowhere",Space,Str "else]"],Str "."]] ,[Para [Str "Now",Space,Str "some",Space,Str "modifiers.",Note [Para [Str "Like",Space,Str "a",Space,Str "citation",Space,Str "without",Space,Str "author:",Space,Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [], citationMode = SuppressAuthor, citationNoteNum = 0, citationHash = 0}] [Str "[-@item1]"],Str ",",Space,Str "and",Space,Str "now",Space,Str "Doe",Space,Str "with",Space,Str "a",Space,Str "locator",Space,Cite [Citation {citationId = "item2", citationPrefix = [], citationSuffix = [Space,Str "p.\160\&44"], citationMode = SuppressAuthor, citationNoteNum = 0, citationHash = 0}] [Str "[-@item2",Space,Str "p.",Space,Str "44]"],Str "."]]]] - ,[Para [Str "With",Space,Str "some",Space,Str "markup",Space,Cite [Citation {citationId = "item1", citationPrefix = [Emph [Str "see"]], citationSuffix = [Space,Str "p.",Space,Strong [Str "32"]], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [Str "[*see*",Space,Str "@item1",Space,Str "p.",Space,Str "**32**]"],Str "."]]] + ,[Para [Str "With",Space,Str "some",Space,Str "markup",Space,Cite [Citation {citationId = "item1", citationPrefix = [Emph [Str "see"]], citationSuffix = [Space,Str "p.\160",Strong [Str "32"]], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [Str "[*see*",Space,Str "@item1",Space,Str "p.",Space,Str "**32**]"],Str "."]]] ,Header 1 ("references",[],[]) [Str "References"]] diff --git a/test/writer.markdown b/test/writer.markdown index 0cc465f1e..de0821970 100644 --- a/test/writer.markdown +++ b/test/writer.markdown @@ -409,6 +409,7 @@ And this is **strong** </tr> </table> <script type="text/javascript">document.write('This *should not* be interpreted as markdown');</script> + Here's a simple block: <div> @@ -446,6 +447,7 @@ foo This should just be an HTML comment: <!-- Comment --> + Multiline: <!-- @@ -455,6 +457,7 @@ Blah <!-- This is another comment. --> + Code block: <!-- Comment --> @@ -462,6 +465,7 @@ Code block: Just plain comment, with trailing spaces on the line: <!-- foo --> + Code: <hr /> |