tags | Ext_native_spans -- ^ Use Span inlines for contents of @@ -286,14 +287,9 @@ multimarkdownExtensions = extensionsFromList , Ext_auto_identifiers , Ext_mmd_header_identifiers , Ext_implicit_figures - -- Note: MMD's syntax for superscripts and subscripts - -- is a bit more permissive than pandoc's, allowing - -- e^2 and a~1 instead of e^2^ and a~1~, so even with - -- these options we don't have full support for MMD - -- superscripts and subscripts, but there's no reason - -- not to include these: - , Ext_superscript + , Ext_short_subsuperscripts , Ext_subscript + , Ext_superscript , Ext_backtick_code_blocks , Ext_spaced_reference_links -- So far only in dev version of mmd: @@ -464,6 +460,7 @@ getAllExtensions f = universalExtensions <> getAll f , Ext_gutenberg , Ext_smart , Ext_literate_haskell + , Ext_short_subsuperscripts , Ext_rebase_relative_paths ] getAll "markdown_strict" = allMarkdownExtensions diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs index 2dc7ddf52..536e502cf 100644 --- a/src/Text/Pandoc/Readers/Markdown.hs +++ b/src/Text/Pandoc/Readers/Markdown.hs @@ -1692,21 +1692,29 @@ strikeout = fmap B.strikeout <$> superscript :: PandocMonad m => MarkdownParser m (F Inlines) superscript = do - guardEnabled Ext_superscript fmap B.superscript <$> try (do char '^' - mconcat <$> many1Till (do notFollowedBy spaceChar - notFollowedBy newline - inline) (char '^')) + mconcat <$> (try regularSuperscript <|> try mmdShortSuperscript)) + where regularSuperscript = many1Till (do guardEnabled Ext_superscript + notFollowedBy spaceChar + notFollowedBy newline + inline) (char '^') + mmdShortSuperscript = do guardEnabled Ext_short_subsuperscripts + result <- take1WhileP isAlphaNum + return $ return $ return $ B.str result subscript :: PandocMonad m => MarkdownParser m (F Inlines) subscript = do - guardEnabled Ext_subscript fmap B.subscript <$> try (do char '~' - mconcat <$> many1Till (do notFollowedBy spaceChar - notFollowedBy newline - inline) (char '~')) + mconcat <$> (try regularSubscript <|> mmdShortSubscript)) + where regularSubscript = many1Till (do guardEnabled Ext_subscript + notFollowedBy spaceChar + notFollowedBy newline + inline) (char '~') + mmdShortSubscript = do guardEnabled Ext_short_subsuperscripts + result <- take1WhileP isAlphaNum + return $ return $ return $ B.str result whitespace :: PandocMonad m => MarkdownParser m (F Inlines) whitespace = spaceChar >> return <$> (lb <|> regsp) "whitespace" diff --git a/test/Tests/Readers/Markdown.hs b/test/Tests/Readers/Markdown.hs index f055ab197..02fc0d8ce 100644 --- a/test/Tests/Readers/Markdown.hs +++ b/test/Tests/Readers/Markdown.hs @@ -36,6 +36,9 @@ markdownGH :: Text -> Pandoc markdownGH = purely $ readMarkdown def { readerExtensions = githubMarkdownExtensions } +markdownMMD :: Text -> Pandoc +markdownMMD = purely $ readMarkdown def { + readerExtensions = multimarkdownExtensions } infix 4 =: (=:) :: ToString c => String -> (Text, c) -> TestTree @@ -360,6 +363,51 @@ tests = [ testGroup "inline code" ("**this should \"be bold**" =?> para (strong "this should \8220be bold")) ] + , testGroup "sub- and superscripts" + [ + test markdownMMD "normal subscript" + ("H~2~" + =?> para ("H" <> subscript "2")) + , test markdownMMD "normal superscript" + ("x^3^" + =?> para ("x" <> superscript "3")) + , test markdownMMD "short subscript delimeted by space" + ("O~2 is dangerous" + =?> para ("O" <> subscript "2" <> space <> "is dangerous")) + , test markdownMMD "short subscript delimeted by newline" + ("O~2\n" + =?> para ("O" <> subscript "2")) + , test markdownMMD "short subscript delimeted by EOF" + ("O~2" + =?> para ("O" <> subscript "2")) + , test markdownMMD "short subscript delimited by punctuation" + ("O~2." + =?> para ("O" <> subscript "2" <> ".")) + , test markdownMMD "short subscript delimited by emph" + ("O~2*combustible!*" + =?> para ("O" <> subscript "2" <> emph "combustible!")) + , test markdownMMD "no nesting in short subscripts" + ("y~*2*" + =?> para ("y~" <> emph "2")) + , test markdownMMD "short superscript delimeted by space" + ("x^2 = y" + =?> para ("x" <> superscript "2" <> space <> "= y")) + , test markdownMMD "short superscript delimeted by newline" + ("x^2\n" + =?> para ("x" <> superscript "2")) + , test markdownMMD "short superscript delimeted by ExF" + ("x^2" + =?> para ("x" <> superscript "2")) + , test markdownMMD "short superscript delimited by punctuation" + ("x^2." + =?> para ("x" <> superscript "2" <> ".")) + , test markdownMMD "short superscript delimited by emph" + ("x^2*combustible!*" + =?> para ("x" <> superscript "2" <> emph "combustible!")) + , test markdownMMD "no nesting in short superscripts" + ("y^*2*" + =?> para ("y^" <> emph "2")) + ] , testGroup "footnotes" [ "indent followed by newline and flush-left text" =: "[^1]\n\n[^1]: my note\n\n \nnot in note\n" -- cgit v1.2.3 From abb35d8b0ffa1160dd63a15ec0d5c391da31093f Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Mon, 16 Aug 2021 08:09:20 -0700 Subject: Fix bug in last commit due to removal of take1WhileP. --- src/Text/Pandoc/Readers/Markdown.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs index 536e502cf..0f2239394 100644 --- a/src/Text/Pandoc/Readers/Markdown.hs +++ b/src/Text/Pandoc/Readers/Markdown.hs @@ -1700,7 +1700,7 @@ superscript = do notFollowedBy newline inline) (char '^') mmdShortSuperscript = do guardEnabled Ext_short_subsuperscripts - result <- take1WhileP isAlphaNum + result <- T.pack <$> many1 alphaNum return $ return $ return $ B.str result subscript :: PandocMonad m => MarkdownParser m (F Inlines) @@ -1713,7 +1713,7 @@ subscript = do notFollowedBy newline inline) (char '~') mmdShortSubscript = do guardEnabled Ext_short_subsuperscripts - result <- take1WhileP isAlphaNum + result <- T.pack <$> many1 alphaNum return $ return $ return $ B.str result whitespace :: PandocMonad m => MarkdownParser m (F Inlines) -- cgit v1.2.3 From 415f445fc136f5832a6e2512833c2ff6a3e89038 Mon Sep 17 00:00:00 2001 From: Emily Bourke Date: Tue, 17 Aug 2021 16:20:33 +0100 Subject: Escape backslashes in haddock comments (#7505) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Any literal backslash needs to be escaped: these are currently showing up as “‘r’” instead of “‘\r’”. Co-authored-by: Emily Bourke --- src/Text/Pandoc/UTF8.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Text/Pandoc/UTF8.hs b/src/Text/Pandoc/UTF8.hs index 4d5921faf..e154f0535 100644 --- a/src/Text/Pandoc/UTF8.hs +++ b/src/Text/Pandoc/UTF8.hs @@ -96,7 +96,7 @@ hGetContents :: Handle -> IO Text hGetContents = fmap toText . B.hGetContents -- | Convert UTF8-encoded ByteString to Text, also --- removing '\r' characters. +-- removing '\\r' characters. toText :: B.ByteString -> Text toText = T.decodeUtf8 . filterCRs . dropBOM where dropBOM bs = @@ -106,12 +106,12 @@ toText = T.decodeUtf8 . filterCRs . dropBOM filterCRs = B.filter (/='\r') -- | Convert UTF8-encoded ByteString to String, also --- removing '\r' characters. +-- removing '\\r' characters. toString :: B.ByteString -> String toString = T.unpack . toText -- | Convert UTF8-encoded ByteString to Text, also --- removing '\r' characters. +-- removing '\\r' characters. toTextLazy :: BL.ByteString -> TL.Text toTextLazy = TL.decodeUtf8 . filterCRs . dropBOM where dropBOM bs = @@ -121,7 +121,7 @@ toTextLazy = TL.decodeUtf8 . filterCRs . dropBOM filterCRs = BL.filter (/='\r') -- | Convert UTF8-encoded ByteString to String, also --- removing '\r' characters. +-- removing '\\r' characters. toStringLazy :: BL.ByteString -> String toStringLazy = TL.unpack . toTextLazy -- cgit v1.2.3 From 88d82203a188415e02a5964b9030f970f1c67aaf Mon Sep 17 00:00:00 2001 From: Emily Bourke Date: Tue, 10 Aug 2021 17:19:20 +0100 Subject: Add TemplateWarning log message type [API change] This is a general warning to use for messages about templates. --- src/Text/Pandoc/Logging.hs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Text/Pandoc/Logging.hs b/src/Text/Pandoc/Logging.hs index 193b8b61c..a5c227770 100644 --- a/src/Text/Pandoc/Logging.hs +++ b/src/Text/Pandoc/Logging.hs @@ -76,6 +76,7 @@ data LogMessage = | InlineNotRendered Inline | BlockNotRendered Block | DocxParserWarning Text + | TemplateWarning Text | IgnoredIOError Text | CouldNotFetchResource Text Text | CouldNotDetermineImageSize Text Text @@ -174,6 +175,8 @@ instance ToJSON LogMessage where ["contents" .= toJSON bl] DocxParserWarning s -> ["contents" .= s] + TemplateWarning s -> + ["contents" .= s] IgnoredIOError s -> ["contents" .= s] CouldNotFetchResource fp s -> @@ -291,6 +294,8 @@ showLogMessage msg = "Not rendering " <> Text.pack (show bl) DocxParserWarning s -> "Docx parser warning: " <> s + TemplateWarning s -> + "Pptx parser warning: " <> s IgnoredIOError s -> "IO Error (ignored): " <> s CouldNotFetchResource fp s -> @@ -386,6 +391,7 @@ messageVerbosity msg = InlineNotRendered{} -> INFO BlockNotRendered{} -> INFO DocxParserWarning{} -> INFO + TemplateWarning{} -> WARNING IgnoredIOError{} -> WARNING CouldNotFetchResource{} -> WARNING CouldNotDetermineImageSize{} -> WARNING -- cgit v1.2.3 From 8474d488a52343d53ee438301d66622aad6e7bb5 Mon Sep 17 00:00:00 2001 From: Emily Bourke Date: Mon, 16 Aug 2021 15:48:28 +0100 Subject: Provide more detailed XML diff in tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I had some failing tests and couldn’t tell what was different in the XML. Updating the comparison to return what’s different made it easier to figure out what was wrong, and I think will be helpful for others in future. --- test/Tests/Writers/OOXML.hs | 72 ++++++++++++++++++++++++++++++++------------- 1 file changed, 51 insertions(+), 21 deletions(-) diff --git a/test/Tests/Writers/OOXML.hs b/test/Tests/Writers/OOXML.hs index 83f05cfec..299e3e547 100644 --- a/test/Tests/Writers/OOXML.hs +++ b/test/Tests/Writers/OOXML.hs @@ -3,13 +3,15 @@ module Tests.Writers.OOXML (ooxmlTest) where -import Text.Pandoc +import Text.Pandoc hiding (Attr) import Test.Tasty import Test.Tasty.Golden.Advanced +import Control.Applicative ((<|>)) import Codec.Archive.Zip import Text.XML.Light import qualified Data.ByteString as BS import qualified Data.ByteString.Lazy as BL +import Data.Foldable (asum) import qualified Data.Text.IO as T import Data.List (isSuffixOf, sort, (\\), intercalate, union) import Data.Maybe (catMaybes, mapMaybe) @@ -17,29 +19,55 @@ import Tests.Helpers import Data.Algorithm.Diff import System.FilePath.Glob (compile, match) -compareXMLBool :: Content -> Content -> Bool +compareXML :: Content -> Content -> Maybe XMLDifference -- We make a special exception for times at the moment, and just pass -- them because we can't control the utctime when running IO. Besides, -- so long as we have two times, we're okay. -compareXMLBool (Elem myElem) (Elem goodElem) +compareXML (Elem myElem) (Elem goodElem) | (QName "created" _ (Just "dcterms")) <- elName myElem , (QName "created" _ (Just "dcterms")) <- elName goodElem = - True -compareXMLBool (Elem myElem) (Elem goodElem) + Nothing +compareXML (Elem myElem) (Elem goodElem) | (QName "modified" _ (Just "dcterms")) <- elName myElem , (QName "modified" _ (Just "dcterms")) <- elName goodElem = - True -compareXMLBool (Elem myElem) (Elem goodElem) = - elName myElem == elName goodElem && - elAttribs myElem == elAttribs goodElem && - and (zipWith compareXMLBool (elContent myElem) (elContent goodElem)) -compareXMLBool (Text myCData) (Text goodCData) = - cdVerbatim myCData == cdVerbatim goodCData && - cdData myCData == cdData goodCData && - cdLine myCData == cdLine goodCData -compareXMLBool (CRef myStr) (CRef goodStr) = - myStr == goodStr -compareXMLBool _ _ = False + Nothing +compareXML (Elem myElem) (Elem goodElem) = + (if elName myElem == elName goodElem + then Nothing + else Just + (ElemNamesDiffer + (Comparison {mine = elName myElem, good = elName goodElem})) + ) + <|> (if sort (elAttribs myElem) == sort (elAttribs goodElem) + then Nothing + else Just + (ElemAttributesDiffer + (Comparison { mine = sort (elAttribs myElem) + , good = sort (elAttribs goodElem) + }))) + <|> asum (zipWith compareXML (elContent myElem) (elContent goodElem)) +compareXML (Text myCData) (Text goodCData) = + (if cdVerbatim myCData == cdVerbatim goodCData + && cdData myCData == cdData goodCData + && cdLine myCData == cdLine goodCData + then Nothing + else Just (CDatasDiffer (Comparison { mine = myCData, good = goodCData }))) +compareXML (CRef myStr) (CRef goodStr) = + if myStr == goodStr + then Nothing + else Just (CRefsDiffer (Comparison { mine = myStr, good = goodStr })) +compareXML m g = Just (OtherContentsDiffer (Comparison {mine = m, good = g})) + +data XMLDifference + = ElemNamesDiffer (Comparison QName) + | ElemAttributesDiffer (Comparison [Attr]) + | CDatasDiffer (Comparison CData) + | CRefsDiffer (Comparison String) + | OtherContentsDiffer (Comparison Content) + deriving (Show) + +data Comparison a = Comparison { good :: a, mine :: a } + deriving (Show) displayDiff :: Content -> Content -> String displayDiff elemA elemB = @@ -106,11 +134,13 @@ compareXMLFile' fp goldenArch testArch = do let testContent = Elem testXMLDoc goldenContent = Elem goldenXMLDoc + display difference = "Non-matching xml in " + ++ fp ++ ":\n" + ++ "* " ++ show difference ++ "\n" + ++ displayDiff testContent goldenContent - if compareXMLBool goldenContent testContent - then Right () - else Left $ - "Non-matching xml in " ++ fp ++ ":\n" ++ displayDiff testContent goldenContent + + maybe (Right ()) (Left . display) (compareXML goldenContent testContent) compareXMLFile :: FilePath -> Archive -> Archive -> Maybe String compareXMLFile fp goldenArch testArch = -- cgit v1.2.3 From 9204e5c9b1ef5d1f038dbc93928f6bbc71bf6b2f Mon Sep 17 00:00:00 2001 From: Emily Bourke Date: Tue, 17 Aug 2021 11:55:29 +0100 Subject: Don’t compare cdLine in OOXML golden tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The `cdLine` field gives the line of the file some CData was found on. I don’t think this is a difference that should fail these golden tests, as the XML should still be parsable if nothing else has changed. --- test/Tests/Writers/OOXML.hs | 1 - 1 file changed, 1 deletion(-) diff --git a/test/Tests/Writers/OOXML.hs b/test/Tests/Writers/OOXML.hs index 299e3e547..56a27a4b8 100644 --- a/test/Tests/Writers/OOXML.hs +++ b/test/Tests/Writers/OOXML.hs @@ -49,7 +49,6 @@ compareXML (Elem myElem) (Elem goodElem) = compareXML (Text myCData) (Text goodCData) = (if cdVerbatim myCData == cdVerbatim goodCData && cdData myCData == cdData goodCData - && cdLine myCData == cdLine goodCData then Nothing else Just (CDatasDiffer (Comparison { mine = myCData, good = goodCData }))) compareXML (CRef myStr) (CRef goodStr) = -- cgit v1.2.3 From 72823ad947face43ef45eaeb7e611979531abed6 Mon Sep 17 00:00:00 2001 From: Emily Bourke Date: Tue, 10 Aug 2021 17:20:53 +0100 Subject: pptx: Select layouts from reference doc by name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Until now, users had to make sure that their reference doc contains layouts in a specific order: the first four layouts in the file had to have a specific structure, or else pandoc would error (or sometimes successfully produce a pptx file, which PowerPoint would then fail to open). This commit changes the layout selection to use the layout names rather than order: users must make sure their reference doc contains four layouts with specific names, and if a layout with the right name isn’t found pandoc will output a warning and use the corresponding layout from the default reference doc as a fallback. I believe the use of names rather than order will be clearer to users, and the clearer errors will help them troubleshoot when things go wrong. - Add tests for moved layouts - Add tests for deleted layouts - Add newly included layouts to slideMaster1.xml to fix tests --- MANUAL.txt | 19 +- src/Text/Pandoc/Writers/Powerpoint/Output.hs | 225 +++++++++++++++++++-- test/Tests/Writers/Powerpoint.hs | 31 ++- test/pptx/code-custom_deleted_layouts.pptx | Bin 0 -> 31033 bytes test/pptx/code-custom_moved_layouts.pptx | Bin 0 -> 41822 bytes test/pptx/code_deleted_layouts.pptx | Bin 0 -> 31032 bytes test/pptx/code_moved_layouts.pptx | Bin 0 -> 41826 bytes ...ment-properties-short-desc_deleted_layouts.pptx | Bin 0 -> 29806 bytes ...cument-properties-short-desc_moved_layouts.pptx | Bin 0 -> 40600 bytes test/pptx/document-properties_deleted_layouts.pptx | Bin 0 -> 30210 bytes test/pptx/document-properties_moved_layouts.pptx | Bin 0 -> 41004 bytes test/pptx/endnotes_deleted_layouts.pptx | Bin 0 -> 29774 bytes test/pptx/endnotes_moved_layouts.pptx | Bin 0 -> 40566 bytes test/pptx/endnotes_toc_deleted_layouts.pptx | Bin 0 -> 30596 bytes test/pptx/endnotes_toc_moved_layouts.pptx | Bin 0 -> 41384 bytes test/pptx/images_deleted_layouts.pptx | Bin 0 -> 47424 bytes test/pptx/images_moved_layouts.pptx | Bin 0 -> 58213 bytes test/pptx/inline_formatting_deleted_layouts.pptx | Bin 0 -> 28966 bytes test/pptx/inline_formatting_moved_layouts.pptx | Bin 0 -> 39758 bytes test/pptx/lists_deleted_layouts.pptx | Bin 0 -> 29861 bytes test/pptx/lists_moved_layouts.pptx | Bin 0 -> 40653 bytes test/pptx/raw_ooxml_deleted_layouts.pptx | Bin 0 -> 29754 bytes test/pptx/raw_ooxml_moved_layouts.pptx | Bin 0 -> 40546 bytes test/pptx/reference_deleted_layouts.pptx | Bin 0 -> 18160 bytes test/pptx/reference_moved_layouts.pptx | Bin 0 -> 44237 bytes test/pptx/remove_empty_slides_deleted_layouts.pptx | Bin 0 -> 46867 bytes test/pptx/remove_empty_slides_moved_layouts.pptx | Bin 0 -> 57656 bytes test/pptx/slide_breaks_deleted_layouts.pptx | Bin 0 -> 31378 bytes test/pptx/slide_breaks_moved_layouts.pptx | Bin 0 -> 42171 bytes ...slide_breaks_slide_level_1_deleted_layouts.pptx | Bin 0 -> 30554 bytes .../slide_breaks_slide_level_1_moved_layouts.pptx | Bin 0 -> 41343 bytes test/pptx/slide_breaks_toc_deleted_layouts.pptx | Bin 0 -> 32328 bytes test/pptx/slide_breaks_toc_moved_layouts.pptx | Bin 0 -> 43118 bytes ...eaker_notes_after_metadata_deleted_layouts.pptx | Bin 0 -> 34473 bytes ...speaker_notes_after_metadata_moved_layouts.pptx | Bin 0 -> 45269 bytes .../speaker_notes_afterheader_deleted_layouts.pptx | Bin 0 -> 33500 bytes .../speaker_notes_afterheader_moved_layouts.pptx | Bin 0 -> 44297 bytes .../speaker_notes_afterseps_deleted_layouts.pptx | Bin 0 -> 54390 bytes .../speaker_notes_afterseps_moved_layouts.pptx | Bin 0 -> 65181 bytes test/pptx/speaker_notes_deleted_layouts.pptx | Bin 0 -> 38203 bytes test/pptx/speaker_notes_moved_layouts.pptx | Bin 0 -> 49002 bytes test/pptx/start_numbering_at_deleted_layouts.pptx | Bin 0 -> 29837 bytes test/pptx/start_numbering_at_moved_layouts.pptx | Bin 0 -> 40630 bytes test/pptx/tables_deleted_layouts.pptx | Bin 0 -> 30381 bytes test/pptx/tables_moved_layouts.pptx | Bin 0 -> 41174 bytes test/pptx/two_column_deleted_layouts.pptx | Bin 0 -> 28883 bytes test/pptx/two_column_moved_layouts.pptx | Bin 0 -> 39676 bytes 47 files changed, 242 insertions(+), 33 deletions(-) create mode 100644 test/pptx/code-custom_deleted_layouts.pptx create mode 100644 test/pptx/code-custom_moved_layouts.pptx create mode 100644 test/pptx/code_deleted_layouts.pptx create mode 100644 test/pptx/code_moved_layouts.pptx create mode 100644 test/pptx/document-properties-short-desc_deleted_layouts.pptx create mode 100644 test/pptx/document-properties-short-desc_moved_layouts.pptx create mode 100644 test/pptx/document-properties_deleted_layouts.pptx create mode 100644 test/pptx/document-properties_moved_layouts.pptx create mode 100644 test/pptx/endnotes_deleted_layouts.pptx create mode 100644 test/pptx/endnotes_moved_layouts.pptx create mode 100644 test/pptx/endnotes_toc_deleted_layouts.pptx create mode 100644 test/pptx/endnotes_toc_moved_layouts.pptx create mode 100644 test/pptx/images_deleted_layouts.pptx create mode 100644 test/pptx/images_moved_layouts.pptx create mode 100644 test/pptx/inline_formatting_deleted_layouts.pptx create mode 100644 test/pptx/inline_formatting_moved_layouts.pptx create mode 100644 test/pptx/lists_deleted_layouts.pptx create mode 100644 test/pptx/lists_moved_layouts.pptx create mode 100644 test/pptx/raw_ooxml_deleted_layouts.pptx create mode 100644 test/pptx/raw_ooxml_moved_layouts.pptx create mode 100644 test/pptx/reference_deleted_layouts.pptx create mode 100644 test/pptx/reference_moved_layouts.pptx create mode 100644 test/pptx/remove_empty_slides_deleted_layouts.pptx create mode 100644 test/pptx/remove_empty_slides_moved_layouts.pptx create mode 100644 test/pptx/slide_breaks_deleted_layouts.pptx create mode 100644 test/pptx/slide_breaks_moved_layouts.pptx create mode 100644 test/pptx/slide_breaks_slide_level_1_deleted_layouts.pptx create mode 100644 test/pptx/slide_breaks_slide_level_1_moved_layouts.pptx create mode 100644 test/pptx/slide_breaks_toc_deleted_layouts.pptx create mode 100644 test/pptx/slide_breaks_toc_moved_layouts.pptx create mode 100644 test/pptx/speaker_notes_after_metadata_deleted_layouts.pptx create mode 100644 test/pptx/speaker_notes_after_metadata_moved_layouts.pptx create mode 100644 test/pptx/speaker_notes_afterheader_deleted_layouts.pptx create mode 100644 test/pptx/speaker_notes_afterheader_moved_layouts.pptx create mode 100644 test/pptx/speaker_notes_afterseps_deleted_layouts.pptx create mode 100644 test/pptx/speaker_notes_afterseps_moved_layouts.pptx create mode 100644 test/pptx/speaker_notes_deleted_layouts.pptx create mode 100644 test/pptx/speaker_notes_moved_layouts.pptx create mode 100644 test/pptx/start_numbering_at_deleted_layouts.pptx create mode 100644 test/pptx/start_numbering_at_moved_layouts.pptx create mode 100644 test/pptx/tables_deleted_layouts.pptx create mode 100644 test/pptx/tables_moved_layouts.pptx create mode 100644 test/pptx/two_column_deleted_layouts.pptx create mode 100644 test/pptx/two_column_moved_layouts.pptx diff --git a/MANUAL.txt b/MANUAL.txt index bed3b2009..0b1424d47 100644 --- a/MANUAL.txt +++ b/MANUAL.txt @@ -1165,13 +1165,18 @@ header when requesting a document from a URL: `.pptx` or `.potx` extension) are known to work, as are most templates derived from these. - The specific requirement is that the template should begin with - the following first four layouts: - - 1. Title Slide - 2. Title and Content - 3. Section Header - 4. Two Content + The specific requirement is that the template should contain layouts + with the following names (as seen within PowerPoint): + + - Title Slide + - Title and Content + - Section Header + - Two Content + + For each name, the first layout found with that name will be used. + If no layout is found with one of the names, pandoc will output a + warning and use the layout with that name from the default reference + doc instead. All templates included with a recent version of MS PowerPoint will fit these criteria. (You can click on `Layout` under the diff --git a/src/Text/Pandoc/Writers/Powerpoint/Output.hs b/src/Text/Pandoc/Writers/Powerpoint/Output.hs index 157810216..a757516a8 100644 --- a/src/Text/Pandoc/Writers/Powerpoint/Output.hs +++ b/src/Text/Pandoc/Writers/Powerpoint/Output.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE DeriveTraversable #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE PatternGuards #-} {- | @@ -21,14 +22,19 @@ import Control.Monad.Reader import Control.Monad.State import Codec.Archive.Zip import Data.List (intercalate, stripPrefix, nub, union, isPrefixOf, intersperse) +import Data.CaseInsensitive (CI) +import qualified Data.CaseInsensitive as CI import Data.Default +import Data.Foldable (toList) +import Data.List.NonEmpty (nonEmpty, NonEmpty ((:|))) import Data.Text (Text) import qualified Data.Text as T -import qualified Data.Text.Read +import Data.Text.Read (decimal) import Data.Time (formatTime, defaultTimeLocale) import Data.Time.Clock (UTCTime) import Data.Time.Clock.POSIX (utcTimeToPOSIXSeconds, posixSecondsToUTCTime) -import System.FilePath.Posix (splitDirectories, splitExtension, takeExtension) +import Data.Traversable (for) +import System.FilePath.Posix (splitDirectories, splitExtension, takeExtension, takeFileName) import Text.Pandoc.XML.Light as XML import Text.Pandoc.Definition import qualified Text.Pandoc.UTF8 as UTF8 @@ -48,11 +54,11 @@ import System.FilePath.Glob import Text.DocTemplates (FromContext(lookupContext), Context) import Text.DocLayout (literal) import Text.TeXMath +import Text.Pandoc.Logging (LogMessage(TemplateWarning)) import Text.Pandoc.Writers.Math (convertMath) import Text.Pandoc.Writers.Powerpoint.Presentation import Text.Pandoc.Shared (tshow, stringify) import Skylighting (fromColor) -import Data.List.NonEmpty (nonEmpty) -- |The 'EMU' type is used to specify sizes in English Metric Units. type EMU = Integer @@ -117,6 +123,7 @@ data WriterEnv = WriterEnv { envRefArchive :: Archive -- no entry in the map for it. , envSpeakerNotesIdMap :: M.Map Int Int , envInSpeakerNotes :: Bool + , envSlideLayouts :: Maybe SlideLayouts } deriving (Show) @@ -136,8 +143,33 @@ instance Default WriterEnv where , envSlideIdMap = mempty , envSpeakerNotesIdMap = mempty , envInSpeakerNotes = False + , envSlideLayouts = Nothing } +type SlideLayouts = SlideLayoutsOf SlideLayout + +data SlideLayoutsOf a = SlideLayouts + { metadata :: a + , title :: a + , content :: a + , twoColumn :: a + } deriving (Show, Functor, Foldable, Traversable) + +data SlideLayout = SlideLayout + { slElement :: Element + , slInReferenceDoc :: Bool + -- ^ True if the layout is in the provided reference doc, False if it's in + -- the default reference doc. + , slPath :: FilePath + , slEntry :: Entry + } deriving (Show) + +getSlideLayouts :: PandocMonad m => P m SlideLayouts +getSlideLayouts = asks envSlideLayouts >>= maybe (throwError e) pure + where + e = PandocSomeError ("Slide layouts aren't defined, even though they should " + <> "always be. This is a bug in pandoc.") + data ContentType = NormalContent | TwoColumnLeftContent | TwoColumnRightContent @@ -264,7 +296,24 @@ presentationToArchiveP p@(Presentation docProps slides) = do T.unlines (map (T.pack . (" " <>)) missingFiles) ) - newArch' <- foldM copyFileToArchive emptyArchive filePaths + newArch <- foldM copyFileToArchive emptyArchive filePaths + + -- Add any layouts taken from the default archive, + -- overwriting any already added. + slideLayouts <- getSlideLayouts + let f layout = + if not (slInReferenceDoc layout) + then addEntryToArchive (slEntry layout) + else id + let newArch' = foldr f newArch slideLayouts + + -- Update the master to make sure it includes any layouts we've just added + master <- getMaster + masterRels <- getMasterRels + let (updatedMasterElem, updatedMasterRelElem) = updateMasterElems slideLayouts master masterRels + updatedMasterEntry <- elemToEntry "ppt/slideMasters/slideMaster1.xml" updatedMasterElem + updatedMasterRelEntry <- elemToEntry "ppt/slideMasters/_rels/slideMaster1.xml.rels" updatedMasterRelElem + -- we make a modified ppt/viewProps.xml out of the presentation viewProps viewPropsEntry <- makeViewPropsEntry -- we make a docProps/core.xml entry out of the presentation docprops @@ -293,9 +342,82 @@ presentationToArchiveP p@(Presentation docProps slides) = do spkNotesEntries <> spkNotesRelEntries <> mediaEntries <> + [updatedMasterEntry, updatedMasterRelEntry] <> [contentTypesEntry, docPropsEntry, docCustomPropsEntry, relsEntry, presEntry, presRelsEntry, viewPropsEntry] +updateMasterElems :: SlideLayouts -> Element -> Element -> (Element, Element) +updateMasterElems layouts master masterRels = (updatedMaster, updatedMasterRels) + where + updatedMaster = master { elContent = updateSldLayoutIdLst <$> elContent master } + (updatedRelationshipIds, updatedMasterRels) = addLayoutRels masterRels + + updateSldLayoutIdLst :: Content -> Content + updateSldLayoutIdLst (Elem e) = case elName e of + (QName "sldLayoutIdLst" _ _) -> let + mkChild relationshipId (lastId, children) = let + thisId = lastId + 1 + newChild = Element + { elName = QName "sldLayoutId" Nothing (Just "p") + , elAttribs = + [ Attr (QName "id" Nothing Nothing) (T.pack (show thisId)) + , Attr (QName "id" Nothing (Just "r")) relationshipId + ] + , elContent = [] + , elLine = Nothing + } + in (thisId, Elem newChild : children) + newChildren = snd (foldr mkChild (maxIdNumber' e, []) updatedRelationshipIds) + in Elem e { elContent = elContent e <> newChildren } + _ -> Elem e + updateSldLayoutIdLst c = c + + addLayoutRels :: + Element -> + ([Text], Element) + addLayoutRels e = let + layoutsToAdd = filter (not . slInReferenceDoc) (toList layouts) + newRelationships = snd (foldr mkRelationship (maxIdNumber e, []) layoutsToAdd) + newRelationshipIds = mapMaybe getRelationshipId newRelationships + mkRelationship layout (lastId, relationships) = let + thisId = lastId + 1 + slideLayoutPath = "../slideLayouts/" <> T.pack (takeFileName (slPath layout)) + newRelationship = Element + { elName = QName "Relationship" Nothing Nothing + , elAttribs = + [ Attr (QName "Id" Nothing Nothing) ("rId" <> T.pack (show thisId)) + , Attr (QName "Type" Nothing Nothing) "http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideLayout" + , Attr (QName "Target" Nothing Nothing) slideLayoutPath + ] + , elContent = [] + , elLine = Nothing + } + in (thisId, Elem newRelationship : relationships) + in (newRelationshipIds, e {elContent = elContent e <> newRelationships}) + + getRelationshipId :: Content -> Maybe Text + getRelationshipId (Elem e) = findAttr (QName "Id" Nothing Nothing) e + getRelationshipId _ = Nothing + + maxIdNumber :: Element -> Integer + maxIdNumber relationships = maximum (0 : idNumbers) + where + idNumbers = fst <$> mapMaybe (hush . decimal . T.drop 3) idAttributes + idAttributes = mapMaybe getIdAttribute (elContent relationships) + getIdAttribute (Elem e) = findAttr (QName "Id" Nothing Nothing) e + getIdAttribute _ = Nothing + + maxIdNumber' :: Element -> Integer + maxIdNumber' sldLayouts = maximum (0 : idNumbers) + where + idNumbers = fst <$> mapMaybe (hush . decimal) idAttributes + idAttributes = mapMaybe getIdAttribute (elContent sldLayouts) + getIdAttribute (Elem e) = findAttr (QName "id" Nothing Nothing) e + getIdAttribute _ = Nothing + + hush :: Either a b -> Maybe b + hush = either (const Nothing) Just + makeSlideIdMap :: Presentation -> M.Map SlideId Int makeSlideIdMap (Presentation _ slides) = M.fromList $ map slideId slides `zip` [1..] @@ -318,6 +440,40 @@ presentationToArchive opts meta pres = do Nothing -> toArchive . BL.fromStrict <$> P.readDataFile "reference.pptx" + let (referenceLayouts, defaultReferenceLayouts) = + (getLayoutsFromArchive refArchive, getLayoutsFromArchive distArchive) + let layoutTitles = SlideLayouts { metadata = "Title Slide" :: Text + , title = "Section Header" + , content = "Title and Content" + , twoColumn = "Two Content" + } + layouts <- for layoutTitles $ \layoutTitle -> do + let layout = M.lookup (CI.mk layoutTitle) referenceLayouts + let defaultLayout = M.lookup (CI.mk layoutTitle) defaultReferenceLayouts + case (layout, defaultLayout) of + (Nothing, Nothing) -> + throwError (PandocSomeError ("Couldn't find layout named \"" + <> layoutTitle <> "\" in the provided " + <> "reference doc or in the default " + <> "reference doc included with pandoc.")) + (Nothing, Just ((element, path, entry) :| _)) -> do + P.logOutput (TemplateWarning ("Couldn't find layout named \"" + <> layoutTitle <> "\" in provided " + <> "reference doc. Falling back to " + <> "the default included with pandoc.")) + pure SlideLayout { slElement = element + , slPath = path + , slEntry = entry + , slInReferenceDoc = False + } + (Just ((element, path, entry) :| _), _ ) -> + pure SlideLayout { slElement = element + , slPath = path + , slEntry = entry + , slInReferenceDoc = True + } + + utctime <- P.getTimestamp presSize <- case getPresentationSize refArchive distArchive of @@ -341,6 +497,7 @@ presentationToArchive opts meta pres = do , envPresentationSize = presSize , envSlideIdMap = makeSlideIdMap pres , envSpeakerNotesIdMap = makeSpeakerNotesMap pres + , envSlideLayouts = Just layouts } let st = def { stMediaGlobalIds = initialGlobalIds refArchive distArchive @@ -348,7 +505,30 @@ presentationToArchive opts meta pres = do runP env st $ presentationToArchiveP pres - +-- | Get all slide layouts from an archive, as a map where the layout's name +-- gives the map key. +-- +-- For each layout, the map contains its XML representation, its path within +-- the archive, and the archive entry. +getLayoutsFromArchive :: Archive -> M.Map (CI Text) (NonEmpty (Element, FilePath, Entry)) +getLayoutsFromArchive archive = + M.fromListWith (<>) ((\t@(e, _, _) -> (CI.mk (name e), pure t)) <$> layouts) + where + layouts :: [(Element, FilePath, Entry)] + layouts = mapMaybe findElementByPath paths + parseXml' entry = case parseXMLElement (UTF8.toTextLazy (fromEntry entry)) of + Left _ -> Nothing + Right element -> Just element + findElementByPath :: FilePath -> Maybe (Element, FilePath, Entry) + findElementByPath path = do + entry <- findEntryByPath path archive + element <- parseXml' entry + pure (element, path, entry) + paths = filter (match (compile "ppt/slideLayouts/slideLayout*.xml")) (filesInArchive archive) + name element = fromMaybe "Untitled layout" $ do + let ns = elemToNameSpaces element + cSld <- findChild (elemName ns "p" "cSld") element + findAttr (QName "name" Nothing Nothing) cSld -------------------------------------------------- @@ -365,15 +545,14 @@ curSlideHasSpeakerNotes = -------------------------------------------------- getLayout :: PandocMonad m => Layout -> P m Element -getLayout layout = do - let layoutpath = case layout of - MetadataSlide{} -> "ppt/slideLayouts/slideLayout1.xml" - TitleSlide{} -> "ppt/slideLayouts/slideLayout3.xml" - ContentSlide{} -> "ppt/slideLayouts/slideLayout2.xml" - TwoColumnSlide{} -> "ppt/slideLayouts/slideLayout4.xml" - refArchive <- asks envRefArchive - distArchive <- asks envDistArchive - parseXml refArchive distArchive layoutpath +getLayout layout = getElement <$> getSlideLayouts + where + getElement = + slElement . case layout of + MetadataSlide{} -> metadata + TitleSlide{} -> title + ContentSlide{} -> content + TwoColumnSlide{} -> twoColumn shapeHasId :: NameSpaces -> T.Text -> Element -> Bool shapeHasId ns ident element @@ -604,6 +783,12 @@ getMaster = do distArchive <- asks envDistArchive parseXml refArchive distArchive "ppt/slideMasters/slideMaster1.xml" +getMasterRels :: PandocMonad m => P m Element +getMasterRels = do + refArchive <- asks envRefArchive + distArchive <- asks envDistArchive + parseXml refArchive distArchive "ppt/slideMasters/_rels/slideMaster1.xml.rels" + -- We want to get the header dimensions, so we can make sure that the -- image goes underneath it. We only use this in a content slide if it -- has a header. @@ -1606,11 +1791,13 @@ speakerNotesSlideRelElement slide = do slideToSlideRelElement :: PandocMonad m => Slide -> P m Element slideToSlideRelElement slide = do idNum <- slideNum slide - let target = case slide of - (Slide _ MetadataSlide{} _) -> "../slideLayouts/slideLayout1.xml" - (Slide _ TitleSlide{} _) -> "../slideLayouts/slideLayout3.xml" - (Slide _ ContentSlide{} _) -> "../slideLayouts/slideLayout2.xml" - (Slide _ TwoColumnSlide{} _) -> "../slideLayouts/slideLayout4.xml" + target <- flip fmap getSlideLayouts $ + T.pack . ("../slideLayouts/" <>) . takeFileName . + slPath . case slide of + (Slide _ MetadataSlide{} _) -> metadata + (Slide _ TitleSlide{} _) -> title + (Slide _ ContentSlide{} _) -> content + (Slide _ TwoColumnSlide{} _) -> twoColumn speakerNotesRels <- maybeToList <$> speakerNotesSlideRelElement slide diff --git a/test/Tests/Writers/Powerpoint.hs b/test/Tests/Writers/Powerpoint.hs index 87ebe990c..344d20238 100644 --- a/test/Tests/Writers/Powerpoint.hs +++ b/test/Tests/Writers/Powerpoint.hs @@ -7,18 +7,21 @@ import System.FilePath import Text.DocTemplates (ToContext(toVal), Context(..)) import qualified Data.Map as M import Data.Text (pack) +import Data.List (unzip4) -- templating is important enough, and can break enough things, that -- we want to run all our tests with both default formatting and a -- template. -modifyPptxName :: FilePath -> FilePath -modifyPptxName fp = - addExtension (dropExtension fp ++ "_templated") "pptx" +modifyPptxName :: FilePath -> String -> FilePath +modifyPptxName fp suffix = + addExtension (dropExtension fp ++ suffix) "pptx" -pptxTests :: String -> WriterOptions -> FilePath -> FilePath -> (TestTree, TestTree) +pptxTests :: String -> WriterOptions -> FilePath -> FilePath -> (TestTree, TestTree, TestTree, TestTree) pptxTests name opts native pptx = let referenceDoc = "pptx/reference_depth.pptx" + movedLayoutsReferenceDoc = "pptx/reference_moved_layouts.pptx" + deletedLayoutsReferenceDoc = "pptx/reference_deleted_layouts.pptx" in ( ooxmlTest writePowerpoint @@ -31,15 +34,29 @@ pptxTests name opts native pptx = name opts{writerReferenceDoc=Just referenceDoc} native - (modifyPptxName pptx) + (modifyPptxName pptx "_templated") + , ooxmlTest + writePowerpoint + name + opts{writerReferenceDoc=Just movedLayoutsReferenceDoc} + native + (modifyPptxName pptx "_moved_layouts") + , ooxmlTest + writePowerpoint + name + opts{writerReferenceDoc=Just deletedLayoutsReferenceDoc} + native + (modifyPptxName pptx "_deleted_layouts") ) -groupPptxTests :: [(TestTree, TestTree)] -> [TestTree] +groupPptxTests :: [(TestTree, TestTree, TestTree, TestTree)] -> [TestTree] groupPptxTests pairs = - let (noRefs, refs) = unzip pairs + let (noRefs, refs, movedLayouts, deletedLayouts) = unzip4 pairs in [ testGroup "Default slide formatting" noRefs , testGroup "With `--reference-doc` pptx file" refs + , testGroup "With layouts in reference doc moved" movedLayouts + , testGroup "With layouts in reference doc deleted" deletedLayouts ] diff --git a/test/pptx/code-custom_deleted_layouts.pptx b/test/pptx/code-custom_deleted_layouts.pptx new file mode 100644 index 000000000..9282e6354 Binary files /dev/null and b/test/pptx/code-custom_deleted_layouts.pptx differ diff --git a/test/pptx/code-custom_moved_layouts.pptx b/test/pptx/code-custom_moved_layouts.pptx new file mode 100644 index 000000000..a14eeb6c8 Binary files /dev/null and b/test/pptx/code-custom_moved_layouts.pptx differ diff --git a/test/pptx/code_deleted_layouts.pptx b/test/pptx/code_deleted_layouts.pptx new file mode 100644 index 000000000..0f503f553 Binary files /dev/null and b/test/pptx/code_deleted_layouts.pptx differ diff --git a/test/pptx/code_moved_layouts.pptx b/test/pptx/code_moved_layouts.pptx new file mode 100644 index 000000000..4d66b1310 Binary files /dev/null and b/test/pptx/code_moved_layouts.pptx differ diff --git a/test/pptx/document-properties-short-desc_deleted_layouts.pptx b/test/pptx/document-properties-short-desc_deleted_layouts.pptx new file mode 100644 index 000000000..e4cf6bd7b Binary files /dev/null and b/test/pptx/document-properties-short-desc_deleted_layouts.pptx differ diff --git a/test/pptx/document-properties-short-desc_moved_layouts.pptx b/test/pptx/document-properties-short-desc_moved_layouts.pptx new file mode 100644 index 000000000..8834f885f Binary files /dev/null and b/test/pptx/document-properties-short-desc_moved_layouts.pptx differ diff --git a/test/pptx/document-properties_deleted_layouts.pptx b/test/pptx/document-properties_deleted_layouts.pptx new file mode 100644 index 000000000..a00c8059d Binary files /dev/null and b/test/pptx/document-properties_deleted_layouts.pptx differ diff --git a/test/pptx/document-properties_moved_layouts.pptx b/test/pptx/document-properties_moved_layouts.pptx new file mode 100644 index 000000000..c1d2d5282 Binary files /dev/null and b/test/pptx/document-properties_moved_layouts.pptx differ diff --git a/test/pptx/endnotes_deleted_layouts.pptx b/test/pptx/endnotes_deleted_layouts.pptx new file mode 100644 index 000000000..5c69a6310 Binary files /dev/null and b/test/pptx/endnotes_deleted_layouts.pptx differ diff --git a/test/pptx/endnotes_moved_layouts.pptx b/test/pptx/endnotes_moved_layouts.pptx new file mode 100644 index 000000000..0d4c491b9 Binary files /dev/null and b/test/pptx/endnotes_moved_layouts.pptx differ diff --git a/test/pptx/endnotes_toc_deleted_layouts.pptx b/test/pptx/endnotes_toc_deleted_layouts.pptx new file mode 100644 index 000000000..46708544c Binary files /dev/null and b/test/pptx/endnotes_toc_deleted_layouts.pptx differ diff --git a/test/pptx/endnotes_toc_moved_layouts.pptx b/test/pptx/endnotes_toc_moved_layouts.pptx new file mode 100644 index 000000000..d1200bd7d Binary files /dev/null and b/test/pptx/endnotes_toc_moved_layouts.pptx differ diff --git a/test/pptx/images_deleted_layouts.pptx b/test/pptx/images_deleted_layouts.pptx new file mode 100644 index 000000000..7a38ea625 Binary files /dev/null and b/test/pptx/images_deleted_layouts.pptx differ diff --git a/test/pptx/images_moved_layouts.pptx b/test/pptx/images_moved_layouts.pptx new file mode 100644 index 000000000..08d1c27e0 Binary files /dev/null and b/test/pptx/images_moved_layouts.pptx differ diff --git a/test/pptx/inline_formatting_deleted_layouts.pptx b/test/pptx/inline_formatting_deleted_layouts.pptx new file mode 100644 index 000000000..bbd5bfeb4 Binary files /dev/null and b/test/pptx/inline_formatting_deleted_layouts.pptx differ diff --git a/test/pptx/inline_formatting_moved_layouts.pptx b/test/pptx/inline_formatting_moved_layouts.pptx new file mode 100644 index 000000000..427492130 Binary files /dev/null and b/test/pptx/inline_formatting_moved_layouts.pptx differ diff --git a/test/pptx/lists_deleted_layouts.pptx b/test/pptx/lists_deleted_layouts.pptx new file mode 100644 index 000000000..6512e44bb Binary files /dev/null and b/test/pptx/lists_deleted_layouts.pptx differ diff --git a/test/pptx/lists_moved_layouts.pptx b/test/pptx/lists_moved_layouts.pptx new file mode 100644 index 000000000..2947c3211 Binary files /dev/null and b/test/pptx/lists_moved_layouts.pptx differ diff --git a/test/pptx/raw_ooxml_deleted_layouts.pptx b/test/pptx/raw_ooxml_deleted_layouts.pptx new file mode 100644 index 000000000..2ea155657 Binary files /dev/null and b/test/pptx/raw_ooxml_deleted_layouts.pptx differ diff --git a/test/pptx/raw_ooxml_moved_layouts.pptx b/test/pptx/raw_ooxml_moved_layouts.pptx new file mode 100644 index 000000000..e58304172 Binary files /dev/null and b/test/pptx/raw_ooxml_moved_layouts.pptx differ diff --git a/test/pptx/reference_deleted_layouts.pptx b/test/pptx/reference_deleted_layouts.pptx new file mode 100644 index 000000000..a9a74ecd5 Binary files /dev/null and b/test/pptx/reference_deleted_layouts.pptx differ diff --git a/test/pptx/reference_moved_layouts.pptx b/test/pptx/reference_moved_layouts.pptx new file mode 100644 index 000000000..72c4f3fd7 Binary files /dev/null and b/test/pptx/reference_moved_layouts.pptx differ diff --git a/test/pptx/remove_empty_slides_deleted_layouts.pptx b/test/pptx/remove_empty_slides_deleted_layouts.pptx new file mode 100644 index 000000000..7ae4a5fab Binary files /dev/null and b/test/pptx/remove_empty_slides_deleted_layouts.pptx differ diff --git a/test/pptx/remove_empty_slides_moved_layouts.pptx b/test/pptx/remove_empty_slides_moved_layouts.pptx new file mode 100644 index 000000000..2572f2447 Binary files /dev/null and b/test/pptx/remove_empty_slides_moved_layouts.pptx differ diff --git a/test/pptx/slide_breaks_deleted_layouts.pptx b/test/pptx/slide_breaks_deleted_layouts.pptx new file mode 100644 index 000000000..86dfad3b2 Binary files /dev/null and b/test/pptx/slide_breaks_deleted_layouts.pptx differ diff --git a/test/pptx/slide_breaks_moved_layouts.pptx b/test/pptx/slide_breaks_moved_layouts.pptx new file mode 100644 index 000000000..90b3b94a6 Binary files /dev/null and b/test/pptx/slide_breaks_moved_layouts.pptx differ diff --git a/test/pptx/slide_breaks_slide_level_1_deleted_layouts.pptx b/test/pptx/slide_breaks_slide_level_1_deleted_layouts.pptx new file mode 100644 index 000000000..2c7fd4d8b Binary files /dev/null and b/test/pptx/slide_breaks_slide_level_1_deleted_layouts.pptx differ diff --git a/test/pptx/slide_breaks_slide_level_1_moved_layouts.pptx b/test/pptx/slide_breaks_slide_level_1_moved_layouts.pptx new file mode 100644 index 000000000..8471b1d10 Binary files /dev/null and b/test/pptx/slide_breaks_slide_level_1_moved_layouts.pptx differ diff --git a/test/pptx/slide_breaks_toc_deleted_layouts.pptx b/test/pptx/slide_breaks_toc_deleted_layouts.pptx new file mode 100644 index 000000000..1e0b76d46 Binary files /dev/null and b/test/pptx/slide_breaks_toc_deleted_layouts.pptx differ diff --git a/test/pptx/slide_breaks_toc_moved_layouts.pptx b/test/pptx/slide_breaks_toc_moved_layouts.pptx new file mode 100644 index 000000000..918264bc5 Binary files /dev/null and b/test/pptx/slide_breaks_toc_moved_layouts.pptx differ diff --git a/test/pptx/speaker_notes_after_metadata_deleted_layouts.pptx b/test/pptx/speaker_notes_after_metadata_deleted_layouts.pptx new file mode 100644 index 000000000..1298870e2 Binary files /dev/null and b/test/pptx/speaker_notes_after_metadata_deleted_layouts.pptx differ diff --git a/test/pptx/speaker_notes_after_metadata_moved_layouts.pptx b/test/pptx/speaker_notes_after_metadata_moved_layouts.pptx new file mode 100644 index 000000000..b844a0b51 Binary files /dev/null and b/test/pptx/speaker_notes_after_metadata_moved_layouts.pptx differ diff --git a/test/pptx/speaker_notes_afterheader_deleted_layouts.pptx b/test/pptx/speaker_notes_afterheader_deleted_layouts.pptx new file mode 100644 index 000000000..853b918cb Binary files /dev/null and b/test/pptx/speaker_notes_afterheader_deleted_layouts.pptx differ diff --git a/test/pptx/speaker_notes_afterheader_moved_layouts.pptx b/test/pptx/speaker_notes_afterheader_moved_layouts.pptx new file mode 100644 index 000000000..9fff9f855 Binary files /dev/null and b/test/pptx/speaker_notes_afterheader_moved_layouts.pptx differ diff --git a/test/pptx/speaker_notes_afterseps_deleted_layouts.pptx b/test/pptx/speaker_notes_afterseps_deleted_layouts.pptx new file mode 100644 index 000000000..1e7f4968d Binary files /dev/null and b/test/pptx/speaker_notes_afterseps_deleted_layouts.pptx differ diff --git a/test/pptx/speaker_notes_afterseps_moved_layouts.pptx b/test/pptx/speaker_notes_afterseps_moved_layouts.pptx new file mode 100644 index 000000000..e092ae444 Binary files /dev/null and b/test/pptx/speaker_notes_afterseps_moved_layouts.pptx differ diff --git a/test/pptx/speaker_notes_deleted_layouts.pptx b/test/pptx/speaker_notes_deleted_layouts.pptx new file mode 100644 index 000000000..6a5ad524f Binary files /dev/null and b/test/pptx/speaker_notes_deleted_layouts.pptx differ diff --git a/test/pptx/speaker_notes_moved_layouts.pptx b/test/pptx/speaker_notes_moved_layouts.pptx new file mode 100644 index 000000000..f95df9622 Binary files /dev/null and b/test/pptx/speaker_notes_moved_layouts.pptx differ diff --git a/test/pptx/start_numbering_at_deleted_layouts.pptx b/test/pptx/start_numbering_at_deleted_layouts.pptx new file mode 100644 index 000000000..d9cf91804 Binary files /dev/null and b/test/pptx/start_numbering_at_deleted_layouts.pptx differ diff --git a/test/pptx/start_numbering_at_moved_layouts.pptx b/test/pptx/start_numbering_at_moved_layouts.pptx new file mode 100644 index 000000000..e1b2d4de8 Binary files /dev/null and b/test/pptx/start_numbering_at_moved_layouts.pptx differ diff --git a/test/pptx/tables_deleted_layouts.pptx b/test/pptx/tables_deleted_layouts.pptx new file mode 100644 index 000000000..a52222551 Binary files /dev/null and b/test/pptx/tables_deleted_layouts.pptx differ diff --git a/test/pptx/tables_moved_layouts.pptx b/test/pptx/tables_moved_layouts.pptx new file mode 100644 index 000000000..56608a039 Binary files /dev/null and b/test/pptx/tables_moved_layouts.pptx differ diff --git a/test/pptx/two_column_deleted_layouts.pptx b/test/pptx/two_column_deleted_layouts.pptx new file mode 100644 index 000000000..60a244f94 Binary files /dev/null and b/test/pptx/two_column_deleted_layouts.pptx differ diff --git a/test/pptx/two_column_moved_layouts.pptx b/test/pptx/two_column_moved_layouts.pptx new file mode 100644 index 000000000..a17f96b18 Binary files /dev/null and b/test/pptx/two_column_moved_layouts.pptx differ -- cgit v1.2.3 From 4c6af94f1c1f9977aa3bcd683cef940bb9caddd0 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Tue, 17 Aug 2021 14:30:17 -0700 Subject: Use released citeproc 0.5. --- cabal.project | 4 ---- pandoc.cabal | 2 +- stack.yaml | 4 +--- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/cabal.project b/cabal.project index 401992868..26373c616 100644 --- a/cabal.project +++ b/cabal.project @@ -2,7 +2,3 @@ packages: pandoc.cabal tests: True flags: +embed_data_files -source-repository-package - type: git - location: https://github.com/jgm/citeproc.git - tag: 8d03cb722fac3ea8f17f432ac20abe35361df551 diff --git a/pandoc.cabal b/pandoc.cabal index f4a173f59..fb7da0a05 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -452,7 +452,7 @@ library blaze-markup >= 0.8 && < 0.9, bytestring >= 0.9 && < 0.12, case-insensitive >= 1.2 && < 1.3, - citeproc >= 0.4.1 && < 0.4.2, + citeproc >= 0.5 && < 0.6, commonmark >= 0.2.1 && < 0.3, commonmark-extensions >= 0.2.1.2 && < 0.3, commonmark-pandoc >= 0.2.1.1 && < 0.3, diff --git a/stack.yaml b/stack.yaml index ce58cf732..a8df254d7 100644 --- a/stack.yaml +++ b/stack.yaml @@ -13,9 +13,7 @@ extra-deps: - skylighting-0.11 - doctemplates-0.10 - texmath-0.12.3.1 -# - citeproc-0.4.1 -- git: https://github.com/jgm/citeproc.git - commit: 8d03cb722fac3ea8f17f432ac20abe35361df551 +- citeproc-0.5 ghc-options: "$locals": -fhide-source-paths -Wno-missing-home-modules resolver: lts-18.0 -- cgit v1.2.3 From 8451bce6ded6b9150f5ab8ae824d99ce1919dfa9 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Tue, 17 Aug 2021 15:12:23 -0700 Subject: Rename TemplateWarning -> PowerpointTemplateWarning. @undergroundquizscene - I think TemplateWarning is apt to be confusing, since this actually doesn't have anything to do with what we call 'templates' in pandoc. Hence the change to a powerpoint-specific name. --- src/Text/Pandoc/Logging.hs | 10 +++++----- src/Text/Pandoc/Writers/Powerpoint/Output.hs | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/Text/Pandoc/Logging.hs b/src/Text/Pandoc/Logging.hs index a5c227770..c49726040 100644 --- a/src/Text/Pandoc/Logging.hs +++ b/src/Text/Pandoc/Logging.hs @@ -76,7 +76,7 @@ data LogMessage = | InlineNotRendered Inline | BlockNotRendered Block | DocxParserWarning Text - | TemplateWarning Text + | PowerpointTemplateWarning Text | IgnoredIOError Text | CouldNotFetchResource Text Text | CouldNotDetermineImageSize Text Text @@ -175,7 +175,7 @@ instance ToJSON LogMessage where ["contents" .= toJSON bl] DocxParserWarning s -> ["contents" .= s] - TemplateWarning s -> + PowerpointTemplateWarning s -> ["contents" .= s] IgnoredIOError s -> ["contents" .= s] @@ -294,8 +294,8 @@ showLogMessage msg = "Not rendering " <> Text.pack (show bl) DocxParserWarning s -> "Docx parser warning: " <> s - TemplateWarning s -> - "Pptx parser warning: " <> s + PowerpointTemplateWarning s -> + "Powerpoint template warning: " <> s IgnoredIOError s -> "IO Error (ignored): " <> s CouldNotFetchResource fp s -> @@ -391,7 +391,7 @@ messageVerbosity msg = InlineNotRendered{} -> INFO BlockNotRendered{} -> INFO DocxParserWarning{} -> INFO - TemplateWarning{} -> WARNING + PowerpointTemplateWarning{} -> WARNING IgnoredIOError{} -> WARNING CouldNotFetchResource{} -> WARNING CouldNotDetermineImageSize{} -> WARNING diff --git a/src/Text/Pandoc/Writers/Powerpoint/Output.hs b/src/Text/Pandoc/Writers/Powerpoint/Output.hs index a757516a8..feb1c08f5 100644 --- a/src/Text/Pandoc/Writers/Powerpoint/Output.hs +++ b/src/Text/Pandoc/Writers/Powerpoint/Output.hs @@ -457,7 +457,8 @@ presentationToArchive opts meta pres = do <> "reference doc or in the default " <> "reference doc included with pandoc.")) (Nothing, Just ((element, path, entry) :| _)) -> do - P.logOutput (TemplateWarning ("Couldn't find layout named \"" + P.logOutput (PowerpointTemplateWarning + ("Couldn't find layout named \"" <> layoutTitle <> "\" in provided " <> "reference doc. Falling back to " <> "the default included with pandoc.")) -- cgit v1.2.3 From 2e9a8935fb7e27969f7bd878899382b63cac0b3a Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Tue, 17 Aug 2021 15:33:10 -0700 Subject: OOXML tests: silence warnings. These can make the test output confusing, making people think tests are failing when they're passing. --- test/Tests/Writers/OOXML.hs | 1 + 1 file changed, 1 insertion(+) diff --git a/test/Tests/Writers/OOXML.hs b/test/Tests/Writers/OOXML.hs index 56a27a4b8..f2957f7a6 100644 --- a/test/Tests/Writers/OOXML.hs +++ b/test/Tests/Writers/OOXML.hs @@ -84,6 +84,7 @@ testArchive writerFn opts fp = do txt <- T.readFile fp bs <- runIOorExplode $ do setTranslations "en-US" + setVerbosity ERROR -- otherwise test output is confusingly noisy readNative def txt >>= writerFn opts return $ toArchive bs -- cgit v1.2.3 From 10dfd81000160f2b48bf9fe47ce4e6441bc1db52 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Tue, 17 Aug 2021 15:33:49 -0700 Subject: Document new link-bibliography metadata field. This affects whether hyperlinks are added to the bibliography by citeproc. --- MANUAL.txt | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/MANUAL.txt b/MANUAL.txt index 0b1424d47..877021cd8 100644 --- a/MANUAL.txt +++ b/MANUAL.txt @@ -5655,9 +5655,16 @@ or BibLaTeX (for `--biblatex`) format. A few other metadata fields affect bibliography formatting: `link-citations` -: If true, citations will be - hyperlinked to the corresponding bibliography entries - (for author-date and numerical styles only). +: If true, citations will be hyperlinked to the + corresponding bibliography entries (for author-date and + numerical styles only). Defaults to false. + +`link-bibliography` +: If true, DOIs, PMCIDs, PMID, and URLs in bibliographies will + be rendered as hyperlinks. (If an entry contains a DOI, PMCID, + PMID, or URL, but none of these fields are rendered by the style, + then the title, or in the absence of a title the whole entry, will + be hyperlinked.) Defaults to true. `lang` : The `lang` field will affect how the style is localized, -- cgit v1.2.3 From fd99fe4d7ee5459d32505ef14f4453839cfcefab Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Tue, 17 Aug 2021 15:34:23 -0700 Subject: Revise citeproc code to fit new citeproc 0.5 API. Linkification of URLs in the bibliography is now done in the citeproc library, depending on the setting of an option. We set that option depending on the value of the metadata field `link-bibliography` (defaulting to true, for consistency with earlier behavior, though the new behavior includes the CSL draft recommendation of hyperlinking the title or the whole entry if a DOI, PMID, PMCID, or URL field is present but not explicitly rendered). These changes implement the following recommendations from the draft CSL v1.0.2 spec (Appendix VI): > The CSL syntax does not have support for configuration of links. > However, processors should include links on bibliographic references, > using the following rules: > If the bibliography entry for an item renders any of the following > identifiers, the identifier should be anchored as a link, with the > target of the link as follows: > - url: output as is > - doi: prepend with "`https://doi.org/`" > - pmid: prepend with "`https://www.ncbi.nlm.nih.gov/pubmed/`" > - pmcid: prepend with "`https://www.ncbi.nlm.nih.gov/pmc/articles/`" > If the identifier is rendered as a URI, include rendered URI components > (e.g. "`https://doi.org/`") in the link anchor. Do not include any other > affix text in the link anchor (e.g. "Available from: ", "doi: ", "PMID: "). > If the bibliography entry for an item does not render any of > the above identifiers, then set the anchor of the link as the item > title. If title is not rendered, then set the anchor of the link as the > full bibliography entry for the item. Set the target of the link as one > of the following, in order of priority: > > - doi: prepend with "`https://doi.org/`" > - pmcid: prepend with "`https://www.ncbi.nlm.nih.gov/pmc/articles/`" > - pmid: prepend with "`https://www.ncbi.nlm.nih.gov/pubmed/`" > - url: output as is > > If the item data does not include any of the above identifiers, do not > include a link. > > Citation processors should include an option flag for calling > applications to disable bibliography linking behavior. Thanks to Benjamin Bray for getting this all working. --- src/Text/Pandoc/Citeproc.hs | 43 ++++------------------------ src/Text/Pandoc/Citeproc/CslJson.hs | 1 + src/Text/Pandoc/Writers/Powerpoint/Output.hs | 12 ++++---- test/command/pandoc-citeproc-31.md | 5 ++-- test/command/pandoc-citeproc-327.md | 4 +-- test/command/pandoc-citeproc-338.md | 3 +- test/command/pandoc-citeproc-386.md | 4 +-- 7 files changed, 21 insertions(+), 51 deletions(-) diff --git a/src/Text/Pandoc/Citeproc.hs b/src/Text/Pandoc/Citeproc.hs index 39760776d..9a649402e 100644 --- a/src/Text/Pandoc/Citeproc.hs +++ b/src/Text/Pandoc/Citeproc.hs @@ -73,7 +73,9 @@ processCitations (Pandoc meta bs) = do let linkCites = maybe False truish $ lookupMeta "link-citations" meta - let opts = defaultCiteprocOptions{ linkCitations = linkCites } + let linkBib = maybe True truish $ lookupMeta "link-bibliography" meta + let opts = defaultCiteprocOptions{ linkCitations = linkCites + , linkBibliography = linkBib } let result = Citeproc.citeproc opts style mblang refs citations mapM_ (report . CiteprocWarning) (resultWarnings result) let sopts = styleOptions style @@ -105,8 +107,7 @@ processCitations (Pandoc meta bs) = do $ cits return $ walk removeQuoteSpan $ Pandoc meta'' - $ insertRefs refkvs classes meta'' - (walk fixLinks $ B.toList bibs) bs' + $ insertRefs refkvs classes meta'' (B.toList bibs) bs' removeQuoteSpan :: Inline -> Inline removeQuoteSpan (Span ("",["csl-quoted"],[]) xs) = Span nullAttr xs @@ -210,7 +211,7 @@ getReferences mblocale (Pandoc meta bs) = do Nothing -> return [] let addQuoteSpan (Quoted _ xs) = Span ("",["csl-quoted"],[]) xs addQuoteSpan x = x - return $ map (linkifyVariables . legacyDateRanges . walk addQuoteSpan) + return $ map (legacyDateRanges . walk addQuoteSpan) (externalRefs ++ inlineRefs) -- note that inlineRefs can override externalRefs @@ -278,7 +279,7 @@ insertResolvedCitations (Cite cs ils) = do [] -> return (Cite cs ils) (x:xs) -> do put xs - return $ Cite cs (walk fixLinks $ B.toList x) + return $ Cite cs (B.toList x) insertResolvedCitations x = return x getCitations :: Locale @@ -419,15 +420,6 @@ mvPunct moveNotes locale (Cite cs ils : Str "." : ys) mvPunct moveNotes locale (x:xs) = x : mvPunct moveNotes locale xs mvPunct _ _ [] = [] --- move https://doi.org etc. prefix inside link text (#6723): -fixLinks :: [Inline] -> [Inline] -fixLinks (Str t : Link attr [Str u1] (u2,tit) : xs) - | u2 == t <> u1 - = Link attr [Str (t <> u1)] (u2,tit) : fixLinks xs -fixLinks (x:xs) = x : fixLinks xs -fixLinks [] = [] - - endWithPunct :: Bool -> [Inline] -> Bool endWithPunct _ [] = False endWithPunct onlyFinal xs@(_:_) = @@ -523,29 +515,6 @@ legacyDateRanges ref = _ -> DateVal d go x = x -linkifyVariables :: Reference Inlines -> Reference Inlines -linkifyVariables ref = - ref{ referenceVariables = M.mapWithKey go $ referenceVariables ref } - where - go "URL" x = tolink "https://" x - go "DOI" x = tolink "https://doi.org/" (fixShortDOI x) - go "ISBN" x = tolink "https://worldcat.org/isbn/" x - go "PMID" x = tolink "https://www.ncbi.nlm.nih.gov/pubmed/" x - go "PMCID" x = tolink "https://www.ncbi.nlm.nih.gov/pmc/articles/" x - go _ x = x - fixShortDOI x = let x' = extractText x - in if "10/" `T.isPrefixOf` x' - then TextVal $ T.drop 3 x' - -- see https://shortdoi.org - else TextVal x' - tolink pref x = let x' = extractText x - x'' = if "://" `T.isInfixOf` x' - then x' - else pref <> x' - in if T.null x' - then x - else FancyVal (B.link x'' "" (B.str x')) - extractText :: Val Inlines -> Text extractText (TextVal x) = x extractText (FancyVal x) = toText x diff --git a/src/Text/Pandoc/Citeproc/CslJson.hs b/src/Text/Pandoc/Citeproc/CslJson.hs index 862af5188..43c1a87ec 100644 --- a/src/Text/Pandoc/Citeproc/CslJson.hs +++ b/src/Text/Pandoc/Citeproc/CslJson.hs @@ -28,6 +28,7 @@ fromCslJson (CslSub x) = B.subscript (fromCslJson x) fromCslJson (CslSup x) = B.superscript (fromCslJson x) fromCslJson (CslNoCase x) = B.spanWith ("",["nocase"],[]) (fromCslJson x) fromCslJson (CslDiv t x) = B.spanWith ("",["csl-" <> t],[]) (fromCslJson x) +fromCslJson (CslLink u x) = B.link u "" (fromCslJson x) cslJsonToReferences :: ByteString -> Either String [Reference Inlines] cslJsonToReferences raw = diff --git a/src/Text/Pandoc/Writers/Powerpoint/Output.hs b/src/Text/Pandoc/Writers/Powerpoint/Output.hs index feb1c08f5..e0eb72161 100644 --- a/src/Text/Pandoc/Writers/Powerpoint/Output.hs +++ b/src/Text/Pandoc/Writers/Powerpoint/Output.hs @@ -54,7 +54,7 @@ import System.FilePath.Glob import Text.DocTemplates (FromContext(lookupContext), Context) import Text.DocLayout (literal) import Text.TeXMath -import Text.Pandoc.Logging (LogMessage(TemplateWarning)) +import Text.Pandoc.Logging (LogMessage(PowerpointTemplateWarning)) import Text.Pandoc.Writers.Math (convertMath) import Text.Pandoc.Writers.Powerpoint.Presentation import Text.Pandoc.Shared (tshow, stringify) @@ -457,11 +457,11 @@ presentationToArchive opts meta pres = do <> "reference doc or in the default " <> "reference doc included with pandoc.")) (Nothing, Just ((element, path, entry) :| _)) -> do - P.logOutput (PowerpointTemplateWarning - ("Couldn't find layout named \"" - <> layoutTitle <> "\" in provided " - <> "reference doc. Falling back to " - <> "the default included with pandoc.")) + P.report (PowerpointTemplateWarning + ("Couldn't find layout named \"" + <> layoutTitle <> "\" in provided " + <> "reference doc. Falling back to " + <> "the default included with pandoc.")) pure SlideLayout { slElement = element , slPath = path , slEntry = entry diff --git a/test/command/pandoc-citeproc-31.md b/test/command/pandoc-citeproc-31.md index a06b2ae41..91aaa8f0b 100644 --- a/test/command/pandoc-citeproc-31.md +++ b/test/command/pandoc-citeproc-31.md @@ -29,8 +29,9 @@ Foo.[^1] Bar.[^2] Baz.[^3] ::: {#refs .references .csl-bib-body} ::: {#ref-item1 .csl-entry} -Olson HA, 'Codes, Costs, and Critiques: The Organization of Information -in *Library Quarterly*, 1931--2004' (2006) 76 *Library Quarterly* 19 +Olson HA, '[Codes, Costs, and Critiques: The Organization of Information +in *Library Quarterly*, 1931--2004](https://doi.org/10.1086/504343)' +(2006) 76 *Library Quarterly* 19 ::: ::: {#ref-item2 .csl-entry} diff --git a/test/command/pandoc-citeproc-327.md b/test/command/pandoc-citeproc-327.md index 92b29bdf8..5cfd59576 100644 --- a/test/command/pandoc-citeproc-327.md +++ b/test/command/pandoc-citeproc-327.md @@ -44,8 +44,8 @@ I referenced something here^\[1\]^ ::: {#refs .references .csl-bib-body} ::: {#ref-LiLiaoDongWanHaiYuDiQiDongWuCiJiShengChanLiYanJiuJiShengJingGuaYiXingPingJie2017 .csl-entry} [\[1\] ]{.csl-left-margin}[李轶平, 于旭光, 孙明, 等. -辽东湾海域底栖动物次级生产力研究及生境适宜性评价\[J\]. 水产科学, -2017(06): 728--734.]{.csl-right-inline} +[辽东湾海域底栖动物次级生产力研究及生境适宜性评价](http://kns.cnki.net/kns/detail/detail.aspx?QueryID=4&CurRec=4&recid=&FileName=CHAN201706006&DbName=CJFDLAST2018&DbCode=CJFQ&yx=Y&pr=&URLID=21.1110.S.20171129.1725.006)\[J\]. +水产科学, 2017(06): 728--734.]{.csl-right-inline} ::: ::: ``` diff --git a/test/command/pandoc-citeproc-338.md b/test/command/pandoc-citeproc-338.md index 3250b680e..c9cf0d254 100644 --- a/test/command/pandoc-citeproc-338.md +++ b/test/command/pandoc-citeproc-338.md @@ -28,8 +28,7 @@ references: ::: {#ref-item-1 .csl-entry} [Wolfinger, Christine]{.smallcaps}: *Keine Angst vor Linux, Unix: ein Lehrbuch für Linux- und Unix-Anwender*. 11., vollst. überarb. Aufl. -Aufl. Berlin \[u.a.\] : Springer Vieweg, 2013 ---- ISBN [978-3-642-32078-1](https://worldcat.org/isbn/978-3-642-32078-1) +Aufl. Berlin \[u.a.\] : Springer Vieweg, 2013 --- ISBN 978-3-642-32078-1 ::: ::: ``` diff --git a/test/command/pandoc-citeproc-386.md b/test/command/pandoc-citeproc-386.md index 6f346e7db..ae709fc34 100644 --- a/test/command/pandoc-citeproc-386.md +++ b/test/command/pandoc-citeproc-386.md @@ -28,8 +28,8 @@ references: ::: {#refs .references .csl-bib-body line-spacing="2"} ::: {#ref-ding_metallic_2012 .csl-entry} -[\[1\] ]{.csl-left-margin}[K. Ding, C. Z. Ning, *Light Sci. Appl.* -**2012**, *1*, e20.]{.csl-right-inline} +[[\[1\]K. Ding, C. Z. Ning, *Light Sci. Appl.* **2012**, *1*, +e20](https://doi.org/10.1038/lsa.2012.20)]{.csl-left-margin}. ::: ::: ``` -- cgit v1.2.3 From 5616d00d09d3a940364befd380dde328c6ac1a08 Mon Sep 17 00:00:00 2001 From: Emily Bourke Date: Wed, 18 Aug 2021 10:13:54 +0100 Subject: pptx: Include image title in description The image title (i.e. `![alt text](link "title")`) was previously ignored when writing to pptx. This commit includes it in PowerPoint's description of the image, along with the link (which was already included). Fixes 7352. --- src/Text/Pandoc/Writers/Powerpoint/Output.hs | 13 +++++++++---- src/Text/Pandoc/Writers/Powerpoint/Presentation.hs | 18 ++++++++++-------- test/pptx/images.pptx | Bin 44579 -> 44596 bytes test/pptx/images_deleted_layouts.pptx | Bin 47424 -> 47437 bytes test/pptx/images_moved_layouts.pptx | Bin 58213 -> 58160 bytes test/pptx/images_templated.pptx | Bin 57729 -> 57660 bytes test/pptx/speaker_notes_afterseps.pptx | Bin 51548 -> 51557 bytes .../speaker_notes_afterseps_deleted_layouts.pptx | Bin 54390 -> 54396 bytes .../pptx/speaker_notes_afterseps_moved_layouts.pptx | Bin 65181 -> 65121 bytes test/pptx/speaker_notes_afterseps_templated.pptx | Bin 64695 -> 64619 bytes 10 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/Text/Pandoc/Writers/Powerpoint/Output.hs b/src/Text/Pandoc/Writers/Powerpoint/Output.hs index e0eb72161..0e6a67861 100644 --- a/src/Text/Pandoc/Writers/Powerpoint/Output.hs +++ b/src/Text/Pandoc/Writers/Powerpoint/Output.hs @@ -872,9 +872,10 @@ makePicElements :: PandocMonad m => Element -> PicProps -> MediaInfo + -> Text -> [ParaElem] -> P m [Element] -makePicElements layout picProps mInfo alt = do +makePicElements layout picProps mInfo titleText alt = do opts <- asks envOpts (pageWidth, pageHeight) <- asks envPresentationSize -- hasHeader <- asks envSlideHasHeader @@ -907,7 +908,11 @@ makePicElements layout picProps mInfo alt = do ,("noChangeAspect","1")] () -- cNvPr will contain the link information so we do that separately, -- and register the link if necessary. - let cNvPrAttr = [("descr", T.pack $ mInfoFilePath mInfo), + let description = (if T.null titleText + then "" + else titleText <> "\n\n") + <> T.pack (mInfoFilePath mInfo) + let cNvPrAttr = [("descr", description), ("id","0"), ("name","Picture 1")] cNvPr <- case picPropLink picProps of @@ -1106,11 +1111,11 @@ shapeToElement layout (TextBox paras) shapeToElement _ _ = return $ mknode "p:sp" [] () shapeToElements :: PandocMonad m => Element -> Shape -> P m [Content] -shapeToElements layout (Pic picProps fp alt) = do +shapeToElements layout (Pic picProps fp titleText alt) = do mInfo <- registerMedia fp alt case mInfoExt mInfo of Just _ -> map Elem <$> - makePicElements layout picProps mInfo alt + makePicElements layout picProps mInfo titleText alt Nothing -> shapeToElements layout $ TextBox [Paragraph def alt] shapeToElements layout (GraphicFrame tbls cptn) = map Elem <$> graphicFrameToElements layout tbls cptn diff --git a/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs b/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs index 9246a93e9..0400783e3 100644 --- a/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs +++ b/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs @@ -197,7 +197,8 @@ data Layout = MetadataSlide [ParaElem] [ParaElem] [[ParaElem]] [ParaElem] -- heading left right deriving (Show, Eq) -data Shape = Pic PicProps FilePath [ParaElem] +data Shape = Pic PicProps FilePath T.Text [ParaElem] + -- title alt-text | GraphicFrame [Graphic] [ParaElem] | TextBox [Paragraph] | RawOOXMLShape T.Text @@ -525,21 +526,22 @@ rowToParagraphs algns tblCells = do mapM (uncurry cellToParagraphs) pairs withAttr :: Attr -> Shape -> Shape -withAttr attr (Pic picPr url caption) = +withAttr attr (Pic picPr url title caption) = let picPr' = picPr { picWidth = dimension Width attr , picHeight = dimension Height attr } in - Pic picPr' url caption + Pic picPr' url title caption withAttr _ sp = sp blockToShape :: Block -> Pres Shape blockToShape (Plain ils) = blockToShape (Para ils) -blockToShape (Para (il:_)) | Image attr ils (url, _) <- il = - withAttr attr . Pic def (T.unpack url) <$> inlinesToParElems ils +blockToShape (Para (il:_)) | Image attr ils (url, title) <- il = + withAttr attr . Pic def (T.unpack url) title <$> inlinesToParElems ils blockToShape (Para (il:_)) | Link _ (il':_) target <- il - , Image attr ils (url, _) <- il' = - withAttr attr . Pic def{picPropLink = Just $ ExternalTarget target} (T.unpack url) + , Image attr ils (url, title) <- il' = + withAttr attr . + Pic def{picPropLink = Just $ ExternalTarget target} (T.unpack url) title <$> inlinesToParElems ils blockToShape (Table _ blkCapt specs thead tbody tfoot) = do let (caption, algn, _, hdrCells, rows) = toLegacyTable blkCapt specs thead tbody tfoot @@ -805,7 +807,7 @@ applyToParagraph f para = do return $ para {paraElems = paraElems'} applyToShape :: Monad m => (ParaElem -> m ParaElem) -> Shape -> m Shape -applyToShape f (Pic pPr fp pes) = Pic pPr fp <$> mapM f pes +applyToShape f (Pic pPr fp title pes) = Pic pPr fp title <$> mapM f pes applyToShape f (GraphicFrame gfx pes) = GraphicFrame gfx <$> mapM f pes applyToShape f (TextBox paras) = TextBox <$> mapM (applyToParagraph f) paras applyToShape _ (RawOOXMLShape str) = return $ RawOOXMLShape str diff --git a/test/pptx/images.pptx b/test/pptx/images.pptx index 670a825de..89325e577 100644 Binary files a/test/pptx/images.pptx and b/test/pptx/images.pptx differ diff --git a/test/pptx/images_deleted_layouts.pptx b/test/pptx/images_deleted_layouts.pptx index 7a38ea625..053928863 100644 Binary files a/test/pptx/images_deleted_layouts.pptx and b/test/pptx/images_deleted_layouts.pptx differ diff --git a/test/pptx/images_moved_layouts.pptx b/test/pptx/images_moved_layouts.pptx index 08d1c27e0..7951a09f6 100644 Binary files a/test/pptx/images_moved_layouts.pptx and b/test/pptx/images_moved_layouts.pptx differ diff --git a/test/pptx/images_templated.pptx b/test/pptx/images_templated.pptx index 48ebf66d6..7c0ed9a17 100644 Binary files a/test/pptx/images_templated.pptx and b/test/pptx/images_templated.pptx differ diff --git a/test/pptx/speaker_notes_afterseps.pptx b/test/pptx/speaker_notes_afterseps.pptx index 13f564bf0..9542fe8b5 100644 Binary files a/test/pptx/speaker_notes_afterseps.pptx and b/test/pptx/speaker_notes_afterseps.pptx differ diff --git a/test/pptx/speaker_notes_afterseps_deleted_layouts.pptx b/test/pptx/speaker_notes_afterseps_deleted_layouts.pptx index 1e7f4968d..9fec1c279 100644 Binary files a/test/pptx/speaker_notes_afterseps_deleted_layouts.pptx and b/test/pptx/speaker_notes_afterseps_deleted_layouts.pptx differ diff --git a/test/pptx/speaker_notes_afterseps_moved_layouts.pptx b/test/pptx/speaker_notes_afterseps_moved_layouts.pptx index e092ae444..de697cbd8 100644 Binary files a/test/pptx/speaker_notes_afterseps_moved_layouts.pptx and b/test/pptx/speaker_notes_afterseps_moved_layouts.pptx differ diff --git a/test/pptx/speaker_notes_afterseps_templated.pptx b/test/pptx/speaker_notes_afterseps_templated.pptx index 9c22eaf38..5a3d15d57 100644 Binary files a/test/pptx/speaker_notes_afterseps_templated.pptx and b/test/pptx/speaker_notes_afterseps_templated.pptx differ -- cgit v1.2.3 From 5159d6653b0e04f03066a50794bc24195bdf81aa Mon Sep 17 00:00:00 2001 From: William Lupton Date: Thu, 19 Aug 2021 14:18:54 +0100 Subject: Clarify that each YAML block is a separate YAML document --- MANUAL.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/MANUAL.txt b/MANUAL.txt index 877021cd8..c94b69289 100644 --- a/MANUAL.txt +++ b/MANUAL.txt @@ -4179,6 +4179,10 @@ A document may contain multiple metadata blocks. If two metadata blocks attempt to set the same field, the value from the second block will be taken. +Each metadata block is handled internally as an independent YAML document. +This means, for example, that any YAML anchors defined in a block cannot be +referenced in another block. + When pandoc is used with `-t markdown` to create a Markdown document, a YAML metadata block will be produced only if the `-s/--standalone` option is used. All of the metadata will appear in a single block -- cgit v1.2.3 From ef4efa5373a419edbb99355808ddc63d35ddef20 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Thu, 19 Aug 2021 10:49:20 -0700 Subject: Improve docx reader's robustness in extracting images. The docx reader made a couple assumptions about how docx containers were laid out that were not always true, with the result that some images in documents did not get found/extracted. Closes #7511. --- src/Text/Pandoc/Readers/Docx/Parse.hs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Text/Pandoc/Readers/Docx/Parse.hs b/src/Text/Pandoc/Readers/Docx/Parse.hs index dbb16a821..eb048ab14 100644 --- a/src/Text/Pandoc/Readers/Docx/Parse.hs +++ b/src/Text/Pandoc/Readers/Docx/Parse.hs @@ -507,9 +507,7 @@ archiveToRelationships archive docXmlPath = filePathIsMedia :: FilePath -> Bool filePathIsMedia fp = - let (dir, _) = splitFileName fp - in - (dir == "word/media/") + "media" `elem` splitPath (takeDirectory fp) lookupLevel :: T.Text -> T.Text -> Numbering -> Maybe Level lookupLevel numId ilvl (Numbering _ numbs absNumbs) = do @@ -774,8 +772,11 @@ expandDrawingId s = do target <- asks (fmap T.unpack . lookupRelationship location s . envRelationships) case target of Just filepath -> do - bytes <- asks (lookup ("word/" ++ filepath) . envMedia) - case bytes of + media <- asks envMedia + let filepath' = case filepath of + ('/':rest) -> rest + _ -> "word/" ++ filepath + case lookup filepath' media of Just bs -> return (filepath, bs) Nothing -> throwError DocxError Nothing -> throwError DocxError -- cgit v1.2.3 From 9879953a4f385be65c0c64d02cd281a4ad676d0d Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Thu, 19 Aug 2021 22:59:55 -0700 Subject: Update changelog and AUTHORS. --- AUTHORS.md | 6 +++ changelog.md | 171 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 177 insertions(+) diff --git a/AUTHORS.md b/AUTHORS.md index 0ed8e62a3..3c1cfa393 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -33,6 +33,7 @@ - Ben Gamari - Ben Steinberg - Beni Cherniavsky-Paskin +- Benjamin Bray - Benoit Schweblin - Bjorn Buckwalter - Blake Eryx @@ -212,6 +213,7 @@ - Nils Carlson - Nixon Enraght-Moony - Nokome Bentley +- OCzarnecki - Ole Martin Ruud - Oliver Matthews - Ophir Lifshitz @@ -224,6 +226,7 @@ - Paul Rivier - Paulo Tanimoto - Pete Ryland +- Peter Fabinksi - Peter Wang - Philip Pesca - Philippe Ombredanne @@ -272,12 +275,14 @@ - Vaibhav Sagar - Vanessa McHale - Vasily Alferov +- Veratyr - Viktor Kronvall - Vincent - Vlad Hanciuta - Wandmalfarbe - Waldir Pimenta - Wikiwide +- William Lupton - Winnie Hellmann - Xavier Olive - Yan Pashkovsky @@ -304,6 +309,7 @@ - lux-lth - lwolfsonkin - mbrackeantidot +- mt_caret - nkalvi - niszet - nuew diff --git a/changelog.md b/changelog.md index 2dfaa9618..9171fe63b 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,176 @@ # Revision history for pandoc +## pandoc 2.14.2 (provisional) + + * Allow `--slide-level=0` (#7476). When the slide level is set + to 0, headings won't be used at all in splitting the document + into slides. Horizontal rules must be used to separate slides. + + * Add RTF reader (#3982). `rtf` is now supported as an input + format as well as an output format. New module + Text.Pandoc.Readers.RTF (exporting `readRTF`). [API change] + + * HTML reader: treat commments as blank when parsing (#7482). + + * Markdown reader: + + + Fix raw LaTeX injection issue (#7497). Using a code block + containing `\end{verbatim}`, one could inject raw TeX into a + LaTeX document even when `raw_tex` is disabled. Thanks to + Augustin Laville for noticing the bug. + + Multimarkdown sub- and superscripts (#5512, OCzarnecki). + Added an extension `short_subsuperscripts` which modifies + the behavior of `subscript` and `superscript`, allowing + subscripts or superscripts containing only alphanumerics + to end with a space character (eg. `x^2 = 4` or `H~2 is + combustible`). This improves support for multimarkdown. + + * LaTeX reader: + + + Proper implicit grouping around environment macros. + + Support `\global` before `\def`, `\let`, etc. (#7494). + + Fix scope for LaTeX macros (#7494). They should by default + scope over the group in which they are defined (except `\gdef` + and `\xdef`, which are global). In addition, environments must + be treated as groups. + + Improve handling of plain TeX macro primitives (#7474). + Fixed semantics for `\let`. + + Implement `\edef`, `\gdef`, and `\xdef`. + + * Docx reader: Improve docx reader's robustness in extracting + images (#7511). The docx reader made some assumptions about + how docx containers were laid out that were not always true, with + the result that some images in documents did not get + extracted. + + * LaTeX writer: Increase table column width precision (#7466, + Peter Fabinski). In some cases, the rounding performed by the + LaTeX table writer would introduce visible overrun outside + the text area. This adds two more decimal places to the width + values. + + * Powerpoint writer: + + + Include image title in description (#7352, Emily Bourke). The + image title (i.e. `![alt text](link "title")`) was previously + ignored when writing to pptx. This commit includes it in + PowerPoint's description of the image, along with the link. + + Select layouts from reference doc by name (Emily Bourke). Until + now, users had to make sure that their reference doc contains + layouts in a specific order: the first four layouts in the file + had to have a specific structure. Now the layout selection uses + the layout names rather than order: users must make sure their + reference doc contains four layouts with specific names, and if + a layout with the right name isn’t found pandoc will emit + a warning and use the corresponding layout from the default + reference doc as a fallback. + + * Docx writer: be sensitive to the `native_numbering` extension + (#7499). Figure and table numbers are now only included if + `native_numbering` is enabled. (By default it is disabled.) + This is a behavior change with respect to 2.14.1, but the + default behavior is now that of previous versions. The + change was necessary to avoid incompatibilities between + pandoc's native numbering and third-party cross reference + filters like pandoc-crossref. + + * RTF writer: + + + Omit `\bin` in `\pict`. According to the spec, this is not + needed or wanted when the data is in hexadecimal format, as + here. + + Emit `\outlinelevel`` for section headings. + + * RTF template: specify font family for fixed-width font f1. + According to the spec, this is mandatory. + + * LaTeX writer: Use ulem for underline (#7351). ulem is + conditionally included already when the `strikeout` variable + is set, so we set this when there is underlined text, and use + `\uline` instead of `\underline`. This fixes wrapping for + underlined text. + + * Text.Pandoc.Citeproc: + + + Revise citeproc code to fit new citeproc 0.5 API (thanks to + Benjamin Bray). Linkification of URLs in the bibliography + is now done in the citeproc library, depending on the + setting of an option. We set that option depending on the + value of the metadata field `link-bibliography` (defaulting + to true, for consistency with earlier behavior). If a DOI, + PMID, PMCID, or URL field is present but not explicitly + rendered, the title (or if no title, the whole entry) is + hyperlinked. These changes implement the recommendations + from the draft CSL v1.0.2 spec (Appendix VI): + + + Avoid odd handling of quotes. Recent citeproc changes + allow us to ignore Quoted elements; citeproc now uses its own + method for represented quoted things, and only localizes and + flipflops quotes it adds itself. Convert Quoted in bib + entries to special Spans before passing them off to + citeproc. This ensures that we get proper localization and + flipflopping if, e.g., quotes are used in titles + (jgm/citeproc#87). + + Removed quote localization from citeproc processing. + This is now done in citeproc itself. + + * Text.Pandoc.Logging: Add PowerpointTemplateWarning log message + type [API change] (Emily Bourke). + + * Text.Pandoc.Extension: Add `Ext_short_subsuperscripts` + constructor to `Extension` [API change] (OCzarnecki). + + * Various sample.lua editorial fixes (#7493, #7487, William + Lupton). + + * Bump base-compat version so we get compatibility with base 4.12. + + * Use Prelude from base-compat for ghc 8.4 too. + + * Add haskell-language-server to shell.nix (#7496, Emily Bourke). + + * Tests.Helpers: export testGolden and use it in RTF reader. + This gives a diff output on failure. + + * Remove obsolete and incorrect sentence in `--slide-level` docs. + + * Add internal module Text.Pandoc.Network.HTTP, exporting + `urlEncode`. + + * Text.Pandoc.Parsing: `parseFromString`: preserve at least + the source directory (#7464). Previously we just set the + source name to "chunk" when parsing from strings, to avoid + misleading source positions. This had the side effect that + `rebase_relative_paths` would break inside sections that + were parsed as strings. So, now we use + "ORIGINAL_SOURCE_PATH_chunk" instead of just "chunk". + + * Text.Pandoc.MIME: use image/x-xcf instead of application/x-xcf + (#7454). + + * Don’t compare `cdLine` in OOXML golden tests (Emily Bourke). + The `cdLine` field gives the line of the file some CData was + found on, which reflects irrelevant formatting differences. + + * Provide more detailed XML diff in tests (Emily Bourke). + + * OOXML tests: silence warnings. These can make the test output + confusing, making people think tests are failing when they're + passing. + + * INSTALL.md: Add GitLab CI/CD example (#7448, Veratyr). + + * MANUAL.txt clarifications (William Lupton). + + * Document use of the 'underline' class (#7492, #7484, William + Lupton). + + * Add a FAQ about the "Cannot allocate memory" error on M1 macs. + + * Use released citeproc 0.5. + + * Remove dependency on HTTP package (#7456, mt_caret). + ## pandoc 2.14.1 (2021-07-18) * Text.Pandoc.ImageSize: Add Tiff constructor for ImageType (#7405) -- cgit v1.2.3 From 07d847a9100924e3c9bec1e536e2ad2b4b57162e Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Fri, 20 Aug 2021 09:54:42 -0700 Subject: RST reader: Fix `:literal:` includes. These should create code blocks, not insert raw RST. Closes #7513. --- src/Text/Pandoc/Readers/RST.hs | 7 ++----- test/command/7436.md | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/Text/Pandoc/Readers/RST.hs b/src/Text/Pandoc/Readers/RST.hs index 3990f0cb5..ff891d3c6 100644 --- a/src/Text/Pandoc/Readers/RST.hs +++ b/src/Text/Pandoc/Readers/RST.hs @@ -466,14 +466,11 @@ includeDirective top fields body = do let classes = maybe [] T.words (lookup "class" fields) let ident = maybe "" trimr $ lookup "name" fields let parser = - case lookup "code" fields of + case lookup "code" fields `mplus` lookup "literal" fields of Just lang -> (codeblock ident classes fields (trimr lang) False . sourcesToText) <$> getInput - Nothing -> - case lookup "literal" fields of - Just _ -> B.rawBlock "rst" . sourcesToText <$> getInput - Nothing -> parseBlocks + Nothing -> parseBlocks let isLiteral = isJust (lookup "code" fields `mplus` lookup "literal" fields) let selectLines = (case trim <$> lookup "end-before" fields of diff --git a/test/command/7436.md b/test/command/7436.md index ad4cb8c2f..fd6e51aa8 100644 --- a/test/command/7436.md +++ b/test/command/7436.md @@ -9,6 +9,6 @@ .. include:: command/three.txt ^D [CodeBlock ("",[""],[("code","")]) "1st line.\n2nd line.\n3rd line.\n" -,RawBlock (Format "rst") "1st line.\n2nd line.\n3rd line.\n" +,CodeBlock ("",[""],[("literal","")]) "1st line.\n2nd line.\n3rd line.\n" ,Para [Str "1st",Space,Str "line.",SoftBreak,Str "2nd",Space,Str "line.",SoftBreak,Str "3rd",Space,Str "line."]] ``` -- cgit v1.2.3 From 13cf02acfd6ddc85bcd1788dc787d35fe92a2010 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Fri, 20 Aug 2021 21:43:22 -0700 Subject: MANUAL.txt/security: add a note on security risks of include directives. --- MANUAL.txt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/MANUAL.txt b/MANUAL.txt index c94b69289..62ee9b593 100644 --- a/MANUAL.txt +++ b/MANUAL.txt @@ -6537,21 +6537,26 @@ application, here are some things to keep in mind: writer could in principle do anything on your file system. Please audit filters and custom writers very carefully before using them. -2. If your application uses pandoc as a Haskell library (rather than +2. Several input formats (including HTML, Org, and RST) support `include` + directives that allow the contents of a file to be included in the + output. An untrusted attacker could use these to view the contents of + files on the file system. + +3. If your application uses pandoc as a Haskell library (rather than shelling out to the executable), it is possible to use it in a mode that fully isolates pandoc from your file system, by running the pandoc operations in the `PandocPure` monad. See the document [Using the pandoc API](https://pandoc.org/using-the-pandoc-api.html) for more details. -3. Pandoc's parsers can exhibit pathological performance on some +4. Pandoc's parsers can exhibit pathological performance on some corner cases. It is wise to put any pandoc operations under a timeout, to avoid DOS attacks that exploit these issues. If you are using the pandoc executable, you can add the command line options `+RTS -M512M -RTS` (for example) to limit the heap size to 512MB. -4. The HTML generated by pandoc is not guaranteed to be safe. +5. The HTML generated by pandoc is not guaranteed to be safe. If `raw_html` is enabled for the Markdown input, users can inject arbitrary HTML. Even if `raw_html` is disabled, users can include dangerous content in URLs and attributes. -- cgit v1.2.3 From aa4bd00ec7f4eac58e00af0aee22d771523fb004 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Fri, 20 Aug 2021 21:53:55 -0700 Subject: Bump to 2.14.2, update changelog. --- changelog.md | 32 +++++++++++++++++++------------- pandoc.cabal | 2 +- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/changelog.md b/changelog.md index 9171fe63b..82961ffd2 100644 --- a/changelog.md +++ b/changelog.md @@ -12,18 +12,21 @@ * HTML reader: treat commments as blank when parsing (#7482). - * Markdown reader: - - + Fix raw LaTeX injection issue (#7497). Using a code block - containing `\end{verbatim}`, one could inject raw TeX into a - LaTeX document even when `raw_tex` is disabled. Thanks to - Augustin Laville for noticing the bug. - + Multimarkdown sub- and superscripts (#5512, OCzarnecki). - Added an extension `short_subsuperscripts` which modifies - the behavior of `subscript` and `superscript`, allowing - subscripts or superscripts containing only alphanumerics - to end with a space character (eg. `x^2 = 4` or `H~2 is - combustible`). This improves support for multimarkdown. + * Markdown reader: + + + Fix raw LaTeX injection issue (#7497). Using a code block + containing `\end{verbatim}`, one could inject raw TeX into a + LaTeX document even when `raw_tex` is disabled. Thanks to + Augustin Laville for noticing the bug. + + Multimarkdown sub- and superscripts (#5512, OCzarnecki). + Added an extension `short_subsuperscripts` which modifies + the behavior of `subscript` and `superscript`, allowing + subscripts or superscripts containing only alphanumerics + to end with a space character (eg. `x^2 = 4` or `H~2 is + combustible`). This improves support for multimarkdown. + + * RST reader: Fix `:literal:` includes (#7513). These should create + code blocks, not insert raw RST. * LaTeX reader: @@ -160,7 +163,10 @@ * INSTALL.md: Add GitLab CI/CD example (#7448, Veratyr). - * MANUAL.txt clarifications (William Lupton). + * MANUAL.txt + + - Clarifications (William Lupton). + - Add a note on security risks of include directives. * Document use of the 'underline' class (#7492, #7484, William Lupton). diff --git a/pandoc.cabal b/pandoc.cabal index fb7da0a05..d924169e6 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -1,6 +1,6 @@ cabal-version: 2.2 name: pandoc -version: 2.14.1 +version: 2.14.2 build-type: Simple license: GPL-2.0-or-later license-file: COPYING.md -- cgit v1.2.3 From 9b8a6917822da3dae933e9de74354fbe9484b2bd Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Fri, 20 Aug 2021 21:56:32 -0700 Subject: Update manual date and man page. --- MANUAL.txt | 2 +- man/pandoc.1 | 105 +++++++++++++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 89 insertions(+), 18 deletions(-) diff --git a/MANUAL.txt b/MANUAL.txt index 62ee9b593..c8a2b66be 100644 --- a/MANUAL.txt +++ b/MANUAL.txt @@ -1,7 +1,7 @@ --- title: Pandoc User's Guide author: John MacFarlane -date: July 18, 2021 +date: August 20, 2021 --- # Synopsis diff --git a/man/pandoc.1 b/man/pandoc.1 index 59888e26a..a0092b385 100644 --- a/man/pandoc.1 +++ b/man/pandoc.1 @@ -1,7 +1,7 @@ '\" t .\" Automatically generated by Pandoc 2.14.1 .\" -.TH "Pandoc User\[cq]s Guide" "" "July 18, 2021" "pandoc 2.14.1" "" +.TH "Pandoc User\[cq]s Guide" "" "July 18, 2021" "pandoc 2.14.2" "" .hy .SH NAME pandoc - general markup converter @@ -291,6 +291,8 @@ if you need extensions not supported in \f[C]gfm\f[R]. .IP \[bu] 2 \f[C]org\f[R] (Emacs Org mode) .IP \[bu] 2 +\f[C]rtf\f[R] (Rich Text Format) +.IP \[bu] 2 \f[C]rst\f[R] (reStructuredText) .IP \[bu] 2 \f[C]t2t\f[R] (txt2tags) @@ -1059,10 +1061,13 @@ Specifies that headings with the specified level create slides (for Headings above this level in the hierarchy are used to divide the slide show into sections; headings below this level create subheads within a slide. -Note that content that is not contained under slide-level headings will -not appear in the slide show. -The default is to set the slide level based on the contents of the -document; see Structuring the slide show. +Valid values are 0-6. +If a slide level of 0 is specified, slides will not be split +automatically on headings, and horizontal rules must be used to indicate +slide boundaries. +If a slide level is not specified explicitly, the slide level will be +set automatically based on the contents of the document; see Structuring +the slide show. .TP \f[B]\f[CB]--section-divs\f[B]\f[R] Wrap sections in \f[C]

\f[R] tags (or \f[C]

\f[R] tags for @@ -1234,17 +1239,22 @@ Templates included with Microsoft PowerPoint 2013 (either with most templates derived from these. .RS .PP -The specific requirement is that the template should begin with the -following first four layouts: -.IP "1." 3 +The specific requirement is that the template should contain layouts +with the following names (as seen within PowerPoint): +.IP \[bu] 2 Title Slide -.IP "2." 3 +.IP \[bu] 2 Title and Content -.IP "3." 3 +.IP \[bu] 2 Section Header -.IP "4." 3 +.IP \[bu] 2 Two Content .PP +For each name, the first layout found with that name will be used. +If no layout is found with one of the names, pandoc will output a +warning and use the layout with that name from the default reference doc +instead. +.PP All templates included with a recent version of MS PowerPoint will fit these criteria. (You can click on \f[C]Layout\f[R] under the \f[C]Home\f[R] menu to @@ -3427,7 +3437,7 @@ Enumeration starts at 1. This extension can be enabled/disabled for the following formats: .TP output formats -\f[C]odt\f[R], \f[C]opendocument\f[R] +\f[C]odt\f[R], \f[C]opendocument\f[R], \f[C]docx\f[R] .SS Extension: \f[C]xrefs_name\f[R] .PP Links to headings, figures and tables inside the document are @@ -4789,6 +4799,11 @@ A document may contain multiple metadata blocks. If two metadata blocks attempt to set the same field, the value from the second block will be taken. .PP +Each metadata block is handled internally as an independent YAML +document. +This means, for example, that any YAML anchors defined in a block cannot +be referenced in another block. +.PP When pandoc is used with \f[C]-t markdown\f[R] to create a Markdown document, a YAML metadata block will be produced only if the \f[C]-s/--standalone\f[R] option is used. @@ -5084,6 +5099,26 @@ blocks: \[ga]<$>\[ga]{.haskell} \f[R] .fi +.SS Underline +.PP +To underline text, use the \f[C]underline\f[R] class: +.IP +.nf +\f[C] +[Underline]{.underline} +\f[R] +.fi +.PP +Or, without the \f[C]bracketed_spans\f[R] extension (but with +\f[C]native_spans\f[R]): +.IP +.nf +\f[C] +Underline +\f[R] +.fi +.PP +This will work in all output formats that support underline. .SS Small caps .PP To write small caps, use the \f[C]smallcaps\f[R] class: @@ -5823,14 +5858,16 @@ See the CSL user documentation for more information about CSL styles and how they affect rendering. .PP Unless a citation key start with a letter, digit, or \f[C]_\f[R], and -contains only alphanumerics and internal punctuation characters +contains only alphanumerics and single internal punctuation characters (\f[C]:.#$%&-+?<>\[ti]/\f[R]), it must be surrounded by curly braces, which are not considered part of the key. -In \f[C]\[at]Foo_bar.baz.\f[R], the key is \f[C]Foo_bar.baz\f[R]. -The final period is not \f[I]internal\f[R] punctuation, so it is not +In \f[C]\[at]Foo_bar.baz.\f[R], the key is \f[C]Foo_bar.baz\f[R] because +the final period is not \f[I]internal\f[R] punctuation, so it is not included in the key. In \f[C]\[at]{Foo_bar.baz.}\f[R], the key is \f[C]Foo_bar.baz.\f[R], including the final period. +In \f[C]\[at]Foo_bar--baz\f[R], the key is \f[C]Foo_bar\f[R] because the +repeated internal punctuation characters terminate the key. The curly braces are recommended if you use URLs as keys: \f[C][\[at]{https://example.com/bib?name=foobar&date=2000}, p. 33]\f[R]. .PP @@ -6147,6 +6184,26 @@ Include source position attributes when parsing \f[C]commonmark\f[R]. For elements that accept attributes, a \f[C]data-pos\f[R] attribute is added; other elements are placed in a surrounding Div or Span elemnet with a \f[C]data-pos\f[R] attribute. +.SS Extension: \f[C]short_subsuperscript\f[R] +.PP +Parse multimarkdown style subscripts and superscripts, which start with +a `\[ti]' or `\[ha]' character, respectively, and include the +alphanumeric sequence that follows. +For example: +.IP +.nf +\f[C] +x\[ha]2 = 4 +\f[R] +.fi +.PP +or +.IP +.nf +\f[C] +Oxygen is O\[ti]2. +\f[R] +.fi .SS Markdown variants .PP In addition to pandoc\[cq]s extended Markdown, the following Markdown @@ -6588,6 +6645,14 @@ A few other metadata fields affect bibliography formatting: \f[B]\f[CB]link-citations\f[B]\f[R] If true, citations will be hyperlinked to the corresponding bibliography entries (for author-date and numerical styles only). +Defaults to false. +.TP +\f[B]\f[CB]link-bibliography\f[B]\f[R] +If true, DOIs, PMCIDs, PMID, and URLs in bibliographies will be rendered +as hyperlinks. +(If an entry contains a DOI, PMCID, PMID, or URL, but none of these +fields are rendered by the style, then the title, or in the absence of a +title the whole entry, will be hyperlinked.) Defaults to true. .TP \f[B]\f[CB]lang\f[B]\f[R] The \f[C]lang\f[R] field will affect how the style is localized, for @@ -7699,12 +7764,18 @@ principle do anything on your file system. Please audit filters and custom writers very carefully before using them. .IP "2." 3 +Several input formats (including HTML, Org, and RST) support +\f[C]include\f[R] directives that allow the contents of a file to be +included in the output. +An untrusted attacker could use these to view the contents of files on +the file system. +.IP "3." 3 If your application uses pandoc as a Haskell library (rather than shelling out to the executable), it is possible to use it in a mode that fully isolates pandoc from your file system, by running the pandoc operations in the \f[C]PandocPure\f[R] monad. See the document Using the pandoc API for more details. -.IP "3." 3 +.IP "4." 3 Pandoc\[cq]s parsers can exhibit pathological performance on some corner cases. It is wise to put any pandoc operations under a timeout, to avoid DOS @@ -7712,7 +7783,7 @@ attacks that exploit these issues. If you are using the pandoc executable, you can add the command line options \f[C]+RTS -M512M -RTS\f[R] (for example) to limit the heap size to 512MB. -.IP "4." 3 +.IP "5." 3 The HTML generated by pandoc is not guaranteed to be safe. If \f[C]raw_html\f[R] is enabled for the Markdown input, users can inject arbitrary HTML. -- cgit v1.2.3 From dc961ca1b49d7f3109174b07910eeb6126fa5dc3 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Fri, 20 Aug 2021 22:05:44 -0700 Subject: Fix typo in changelog. --- changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index 82961ffd2..f9a2b0c27 100644 --- a/changelog.md +++ b/changelog.md @@ -10,7 +10,7 @@ format as well as an output format. New module Text.Pandoc.Readers.RTF (exporting `readRTF`). [API change] - * HTML reader: treat commments as blank when parsing (#7482). + * HTML reader: treat comments as blank when parsing (#7482). * Markdown reader: -- cgit v1.2.3 From a7d2559742ad449f80b182f9ad86129d7160266f Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Fri, 20 Aug 2021 22:08:19 -0700 Subject: Add note to changelog. --- changelog.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/changelog.md b/changelog.md index f9a2b0c27..b0bde683a 100644 --- a/changelog.md +++ b/changelog.md @@ -173,6 +173,8 @@ * Add a FAQ about the "Cannot allocate memory" error on M1 macs. + * Use texmath 0.12.3.1. + * Use released citeproc 0.5. * Remove dependency on HTTP package (#7456, mt_caret). -- cgit v1.2.3 From d05460d00d7c9af3b4913f1760ea385a7d855d84 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sat, 21 Aug 2021 09:25:51 -0700 Subject: Regenerate README.md. --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index d72e86305..c9866b894 100644 --- a/README.md +++ b/README.md @@ -76,6 +76,8 @@ library. It can convert *from* - `odt` ([ODT](https://en.wikipedia.org/wiki/OpenDocument)) - `opml` ([OPML](http://dev.opml.org/spec2.html)) - `org` ([Emacs Org mode](https://orgmode.org)) +- `rtf` ([Rich Text + Format](https://en.wikipedia.org/wiki/Rich_Text_Format)) - `rst` ([reStructuredText](https://docutils.sourceforge.io/docs/ref/rst/introduction.html)) - `t2t` ([txt2tags](https://txt2tags.org)) -- cgit v1.2.3 From 591cdca38b8af5a50a4e121b34d87f3c9bca5844 Mon Sep 17 00:00:00 2001 From: Simon Schuster Date: Fri, 20 Aug 2021 16:41:50 +0200 Subject: LaTeX-parser: restrict \endinput to current file --- pandoc.cabal | 1 + src/Text/Pandoc/Readers/LaTeX.hs | 6 +++++- src/Text/Pandoc/Readers/LaTeX/Parsing.hs | 4 ++++ test/command/bar-endinput.tex | 3 +++ test/command/input-with-endinput.md | 14 ++++++++++++++ 5 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 test/command/bar-endinput.tex create mode 100644 test/command/input-with-endinput.md diff --git a/pandoc.cabal b/pandoc.cabal index d924169e6..b90a61942 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -242,6 +242,7 @@ extra-source-files: test/command/sub-file-chapter-1.tex test/command/sub-file-chapter-2.tex test/command/bar.tex + test/command/bar-endinput.tex test/command/yaml-metadata.yaml test/command/3510-subdoc.org test/command/3510-export.latex diff --git a/src/Text/Pandoc/Readers/LaTeX.hs b/src/Text/Pandoc/Readers/LaTeX.hs index 31c8d9095..5d3ff5f95 100644 --- a/src/Text/Pandoc/Readers/LaTeX.hs +++ b/src/Text/Pandoc/Readers/LaTeX.hs @@ -890,7 +890,7 @@ blockCommands = M.fromList addMeta "bibliography" . splitBibs . untokenize)) , ("addbibresource", mempty <$ (skipopts *> braced >>= addMeta "bibliography" . splitBibs . untokenize)) - , ("endinput", mempty <$ skipMany anyTok) + , ("endinput", mempty <$ skipSameFileToks) -- includes , ("lstinputlisting", inputListing) , ("inputminted", inputMinted) @@ -921,6 +921,10 @@ blockCommands = M.fromList , ("epigraph", epigraph) ] +skipSameFileToks :: PandocMonad m => LP m () +skipSameFileToks = do + pos <- getPosition + skipMany $ infile (sourceName pos) environments :: PandocMonad m => M.Map Text (LP m Blocks) environments = M.union (tableEnvironments blocks inline) $ diff --git a/src/Text/Pandoc/Readers/LaTeX/Parsing.hs b/src/Text/Pandoc/Readers/LaTeX/Parsing.hs index 075e1f656..9b84cdd21 100644 --- a/src/Text/Pandoc/Readers/LaTeX/Parsing.hs +++ b/src/Text/Pandoc/Readers/LaTeX/Parsing.hs @@ -45,6 +45,7 @@ module Text.Pandoc.Readers.LaTeX.Parsing , isNewlineTok , isWordTok , isArgTok + , infile , spaces , spaces1 , tokTypeIn @@ -646,6 +647,9 @@ isArgTok :: Tok -> Bool isArgTok (Tok _ (Arg _) _) = True isArgTok _ = False +infile :: PandocMonad m => SourceName -> LP m Tok +infile reference = satisfyTok (\(Tok source _ _) -> (sourceName source) == reference) + spaces :: PandocMonad m => LP m () spaces = skipMany (satisfyTok (tokTypeIn [Comment, Spaces, Newline])) diff --git a/test/command/bar-endinput.tex b/test/command/bar-endinput.tex new file mode 100644 index 000000000..2f3f9bd6c --- /dev/null +++ b/test/command/bar-endinput.tex @@ -0,0 +1,3 @@ +\emph{hi there} +\endinput +\emph{invisible} diff --git a/test/command/input-with-endinput.md b/test/command/input-with-endinput.md new file mode 100644 index 000000000..df0475a15 --- /dev/null +++ b/test/command/input-with-endinput.md @@ -0,0 +1,14 @@ +``` +% pandoc --from=latex -t native +\begin{document} +Visible + +\include{command/bar-endinput} + +Visible +\end{document} +^D +[Para [Str "Visible"] +,Para [Emph [Str "hi",Space,Str "there"]] +,Para [Str "Visible"]] +``` -- cgit v1.2.3 From 607d71662416786d716e4e93bfbb611851531ae7 Mon Sep 17 00:00:00 2001 From: Salim B Date: Sun, 22 Aug 2021 10:54:21 +0000 Subject: Harmonize spelling of 'slide show' --- MANUAL.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/MANUAL.txt b/MANUAL.txt index c8a2b66be..a61c8ca09 100644 --- a/MANUAL.txt +++ b/MANUAL.txt @@ -5998,13 +5998,13 @@ the [Beamer User's Guide] may also be used: `allowdisplaybreaks`, ## Background in reveal.js and beamer -Background images can be added to self-contained reveal.js slideshows and -to beamer slideshows. +Background images can be added to self-contained reveal.js slide shows and +to beamer slide shows. For the same image on every slide, use the configuration option `background-image` either in the YAML metadata block or as a command-line variable. (There are no other options in -beamer and the rest of this section concerns reveal.js slideshows.) +beamer and the rest of this section concerns reveal.js slide shows.) For reveal.js, you can instead use the reveal.js-native option `parallaxBackgroundImage`. You can also set `parallaxBackgroundHorizontal` @@ -6033,7 +6033,7 @@ For example in reveal.js: ``` --- -title: My Slideshow +title: My Slide Show parallaxBackgroundImage: /path/to/my/background_image.png title-slide-attributes: data-background-image: /path/to/title_image.png -- cgit v1.2.3 From 03b50c0f78ecdebf91a0dac76ccd07b547ff3d27 Mon Sep 17 00:00:00 2001 From: Salim B Date: Sun, 22 Aug 2021 11:13:39 +0000 Subject: Add some more info regarding `--slide-level=0` --- MANUAL.txt | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/MANUAL.txt b/MANUAL.txt index a61c8ca09..bc17763bc 100644 --- a/MANUAL.txt +++ b/MANUAL.txt @@ -5781,8 +5781,8 @@ By default, the *slide level* is the highest heading level in the hierarchy that is followed immediately by content, and not another heading, somewhere in the document. In the example above, level-1 headings are always followed by level-2 headings, which are followed by content, -so the slide level is 2. This default can be overridden using -the `--slide-level` option. +so the slide level is 2. This default can be overridden using the +`--slide-level` option. The document is carved up into slides according to the following rules: @@ -5806,19 +5806,20 @@ rules: subsequent slide with the same title (for beamer). * A title page is constructed automatically from the document's title - block, if present. (In the case of beamer, this can be disabled + block, if present. (In the case of beamer, this can be disabled by commenting out some lines in the default template.) These rules are designed to support many different styles of slide show. If you don't care about structuring your slides into sections and subsections, -you can just use level-1 headings for all each slide. (In that case, level-1 -will be the slide level.) But you can also structure the slide show into -sections, as in the example above. +you can either just use level-1 headings for all slides (in that case, level 1 +will be the slide level) or you can set `--slide-level=0`. Note: in reveal.js slide shows, if slide level is 2, a two-dimensional layout will be produced, with level-1 headings building horizontally -and level-2 headings building vertically. It is not recommended that -you use deeper nesting of section levels with reveal.js. +and level-2 headings building vertically. It is not recommended that +you use deeper nesting of section levels with reveal.js unless you set +`--slide-level=0` (which lets reveal.js produce a one-dimensional layout +and only interprets horizontal rules as slide boundaries). ## Incremental lists -- cgit v1.2.3 From 10a71c484fd5f878730047f1dd6a4ee881f2dee2 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sat, 21 Aug 2021 15:23:42 -0700 Subject: App: Move output-file writing out of PandocMonad action. --- src/Text/Pandoc/App.hs | 58 +++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/src/Text/Pandoc/App.hs b/src/Text/Pandoc/App.hs index 98b072ffb..5696156ad 100644 --- a/src/Text/Pandoc/App.hs +++ b/src/Text/Pandoc/App.hs @@ -95,33 +95,15 @@ convertWithOpts opts = do Just xs | not (optIgnoreArgs opts) -> xs _ -> ["-"] - let runIO' :: PandocIO a -> IO a - runIO' f = do - (res, reports) <- runIOorExplode $ do - setTrace (optTrace opts) - setVerbosity verbosity - x <- f - rs <- getLog - return (x, rs) - case optLogFile opts of - Nothing -> return () - Just logfile -> BL.writeFile logfile (encodeLogMessages reports) - let isWarning msg = messageVerbosity msg == WARNING - when (optFailIfWarnings opts && any isWarning reports) $ - E.throwIO PandocFailOnWarningError - return res - - let eol = case optEol opts of - CRLF -> IO.CRLF - LF -> IO.LF - Native -> nativeNewline #ifdef _WINDOWS let istty = True #else istty <- liftIO $ queryTerminal stdOutput #endif - runIO' $ do + (output, reports) <- runIOorExplode $ do + setTrace (optTrace opts) + setVerbosity verbosity setUserDataDir datadir setResourcePath (optResourcePath opts) @@ -305,14 +287,14 @@ convertWithOpts opts = do >=> maybe return extractMedia (optExtractMedia opts) ) - case writer of - ByteStringWriter f -> f writerOptions doc >>= writeFnBinary outputFile + output <- case writer of + ByteStringWriter f -> BinaryOutput <$> f writerOptions doc TextWriter f -> case outputPdfProgram outputSettings of Just pdfProg -> do res <- makePDF pdfProg (optPdfEngineOpts opts) f writerOptions doc case res of - Right pdf -> writeFnBinary outputFile pdf + Right pdf -> return $ BinaryOutput pdf Left err' -> throwError $ PandocPDFError $ TL.toStrict (TE.decodeUtf8With TE.lenientDecode err') @@ -321,11 +303,29 @@ convertWithOpts opts = do | standalone = t | T.null t || T.last t /= '\n' = t <> T.singleton '\n' | otherwise = t - output <- ensureNl <$> f writerOptions doc - writerFn eol outputFile =<< - if optSelfContained opts && htmlFormat format - then makeSelfContained output - else return output + textOutput <- ensureNl <$> f writerOptions doc + if optSelfContained opts && htmlFormat format + then TextOutput <$> makeSelfContained textOutput + else return $ TextOutput textOutput + reports <- getLog + return (output, reports) + + case optLogFile opts of + Nothing -> return () + Just logfile -> BL.writeFile logfile (encodeLogMessages reports) + let isWarning msg = messageVerbosity msg == WARNING + when (optFailIfWarnings opts && any isWarning reports) $ + E.throwIO PandocFailOnWarningError + let eol = case optEol opts of + CRLF -> IO.CRLF + LF -> IO.LF + Native -> nativeNewline + case output of + TextOutput t -> writerFn eol outputFile t + BinaryOutput bs -> writeFnBinary outputFile bs + +data PandocOutput = TextOutput Text | BinaryOutput BL.ByteString + deriving (Show) type Transform = Pandoc -> Pandoc -- cgit v1.2.3 From aabcee60022c1bc0e81505403dc43ded2e99be4e Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sun, 22 Aug 2021 08:45:36 -0700 Subject: MANUAL: document error code 25 --- MANUAL.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/MANUAL.txt b/MANUAL.txt index bc17763bc..a3e2b4c33 100644 --- a/MANUAL.txt +++ b/MANUAL.txt @@ -1472,6 +1472,7 @@ Nonzero exit codes have the following meanings: 22 PandocUnknownWriterError 23 PandocUnsupportedExtensionError 24 PandocCiteprocError + 25 PandocBibliographyError 31 PandocEpubSubdirectoryError 43 PandocPDFError 44 PandocXMLError -- cgit v1.2.3 From d37dea9eeb788f53cdde386dba812a965539132a Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sun, 22 Aug 2021 18:35:28 -0700 Subject: PandocIO: derive MonadCatch, MonadThrow, MonadMask. This will allow us to use withTempDir. --- src/Text/Pandoc/Class/PandocIO.hs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Text/Pandoc/Class/PandocIO.hs b/src/Text/Pandoc/Class/PandocIO.hs index 63cb94155..0e5247ff9 100644 --- a/src/Text/Pandoc/Class/PandocIO.hs +++ b/src/Text/Pandoc/Class/PandocIO.hs @@ -29,6 +29,7 @@ import Text.Pandoc.Class.PandocMonad import Text.Pandoc.Definition import Text.Pandoc.Error import qualified Text.Pandoc.Class.IO as IO +import Control.Monad.Catch (MonadCatch, MonadMask, MonadThrow) -- | Evaluate a 'PandocIO' operation. runIO :: PandocIO a -> IO (Either PandocError a) @@ -45,6 +46,9 @@ newtype PandocIO a = PandocIO { , Functor , Applicative , Monad + , MonadCatch + , MonadMask + , MonadThrow , MonadError PandocError ) -- cgit v1.2.3 From 5a23f8ff3eaa4051da3371da50a11b601f27d889 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sun, 22 Aug 2021 19:00:43 -0700 Subject: Clean up PDF module. Previously we had to run runIOorExplode inside withTempDir. Now that PandocIO is an instance of MonadMask, this is no longer necessary. --- src/Text/Pandoc/PDF.hs | 108 ++++++++++++++++++++++--------------------------- 1 file changed, 49 insertions(+), 59 deletions(-) diff --git a/src/Text/Pandoc/PDF.hs b/src/Text/Pandoc/PDF.hs index c4e30af34..2953b084c 100644 --- a/src/Text/Pandoc/PDF.hs +++ b/src/Text/Pandoc/PDF.hs @@ -2,6 +2,7 @@ {-# LANGUAGE LambdaCase #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE ScopedTypeVariables #-} +{-# LANGUAGE FlexibleContexts #-} {- | Module : Text.Pandoc.PDF Copyright : Copyright (C) 2012-2021 John MacFarlane @@ -54,9 +55,8 @@ import Text.Pandoc.Writers.Shared (getField, metaToContext) import Data.List (intercalate) #endif import Data.List (isPrefixOf, find) -import Text.Pandoc.Class.PandocIO (PandocIO, extractMedia, runIOorExplode) -import Text.Pandoc.Class.PandocMonad (fillMediaBag, getCommonState, getVerbosity, - putCommonState, report, setVerbosity) +import Text.Pandoc.Class.PandocIO (PandocIO, extractMedia) +import Text.Pandoc.Class.PandocMonad (fillMediaBag, getVerbosity, report) import Text.Pandoc.Logging #ifdef _WINDOWS @@ -86,50 +86,42 @@ makePDF program pdfargs writer opts doc = source <- writer opts doc let args = ["-ms", "-mpdfmark", "-mspdf", "-e", "-t", "-k", "-KUTF-8", "-i"] ++ pdfargs - verbosity <- getVerbosity - liftIO $ generic2pdf verbosity program args source + generic2pdf program args source baseProg -> do - commonState <- getCommonState - verbosity <- getVerbosity -- latex has trouble with tildes in paths, which -- you find in Windows temp dir paths with longer -- user names (see #777) - let withTempDir templ action = do - tmp <- getTemporaryDirectory - uname <- E.catch + let withTempDir :: FilePath -> (FilePath -> PandocIO a) -> PandocIO a + withTempDir templ action = do + tmp <- liftIO getTemporaryDirectory + uname <- liftIO $ E.catch (do (ec, sout, _) <- readProcessWithExitCode "uname" ["-o"] "" if ec == ExitSuccess then return $ Just $ filter (not . isSpace) sout else return Nothing) - (\(_ :: E.SomeException) -> return Nothing) + (\(_ :: E.SomeException) -> return Nothing) if '~' `elem` tmp || uname == Just "Cygwin" -- see #5451 then withTempDirectory "." templ action else withSystemTempDirectory templ action - (newCommonState, res) <- liftIO $ withTempDir "tex2pdf." $ \tmpdir' -> do + withTempDir "tex2pdf." $ \tmpdir' -> do #ifdef _WINDOWS -- note: we want / even on Windows, for TexLive let tmpdir = changePathSeparators tmpdir' #else let tmpdir = tmpdir' #endif - runIOorExplode $ do - putCommonState commonState - doc' <- handleImages opts tmpdir doc - source <- writer opts{ writerExtensions = -- disable use of quote - -- ligatures to avoid bad ligatures like ?` - disableExtension Ext_smart - (writerExtensions opts) } doc' - res <- case baseProg of - "context" -> context2pdf verbosity program pdfargs tmpdir source - "tectonic" -> tectonic2pdf verbosity program pdfargs tmpdir source - prog | prog `elem` ["pdflatex", "lualatex", "xelatex", "latexmk"] - -> tex2pdf verbosity program pdfargs tmpdir source - _ -> return $ Left $ UTF8.fromStringLazy - $ "Unknown program " ++ program - cs <- getCommonState - return (cs, res) - putCommonState newCommonState - return res + doc' <- handleImages opts tmpdir doc + source <- writer opts{ writerExtensions = -- disable use of quote + -- ligatures to avoid bad ligatures like ?` + disableExtension Ext_smart + (writerExtensions opts) } doc' + case baseProg of + "context" -> context2pdf program pdfargs tmpdir source + "tectonic" -> tectonic2pdf program pdfargs tmpdir source + prog | prog `elem` ["pdflatex", "lualatex", "xelatex", "latexmk"] + -> tex2pdf program pdfargs tmpdir source + _ -> return $ Left $ UTF8.fromStringLazy + $ "Unknown program " ++ program makeWithWkhtmltopdf :: String -- ^ wkhtmltopdf or path -> [String] -- ^ arguments @@ -221,33 +213,30 @@ convertImage opts tmpdir fname = do mime = getMimeType fname doNothing = return (Right fname) -tectonic2pdf :: Verbosity -- ^ Verbosity level - -> String -- ^ tex program +tectonic2pdf :: String -- ^ tex program -> [String] -- ^ Arguments to the latex-engine -> FilePath -- ^ temp directory for output -> Text -- ^ tex source -> PandocIO (Either ByteString ByteString) -tectonic2pdf verbosity program args tmpDir source = do - (exit, log', mbPdf) <- runTectonic verbosity program args tmpDir source +tectonic2pdf program args tmpDir source = do + (exit, log', mbPdf) <- runTectonic program args tmpDir source case (exit, mbPdf) of (ExitFailure _, _) -> return $ Left $ extractMsg log' (ExitSuccess, Nothing) -> return $ Left "" (ExitSuccess, Just pdf) -> do - missingCharacterWarnings verbosity log' + missingCharacterWarnings log' return $ Right pdf -tex2pdf :: Verbosity -- ^ Verbosity level - -> String -- ^ tex program +tex2pdf :: String -- ^ tex program -> [String] -- ^ Arguments to the latex-engine -> FilePath -- ^ temp directory for output -> Text -- ^ tex source -> PandocIO (Either ByteString ByteString) -tex2pdf verbosity program args tmpDir source = do +tex2pdf program args tmpDir source = do let numruns | takeBaseName program == "latexmk" = 1 | "\\tableofcontents" `T.isInfixOf` source = 3 -- to get page numbers | otherwise = 2 -- 1 run won't give you PDF bookmarks - (exit, log', mbPdf) <- runTeXProgram verbosity program args numruns - tmpDir source + (exit, log', mbPdf) <- runTeXProgram program args numruns tmpDir source case (exit, mbPdf) of (ExitFailure _, _) -> do let logmsg = extractMsg log' @@ -260,11 +249,11 @@ tex2pdf verbosity program args tmpDir source = do return $ Left $ logmsg <> extramsg (ExitSuccess, Nothing) -> return $ Left "" (ExitSuccess, Just pdf) -> do - missingCharacterWarnings verbosity log' + missingCharacterWarnings log' return $ Right pdf -missingCharacterWarnings :: Verbosity -> ByteString -> PandocIO () -missingCharacterWarnings verbosity log' = do +missingCharacterWarnings :: ByteString -> PandocIO () +missingCharacterWarnings log' = do let ls = BC.lines log' let isMissingCharacterWarning = BC.isPrefixOf "Missing character: " let toCodePoint c @@ -275,7 +264,6 @@ missingCharacterWarnings verbosity log' = do | l <- ls , isMissingCharacterWarning l ] - setVerbosity verbosity mapM_ (report . MissingCharacter) warnings -- parsing output @@ -299,9 +287,9 @@ extractConTeXtMsg log' = do -- running tex programs -runTectonic :: Verbosity -> String -> [String] -> FilePath +runTectonic :: String -> [String] -> FilePath -> Text -> PandocIO (ExitCode, ByteString, Maybe ByteString) -runTectonic verbosity program args' tmpDir' source = do +runTectonic program args' tmpDir' source = do let getOutDir acc (a:b:xs) = if a `elem` ["-o", "--outdir"] then (reverse acc ++ xs, Just b) else getOutDir (b:a:acc) xs @@ -313,6 +301,7 @@ runTectonic verbosity program args' tmpDir' source = do let sourceBL = BL.fromStrict $ UTF8.fromText source let programArgs = ["--outdir", tmpDir] ++ args ++ ["-"] env <- liftIO getEnvironment + verbosity <- getVerbosity when (verbosity >= INFO) $ liftIO $ showVerboseInfo (Just tmpDir) program programArgs env (utf8ToText sourceBL) @@ -353,9 +342,9 @@ getResultingPDF logFile pdfFile = do -- Run a TeX program on an input bytestring and return (exit code, -- contents of stdout, contents of produced PDF if any). Rerun -- a fixed number of times to resolve references. -runTeXProgram :: Verbosity -> String -> [String] -> Int -> FilePath +runTeXProgram :: String -> [String] -> Int -> FilePath -> Text -> PandocIO (ExitCode, ByteString, Maybe ByteString) -runTeXProgram verbosity program args numRuns tmpDir' source = do +runTeXProgram program args numRuns tmpDir' source = do let isOutdirArg x = "-outdir=" `isPrefixOf` x || "-output-directory=" `isPrefixOf` x let tmpDir = @@ -378,6 +367,7 @@ runTeXProgram verbosity program args numRuns tmpDir' source = do ("TEXMFOUTPUT", tmpDir) : [(k,v) | (k,v) <- env' , k /= "TEXINPUTS" && k /= "TEXMFOUTPUT"] + verbosity <- getVerbosity when (verbosity >= INFO) $ liftIO $ UTF8.readFile file >>= showVerboseInfo (Just tmpDir) program programArgs env'' @@ -398,16 +388,16 @@ runTeXProgram verbosity program args numRuns tmpDir' source = do return (exit, fromMaybe out log', pdf) runTeX 1 -generic2pdf :: Verbosity - -> String +generic2pdf :: String -> [String] -> Text - -> IO (Either ByteString ByteString) -generic2pdf verbosity program args source = do - env' <- getEnvironment + -> PandocIO (Either ByteString ByteString) +generic2pdf program args source = do + env' <- liftIO getEnvironment + verbosity <- getVerbosity when (verbosity >= INFO) $ - showVerboseInfo Nothing program args env' source - (exit, out) <- E.catch + liftIO $ showVerboseInfo Nothing program args env' source + (exit, out) <- liftIO $ E.catch (pipeProcess (Just env') program args (BL.fromStrict $ UTF8.fromText source)) (handlePDFProgramNotFound program) @@ -454,19 +444,19 @@ html2pdf verbosity program args source = (ExitSuccess, Nothing) -> Left "" (ExitSuccess, Just pdf) -> Right pdf -context2pdf :: Verbosity -- ^ Verbosity level - -> String -- ^ "context" or path to it +context2pdf :: String -- ^ "context" or path to it -> [String] -- ^ extra arguments -> FilePath -- ^ temp directory for output -> Text -- ^ ConTeXt source -> PandocIO (Either ByteString ByteString) -context2pdf verbosity program pdfargs tmpDir source = +context2pdf program pdfargs tmpDir source = do + verbosity <- getVerbosity liftIO $ inDirectory tmpDir $ do let file = "input.tex" BS.writeFile file $ UTF8.fromText source let programArgs = "--batchmode" : pdfargs ++ [file] env' <- getEnvironment - when (verbosity >= INFO) $ + when (verbosity >= INFO) $ liftIO $ UTF8.readFile file >>= showVerboseInfo (Just tmpDir) program programArgs env' (exit, out) <- E.catch -- cgit v1.2.3 From 3f9b7a10ad2de63f6a9c77ff361acf17f94d536b Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Mon, 23 Aug 2021 22:06:39 -0700 Subject: Markdown reader: fix interaction of --strip-comments and list parsing. Use of `--strip-comments` was causing tight lists to be rendered as loose (as if the comment were a blank line). Closes #7521. --- src/Text/Pandoc/Readers/Markdown.hs | 2 +- test/command/7521.md | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 test/command/7521.md diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs index 0f2239394..45594e0fa 100644 --- a/src/Text/Pandoc/Readers/Markdown.hs +++ b/src/Text/Pandoc/Readers/Markdown.hs @@ -829,7 +829,7 @@ listLineCommon :: PandocMonad m => MarkdownParser m Text listLineCommon = T.concat <$> manyTill ( many1Char (satisfy $ \c -> c `notElem` ['\n', '<', '`']) <|> fmap snd (withRaw code) - <|> fmap snd (htmlTag isCommentTag) + <|> fmap (renderTags . (:[]) . fst) (htmlTag isCommentTag) <|> countChar 1 anyChar ) newline diff --git a/test/command/7521.md b/test/command/7521.md new file mode 100644 index 000000000..38bc40482 --- /dev/null +++ b/test/command/7521.md @@ -0,0 +1,11 @@ +``` +% pandoc -- --strip-comments +- one + +- two +- ^D +

+``` -- cgit v1.2.3 From 7ff06a8c43019f56db3e647a55d4d8ec82d2fd62 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Tue, 24 Aug 2021 12:56:31 -0700 Subject: Fix test for #7521. --- test/command/7521.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/command/7521.md b/test/command/7521.md index 38bc40482..4a24f13e1 100644 --- a/test/command/7521.md +++ b/test/command/7521.md @@ -1,9 +1,9 @@ ``` -% pandoc -- --strip-comments +% pandoc --strip-comments - one - two -- ^D +^D

Date: Sun, 22 Aug 2021 12:01:28 -0700 Subject: Lua subsystem and custom writers: generalize types from PandocIO... to any instance of PandocMonad and MonadIO. This involves an API change, since the type of runLua is now (PandocMonad m, MonadIO m) => Lua a -> m (Either PandocError a) --- src/Text/Pandoc/Lua/Init.hs | 5 ++--- src/Text/Pandoc/Lua/PandocLua.hs | 5 ++--- src/Text/Pandoc/Writers/Custom.hs | 6 ++++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Text/Pandoc/Lua/Init.hs b/src/Text/Pandoc/Lua/Init.hs index baa6f0295..94691666c 100644 --- a/src/Text/Pandoc/Lua/Init.hs +++ b/src/Text/Pandoc/Lua/Init.hs @@ -18,8 +18,7 @@ import Control.Monad.Trans (MonadIO (..)) import Data.Data (Data, dataTypeConstrs, dataTypeOf, showConstr) import Foreign.Lua (Lua) import GHC.IO.Encoding (getForeignEncoding, setForeignEncoding, utf8) -import Text.Pandoc.Class.PandocMonad (readDataFile) -import Text.Pandoc.Class.PandocIO (PandocIO) +import Text.Pandoc.Class.PandocMonad (readDataFile, PandocMonad) import Text.Pandoc.Error (PandocError) import Text.Pandoc.Lua.Packages (installPandocPackageSearcher) import Text.Pandoc.Lua.PandocLua (PandocLua, liftPandocLua, runPandocLua) @@ -30,7 +29,7 @@ import qualified Text.Pandoc.Lua.Module.Pandoc as ModulePandoc -- | Run the lua interpreter, using pandoc's default way of environment -- initialization. -runLua :: Lua a -> PandocIO (Either PandocError a) +runLua :: (PandocMonad m, MonadIO m) => Lua a -> m (Either PandocError a) runLua luaOp = do enc <- liftIO $ getForeignEncoding <* setForeignEncoding utf8 res <- runPandocLua . try $ do diff --git a/src/Text/Pandoc/Lua/PandocLua.hs b/src/Text/Pandoc/Lua/PandocLua.hs index 750e019b6..3f6641f95 100644 --- a/src/Text/Pandoc/Lua/PandocLua.hs +++ b/src/Text/Pandoc/Lua/PandocLua.hs @@ -30,7 +30,6 @@ import Control.Monad.Catch (MonadCatch, MonadMask, MonadThrow) import Control.Monad.Except (MonadError (catchError, throwError)) import Control.Monad.IO.Class (MonadIO (liftIO)) import Foreign.Lua (Lua (..), NumResults, Pushable, ToHaskellFunction) -import Text.Pandoc.Class.PandocIO (PandocIO) import Text.Pandoc.Class.PandocMonad (PandocMonad (..), readDefaultDataFile) import Text.Pandoc.Error (PandocError (PandocLuaError)) import Text.Pandoc.Lua.Global (Global (..), setGlobals) @@ -59,7 +58,7 @@ liftPandocLua = PandocLua -- | Evaluate a @'PandocLua'@ computation, running all contained Lua -- operations.. -runPandocLua :: PandocLua a -> PandocIO a +runPandocLua :: (PandocMonad m, MonadIO m) => PandocLua a -> m a runPandocLua pLua = do origState <- getCommonState globals <- defaultGlobals @@ -103,7 +102,7 @@ loadDefaultModule name = do throwError $ PandocLuaError (T.pack err) -- | Global variables which should always be set. -defaultGlobals :: PandocIO [Global] +defaultGlobals :: PandocMonad m => m [Global] defaultGlobals = do commonState <- getCommonState return diff --git a/src/Text/Pandoc/Writers/Custom.hs b/src/Text/Pandoc/Writers/Custom.hs index 58c4bb5be..1e9f37d2f 100644 --- a/src/Text/Pandoc/Writers/Custom.hs +++ b/src/Text/Pandoc/Writers/Custom.hs @@ -22,11 +22,12 @@ import qualified Data.Text as T import Data.Text (Text, pack) import Foreign.Lua (Lua, Pushable) import Text.DocLayout (render, literal) -import Text.Pandoc.Class.PandocIO (PandocIO) +import Control.Monad.IO.Class (MonadIO) import Text.Pandoc.Definition import Text.Pandoc.Lua (Global (..), runLua, setGlobals) import Text.Pandoc.Lua.Util (addField, dofileWithTraceback) import Text.Pandoc.Options +import Text.Pandoc.Class (PandocMonad) import Text.Pandoc.Templates (renderTemplate) import Text.Pandoc.Writers.Shared @@ -79,7 +80,8 @@ instance (Pushable a, Pushable b) => Pushable (KeyValue a b) where Lua.rawset (Lua.nthFromTop 3) -- | Convert Pandoc to custom markup. -writeCustom :: FilePath -> WriterOptions -> Pandoc -> PandocIO Text +writeCustom :: (PandocMonad m, MonadIO m) + => FilePath -> WriterOptions -> Pandoc -> m Text writeCustom luaFile opts doc@(Pandoc meta _) = do let globals = [ PANDOC_DOCUMENT doc , PANDOC_SCRIPT_FILE luaFile -- cgit v1.2.3 From 65e78dac74d29e70db883930eaa384598a23855b Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sun, 22 Aug 2021 19:27:32 -0700 Subject: PDF: generalize type of makePDF... instead of PandocIO, it can be used in any instance of PandocMonad, MonadIO, and MonadMask. [API change] --- src/Text/Pandoc/PDF.hs | 95 +++++++++++++++++++++++++++++--------------------- 1 file changed, 55 insertions(+), 40 deletions(-) diff --git a/src/Text/Pandoc/PDF.hs b/src/Text/Pandoc/PDF.hs index 2953b084c..9ff4bfb09 100644 --- a/src/Text/Pandoc/PDF.hs +++ b/src/Text/Pandoc/PDF.hs @@ -51,12 +51,13 @@ import Text.Pandoc.Shared (inDirectory, stringify, tshow) import qualified Text.Pandoc.UTF8 as UTF8 import Text.Pandoc.Walk (walkM) import Text.Pandoc.Writers.Shared (getField, metaToContext) +import Control.Monad.Catch (MonadMask) #ifdef _WINDOWS import Data.List (intercalate) #endif import Data.List (isPrefixOf, find) -import Text.Pandoc.Class.PandocIO (PandocIO, extractMedia) -import Text.Pandoc.Class.PandocMonad (fillMediaBag, getVerbosity, report) +import Text.Pandoc.Class (fillMediaBag, getVerbosity, + report, extractMedia, PandocMonad) import Text.Pandoc.Logging #ifdef _WINDOWS @@ -67,14 +68,15 @@ changePathSeparators = intercalate "/" . map (filter (/='\\')) . splitDirectories #endif -makePDF :: String -- ^ pdf creator (pdflatex, lualatex, xelatex, +makePDF :: (PandocMonad m, MonadIO m, MonadMask m) + => String -- ^ pdf creator (pdflatex, lualatex, xelatex, -- wkhtmltopdf, weasyprint, prince, context, pdfroff, -- or path to executable) -> [String] -- ^ arguments to pass to pdf creator - -> (WriterOptions -> Pandoc -> PandocIO Text) -- ^ writer + -> (WriterOptions -> Pandoc -> m Text) -- ^ writer -> WriterOptions -- ^ options -> Pandoc -- ^ document - -> PandocIO (Either ByteString ByteString) + -> m (Either ByteString ByteString) makePDF program pdfargs writer opts doc = case takeBaseName program of "wkhtmltopdf" -> makeWithWkhtmltopdf program pdfargs writer opts doc @@ -88,21 +90,6 @@ makePDF program pdfargs writer opts doc = "-e", "-t", "-k", "-KUTF-8", "-i"] ++ pdfargs generic2pdf program args source baseProg -> do - -- latex has trouble with tildes in paths, which - -- you find in Windows temp dir paths with longer - -- user names (see #777) - let withTempDir :: FilePath -> (FilePath -> PandocIO a) -> PandocIO a - withTempDir templ action = do - tmp <- liftIO getTemporaryDirectory - uname <- liftIO $ E.catch - (do (ec, sout, _) <- readProcessWithExitCode "uname" ["-o"] "" - if ec == ExitSuccess - then return $ Just $ filter (not . isSpace) sout - else return Nothing) - (\(_ :: E.SomeException) -> return Nothing) - if '~' `elem` tmp || uname == Just "Cygwin" -- see #5451 - then withTempDirectory "." templ action - else withSystemTempDirectory templ action withTempDir "tex2pdf." $ \tmpdir' -> do #ifdef _WINDOWS -- note: we want / even on Windows, for TexLive @@ -123,12 +110,30 @@ makePDF program pdfargs writer opts doc = _ -> return $ Left $ UTF8.fromStringLazy $ "Unknown program " ++ program -makeWithWkhtmltopdf :: String -- ^ wkhtmltopdf or path +-- latex has trouble with tildes in paths, which +-- you find in Windows temp dir paths with longer +-- user names (see #777) +withTempDir :: (PandocMonad m, MonadMask m, MonadIO m) + => FilePath -> (FilePath -> m a) -> m a +withTempDir templ action = do + tmp <- liftIO getTemporaryDirectory + uname <- liftIO $ E.catch + (do (ec, sout, _) <- readProcessWithExitCode "uname" ["-o"] "" + if ec == ExitSuccess + then return $ Just $ filter (not . isSpace) sout + else return Nothing) + (\(_ :: E.SomeException) -> return Nothing) + if '~' `elem` tmp || uname == Just "Cygwin" -- see #5451 + then withTempDirectory "." templ action + else withSystemTempDirectory templ action + +makeWithWkhtmltopdf :: (PandocMonad m, MonadIO m) + => String -- ^ wkhtmltopdf or path -> [String] -- ^ arguments - -> (WriterOptions -> Pandoc -> PandocIO Text) -- ^ writer + -> (WriterOptions -> Pandoc -> m Text) -- ^ writer -> WriterOptions -- ^ options -> Pandoc -- ^ document - -> PandocIO (Either ByteString ByteString) + -> m (Either ByteString ByteString) makeWithWkhtmltopdf program pdfargs writer opts doc@(Pandoc meta _) = do let mathArgs = case writerHTMLMathMethod opts of -- with MathJax, wait til all math is rendered: @@ -159,16 +164,18 @@ makeWithWkhtmltopdf program pdfargs writer opts doc@(Pandoc meta _) = do verbosity <- getVerbosity liftIO $ html2pdf verbosity program args source -handleImages :: WriterOptions +handleImages :: (PandocMonad m, MonadIO m) + => WriterOptions -> FilePath -- ^ temp dir to store images -> Pandoc -- ^ document - -> PandocIO Pandoc + -> m Pandoc handleImages opts tmpdir doc = fillMediaBag doc >>= extractMedia tmpdir >>= walkM (convertImages opts tmpdir) -convertImages :: WriterOptions -> FilePath -> Inline -> PandocIO Inline +convertImages :: (PandocMonad m, MonadIO m) + => WriterOptions -> FilePath -> Inline -> m Inline convertImages opts tmpdir (Image attr ils (src, tit)) = do img <- liftIO $ convertImage opts tmpdir $ T.unpack src newPath <- @@ -213,11 +220,12 @@ convertImage opts tmpdir fname = do mime = getMimeType fname doNothing = return (Right fname) -tectonic2pdf :: String -- ^ tex program +tectonic2pdf :: (PandocMonad m, MonadIO m) + => String -- ^ tex program -> [String] -- ^ Arguments to the latex-engine -> FilePath -- ^ temp directory for output -> Text -- ^ tex source - -> PandocIO (Either ByteString ByteString) + -> m (Either ByteString ByteString) tectonic2pdf program args tmpDir source = do (exit, log', mbPdf) <- runTectonic program args tmpDir source case (exit, mbPdf) of @@ -227,11 +235,12 @@ tectonic2pdf program args tmpDir source = do missingCharacterWarnings log' return $ Right pdf -tex2pdf :: String -- ^ tex program +tex2pdf :: (PandocMonad m, MonadIO m) + => String -- ^ tex program -> [String] -- ^ Arguments to the latex-engine -> FilePath -- ^ temp directory for output -> Text -- ^ tex source - -> PandocIO (Either ByteString ByteString) + -> m (Either ByteString ByteString) tex2pdf program args tmpDir source = do let numruns | takeBaseName program == "latexmk" = 1 | "\\tableofcontents" `T.isInfixOf` source = 3 -- to get page numbers @@ -252,7 +261,7 @@ tex2pdf program args tmpDir source = do missingCharacterWarnings log' return $ Right pdf -missingCharacterWarnings :: ByteString -> PandocIO () +missingCharacterWarnings :: PandocMonad m => ByteString -> m () missingCharacterWarnings log' = do let ls = BC.lines log' let isMissingCharacterWarning = BC.isPrefixOf "Missing character: " @@ -287,8 +296,9 @@ extractConTeXtMsg log' = do -- running tex programs -runTectonic :: String -> [String] -> FilePath - -> Text -> PandocIO (ExitCode, ByteString, Maybe ByteString) +runTectonic :: (PandocMonad m, MonadIO m) + => String -> [String] -> FilePath + -> Text -> m (ExitCode, ByteString, Maybe ByteString) runTectonic program args' tmpDir' source = do let getOutDir acc (a:b:xs) = if a `elem` ["-o", "--outdir"] then (reverse acc ++ xs, Just b) @@ -318,7 +328,9 @@ runTectonic program args' tmpDir' source = do -- read a pdf that has been written to a temporary directory, and optionally read -- logs -getResultingPDF :: Maybe String -> String -> PandocIO (Maybe ByteString, Maybe ByteString) +getResultingPDF :: (PandocMonad m, MonadIO m) + => Maybe String -> String + -> m (Maybe ByteString, Maybe ByteString) getResultingPDF logFile pdfFile = do pdfExists <- liftIO $ doesFileExist pdfFile pdf <- if pdfExists @@ -342,8 +354,9 @@ getResultingPDF logFile pdfFile = do -- Run a TeX program on an input bytestring and return (exit code, -- contents of stdout, contents of produced PDF if any). Rerun -- a fixed number of times to resolve references. -runTeXProgram :: String -> [String] -> Int -> FilePath - -> Text -> PandocIO (ExitCode, ByteString, Maybe ByteString) +runTeXProgram :: (PandocMonad m, MonadIO m) + => String -> [String] -> Int -> FilePath + -> Text -> m (ExitCode, ByteString, Maybe ByteString) runTeXProgram program args numRuns tmpDir' source = do let isOutdirArg x = "-outdir=" `isPrefixOf` x || "-output-directory=" `isPrefixOf` x @@ -388,10 +401,11 @@ runTeXProgram program args numRuns tmpDir' source = do return (exit, fromMaybe out log', pdf) runTeX 1 -generic2pdf :: String +generic2pdf :: (PandocMonad m, MonadIO m) + => String -> [String] -> Text - -> PandocIO (Either ByteString ByteString) + -> m (Either ByteString ByteString) generic2pdf program args source = do env' <- liftIO getEnvironment verbosity <- getVerbosity @@ -444,11 +458,12 @@ html2pdf verbosity program args source = (ExitSuccess, Nothing) -> Left "" (ExitSuccess, Just pdf) -> Right pdf -context2pdf :: String -- ^ "context" or path to it +context2pdf :: (PandocMonad m, MonadIO m) + => String -- ^ "context" or path to it -> [String] -- ^ extra arguments -> FilePath -- ^ temp directory for output -> Text -- ^ ConTeXt source - -> PandocIO (Either ByteString ByteString) + -> m (Either ByteString ByteString) context2pdf program pdfargs tmpDir source = do verbosity <- getVerbosity liftIO $ inDirectory tmpDir $ do -- cgit v1.2.3 From 0efbfb33ada6166eb53c5effb1b80393647a1c40 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sun, 22 Aug 2021 21:38:55 -0700 Subject: Text.Pandoc.Filter: Generalize type of applyFilters... from PandocIO to any instance of MonadIO and PandocMonad. [API change] --- src/Text/Pandoc/Class/PandocSandboxed.hs | 79 ++++++++++++++++++++++++++++++++ src/Text/Pandoc/Filter.hs | 10 ++-- src/Text/Pandoc/Filter/Lua.hs | 11 +++-- 3 files changed, 91 insertions(+), 9 deletions(-) create mode 100644 src/Text/Pandoc/Class/PandocSandboxed.hs diff --git a/src/Text/Pandoc/Class/PandocSandboxed.hs b/src/Text/Pandoc/Class/PandocSandboxed.hs new file mode 100644 index 000000000..61ee1f1c6 --- /dev/null +++ b/src/Text/Pandoc/Class/PandocSandboxed.hs @@ -0,0 +1,79 @@ +{-# LANGUAGE DeriveFunctor #-} +{-# LANGUAGE GeneralizedNewtypeDeriving #-} +{- | +Module : Text.Pandoc.Class.PandocIO +Copyright : Copyright (C) 2016-2020 Jesse Rosenthal, John MacFarlane +License : GNU GPL, version 2 or above + +Maintainer : Jesse Rosenthal +Stability : alpha +Portability : portable + +This module defines @'PandocIO'@, an IO-based instance of the +@'PandocMonad'@ type class. File, data, and network access all are run +using IO operators. +-} +module Text.Pandoc.Class.PandocIO + ( PandocIO(..) + , runIO + , runIOorExplode + , extractMedia + ) where + +import Control.Monad.Except (ExceptT, MonadError, runExceptT) +import Control.Monad.IO.Class (MonadIO) +import Control.Monad.State (StateT, evalStateT, lift, get, put) +import Data.Default (Default (def)) +import Text.Pandoc.Class.CommonState (CommonState (..)) +import Text.Pandoc.Class.PandocMonad +import Text.Pandoc.Definition +import Text.Pandoc.Error +import qualified Text.Pandoc.Class.IO as IO +import Control.Monad.Catch (MonadCatch, MonadMask, MonadThrow) + +-- | Evaluate a 'PandocIO' operation. +runIO :: PandocIO a -> IO (Either PandocError a) +runIO ma = flip evalStateT def $ runExceptT $ unPandocIO ma + +-- | Evaluate a 'PandocIO' operation, handling any errors +-- by exiting with an appropriate message and error status. +runIOorExplode :: PandocIO a -> IO a +runIOorExplode ma = runIO ma >>= handleError + +newtype PandocIO a = PandocIO { + unPandocIO :: ExceptT PandocError (StateT CommonState IO) a + } deriving ( MonadIO + , Functor + , Applicative + , Monad + , MonadCatch + , MonadMask + , MonadThrow + , MonadError PandocError + ) + +instance PandocMonad PandocIO where + lookupEnv = IO.lookupEnv + getCurrentTime = IO.getCurrentTime + getCurrentTimeZone = IO.getCurrentTimeZone + newStdGen = IO.newStdGen + newUniqueHash = IO.newUniqueHash + + openURL = IO.openURL + readFileLazy = IO.readFileLazy + readFileStrict = IO.readFileStrict + readStdinStrict = IO.readStdinStrict + + glob = IO.glob + fileExists = IO.fileExists + getDataFileName = IO.getDataFileName + getModificationTime = IO.getModificationTime + + getCommonState = PandocIO $ lift get + putCommonState = PandocIO . lift . put + + logOutput = IO.logOutput + +-- | Extract media from the mediabag into a directory. +extractMedia :: (PandocMonad m, MonadIO m) => FilePath -> Pandoc -> m Pandoc +extractMedia = IO.extractMedia diff --git a/src/Text/Pandoc/Filter.hs b/src/Text/Pandoc/Filter.hs index 1209ceeb7..c2f522109 100644 --- a/src/Text/Pandoc/Filter.hs +++ b/src/Text/Pandoc/Filter.hs @@ -21,8 +21,7 @@ module Text.Pandoc.Filter import System.CPUTime (getCPUTime) import Data.Aeson.TH (deriveJSON, defaultOptions) import GHC.Generics (Generic) -import Text.Pandoc.Class.PandocIO (PandocIO) -import Text.Pandoc.Class.PandocMonad (report, getVerbosity) +import Text.Pandoc.Class (report, getVerbosity, PandocMonad) import Text.Pandoc.Definition (Pandoc) import Text.Pandoc.Options (ReaderOptions) import Text.Pandoc.Logging @@ -66,11 +65,12 @@ instance FromYAML Filter where _ -> JSONFilter fp) node -- | Modify the given document using a filter. -applyFilters :: ReaderOptions +applyFilters :: (PandocMonad m, MonadIO m) + => ReaderOptions -> [Filter] -> [String] -> Pandoc - -> PandocIO Pandoc + -> m Pandoc applyFilters ropts filters args d = do expandedFilters <- mapM expandFilterPath filters foldM applyFilter d expandedFilters @@ -92,7 +92,7 @@ applyFilters ropts filters args d = do toMilliseconds picoseconds = picoseconds `div` 1000000000 -- | Expand paths of filters, searching the data directory. -expandFilterPath :: Filter -> PandocIO Filter +expandFilterPath :: (PandocMonad m, MonadIO m) => Filter -> m Filter expandFilterPath (LuaFilter fp) = LuaFilter <$> Path.expandFilterPath fp expandFilterPath (JSONFilter fp) = JSONFilter <$> Path.expandFilterPath fp expandFilterPath CiteprocFilter = return CiteprocFilter diff --git a/src/Text/Pandoc/Filter/Lua.hs b/src/Text/Pandoc/Filter/Lua.hs index c238e53d9..4e264261b 100644 --- a/src/Text/Pandoc/Filter/Lua.hs +++ b/src/Text/Pandoc/Filter/Lua.hs @@ -14,7 +14,8 @@ module Text.Pandoc.Filter.Lua (apply) where import Control.Exception (throw) import Control.Monad ((>=>)) import qualified Data.Text as T -import Text.Pandoc.Class.PandocIO (PandocIO) +import Text.Pandoc.Class (PandocMonad) +import Control.Monad.Trans (MonadIO) import Text.Pandoc.Definition (Pandoc) import Text.Pandoc.Error (PandocError (PandocFilterError, PandocLuaError)) import Text.Pandoc.Lua (Global (..), runLua, runFilterFile, setGlobals) @@ -23,11 +24,12 @@ import Text.Pandoc.Options (ReaderOptions) -- | Run the Lua filter in @filterPath@ for a transformation to the -- target format (first element in args). Pandoc uses Lua init files to -- setup the Lua interpreter. -apply :: ReaderOptions +apply :: (PandocMonad m, MonadIO m) + => ReaderOptions -> [String] -> FilePath -> Pandoc - -> PandocIO Pandoc + -> m Pandoc apply ropts args fp doc = do let format = case args of (x:_) -> x @@ -39,7 +41,8 @@ apply ropts args fp doc = do ] runFilterFile fp doc -forceResult :: FilePath -> Either PandocError Pandoc -> PandocIO Pandoc +forceResult :: (PandocMonad m, MonadIO m) + => FilePath -> Either PandocError Pandoc -> m Pandoc forceResult fp eitherResult = case eitherResult of Right x -> return x Left err -> throw . PandocFilterError (T.pack fp) $ case err of -- cgit v1.2.3 From bf860df938782fc1862ce95d12b47c40e564373b Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sun, 22 Aug 2021 21:41:54 -0700 Subject: T.P.App.OutputSettings: Generalize some types... so we can run this with any instance of PandocMonad and MonadIO, not just PandocIO. --- src/Text/Pandoc/App.hs | 2 +- src/Text/Pandoc/App/OutputSettings.hs | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/Text/Pandoc/App.hs b/src/Text/Pandoc/App.hs index 5696156ad..dd58b1b39 100644 --- a/src/Text/Pandoc/App.hs +++ b/src/Text/Pandoc/App.hs @@ -133,7 +133,7 @@ convertWithOpts opts = do <> "` instead of `pandoc " <> inputFile <> " -o " <> outputFile <> "`." _ -> return () - (reader :: Reader PandocIO, readerExts) <- getReader readerName + (reader, readerExts) <- getReader readerName let convertTabs = tabFilter (if optPreserveTabs opts || readerNameBase == "t2t" || diff --git a/src/Text/Pandoc/App/OutputSettings.hs b/src/Text/Pandoc/App/OutputSettings.hs index 3864ab188..3f83f4b21 100644 --- a/src/Text/Pandoc/App/OutputSettings.hs +++ b/src/Text/Pandoc/App/OutputSettings.hs @@ -45,16 +45,16 @@ readUtf8File :: PandocMonad m => FilePath -> m T.Text readUtf8File = fmap UTF8.toText . readFileStrict -- | Settings specifying how document output should be produced. -data OutputSettings = OutputSettings +data OutputSettings m = OutputSettings { outputFormat :: T.Text - , outputWriter :: Writer PandocIO + , outputWriter :: Writer m , outputWriterName :: T.Text , outputWriterOptions :: WriterOptions , outputPdfProgram :: Maybe String } -- | Get output settings from command line options. -optToOutputSettings :: Opt -> PandocIO OutputSettings +optToOutputSettings :: (PandocMonad m, MonadIO m) => Opt -> m (OutputSettings m) optToOutputSettings opts = do let outputFile = fromMaybe "-" (optOutputFile opts) @@ -90,11 +90,10 @@ optToOutputSettings opts = do then writerName else T.toLower $ baseWriterName writerName - (writer :: Writer PandocIO, writerExts) <- + (writer, writerExts) <- if ".lua" `T.isSuffixOf` format then return (TextWriter - (\o d -> writeCustom (T.unpack writerName) o d) - :: Writer PandocIO, mempty) + (\o d -> writeCustom (T.unpack writerName) o d), mempty) else getWriter (T.toLower writerName) let standalone = optStandalone opts || not (isTextFormat format) || pdfOutput -- cgit v1.2.3 From 8ad22002cb5ac4c79acda84c7256c6a122e2dd93 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sun, 22 Aug 2021 19:26:53 -0700 Subject: Class: Generalize type of extractMedia. It was uselessly restricted to PandocIO, instead of any instance of PandocMonad and MonadIO. [API change] --- src/Text/Pandoc/Class/PandocIO.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Text/Pandoc/Class/PandocIO.hs b/src/Text/Pandoc/Class/PandocIO.hs index 0e5247ff9..86038a659 100644 --- a/src/Text/Pandoc/Class/PandocIO.hs +++ b/src/Text/Pandoc/Class/PandocIO.hs @@ -74,5 +74,5 @@ instance PandocMonad PandocIO where logOutput = IO.logOutput -- | Extract media from the mediabag into a directory. -extractMedia :: FilePath -> Pandoc -> PandocIO Pandoc +extractMedia :: (PandocMonad m, MonadIO m) => FilePath -> Pandoc -> m Pandoc extractMedia = IO.extractMedia -- cgit v1.2.3 From c39ddeb8f86e9dec5bd6096685812452e3f2c65e Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sun, 22 Aug 2021 17:47:18 -0700 Subject: Text.Pandoc.Class: add readStdinStrict method to PandocMonad. [API change] --- src/Text/Pandoc/Class/IO.hs | 6 ++++++ src/Text/Pandoc/Class/PandocIO.hs | 1 + src/Text/Pandoc/Class/PandocMonad.hs | 5 +++++ src/Text/Pandoc/Class/PandocPure.hs | 4 ++++ src/Text/Pandoc/Lua/PandocLua.hs | 1 + 5 files changed, 17 insertions(+) diff --git a/src/Text/Pandoc/Class/IO.hs b/src/Text/Pandoc/Class/IO.hs index f4cfc8682..305f07a01 100644 --- a/src/Text/Pandoc/Class/IO.hs +++ b/src/Text/Pandoc/Class/IO.hs @@ -30,6 +30,7 @@ module Text.Pandoc.Class.IO , openURL , readFileLazy , readFileStrict + , readStdinStrict , extractMedia ) where @@ -158,6 +159,11 @@ readFileLazy s = liftIOError BL.readFile s readFileStrict :: (PandocMonad m, MonadIO m) => FilePath -> m B.ByteString readFileStrict s = liftIOError B.readFile s +-- | Read the strict ByteString contents from stdin, raising +-- an error on failure. +readStdinStrict :: (PandocMonad m, MonadIO m) => m B.ByteString +readStdinStrict = liftIOError (const B.getContents) "stdin" + -- | Return a list of paths that match a glob, relative to the working -- directory. See 'System.FilePath.Glob' for the glob syntax. glob :: (PandocMonad m, MonadIO m) => String -> m [FilePath] diff --git a/src/Text/Pandoc/Class/PandocIO.hs b/src/Text/Pandoc/Class/PandocIO.hs index 86038a659..61ee1f1c6 100644 --- a/src/Text/Pandoc/Class/PandocIO.hs +++ b/src/Text/Pandoc/Class/PandocIO.hs @@ -62,6 +62,7 @@ instance PandocMonad PandocIO where openURL = IO.openURL readFileLazy = IO.readFileLazy readFileStrict = IO.readFileStrict + readStdinStrict = IO.readStdinStrict glob = IO.glob fileExists = IO.fileExists diff --git a/src/Text/Pandoc/Class/PandocMonad.hs b/src/Text/Pandoc/Class/PandocMonad.hs index 439aec071..d3cf1201c 100644 --- a/src/Text/Pandoc/Class/PandocMonad.hs +++ b/src/Text/Pandoc/Class/PandocMonad.hs @@ -117,6 +117,9 @@ class (Functor m, Applicative m, Monad m, MonadError PandocError m) -- | Read the strict ByteString contents from a file path, -- raising an error on failure. readFileStrict :: FilePath -> m B.ByteString + -- | Read the contents of stdin as a strict ByteString, raising + -- an error on failure. + readStdinStrict :: m B.ByteString -- | Return a list of paths that match a glob, relative to -- the working directory. See 'System.FilePath.Glob' for -- the glob syntax. @@ -674,6 +677,7 @@ instance (MonadTrans t, PandocMonad m, Functor (t m), openURL = lift . openURL readFileLazy = lift . readFileLazy readFileStrict = lift . readFileStrict + readStdinStrict = lift readStdinStrict glob = lift . glob fileExists = lift . fileExists getDataFileName = lift . getDataFileName @@ -691,6 +695,7 @@ instance {-# OVERLAPS #-} PandocMonad m => PandocMonad (ParsecT s st m) where openURL = lift . openURL readFileLazy = lift . readFileLazy readFileStrict = lift . readFileStrict + readStdinStrict = lift readStdinStrict glob = lift . glob fileExists = lift . fileExists getDataFileName = lift . getDataFileName diff --git a/src/Text/Pandoc/Class/PandocPure.hs b/src/Text/Pandoc/Class/PandocPure.hs index 23c941839..290a6d97c 100644 --- a/src/Text/Pandoc/Class/PandocPure.hs +++ b/src/Text/Pandoc/Class/PandocPure.hs @@ -64,6 +64,7 @@ data PureState = PureState , stReferencePptx :: Archive , stReferenceODT :: Archive , stFiles :: FileTree + , stStdin :: B.ByteString , stUserDataFiles :: FileTree , stCabalDataFiles :: FileTree } @@ -80,6 +81,7 @@ instance Default PureState where , stReferencePptx = emptyArchive , stReferenceODT = emptyArchive , stFiles = mempty + , stStdin = mempty , stUserDataFiles = mempty , stCabalDataFiles = mempty } @@ -193,6 +195,8 @@ instance PandocMonad PandocPure where Just bs -> return bs Nothing -> throwError $ PandocResourceNotFound $ T.pack fp + readStdinStrict = getsPureState stStdin + glob s = do FileTree ftmap <- getsPureState stFiles return $ filter (match (compile s)) $ M.keys ftmap diff --git a/src/Text/Pandoc/Lua/PandocLua.hs b/src/Text/Pandoc/Lua/PandocLua.hs index 3f6641f95..b7f084957 100644 --- a/src/Text/Pandoc/Lua/PandocLua.hs +++ b/src/Text/Pandoc/Lua/PandocLua.hs @@ -126,6 +126,7 @@ instance PandocMonad PandocLua where readFileLazy = IO.readFileLazy readFileStrict = IO.readFileStrict + readStdinStrict = IO.readStdinStrict glob = IO.glob fileExists = IO.fileExists -- cgit v1.2.3 From fd7c140cde7544c0236586e2aa22691c33c3265a Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sun, 22 Aug 2021 17:47:47 -0700 Subject: Reorganize App to make it easier to limit IO in main loop. Previously we used liftIO fairly liberally. The code has been restructured to avoid this. A small behavior change is that pandoc will now fall back to latin1 encoding for inputs that can't be read as UTF-8. This is what it did previously for content fetched from the web and not marked as to content type. It makes sense to do the same for local files. --- src/Text/Pandoc/App.hs | 185 ++++++++++++++++++++++++++----------------------- 1 file changed, 100 insertions(+), 85 deletions(-) diff --git a/src/Text/Pandoc/App.hs b/src/Text/Pandoc/App.hs index dd58b1b39..66d659ba1 100644 --- a/src/Text/Pandoc/App.hs +++ b/src/Text/Pandoc/App.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE TupleSections #-} {-# LANGUAGE LambdaCase #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE CPP #-} @@ -27,7 +28,7 @@ module Text.Pandoc.App ( import qualified Control.Exception as E import Control.Monad ( (>=>), when ) import Control.Monad.Trans ( MonadIO(..) ) -import Control.Monad.Except (throwError) +import Control.Monad.Except (throwError, catchError) import qualified Data.ByteString as BS import qualified Data.ByteString.Char8 as B8 import qualified Data.ByteString.Lazy as BL @@ -38,6 +39,7 @@ import Data.Text (Text) import qualified Data.Text as T import qualified Data.Text.Lazy as TL import qualified Data.Text.Lazy.Encoding as TE +import qualified Data.Text.Encoding as TSE import qualified Data.Text.Encoding.Error as TE import qualified Data.Text.Encoding.Error as TSE import Network.URI (URI (..), parseURI) @@ -48,7 +50,7 @@ import System.IO (nativeNewline, stdout) import qualified System.IO as IO (Newline (..)) import Text.Pandoc import Text.Pandoc.Builder (setMeta) -import Text.Pandoc.MIME (getCharset) +import Text.Pandoc.MIME (getCharset, MimeType) import Text.Pandoc.App.FormatHeuristics (formatFromFilePaths) import Text.Pandoc.App.Opt (Opt (..), LineEnding (..), defaultOpts, IpynbOutput (..)) @@ -69,6 +71,7 @@ import qualified Text.Pandoc.UTF8 as UTF8 import System.Posix.IO (stdOutput) import System.Posix.Terminal (queryTerminal) #endif +import Debug.Trace convertWithOpts :: Opt -> IO () convertWithOpts opts = do @@ -94,14 +97,14 @@ convertWithOpts opts = do let sources = case optInputFiles opts of Just xs | not (optIgnoreArgs opts) -> xs _ -> ["-"] - #ifdef _WINDOWS let istty = True #else istty <- liftIO $ queryTerminal stdOutput #endif - (output, reports) <- runIOorExplode $ do + res <- runIO $ do + setTrace (optTrace opts) setVerbosity verbosity setUserDataDir datadir @@ -110,6 +113,8 @@ convertWithOpts opts = do setInputFiles (fromMaybe ["-"] (optInputFiles opts)) setOutputFile (optOutputFile opts) + inputs <- readSources sources + -- assign reader and writer based on options and filenames readerName <- case optFrom opts of Just f -> return f @@ -135,20 +140,6 @@ convertWithOpts opts = do (reader, readerExts) <- getReader readerName - let convertTabs = tabFilter (if optPreserveTabs opts || - readerNameBase == "t2t" || - readerNameBase == "man" - then 0 - else optTabStop opts) - - - let readSources :: [FilePath] -> PandocIO [(FilePath, Text)] - readSources srcs = - mapM (\fp -> do - t <- readSource fp - return (if fp == "-" then "" else fp, convertTabs t)) srcs - - outputSettings <- optToOutputSettings opts let format = outputFormat outputSettings let writer = outputWriter outputSettings @@ -236,20 +227,11 @@ convertWithOpts opts = do _ -> Format format) :)) $ [] - let sourceToDoc :: [FilePath] -> PandocIO Pandoc - sourceToDoc sources' = - case reader of - TextReader r - | readerNameBase == "json" -> - mconcat <$> mapM (readSource >=> r readerOpts) sources' - | optFileScope opts -> - -- Read source and convert tabs (see #6709) - let readSource' = fmap convertTabs . readSource - in mconcat <$> mapM (readSource' >=> r readerOpts) sources' - | otherwise -> - readSources sources' >>= r readerOpts - ByteStringReader r -> - mconcat <$> mapM (readFile' >=> r readerOpts) sources' + let convertTabs = tabFilter (if optPreserveTabs opts || + readerNameBase == "t2t" || + readerNameBase == "man" + then 0 + else optTabStop opts) when (readerNameBase == "markdown_github" || @@ -275,7 +257,22 @@ convertWithOpts opts = do maybe id (setMeta "citation-abbreviations") (optCitationAbbreviations opts) $ mempty - doc <- sourceToDoc sources >>= + doc <- (case reader of + TextReader r + | readerNameBase == "json" -> + mconcat <$> + mapM (inputToText convertTabs + >=> r readerOpts . (:[])) inputs + | optFileScope opts -> + mconcat <$> mapM + (inputToText convertTabs + >=> r readerOpts . (:[])) + inputs + | otherwise -> mapM (inputToText convertTabs) inputs + >>= r readerOpts + ByteStringReader r -> + mconcat <$> mapM (r readerOpts . inputToLazyByteString) inputs) + >>= ( (if isJust (optExtractMedia opts) then fillMediaBag else return) @@ -310,19 +307,22 @@ convertWithOpts opts = do reports <- getLog return (output, reports) - case optLogFile opts of - Nothing -> return () - Just logfile -> BL.writeFile logfile (encodeLogMessages reports) - let isWarning msg = messageVerbosity msg == WARNING - when (optFailIfWarnings opts && any isWarning reports) $ - E.throwIO PandocFailOnWarningError - let eol = case optEol opts of - CRLF -> IO.CRLF - LF -> IO.LF - Native -> nativeNewline - case output of - TextOutput t -> writerFn eol outputFile t - BinaryOutput bs -> writeFnBinary outputFile bs + case res of + Left e -> E.throwIO e + Right (output, reports) -> do + case optLogFile opts of + Nothing -> return () + Just logfile -> BL.writeFile logfile (encodeLogMessages reports) + let isWarning msg = messageVerbosity msg == WARNING + when (optFailIfWarnings opts && any isWarning reports) $ + E.throwIO PandocFailOnWarningError + let eol = case optEol opts of + CRLF -> IO.CRLF + LF -> IO.LF + Native -> nativeNewline + case output of + TextOutput t -> writerFn eol outputFile t + BinaryOutput bs -> writeFnBinary outputFile bs data PandocOutput = TextOutput Text | BinaryOutput BL.ByteString deriving (Show) @@ -344,49 +344,64 @@ adjustMetadata f (Pandoc meta bs) = Pandoc (f meta) bs applyTransforms :: Monad m => [Transform] -> Pandoc -> m Pandoc applyTransforms transforms d = return $ foldr ($) d transforms -readSource :: FilePath -> PandocIO Text -readSource src = case parseURI src of - Just u | uriScheme u `elem` ["http:","https:"] -> - readURI src - | uriScheme u == "file:" -> liftIO $ - readTextFile (uriPathToPath $ T.pack $ uriPath u) - _ -> liftIO $ readTextFile src - where readTextFile :: FilePath -> IO Text - readTextFile fp = do - bs <- if src == "-" - then BS.getContents - else BS.readFile fp - E.catch (return $! UTF8.toText bs) - (\e -> E.throwIO $ case e of - TSE.DecodeError _ (Just w) -> - case BS.elemIndex w bs of - Just offset -> - PandocUTF8DecodingError (T.pack fp) offset w - _ -> PandocUTF8DecodingError (T.pack fp) 0 w - _ -> PandocAppError (tshow e)) - -readURI :: FilePath -> PandocIO Text -readURI src = do - (bs, mt) <- openURL (T.pack src) +readSources :: (PandocMonad m, MonadIO m) + => [FilePath] -> m [(FilePath, (BS.ByteString, Maybe MimeType))] +readSources srcs = + mapM (\fp -> do t <- readSource fp + return (if fp == "-" then "" else fp, t)) srcs + +readSource :: (PandocMonad m, MonadIO m) + => FilePath -> m (BS.ByteString, Maybe MimeType) +readSource "-" = (,Nothing) <$> readStdinStrict +readSource src = + case parseURI src of + Just u | uriScheme u `elem` ["http:","https:"] -> openURL (T.pack src) + | uriScheme u == "file:" -> + (,Nothing) <$> + readFileStrict (uriPathToPath $ T.pack $ uriPath u) + _ -> (,Nothing) <$> readFileStrict src + +utf8ToText :: PandocMonad m => FilePath -> BS.ByteString -> m Text +utf8ToText fp bs = + case TSE.decodeUtf8' . dropBOM $ bs of + Left (TSE.DecodeError _ (Just w)) -> + case BS.elemIndex w bs of + Just offset -> throwError $ PandocUTF8DecodingError (T.pack fp) offset w + Nothing -> throwError $ PandocUTF8DecodingError (T.pack fp) 0 w + Left e -> throwError $ PandocAppError (tshow e) + Right t -> return t + where + dropBOM bs' = + if "\xEF\xBB\xBF" `BS.isPrefixOf` bs' + then BS.drop 3 bs' + else bs' + + +inputToText :: PandocMonad m + => (Text -> Text) + -> (FilePath, (BS.ByteString, Maybe MimeType)) + -> m (FilePath, Text) +inputToText convTabs (fp, (bs,mt)) = + (fp,) . convTabs . T.filter (/='\r') <$> case mt >>= getCharset of - Just "UTF-8" -> return $ UTF8.toText bs + Just "UTF-8" -> utf8ToText fp bs Just "ISO-8859-1" -> return $ T.pack $ B8.unpack bs Just charset -> throwError $ PandocUnsupportedCharsetError charset - Nothing -> liftIO $ -- try first as UTF-8, then as latin1 - E.catch (return $! UTF8.toText bs) - (\case - TSE.DecodeError{} -> + Nothing -> catchError + (utf8ToText fp bs) + (\case + PandocUTF8DecodingError{} -> return $ T.pack $ B8.unpack bs - e -> E.throwIO e) + e -> throwError e) -readFile' :: MonadIO m => FilePath -> m BL.ByteString -readFile' "-" = liftIO BL.getContents -readFile' f = liftIO $ BL.readFile f +inputToLazyByteString :: (FilePath, (BS.ByteString, Maybe MimeType)) + -> BL.ByteString +inputToLazyByteString (_, (bs,_)) = BL.fromStrict bs -writeFnBinary :: MonadIO m => FilePath -> BL.ByteString -> m () -writeFnBinary "-" = liftIO . BL.putStr -writeFnBinary f = liftIO . BL.writeFile (UTF8.encodePath f) +writeFnBinary :: FilePath -> BL.ByteString -> IO () +writeFnBinary "-" = BL.putStr +writeFnBinary f = BL.writeFile (UTF8.encodePath f) -writerFn :: MonadIO m => IO.Newline -> FilePath -> Text -> m () -writerFn eol "-" = liftIO . UTF8.putStrWith eol -writerFn eol f = liftIO . UTF8.writeFileWith eol f +writerFn :: IO.Newline -> FilePath -> Text -> IO () +writerFn eol "-" = UTF8.putStrWith eol +writerFn eol f = UTF8.writeFileWith eol f -- cgit v1.2.3 From c29a72ffe7cd5dcbfec76cdf7faf243560367526 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Tue, 24 Aug 2021 23:27:59 -0700 Subject: Comment out unused module. --- src/Text/Pandoc/App.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Text/Pandoc/App.hs b/src/Text/Pandoc/App.hs index 66d659ba1..0b7f2458d 100644 --- a/src/Text/Pandoc/App.hs +++ b/src/Text/Pandoc/App.hs @@ -71,7 +71,7 @@ import qualified Text.Pandoc.UTF8 as UTF8 import System.Posix.IO (stdOutput) import System.Posix.Terminal (queryTerminal) #endif -import Debug.Trace +-- import Debug.Trace convertWithOpts :: Opt -> IO () convertWithOpts opts = do -- cgit v1.2.3 From af9d464ceeca240b5bf5d2c9649e78c71a6db7c5 Mon Sep 17 00:00:00 2001 From: William Lupton Date: Fri, 27 Aug 2021 09:32:58 +0100 Subject: Clarify 'attributes' extension support --- MANUAL.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MANUAL.txt b/MANUAL.txt index a3e2b4c33..5dc35c8ff 100644 --- a/MANUAL.txt +++ b/MANUAL.txt @@ -5124,7 +5124,8 @@ or image itself, if these differ. #### Extension: `attributes` #### Allows attributes to be attached to any inline or block-level -element. The syntax for the attributes is the same as that +element when parsing `commonmark`. +The syntax for the attributes is the same as that used in [`header_attributes`][Extension: `header_attributes`]. - Attributes that occur immediately after an inline -- cgit v1.2.3 From e4d7a6177f6ef7bf835f61ed01b0229423cd0e55 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Fri, 27 Aug 2021 09:41:46 -0700 Subject: Ensure we have unique ids for wp:docPr and pic:cNvPr elements. This will, I hope, fix #7527 and #7503. --- src/Text/Pandoc/Writers/Docx.hs | 20 +++++++++++--------- test/docx/golden/image.docx | Bin 26776 -> 26811 bytes test/docx/golden/inline_images.docx | Bin 26703 -> 26711 bytes 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/Text/Pandoc/Writers/Docx.hs b/src/Text/Pandoc/Writers/Docx.hs index 756583d1f..efd8b2658 100644 --- a/src/Text/Pandoc/Writers/Docx.hs +++ b/src/Text/Pandoc/Writers/Docx.hs @@ -175,6 +175,7 @@ writeDocx opts doc = do let initialSt = defaultWriterState { stStyleMaps = styleMaps , stTocTitle = tocTitle + , stCurId = 20 } let isRTLmeta = case lookupMeta "dir" meta of @@ -783,8 +784,6 @@ rStyleM styleName = do return $ mknode "w:rStyle" [("w:val", fromStyleId sty')] () getUniqueId :: (PandocMonad m) => WS m Text --- the + 20 is to ensure that there are no clashes with the rIds --- already in word/document.xml.rel getUniqueId = do n <- gets stCurId modify $ \st -> st{stCurId = n + 1} @@ -1234,7 +1233,9 @@ inlineToOpenXML' opts (Image attr@(imgident, _, _) alt (src, title)) = do imgs <- gets stImages let stImage = M.lookup (T.unpack src) imgs - generateImgElt (ident, _, _, img) = + generateImgElt (ident, _, _, img) = do + docprid <- getUniqueId + nvpicprid <- getUniqueId let (xpt,ypt) = desiredSizeInPoints opts attr (either (const def) id (imageSize opts img)) @@ -1246,7 +1247,9 @@ inlineToOpenXML' opts (Image attr@(imgident, _, _) alt (src, title)) = do ,("noChangeAspect","1")] () nvPicPr = mknode "pic:nvPicPr" [] [ mknode "pic:cNvPr" - [("descr",src),("id","0"),("name","Picture")] () + [("descr",src) + ,("id", nvpicprid) + ,("name","Picture")] () , cNvPicPr ] blipFill = mknode "pic:blipFill" [] [ mknode "a:blip" [("r:embed",T.pack ident)] () @@ -1283,16 +1286,15 @@ inlineToOpenXML' opts (Image attr@(imgident, _, _) alt (src, title)) = do , mknode "wp:docPr" [ ("descr", stringify alt) , ("title", title) - , ("id","1") + , ("id", docprid) , ("name","Picture") ] () , graphic ] - in - imgElt + return [Elem imgElt] wrapBookmark imgident =<< case stImage of - Just imgData -> return [Elem $ generateImgElt imgData] + Just imgData -> generateImgElt imgData Nothing -> ( do --try (img, mt) <- P.fetchItem src ident <- ("rId" <>) <$> getUniqueId @@ -1321,7 +1323,7 @@ inlineToOpenXML' opts (Image attr@(imgident, _, _) alt (src, title)) = do else do -- insert mime type to use in constructing [Content_Types].xml modify $ \st -> st { stImages = M.insert (T.unpack src) imgData $ stImages st } - return [Elem $ generateImgElt imgData] + generateImgElt imgData ) `catchError` ( \e -> do report $ CouldNotFetchResource src $ T.pack (show e) diff --git a/test/docx/golden/image.docx b/test/docx/golden/image.docx index 7c2d8a9ac..a84eed100 100644 Binary files a/test/docx/golden/image.docx and b/test/docx/golden/image.docx differ diff --git a/test/docx/golden/inline_images.docx b/test/docx/golden/inline_images.docx index 662e70556..f3c19555f 100644 Binary files a/test/docx/golden/inline_images.docx and b/test/docx/golden/inline_images.docx differ -- cgit v1.2.3 From 8e5a79f264dd1ebe80e048397b6281e318d25e82 Mon Sep 17 00:00:00 2001 From: Emily Bourke Date: Fri, 20 Aug 2021 14:40:09 +0100 Subject: pptx: Make first heading title if slide level is 0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Before this commit, the pptx writer adds a slide break before any table, “columns” div, or paragraph starting with an image, unless the only thing before it on the same slide is a heading at the slide level. In that case, the item and heading are kept on the same slide, and the heading is used as the slide title (inserted into the layout’s “title” placeholder). However, if the slide level is set to 0 (as was recently enabled) this makes it impossible to have a slide with a title which contains any of those items in its body. This commit changes this behaviour: now if the slide level is 0, then items will be kept with a heading of any level, if the heading’s the only thing before the item on the same slide. --- src/Text/Pandoc/Writers/Powerpoint/Presentation.hs | 53 +++++++++++---------- test/Tests/Writers/Powerpoint.hs | 25 ++++++++++ test/pptx/slide-level-0-h1-h2-with-table.native | 14 ++++++ test/pptx/slide-level-0-h1-h2-with-table.pptx | Bin 0 -> 26985 bytes ...e-level-0-h1-h2-with-table_deleted_layouts.pptx | Bin 0 -> 29828 bytes ...ide-level-0-h1-h2-with-table_moved_layouts.pptx | Bin 0 -> 40552 bytes .../slide-level-0-h1-h2-with-table_templated.pptx | Bin 0 -> 40052 bytes test/pptx/slide-level-0-h1-with-image.native | 2 + test/pptx/slide-level-0-h1-with-image.pptx | Bin 0 -> 42596 bytes ...lide-level-0-h1-with-image_deleted_layouts.pptx | Bin 0 -> 45433 bytes .../slide-level-0-h1-with-image_moved_layouts.pptx | Bin 0 -> 56156 bytes .../slide-level-0-h1-with-image_templated.pptx | Bin 0 -> 55657 bytes test/pptx/slide-level-0-h1-with-table.native | 13 +++++ test/pptx/slide-level-0-h1-with-table.pptx | Bin 0 -> 26166 bytes ...lide-level-0-h1-with-table_deleted_layouts.pptx | Bin 0 -> 29008 bytes .../slide-level-0-h1-with-table_moved_layouts.pptx | Bin 0 -> 39731 bytes .../slide-level-0-h1-with-table_templated.pptx | Bin 0 -> 39232 bytes test/pptx/slide-level-0-h2-with-image.native | 2 + test/pptx/slide-level-0-h2-with-image.pptx | Bin 0 -> 42596 bytes ...lide-level-0-h2-with-image_deleted_layouts.pptx | Bin 0 -> 45433 bytes .../slide-level-0-h2-with-image_moved_layouts.pptx | Bin 0 -> 56156 bytes .../slide-level-0-h2-with-image_templated.pptx | Bin 0 -> 55657 bytes 22 files changed, 85 insertions(+), 24 deletions(-) create mode 100644 test/pptx/slide-level-0-h1-h2-with-table.native create mode 100644 test/pptx/slide-level-0-h1-h2-with-table.pptx create mode 100644 test/pptx/slide-level-0-h1-h2-with-table_deleted_layouts.pptx create mode 100644 test/pptx/slide-level-0-h1-h2-with-table_moved_layouts.pptx create mode 100644 test/pptx/slide-level-0-h1-h2-with-table_templated.pptx create mode 100644 test/pptx/slide-level-0-h1-with-image.native create mode 100644 test/pptx/slide-level-0-h1-with-image.pptx create mode 100644 test/pptx/slide-level-0-h1-with-image_deleted_layouts.pptx create mode 100644 test/pptx/slide-level-0-h1-with-image_moved_layouts.pptx create mode 100644 test/pptx/slide-level-0-h1-with-image_templated.pptx create mode 100644 test/pptx/slide-level-0-h1-with-table.native create mode 100644 test/pptx/slide-level-0-h1-with-table.pptx create mode 100644 test/pptx/slide-level-0-h1-with-table_deleted_layouts.pptx create mode 100644 test/pptx/slide-level-0-h1-with-table_moved_layouts.pptx create mode 100644 test/pptx/slide-level-0-h1-with-table_templated.pptx create mode 100644 test/pptx/slide-level-0-h2-with-image.native create mode 100644 test/pptx/slide-level-0-h2-with-image.pptx create mode 100644 test/pptx/slide-level-0-h2-with-image_deleted_layouts.pptx create mode 100644 test/pptx/slide-level-0-h2-with-image_moved_layouts.pptx create mode 100644 test/pptx/slide-level-0-h2-with-image_templated.pptx diff --git a/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs b/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs index 0400783e3..284b9ae62 100644 --- a/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs +++ b/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs @@ -604,7 +604,7 @@ splitBlocks' cur acc (Para (il:ils) : blks) | isImage il = do then span isNotesDiv blks else ([], blks) case cur of - [Header n _ _] | n == slideLevel -> + [Header n _ _] | n == slideLevel || slideLevel == 0 -> splitBlocks' [] (acc ++ [cur ++ [Para [il]] ++ nts]) (if null ils then blks' else Para ils : blks') @@ -615,14 +615,14 @@ splitBlocks' cur acc (tbl@Table{} : blks) = do slideLevel <- asks envSlideLevel let (nts, blks') = span isNotesDiv blks case cur of - [Header n _ _] | n == slideLevel -> + [Header n _ _] | n == slideLevel || slideLevel == 0 -> splitBlocks' [] (acc ++ [cur ++ [tbl] ++ nts]) blks' _ -> splitBlocks' [] (acc ++ ([cur | not (null cur)]) ++ [tbl : nts]) blks' splitBlocks' cur acc (d@(Div (_, classes, _) _): blks) | "columns" `elem` classes = do slideLevel <- asks envSlideLevel let (nts, blks') = span isNotesDiv blks case cur of - [Header n _ _] | n == slideLevel -> + [Header n _ _] | n == slideLevel || slideLevel == 0 -> splitBlocks' [] (acc ++ [cur ++ [d] ++ nts]) blks' _ -> splitBlocks' [] (acc ++ ([cur | not (null cur)]) ++ [d : nts]) blks' splitBlocks' cur acc (blk : blks) = splitBlocks' (cur ++ [blk]) acc blks @@ -630,25 +630,10 @@ splitBlocks' cur acc (blk : blks) = splitBlocks' (cur ++ [blk]) acc blks splitBlocks :: [Block] -> Pres [[Block]] splitBlocks = splitBlocks' [] [] -blocksToSlide' :: Int -> [Block] -> SpeakerNotes -> Pres Slide -blocksToSlide' lvl (Header n (ident, _, _) ils : blks) spkNotes - | n < lvl = do - registerAnchorId ident - sldId <- asks envCurSlideId - hdr <- inlinesToParElems ils - return $ Slide sldId (TitleSlide hdr) spkNotes - | n == lvl = do - registerAnchorId ident - hdr <- inlinesToParElems ils - -- Now get the slide without the header, and then add the header - -- in. - slide <- blocksToSlide' lvl blks spkNotes - let layout = case slideLayout slide of - ContentSlide _ cont -> ContentSlide hdr cont - TwoColumnSlide _ contL contR -> TwoColumnSlide hdr contL contR - layout' -> layout' - return $ slide{slideLayout = layout} -blocksToSlide' _ (blk : blks) spkNotes +-- | Assuming the slide title is already handled, convert these blocks to the +-- body content for the slide. +bodyBlocksToSlide :: Int -> [Block] -> SpeakerNotes -> Pres Slide +bodyBlocksToSlide _ (blk : blks) spkNotes | Div (_, classes, _) divBlks <- blk , "columns" `elem` classes , Div (_, clsL, _) blksL : Div (_, clsR, _) blksR : remaining <- divBlks @@ -669,7 +654,7 @@ blocksToSlide' _ (blk : blks) spkNotes sldId (TwoColumnSlide [] shapesL shapesR) spkNotes -blocksToSlide' _ (blk : blks) spkNotes = do +bodyBlocksToSlide _ (blk : blks) spkNotes = do inNoteSlide <- asks envInNoteSlide shapes <- if inNoteSlide then forceFontSize noteSize $ blocksToShapes (blk : blks) @@ -680,7 +665,7 @@ blocksToSlide' _ (blk : blks) spkNotes = do sldId (ContentSlide [] shapes) spkNotes -blocksToSlide' _ [] spkNotes = do +bodyBlocksToSlide _ [] spkNotes = do sldId <- asks envCurSlideId return $ Slide @@ -688,6 +673,26 @@ blocksToSlide' _ [] spkNotes = do (ContentSlide [] []) spkNotes +blocksToSlide' :: Int -> [Block] -> SpeakerNotes -> Pres Slide +blocksToSlide' lvl (Header n (ident, _, _) ils : blks) spkNotes + | n < lvl = do + registerAnchorId ident + sldId <- asks envCurSlideId + hdr <- inlinesToParElems ils + return $ Slide sldId (TitleSlide hdr) spkNotes + | n == lvl || lvl == 0 = do + registerAnchorId ident + hdr <- inlinesToParElems ils + -- Now get the slide without the header, and then add the header + -- in. + slide <- bodyBlocksToSlide lvl blks spkNotes + let layout = case slideLayout slide of + ContentSlide _ cont -> ContentSlide hdr cont + TwoColumnSlide _ contL contR -> TwoColumnSlide hdr contL contR + layout' -> layout' + return $ slide{slideLayout = layout} +blocksToSlide' lvl blks spkNotes = bodyBlocksToSlide lvl blks spkNotes + blockToSpeakerNotes :: Block -> Pres SpeakerNotes blockToSpeakerNotes (Div (_, ["notes"], _) blks) = local (\env -> env{envInSpeakerNotes=True}) $ diff --git a/test/Tests/Writers/Powerpoint.hs b/test/Tests/Writers/Powerpoint.hs index 344d20238..fd6d01d2d 100644 --- a/test/Tests/Writers/Powerpoint.hs +++ b/test/Tests/Writers/Powerpoint.hs @@ -146,4 +146,29 @@ tests = groupPptxTests [ pptxTests "Inline formatting" [(pack "monofont", toVal $ pack "Consolas")] } "pptx/code.native" "pptx/code-custom.pptx" + , pptxTests ("Using slide level 0, if the first thing on " + <> "a slide is a h1 it's used as the " + <> "slide title") + def { writerSlideLevel = Just 0 } + "pptx/slide-level-0-h1-with-image.native" + "pptx/slide-level-0-h1-with-image.pptx" + , pptxTests ("Using slide level 0, if the first thing on " + <> "a slide is a h2 it's used as the " + <> "slide title") + def { writerSlideLevel = Just 0 } + "pptx/slide-level-0-h2-with-image.native" + "pptx/slide-level-0-h2-with-image.pptx" + , pptxTests ("Using slide level 0, if the first thing on " + <> "a slide is a heading it's used as the " + <> "slide title (works with a table)") + def { writerSlideLevel = Just 0 } + "pptx/slide-level-0-h1-with-table.native" + "pptx/slide-level-0-h1-with-table.pptx" + , pptxTests ("Using slide level 0, if the first thing on " + <> "a slide is a heading it's used as the " + <> "slide title (two headings forces a " + <> "slide break though)") + def { writerSlideLevel = Just 0 } + "pptx/slide-level-0-h1-h2-with-table.native" + "pptx/slide-level-0-h1-h2-with-table.pptx" ] diff --git a/test/pptx/slide-level-0-h1-h2-with-table.native b/test/pptx/slide-level-0-h1-h2-with-table.native new file mode 100644 index 000000000..c6e65ecf5 --- /dev/null +++ b/test/pptx/slide-level-0-h1-h2-with-table.native @@ -0,0 +1,14 @@ +[Header 1 ("hello",[],[]) [Str "Hello"] +,Header 2 ("there",[],[]) [Str "There"] +,Table ("",[],[]) (Caption Nothing + []) + [(AlignDefault,ColWidth 5.555555555555555e-2)] + (TableHead ("",[],[]) + []) + [(TableBody ("",[],[]) (RowHeadColumns 0) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "1"]]]])] + (TableFoot ("",[],[]) + [])] diff --git a/test/pptx/slide-level-0-h1-h2-with-table.pptx b/test/pptx/slide-level-0-h1-h2-with-table.pptx new file mode 100644 index 000000000..197a6833f Binary files /dev/null and b/test/pptx/slide-level-0-h1-h2-with-table.pptx differ diff --git a/test/pptx/slide-level-0-h1-h2-with-table_deleted_layouts.pptx b/test/pptx/slide-level-0-h1-h2-with-table_deleted_layouts.pptx new file mode 100644 index 000000000..5e776e05c Binary files /dev/null and b/test/pptx/slide-level-0-h1-h2-with-table_deleted_layouts.pptx differ diff --git a/test/pptx/slide-level-0-h1-h2-with-table_moved_layouts.pptx b/test/pptx/slide-level-0-h1-h2-with-table_moved_layouts.pptx new file mode 100644 index 000000000..35204de1b Binary files /dev/null and b/test/pptx/slide-level-0-h1-h2-with-table_moved_layouts.pptx differ diff --git a/test/pptx/slide-level-0-h1-h2-with-table_templated.pptx b/test/pptx/slide-level-0-h1-h2-with-table_templated.pptx new file mode 100644 index 000000000..5c659952e Binary files /dev/null and b/test/pptx/slide-level-0-h1-h2-with-table_templated.pptx differ diff --git a/test/pptx/slide-level-0-h1-with-image.native b/test/pptx/slide-level-0-h1-with-image.native new file mode 100644 index 000000000..0f5033b54 --- /dev/null +++ b/test/pptx/slide-level-0-h1-with-image.native @@ -0,0 +1,2 @@ +[Header 1 ("hello",[],[]) [Str "Hello"] +,Para [Image ("",[],[]) [Str "An",Space,Str "image"] ("lalune.jpg","fig:")]] diff --git a/test/pptx/slide-level-0-h1-with-image.pptx b/test/pptx/slide-level-0-h1-with-image.pptx new file mode 100644 index 000000000..2f3a53f5c Binary files /dev/null and b/test/pptx/slide-level-0-h1-with-image.pptx differ diff --git a/test/pptx/slide-level-0-h1-with-image_deleted_layouts.pptx b/test/pptx/slide-level-0-h1-with-image_deleted_layouts.pptx new file mode 100644 index 000000000..16c61d1be Binary files /dev/null and b/test/pptx/slide-level-0-h1-with-image_deleted_layouts.pptx differ diff --git a/test/pptx/slide-level-0-h1-with-image_moved_layouts.pptx b/test/pptx/slide-level-0-h1-with-image_moved_layouts.pptx new file mode 100644 index 000000000..395036069 Binary files /dev/null and b/test/pptx/slide-level-0-h1-with-image_moved_layouts.pptx differ diff --git a/test/pptx/slide-level-0-h1-with-image_templated.pptx b/test/pptx/slide-level-0-h1-with-image_templated.pptx new file mode 100644 index 000000000..d306375e9 Binary files /dev/null and b/test/pptx/slide-level-0-h1-with-image_templated.pptx differ diff --git a/test/pptx/slide-level-0-h1-with-table.native b/test/pptx/slide-level-0-h1-with-table.native new file mode 100644 index 000000000..b961e900d --- /dev/null +++ b/test/pptx/slide-level-0-h1-with-table.native @@ -0,0 +1,13 @@ +[Header 1 ("hello",[],[]) [Str "Hello"] +,Table ("",[],[]) (Caption Nothing + []) + [(AlignDefault,ColWidth 5.555555555555555e-2)] + (TableHead ("",[],[]) + []) + [(TableBody ("",[],[]) (RowHeadColumns 0) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "1"]]]])] + (TableFoot ("",[],[]) + [])] diff --git a/test/pptx/slide-level-0-h1-with-table.pptx b/test/pptx/slide-level-0-h1-with-table.pptx new file mode 100644 index 000000000..44dbbf90c Binary files /dev/null and b/test/pptx/slide-level-0-h1-with-table.pptx differ diff --git a/test/pptx/slide-level-0-h1-with-table_deleted_layouts.pptx b/test/pptx/slide-level-0-h1-with-table_deleted_layouts.pptx new file mode 100644 index 000000000..0eb7c0b08 Binary files /dev/null and b/test/pptx/slide-level-0-h1-with-table_deleted_layouts.pptx differ diff --git a/test/pptx/slide-level-0-h1-with-table_moved_layouts.pptx b/test/pptx/slide-level-0-h1-with-table_moved_layouts.pptx new file mode 100644 index 000000000..197499bc3 Binary files /dev/null and b/test/pptx/slide-level-0-h1-with-table_moved_layouts.pptx differ diff --git a/test/pptx/slide-level-0-h1-with-table_templated.pptx b/test/pptx/slide-level-0-h1-with-table_templated.pptx new file mode 100644 index 000000000..87b45dda2 Binary files /dev/null and b/test/pptx/slide-level-0-h1-with-table_templated.pptx differ diff --git a/test/pptx/slide-level-0-h2-with-image.native b/test/pptx/slide-level-0-h2-with-image.native new file mode 100644 index 000000000..5def0cb92 --- /dev/null +++ b/test/pptx/slide-level-0-h2-with-image.native @@ -0,0 +1,2 @@ +[Header 2 ("hello",[],[]) [Str "Hello"] +,Para [Image ("",[],[]) [Str "An",Space,Str "image"] ("lalune.jpg","fig:")]] diff --git a/test/pptx/slide-level-0-h2-with-image.pptx b/test/pptx/slide-level-0-h2-with-image.pptx new file mode 100644 index 000000000..948659d6a Binary files /dev/null and b/test/pptx/slide-level-0-h2-with-image.pptx differ diff --git a/test/pptx/slide-level-0-h2-with-image_deleted_layouts.pptx b/test/pptx/slide-level-0-h2-with-image_deleted_layouts.pptx new file mode 100644 index 000000000..afc096ce6 Binary files /dev/null and b/test/pptx/slide-level-0-h2-with-image_deleted_layouts.pptx differ diff --git a/test/pptx/slide-level-0-h2-with-image_moved_layouts.pptx b/test/pptx/slide-level-0-h2-with-image_moved_layouts.pptx new file mode 100644 index 000000000..395036069 Binary files /dev/null and b/test/pptx/slide-level-0-h2-with-image_moved_layouts.pptx differ diff --git a/test/pptx/slide-level-0-h2-with-image_templated.pptx b/test/pptx/slide-level-0-h2-with-image_templated.pptx new file mode 100644 index 000000000..d306375e9 Binary files /dev/null and b/test/pptx/slide-level-0-h2-with-image_templated.pptx differ -- cgit v1.2.3 From 7d0db790032bddd29db1eaeb36c9c25929431748 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Fri, 27 Aug 2021 16:25:50 -0700 Subject: T.P.Image: svgToPng, change first parameter from WriterOptions to Int. The information we need is just a DPI, so why require more? --- src/Text/Pandoc/Image.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Text/Pandoc/Image.hs b/src/Text/Pandoc/Image.hs index e0c938938..ce3c0e41d 100644 --- a/src/Text/Pandoc/Image.hs +++ b/src/Text/Pandoc/Image.hs @@ -21,14 +21,14 @@ import qualified Control.Exception as E -- | Convert svg image to png. rsvg-convert -- is used and must be available on the path. -svgToPng :: WriterOptions +svgToPng :: Int -> L.ByteString -- ^ Input image as bytestring -> IO (Either Text L.ByteString) -svgToPng opts bs = do - let dpi = show $ writerDpi opts +svgToPng dpi bs = do + let dpi' = show dpi E.catch (do (exit, out) <- pipeProcess Nothing "rsvg-convert" - ["-f","png","-a","--dpi-x",dpi,"--dpi-y",dpi] + ["-f","png","-a","--dpi-x",dpi',"--dpi-y",dpi'] bs return $ if exit == ExitSuccess then Right out -- cgit v1.2.3 From eb7ed27f3f30ef954fe22c8b194f39f8ac8d0029 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Fri, 27 Aug 2021 16:35:58 -0700 Subject: Add haddock for dpi parameter. --- src/Text/Pandoc/Image.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Text/Pandoc/Image.hs b/src/Text/Pandoc/Image.hs index ce3c0e41d..468edf2c2 100644 --- a/src/Text/Pandoc/Image.hs +++ b/src/Text/Pandoc/Image.hs @@ -21,7 +21,7 @@ import qualified Control.Exception as E -- | Convert svg image to png. rsvg-convert -- is used and must be available on the path. -svgToPng :: Int +svgToPng :: Int -- ^ DPI -> L.ByteString -- ^ Input image as bytestring -> IO (Either Text L.ByteString) svgToPng dpi bs = do -- cgit v1.2.3 From 4d7cdc467163601fd819199a69860616a9778040 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Fri, 27 Aug 2021 22:27:01 -0700 Subject: Image: Generalize svgToPng to MonadIO. --- src/Text/Pandoc/Image.hs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Text/Pandoc/Image.hs b/src/Text/Pandoc/Image.hs index 468edf2c2..cbc26c981 100644 --- a/src/Text/Pandoc/Image.hs +++ b/src/Text/Pandoc/Image.hs @@ -11,22 +11,23 @@ Portability : portable Functions for converting images. -} module Text.Pandoc.Image ( svgToPng ) where -import Text.Pandoc.Options (WriterOptions(..)) import Text.Pandoc.Process (pipeProcess) import qualified Data.ByteString.Lazy as L import System.Exit import Data.Text (Text) import Text.Pandoc.Shared (tshow) import qualified Control.Exception as E +import Control.Monad.IO.Class (MonadIO(liftIO)) -- | Convert svg image to png. rsvg-convert -- is used and must be available on the path. -svgToPng :: Int -- ^ DPI +svgToPng :: MonadIO m + => Int -- ^ DPI -> L.ByteString -- ^ Input image as bytestring - -> IO (Either Text L.ByteString) + -> m (Either Text L.ByteString) svgToPng dpi bs = do let dpi' = show dpi - E.catch + liftIO $ E.catch (do (exit, out) <- pipeProcess Nothing "rsvg-convert" ["-f","png","-a","--dpi-x",dpi',"--dpi-y",dpi'] bs -- cgit v1.2.3 From 51caa8b78d66ac81253766cc2c6916d39c14efc2 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sat, 28 Aug 2021 09:19:50 -0700 Subject: Docx writer: handle SVG images. This change has several parts: - In Text.Pandoc.App, if the writer is docx, we fill the media bag and attempt to convert any SVG images to PNG, adding these to the media bag. The PNG backups have the same filenames as the SVG images, but with an added .png extension. If the conversion cannot be done (e.g. because rsvg-convert is not present), a warning is omitted. - In Text.Pandoc.Writers.Docx, we now use Word 2016's syntax for including SVG images. If a PNG fallback is present in the media bag, we include a link to that too. It would be helpful if someone with an old Word version could test to see that the documents we produce can be opened and viewed with the PNG fallbacks. If not, then perhaps we can eliminate the slightly complex code for producing these fallbacks. Closes #4058. --- src/Text/Pandoc/App.hs | 21 ++++++++++++++++++--- src/Text/Pandoc/Writers/Docx.hs | 41 ++++++++++++++++++++++++++++++++++++++--- 2 files changed, 56 insertions(+), 6 deletions(-) diff --git a/src/Text/Pandoc/App.hs b/src/Text/Pandoc/App.hs index 0b7f2458d..15236896c 100644 --- a/src/Text/Pandoc/App.hs +++ b/src/Text/Pandoc/App.hs @@ -26,7 +26,7 @@ module Text.Pandoc.App ( , applyFilters ) where import qualified Control.Exception as E -import Control.Monad ( (>=>), when ) +import Control.Monad ( (>=>), when, forM_ ) import Control.Monad.Trans ( MonadIO(..) ) import Control.Monad.Except (throwError, catchError) import qualified Data.ByteString as BS @@ -45,12 +45,14 @@ import qualified Data.Text.Encoding.Error as TSE import Network.URI (URI (..), parseURI) import System.Directory (doesDirectoryExist) import System.Exit (exitSuccess) -import System.FilePath ( takeBaseName, takeExtension ) +import System.FilePath ( takeBaseName, takeExtension) import System.IO (nativeNewline, stdout) import qualified System.IO as IO (Newline (..)) import Text.Pandoc import Text.Pandoc.Builder (setMeta) +import Text.Pandoc.MediaBag (mediaItems) import Text.Pandoc.MIME (getCharset, MimeType) +import Text.Pandoc.Image (svgToPng) import Text.Pandoc.App.FormatHeuristics (formatFromFilePaths) import Text.Pandoc.App.Opt (Opt (..), LineEnding (..), defaultOpts, IpynbOutput (..)) @@ -71,7 +73,6 @@ import qualified Text.Pandoc.UTF8 as UTF8 import System.Posix.IO (stdOutput) import System.Posix.Terminal (queryTerminal) #endif --- import Debug.Trace convertWithOpts :: Opt -> IO () convertWithOpts opts = do @@ -274,6 +275,7 @@ convertWithOpts opts = do mconcat <$> mapM (r readerOpts . inputToLazyByteString) inputs) >>= ( (if isJust (optExtractMedia opts) + || writerNameBase == "docx" -- for fallback png creation then fillMediaBag else return) >=> return . adjustMetadata (metadataFromFile <>) @@ -284,6 +286,19 @@ convertWithOpts opts = do >=> maybe return extractMedia (optExtractMedia opts) ) + when (writerNameBase == "docx") $ do -- create fallback pngs for svgs + items <- mediaItems <$> getMediaBag + forM_ items $ \(fp, mt, bs) -> + case T.takeWhile (/=';') mt of + "image/svg+xml" -> do + res <- svgToPng (writerDpi writerOptions) bs + case res of + Right bs' -> do + let fp' = fp <> ".png" + insertMedia fp' (Just "image/png") bs' + Left e -> report $ CouldNotConvertImage (T.pack fp) (tshow e) + _ -> return () + output <- case writer of ByteStringWriter f -> BinaryOutput <$> f writerOptions doc TextWriter f -> case outputPdfProgram outputSettings of diff --git a/src/Text/Pandoc/Writers/Docx.hs b/src/Text/Pandoc/Writers/Docx.hs index efd8b2658..c0e2aae97 100644 --- a/src/Text/Pandoc/Writers/Docx.hs +++ b/src/Text/Pandoc/Writers/Docx.hs @@ -36,7 +36,9 @@ import Data.Time.Clock.POSIX import Data.Digest.Pure.SHA (sha1, showDigest) import Skylighting import Text.Collate.Lang (renderLang) -import Text.Pandoc.Class.PandocMonad (PandocMonad, report, toLang, translateTerm) +import Text.Pandoc.Class (PandocMonad, report, toLang, translateTerm, + getMediaBag) +import Text.Pandoc.MediaBag (lookupMedia, mediaItems, MediaItem(..)) import qualified Text.Pandoc.Translations as Term import qualified Text.Pandoc.Class.PandocMonad as P import Data.Time @@ -1233,9 +1235,42 @@ inlineToOpenXML' opts (Image attr@(imgident, _, _) alt (src, title)) = do imgs <- gets stImages let stImage = M.lookup (T.unpack src) imgs - generateImgElt (ident, _, _, img) = do + generateImgElt (ident, _fp, mt, img) = do docprid <- getUniqueId nvpicprid <- getUniqueId + (blipAttrs, blipContents) <- + case T.takeWhile (/=';') <$> mt of + Just "image/svg+xml" -> do + -- get fallback png + mediabag <- getMediaBag + mbFallback <- + case lookupMedia (T.unpack (src <> ".png")) mediabag of + Just item -> do + id' <- T.unpack . ("rId" <>) <$> getUniqueId + let fp' = "media/" <> id' <> ".png" + let imgdata = (id', + fp', + Just (mediaMimeType item), + BL.toStrict $ mediaContents item) + modify $ \st -> st { stImages = + M.insert fp' imgdata $ stImages st } + return $ Just id' + Nothing -> return Nothing + let extLst = mknode "a:extLst" [] + [ mknode "a:ext" + [("uri","{28A0092B-C50C-407E-A947-70E740481C1C}")] + [ mknode "a14:useLocalDpi" + [("xmlns:a14","http://schemas.microsoft.com/office/drawing/2010/main"), + ("val","0")] () ] + , mknode "a:ext" + [("uri","{96DAC541-7B7A-43D3-8B79-37D633B846F1}")] + [ mknode "asvg:svgBlip" + [("xmlns:asvg", "http://schemas.microsoft.com/office/drawing/2016/SVG/main"), + ("r:embed",T.pack ident)] () ] + ] + return (maybe [] (\id'' -> [("r:embed", T.pack id'')]) mbFallback, + [extLst]) + _ -> return ([("r:embed", T.pack ident)], []) let (xpt,ypt) = desiredSizeInPoints opts attr (either (const def) id (imageSize opts img)) @@ -1252,7 +1287,7 @@ inlineToOpenXML' opts (Image attr@(imgident, _, _) alt (src, title)) = do ,("name","Picture")] () , cNvPicPr ] blipFill = mknode "pic:blipFill" [] - [ mknode "a:blip" [("r:embed",T.pack ident)] () + [ mknode "a:blip" blipAttrs blipContents , mknode "a:stretch" [] $ mknode "a:fillRect" [] () ] -- cgit v1.2.3 From b76796eae8ce842f8414cca8cd8e3b55be513694 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sat, 28 Aug 2021 12:44:03 -0700 Subject: Remove unneeded import. --- src/Text/Pandoc/Writers/Docx.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Text/Pandoc/Writers/Docx.hs b/src/Text/Pandoc/Writers/Docx.hs index c0e2aae97..78d0840a4 100644 --- a/src/Text/Pandoc/Writers/Docx.hs +++ b/src/Text/Pandoc/Writers/Docx.hs @@ -38,7 +38,7 @@ import Skylighting import Text.Collate.Lang (renderLang) import Text.Pandoc.Class (PandocMonad, report, toLang, translateTerm, getMediaBag) -import Text.Pandoc.MediaBag (lookupMedia, mediaItems, MediaItem(..)) +import Text.Pandoc.MediaBag (lookupMedia, MediaItem(..)) import qualified Text.Pandoc.Translations as Term import qualified Text.Pandoc.Class.PandocMonad as P import Data.Time -- cgit v1.2.3 From d6d7c9620abddc5e5e45450c091bc8a73bac8f66 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sat, 21 Aug 2021 15:30:13 -0700 Subject: Add `--sandbox` option. + Add sandbox feature for readers. When this option is used, readers and writers only have access to input files (and other files specified directly on command line). This restriction is enforced in the type system. + Filters, PDF production, custom writers are unaffected. This feature only insulates the actual readers and writers, not the pipeline around them in Text.Pandoc.App. + Note that when `--sandboxed` is specified, readers won't have access to the resource path, nor will anything have access to the user data directory. + Add module Text.Pandoc.Class.Sandbox, defining `sandbox`. Exported via Text.Pandoc.Class. [API change] Closes #5045. --- MANUAL.txt | 13 ++++- pandoc.cabal | 1 + src/Text/Pandoc/App.hs | 29 ++++++++++-- src/Text/Pandoc/App/CommandLineOptions.hs | 5 ++ src/Text/Pandoc/App/Opt.hs | 4 ++ src/Text/Pandoc/App/OutputSettings.hs | 22 ++++++++- src/Text/Pandoc/Class.hs | 2 + src/Text/Pandoc/Class/PandocSandboxed.hs | 79 ------------------------------- src/Text/Pandoc/Class/Sandbox.hs | 50 +++++++++++++++++++ 9 files changed, 120 insertions(+), 85 deletions(-) delete mode 100644 src/Text/Pandoc/Class/PandocSandboxed.hs create mode 100644 src/Text/Pandoc/Class/Sandbox.hs diff --git a/MANUAL.txt b/MANUAL.txt index 5dc35c8ff..75e74f1cd 100644 --- a/MANUAL.txt +++ b/MANUAL.txt @@ -730,6 +730,16 @@ header when requesting a document from a URL: document in standalone mode. If no *VAL* is specified, the key will be given the value `true`. +`--sandbox` + +: Run pandoc in a sandbox, limiting IO operations in readers + and writers to reading the files specified on the command line. + Note that this option does not limit IO operations by + filters or in the production of PDF documents. But it does + offer security against, for example, disclosure of files + through the use of `include` directives. Anyone using + pandoc on untrusted user input should use this option. + `-D` *FORMAT*, `--print-default-template=`*FORMAT* : Print the system default template for an output *FORMAT*. (See `-t` @@ -6543,7 +6553,8 @@ application, here are some things to keep in mind: 2. Several input formats (including HTML, Org, and RST) support `include` directives that allow the contents of a file to be included in the output. An untrusted attacker could use these to view the contents of - files on the file system. + files on the file system. (Using the `--sandbox` option can + protect against this threat.) 3. If your application uses pandoc as a Haskell library (rather than shelling out to the executable), it is possible to use it in a mode diff --git a/pandoc.cabal b/pandoc.cabal index b90a61942..da53cb1cd 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -622,6 +622,7 @@ library Text.Pandoc.Class.PandocMonad, Text.Pandoc.Class.PandocIO, Text.Pandoc.Class.PandocPure, + Text.Pandoc.Class.Sandbox, Text.Pandoc.Filter.JSON, Text.Pandoc.Filter.Lua, Text.Pandoc.Filter.Path, diff --git a/src/Text/Pandoc/App.hs b/src/Text/Pandoc/App.hs index 15236896c..f7c1f218d 100644 --- a/src/Text/Pandoc/App.hs +++ b/src/Text/Pandoc/App.hs @@ -139,7 +139,26 @@ convertWithOpts opts = do <> "` instead of `pandoc " <> inputFile <> " -o " <> outputFile <> "`." _ -> return () - (reader, readerExts) <- getReader readerName + + let makeSandboxed pureReader = + let files = maybe id (:) (optReferenceDoc opts) . + maybe id (:) (optEpubMetadata opts) . + maybe id (:) (optEpubCoverImage opts) . + maybe id (:) (optCSL opts) . + maybe id (:) (optCitationAbbreviations opts) $ + optEpubFonts opts ++ + optBibliography opts + in case pureReader of + TextReader r -> TextReader $ \o t -> sandbox files (r o t) + ByteStringReader r + -> ByteStringReader $ \o t -> sandbox files (r o t) + + (reader, readerExts) <- + if optSandbox opts + then case runPure (getReader readerName) of + Left e -> throwError e + Right (r, rexts) -> return (makeSandboxed r, rexts) + else getReader readerName outputSettings <- optToOutputSettings opts let format = outputFormat outputSettings @@ -274,8 +293,9 @@ convertWithOpts opts = do ByteStringReader r -> mconcat <$> mapM (r readerOpts . inputToLazyByteString) inputs) >>= - ( (if isJust (optExtractMedia opts) - || writerNameBase == "docx" -- for fallback png creation + ( (if not (optSandbox opts) && + (isJust (optExtractMedia opts) + || writerNameBase == "docx") -- for fallback pngs then fillMediaBag else return) >=> return . adjustMetadata (metadataFromFile <>) @@ -286,7 +306,8 @@ convertWithOpts opts = do >=> maybe return extractMedia (optExtractMedia opts) ) - when (writerNameBase == "docx") $ do -- create fallback pngs for svgs + when (writerNameBase == "docx" && not (optSandbox opts)) $ do + -- create fallback pngs for svgs items <- mediaItems <$> getMediaBag forM_ items $ \(fp, mt, bs) -> case T.takeWhile (/=';') mt of diff --git a/src/Text/Pandoc/App/CommandLineOptions.hs b/src/Text/Pandoc/App/CommandLineOptions.hs index d2c12573c..99017000a 100644 --- a/src/Text/Pandoc/App/CommandLineOptions.hs +++ b/src/Text/Pandoc/App/CommandLineOptions.hs @@ -188,6 +188,11 @@ options = (\opt -> return opt { optFileScope = True })) "" -- "Parse input files before combining" + , Option "" ["sandbox"] + (NoArg + (\opt -> return opt { optSandbox = True })) + "" + , Option "s" ["standalone"] (NoArg (\opt -> return opt { optStandalone = True })) diff --git a/src/Text/Pandoc/App/Opt.hs b/src/Text/Pandoc/App/Opt.hs index d54d932b7..48eb15fdf 100644 --- a/src/Text/Pandoc/App/Opt.hs +++ b/src/Text/Pandoc/App/Opt.hs @@ -160,6 +160,7 @@ data Opt = Opt , optCSL :: Maybe FilePath -- ^ CSL stylesheet , optBibliography :: [FilePath] -- ^ Bibliography files , optCitationAbbreviations :: Maybe FilePath -- ^ Citation abbreviations + , optSandbox :: Bool } deriving (Generic, Show) instance FromYAML (Opt -> Opt) where @@ -595,6 +596,8 @@ doOpt (k',v) = do parseYAML v >>= \x -> return (\o -> o{ optEol = x }) "strip-comments" -> parseYAML v >>= \x -> return (\o -> o { optStripComments = x }) + "sandbox" -> + parseYAML v >>= \x -> return (\o -> o { optSandbox = x }) _ -> failAtNode k' $ "Unknown option " ++ show k -- | Defaults for command-line options. @@ -673,6 +676,7 @@ defaultOpts = Opt , optCSL = Nothing , optBibliography = [] , optCitationAbbreviations = Nothing + , optSandbox = False } parseStringKey :: Node Pos -> Parser Text diff --git a/src/Text/Pandoc/App/OutputSettings.hs b/src/Text/Pandoc/App/OutputSettings.hs index 3f83f4b21..7b057713b 100644 --- a/src/Text/Pandoc/App/OutputSettings.hs +++ b/src/Text/Pandoc/App/OutputSettings.hs @@ -90,11 +90,31 @@ optToOutputSettings opts = do then writerName else T.toLower $ baseWriterName writerName + let makeSandboxed pureWriter = + let files = maybe id (:) (optReferenceDoc opts) . + maybe id (:) (optEpubMetadata opts) . + maybe id (:) (optEpubCoverImage opts) . + maybe id (:) (optCSL opts) . + maybe id (:) (optCitationAbbreviations opts) $ + optEpubFonts opts ++ + optBibliography opts + in case pureWriter of + TextWriter w -> TextWriter $ \o d -> sandbox files (w o d) + ByteStringWriter w + -> ByteStringWriter $ \o d -> sandbox files (w o d) + + (writer, writerExts) <- if ".lua" `T.isSuffixOf` format then return (TextWriter (\o d -> writeCustom (T.unpack writerName) o d), mempty) - else getWriter (T.toLower writerName) + else if optSandbox opts + then + case runPure (getWriter writerName) of + Left e -> throwError e + Right (w, wexts) -> + return (makeSandboxed w, wexts) + else getWriter (T.toLower writerName) let standalone = optStandalone opts || not (isTextFormat format) || pdfOutput diff --git a/src/Text/Pandoc/Class.hs b/src/Text/Pandoc/Class.hs index 2f28ac4dd..6394df251 100644 --- a/src/Text/Pandoc/Class.hs +++ b/src/Text/Pandoc/Class.hs @@ -19,6 +19,7 @@ module Text.Pandoc.Class , module Text.Pandoc.Class.PandocIO , module Text.Pandoc.Class.PandocMonad , module Text.Pandoc.Class.PandocPure + , module Text.Pandoc.Class.Sandbox , Translations ) where @@ -27,3 +28,4 @@ import Text.Pandoc.Class.PandocMonad import Text.Pandoc.Class.PandocIO import Text.Pandoc.Class.PandocPure import Text.Pandoc.Translations (Translations) +import Text.Pandoc.Class.Sandbox diff --git a/src/Text/Pandoc/Class/PandocSandboxed.hs b/src/Text/Pandoc/Class/PandocSandboxed.hs deleted file mode 100644 index 61ee1f1c6..000000000 --- a/src/Text/Pandoc/Class/PandocSandboxed.hs +++ /dev/null @@ -1,79 +0,0 @@ -{-# LANGUAGE DeriveFunctor #-} -{-# LANGUAGE GeneralizedNewtypeDeriving #-} -{- | -Module : Text.Pandoc.Class.PandocIO -Copyright : Copyright (C) 2016-2020 Jesse Rosenthal, John MacFarlane -License : GNU GPL, version 2 or above - -Maintainer : Jesse Rosenthal -Stability : alpha -Portability : portable - -This module defines @'PandocIO'@, an IO-based instance of the -@'PandocMonad'@ type class. File, data, and network access all are run -using IO operators. --} -module Text.Pandoc.Class.PandocIO - ( PandocIO(..) - , runIO - , runIOorExplode - , extractMedia - ) where - -import Control.Monad.Except (ExceptT, MonadError, runExceptT) -import Control.Monad.IO.Class (MonadIO) -import Control.Monad.State (StateT, evalStateT, lift, get, put) -import Data.Default (Default (def)) -import Text.Pandoc.Class.CommonState (CommonState (..)) -import Text.Pandoc.Class.PandocMonad -import Text.Pandoc.Definition -import Text.Pandoc.Error -import qualified Text.Pandoc.Class.IO as IO -import Control.Monad.Catch (MonadCatch, MonadMask, MonadThrow) - --- | Evaluate a 'PandocIO' operation. -runIO :: PandocIO a -> IO (Either PandocError a) -runIO ma = flip evalStateT def $ runExceptT $ unPandocIO ma - --- | Evaluate a 'PandocIO' operation, handling any errors --- by exiting with an appropriate message and error status. -runIOorExplode :: PandocIO a -> IO a -runIOorExplode ma = runIO ma >>= handleError - -newtype PandocIO a = PandocIO { - unPandocIO :: ExceptT PandocError (StateT CommonState IO) a - } deriving ( MonadIO - , Functor - , Applicative - , Monad - , MonadCatch - , MonadMask - , MonadThrow - , MonadError PandocError - ) - -instance PandocMonad PandocIO where - lookupEnv = IO.lookupEnv - getCurrentTime = IO.getCurrentTime - getCurrentTimeZone = IO.getCurrentTimeZone - newStdGen = IO.newStdGen - newUniqueHash = IO.newUniqueHash - - openURL = IO.openURL - readFileLazy = IO.readFileLazy - readFileStrict = IO.readFileStrict - readStdinStrict = IO.readStdinStrict - - glob = IO.glob - fileExists = IO.fileExists - getDataFileName = IO.getDataFileName - getModificationTime = IO.getModificationTime - - getCommonState = PandocIO $ lift get - putCommonState = PandocIO . lift . put - - logOutput = IO.logOutput - --- | Extract media from the mediabag into a directory. -extractMedia :: (PandocMonad m, MonadIO m) => FilePath -> Pandoc -> m Pandoc -extractMedia = IO.extractMedia diff --git a/src/Text/Pandoc/Class/Sandbox.hs b/src/Text/Pandoc/Class/Sandbox.hs new file mode 100644 index 000000000..8bc0f1e77 --- /dev/null +++ b/src/Text/Pandoc/Class/Sandbox.hs @@ -0,0 +1,50 @@ +{- | +Module : Text.Pandoc.Class.Sandbox +Copyright : Copyright (C) 2021 John MacFarlane +License : GNU GPL, version 2 or above + +Maintainer : John MacFarlane () +Stability : alpha +Portability : portable + +This module provides a way to run PandocMonad actions in a sandbox +(pure context, with no IO allowed and access only to designated files). +-} + +module Text.Pandoc.Class.Sandbox + ( sandbox ) +where + +import Control.Monad (foldM) +import Control.Monad.Except (throwError) +import Control.Monad.IO.Class (MonadIO (liftIO)) +import Text.Pandoc.Class.PandocMonad +import Text.Pandoc.Class.PandocPure +import Text.Pandoc.Class.CommonState (CommonState(..)) +import Text.Pandoc.Logging (messageVerbosity) + +-- | Lift a PandocPure action into any instance of PandocMonad. +-- The main computation is done purely, but CommonState is preserved +-- continuously, and warnings are emitted after the action completes. +-- The parameter is a list of FilePaths which will be added to the +-- ersatz file system and be available for reading. +sandbox :: (PandocMonad m, MonadIO m) => [FilePath] -> PandocPure a -> m a +sandbox files action = do + oldState <- getCommonState + tree <- liftIO $ foldM addToFileTree mempty files + case runPure (do putCommonState oldState + modifyPureState $ \ps -> ps{ stFiles = tree } + result <- action + st <- getCommonState + return (st, result)) of + Left e -> throwError e + Right (st, result) -> do + putCommonState st + let verbosity = stVerbosity st + -- emit warnings, since these are not printed in runPure + let newMessages = reverse $ take + (length (stLog st) - length (stLog oldState)) (stLog st) + mapM_ logOutput + (filter ((<= verbosity) . messageVerbosity) newMessages) + return result + -- cgit v1.2.3 From 6180d42434526c4c5137ceb4e7bfa284daaf6089 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sat, 28 Aug 2021 21:31:51 -0700 Subject: Add more potential threats to security section of manual. --- MANUAL.txt | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/MANUAL.txt b/MANUAL.txt index 75e74f1cd..f81f4c70b 100644 --- a/MANUAL.txt +++ b/MANUAL.txt @@ -6556,21 +6556,29 @@ application, here are some things to keep in mind: files on the file system. (Using the `--sandbox` option can protect against this threat.) -3. If your application uses pandoc as a Haskell library (rather than +3. Several output formats (including RTF, FB2, HTML with + `--self-contained`, EPUB, Docx, and ODT) will embed encoded + or raw images into the output file. An untrusted attacker + could exploit this to view the contents of non-image files on the + file system. (Using the `--sandbox` option can protect + against this threat, but will also prevent including images in + these formats.) + +4. If your application uses pandoc as a Haskell library (rather than shelling out to the executable), it is possible to use it in a mode that fully isolates pandoc from your file system, by running the pandoc operations in the `PandocPure` monad. See the document [Using the pandoc API](https://pandoc.org/using-the-pandoc-api.html) for more details. -4. Pandoc's parsers can exhibit pathological performance on some +5. Pandoc's parsers can exhibit pathological performance on some corner cases. It is wise to put any pandoc operations under a timeout, to avoid DOS attacks that exploit these issues. If you are using the pandoc executable, you can add the command line options `+RTS -M512M -RTS` (for example) to limit the heap size to 512MB. -5. The HTML generated by pandoc is not guaranteed to be safe. +6. The HTML generated by pandoc is not guaranteed to be safe. If `raw_html` is enabled for the Markdown input, users can inject arbitrary HTML. Even if `raw_html` is disabled, users can include dangerous content in URLs and attributes. -- cgit v1.2.3 From 5dcd4610e2301baf73f96abcd80315be45d41f3e Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sun, 29 Aug 2021 10:12:20 -0700 Subject: Improve asciidoc escaping for `--` in URLs. Closes #7529. --- src/Text/Pandoc/Writers/AsciiDoc.hs | 14 +++++++++++--- test/command/7529.md | 7 +++++++ 2 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 test/command/7529.md diff --git a/src/Text/Pandoc/Writers/AsciiDoc.hs b/src/Text/Pandoc/Writers/AsciiDoc.hs index ab7e5f1a9..bcef4a089 100644 --- a/src/Text/Pandoc/Writers/AsciiDoc.hs +++ b/src/Text/Pandoc/Writers/AsciiDoc.hs @@ -546,6 +546,7 @@ inlineToAsciiDoc opts (Link _ txt (src, _tit)) = do -- or my@email.com[email john] linktext <- inlineListToAsciiDoc opts txt let isRelative = T.all (/= ':') src + let needsPassthrough = "--" `T.isInfixOf` src let prefix = if isRelative then text "link:" else empty @@ -553,9 +554,16 @@ inlineToAsciiDoc opts (Link _ txt (src, _tit)) = do let useAuto = case txt of [Str s] | escapeURI s == srcSuffix -> True _ -> False - return $ if useAuto - then literal srcSuffix - else prefix <> literal src <> "[" <> linktext <> "]" + return $ + if needsPassthrough + then + if useAuto + then "link:++" <> literal srcSuffix <> "++[]" + else "link:++" <> literal src <> "++[" <> linktext <> "]" + else + if useAuto + then literal srcSuffix + else prefix <> literal src <> "[" <> linktext <> "]" inlineToAsciiDoc opts (Image attr alternate (src, tit)) = ("image:" <>) <$> imageArguments opts attr alternate src tit inlineToAsciiDoc opts (Note [Para inlines]) = diff --git a/test/command/7529.md b/test/command/7529.md new file mode 100644 index 000000000..f0c443d73 --- /dev/null +++ b/test/command/7529.md @@ -0,0 +1,7 @@ +``` +pandoc -f html -t asciidoc +https://example.com/show.cgi?id=hi--there--everyone +^D +link:++https://example.com/show.cgi?id=hi--there--everyone++[] +``` + -- cgit v1.2.3 From 7d91ff28ace66fdbe49d7984b56ae097550e166c Mon Sep 17 00:00:00 2001 From: Jeroen de Haas Date: Mon, 30 Aug 2021 12:52:45 +0200 Subject: Do not leak working directory in TikZ filter --- doc/lua-filters.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/lua-filters.md b/doc/lua-filters.md index e2a65fe1e..52e54cb5b 100644 --- a/doc/lua-filters.md +++ b/doc/lua-filters.md @@ -695,12 +695,12 @@ end function RawBlock(el) if starts_with('\\begin{tikzpicture}', el.text) then local filetype = extension_for[FORMAT] or 'svg' - local fname = system.get_working_directory() .. '/' .. - pandoc.sha1(el.text) .. '.' .. filetype + local fbasename = pandoc.sha1(el.text) .. '.' .. filetype + local fname = system.get_working_directory() .. '/' .. fbasename if not file_exists(fname) then tikz2image(el.text, filetype, fname) end - return pandoc.Para({pandoc.Image({}, fname)}) + return pandoc.Para({pandoc.Image({}, fbasename)}) else return el end -- cgit v1.2.3 From 0617d3a88bb1f84622b8a94bd3366c7c8c9e8f8a Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Mon, 30 Aug 2021 09:38:13 -0700 Subject: Hlint: ignore "Use void." --- .hlint.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.hlint.yaml b/.hlint.yaml index ad0f7ddb9..177aa2e32 100644 --- a/.hlint.yaml +++ b/.hlint.yaml @@ -10,6 +10,7 @@ # - ignore: {name: "Avoid lambda"} - ignore: {name: "Use bimap"} +- ignore: {name: "Use void"} - ignore: {name: "Eta reduce"} - ignore: {name: "Evaluate"} - ignore: {name: "Reduce duplication"} # TODO: could be more fine-grained -- cgit v1.2.3 From 8dbea4909211ef7b2acc677288be7c5f10cbb40e Mon Sep 17 00:00:00 2001 From: Emily Bourke Date: Wed, 25 Aug 2021 14:35:19 +0100 Subject: pptx: Restructure tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Use dashes consistently rather than underscores - Make a folder for each set of tests - List test files explicitly (Cabal doesn’t support ** until version 2.4) --- pandoc.cabal | 55 +++++++++- test/Tests/Writers/Powerpoint.hs | 114 ++++++++++----------- test/pptx/code-custom.pptx | Bin 28184 -> 0 bytes test/pptx/code-custom/deleted-layouts.pptx | Bin 0 -> 31033 bytes test/pptx/code-custom/moved-layouts.pptx | Bin 0 -> 41822 bytes test/pptx/code-custom/output.pptx | Bin 0 -> 28184 bytes test/pptx/code-custom/templated.pptx | Bin 0 -> 41337 bytes test/pptx/code-custom_deleted_layouts.pptx | Bin 31033 -> 0 bytes test/pptx/code-custom_moved_layouts.pptx | Bin 41822 -> 0 bytes test/pptx/code-custom_templated.pptx | Bin 41337 -> 0 bytes test/pptx/code.native | 21 ---- test/pptx/code.pptx | Bin 28183 -> 0 bytes test/pptx/code/deleted-layouts.pptx | Bin 0 -> 31032 bytes test/pptx/code/input.native | 21 ++++ test/pptx/code/moved-layouts.pptx | Bin 0 -> 41826 bytes test/pptx/code/output.pptx | Bin 0 -> 28183 bytes test/pptx/code/templated.pptx | Bin 0 -> 41337 bytes test/pptx/code_deleted_layouts.pptx | Bin 31032 -> 0 bytes test/pptx/code_moved_layouts.pptx | Bin 41826 -> 0 bytes test/pptx/code_templated.pptx | Bin 41337 -> 0 bytes test/pptx/document-properties-short-desc.native | 2 - test/pptx/document-properties-short-desc.pptx | Bin 26967 -> 0 bytes .../deleted-layouts.pptx | Bin 0 -> 29806 bytes .../document-properties-short-desc/input.native | 2 + .../moved-layouts.pptx | Bin 0 -> 40600 bytes .../document-properties-short-desc/output.pptx | Bin 0 -> 26967 bytes .../document-properties-short-desc/templated.pptx | Bin 0 -> 40113 bytes ...ment-properties-short-desc_deleted_layouts.pptx | Bin 29806 -> 0 bytes ...cument-properties-short-desc_moved_layouts.pptx | Bin 40600 -> 0 bytes .../document-properties-short-desc_templated.pptx | Bin 40113 -> 0 bytes test/pptx/document-properties.native | 2 - test/pptx/document-properties.pptx | Bin 27375 -> 0 bytes test/pptx/document-properties/deleted-layouts.pptx | Bin 0 -> 30210 bytes test/pptx/document-properties/input.native | 2 + test/pptx/document-properties/moved-layouts.pptx | Bin 0 -> 41004 bytes test/pptx/document-properties/output.pptx | Bin 0 -> 27375 bytes test/pptx/document-properties/templated.pptx | Bin 0 -> 40517 bytes test/pptx/document-properties_deleted_layouts.pptx | Bin 30210 -> 0 bytes test/pptx/document-properties_moved_layouts.pptx | Bin 41004 -> 0 bytes test/pptx/document-properties_templated.pptx | Bin 40517 -> 0 bytes test/pptx/endnotes-toc/deleted-layouts.pptx | Bin 0 -> 30596 bytes test/pptx/endnotes-toc/moved-layouts.pptx | Bin 0 -> 41384 bytes test/pptx/endnotes-toc/output.pptx | Bin 0 -> 27747 bytes test/pptx/endnotes-toc/templated.pptx | Bin 0 -> 40899 bytes test/pptx/endnotes.native | 2 - test/pptx/endnotes.pptx | Bin 26928 -> 0 bytes test/pptx/endnotes/deleted-layouts.pptx | Bin 0 -> 29774 bytes test/pptx/endnotes/input.native | 2 + test/pptx/endnotes/moved-layouts.pptx | Bin 0 -> 40566 bytes test/pptx/endnotes/output.pptx | Bin 0 -> 26928 bytes test/pptx/endnotes/templated.pptx | Bin 0 -> 40078 bytes test/pptx/endnotes_deleted_layouts.pptx | Bin 29774 -> 0 bytes test/pptx/endnotes_moved_layouts.pptx | Bin 40566 -> 0 bytes test/pptx/endnotes_templated.pptx | Bin 40078 -> 0 bytes test/pptx/endnotes_toc.pptx | Bin 27747 -> 0 bytes test/pptx/endnotes_toc_deleted_layouts.pptx | Bin 30596 -> 0 bytes test/pptx/endnotes_toc_moved_layouts.pptx | Bin 41384 -> 0 bytes test/pptx/endnotes_toc_templated.pptx | Bin 40899 -> 0 bytes test/pptx/images.native | 5 - test/pptx/images.pptx | Bin 44596 -> 0 bytes test/pptx/images/deleted-layouts.pptx | Bin 0 -> 47437 bytes test/pptx/images/input.native | 5 + test/pptx/images/moved-layouts.pptx | Bin 0 -> 58160 bytes test/pptx/images/output.pptx | Bin 0 -> 44596 bytes test/pptx/images/templated.pptx | Bin 0 -> 57660 bytes test/pptx/images_deleted_layouts.pptx | Bin 47437 -> 0 bytes test/pptx/images_moved_layouts.pptx | Bin 58160 -> 0 bytes test/pptx/images_templated.pptx | Bin 57660 -> 0 bytes test/pptx/inline-formatting/deleted-layouts.pptx | Bin 0 -> 28966 bytes test/pptx/inline-formatting/input.native | 5 + test/pptx/inline-formatting/moved-layouts.pptx | Bin 0 -> 39758 bytes test/pptx/inline-formatting/output.pptx | Bin 0 -> 26121 bytes test/pptx/inline-formatting/templated.pptx | Bin 0 -> 39272 bytes test/pptx/inline_formatting.native | 5 - test/pptx/inline_formatting.pptx | Bin 26121 -> 0 bytes test/pptx/inline_formatting_deleted_layouts.pptx | Bin 28966 -> 0 bytes test/pptx/inline_formatting_moved_layouts.pptx | Bin 39758 -> 0 bytes test/pptx/inline_formatting_templated.pptx | Bin 39272 -> 0 bytes test/pptx/lists.native | 18 ---- test/pptx/lists.pptx | Bin 27015 -> 0 bytes test/pptx/lists/deleted-layouts.pptx | Bin 0 -> 29861 bytes test/pptx/lists/input.native | 18 ++++ test/pptx/lists/moved-layouts.pptx | Bin 0 -> 40653 bytes test/pptx/lists/output.pptx | Bin 0 -> 27015 bytes test/pptx/lists/templated.pptx | Bin 0 -> 40166 bytes test/pptx/lists_deleted_layouts.pptx | Bin 29861 -> 0 bytes test/pptx/lists_moved_layouts.pptx | Bin 40653 -> 0 bytes test/pptx/lists_templated.pptx | Bin 40166 -> 0 bytes test/pptx/raw-ooxml/deleted-layouts.pptx | Bin 0 -> 29754 bytes test/pptx/raw-ooxml/input.native | 3 + test/pptx/raw-ooxml/moved-layouts.pptx | Bin 0 -> 40546 bytes test/pptx/raw-ooxml/output.pptx | Bin 0 -> 26908 bytes test/pptx/raw-ooxml/templated.pptx | Bin 0 -> 40059 bytes test/pptx/raw_ooxml.native | 3 - test/pptx/raw_ooxml.pptx | Bin 26908 -> 0 bytes test/pptx/raw_ooxml_deleted_layouts.pptx | Bin 29754 -> 0 bytes test/pptx/raw_ooxml_moved_layouts.pptx | Bin 40546 -> 0 bytes test/pptx/raw_ooxml_templated.pptx | Bin 40059 -> 0 bytes test/pptx/reference-deleted-layouts.pptx | Bin 0 -> 18160 bytes test/pptx/reference-depth.pptx | Bin 0 -> 43743 bytes test/pptx/reference-moved-layouts.pptx | Bin 0 -> 44237 bytes test/pptx/reference_deleted_layouts.pptx | Bin 18160 -> 0 bytes test/pptx/reference_depth.pptx | Bin 43743 -> 0 bytes test/pptx/reference_moved_layouts.pptx | Bin 44237 -> 0 bytes test/pptx/remove-empty-slides/deleted-layouts.pptx | Bin 0 -> 46867 bytes test/pptx/remove-empty-slides/input.native | 5 + test/pptx/remove-empty-slides/moved-layouts.pptx | Bin 0 -> 57656 bytes test/pptx/remove-empty-slides/output.pptx | Bin 0 -> 44025 bytes test/pptx/remove-empty-slides/templated.pptx | Bin 0 -> 57172 bytes test/pptx/remove_empty_slides.native | 5 - test/pptx/remove_empty_slides.pptx | Bin 44025 -> 0 bytes test/pptx/remove_empty_slides_deleted_layouts.pptx | Bin 46867 -> 0 bytes test/pptx/remove_empty_slides_moved_layouts.pptx | Bin 57656 -> 0 bytes test/pptx/remove_empty_slides_templated.pptx | Bin 57172 -> 0 bytes .../deleted-layouts.pptx | Bin 0 -> 30554 bytes .../slide-breaks-slide-level-1/moved-layouts.pptx | Bin 0 -> 41343 bytes test/pptx/slide-breaks-slide-level-1/output.pptx | Bin 0 -> 27705 bytes .../pptx/slide-breaks-slide-level-1/templated.pptx | Bin 0 -> 40858 bytes test/pptx/slide-breaks-toc/deleted-layouts.pptx | Bin 0 -> 32328 bytes test/pptx/slide-breaks-toc/moved-layouts.pptx | Bin 0 -> 43118 bytes test/pptx/slide-breaks-toc/output.pptx | Bin 0 -> 29481 bytes test/pptx/slide-breaks-toc/templated.pptx | Bin 0 -> 42634 bytes test/pptx/slide-breaks/deleted-layouts.pptx | Bin 0 -> 31378 bytes test/pptx/slide-breaks/input.native | 7 ++ test/pptx/slide-breaks/moved-layouts.pptx | Bin 0 -> 42171 bytes test/pptx/slide-breaks/output.pptx | Bin 0 -> 28531 bytes test/pptx/slide-breaks/templated.pptx | Bin 0 -> 41683 bytes test/pptx/slide-level-0-h1-h2-with-table.native | 14 --- test/pptx/slide-level-0-h1-h2-with-table.pptx | Bin 26985 -> 0 bytes ...e-level-0-h1-h2-with-table_deleted_layouts.pptx | Bin 29828 -> 0 bytes ...ide-level-0-h1-h2-with-table_moved_layouts.pptx | Bin 40552 -> 0 bytes .../slide-level-0-h1-h2-with-table_templated.pptx | Bin 40052 -> 0 bytes test/pptx/slide-level-0-h1-with-image.native | 2 - test/pptx/slide-level-0-h1-with-image.pptx | Bin 42596 -> 0 bytes ...lide-level-0-h1-with-image_deleted_layouts.pptx | Bin 45433 -> 0 bytes .../slide-level-0-h1-with-image_moved_layouts.pptx | Bin 56156 -> 0 bytes .../slide-level-0-h1-with-image_templated.pptx | Bin 55657 -> 0 bytes test/pptx/slide-level-0-h1-with-table.native | 13 --- test/pptx/slide-level-0-h1-with-table.pptx | Bin 26166 -> 0 bytes ...lide-level-0-h1-with-table_deleted_layouts.pptx | Bin 29008 -> 0 bytes .../slide-level-0-h1-with-table_moved_layouts.pptx | Bin 39731 -> 0 bytes .../slide-level-0-h1-with-table_templated.pptx | Bin 39232 -> 0 bytes test/pptx/slide-level-0-h2-with-image.native | 2 - test/pptx/slide-level-0-h2-with-image.pptx | Bin 42596 -> 0 bytes ...lide-level-0-h2-with-image_deleted_layouts.pptx | Bin 45433 -> 0 bytes .../slide-level-0-h2-with-image_moved_layouts.pptx | Bin 56156 -> 0 bytes .../slide-level-0-h2-with-image_templated.pptx | Bin 55657 -> 0 bytes .../h1-h2-with-table/deleted-layouts.pptx | Bin 0 -> 29828 bytes .../slide-level-0/h1-h2-with-table/input.native | 14 +++ .../h1-h2-with-table/moved-layouts.pptx | Bin 0 -> 40552 bytes .../slide-level-0/h1-h2-with-table/output.pptx | Bin 0 -> 26985 bytes .../slide-level-0/h1-h2-with-table/templated.pptx | Bin 0 -> 40052 bytes .../h1-with-image/deleted-layouts.pptx | Bin 0 -> 45433 bytes test/pptx/slide-level-0/h1-with-image/input.native | 2 + .../slide-level-0/h1-with-image/moved-layouts.pptx | Bin 0 -> 56156 bytes test/pptx/slide-level-0/h1-with-image/output.pptx | Bin 0 -> 42596 bytes .../slide-level-0/h1-with-image/templated.pptx | Bin 0 -> 55657 bytes .../h1-with-table/deleted-layouts.pptx | Bin 0 -> 29008 bytes test/pptx/slide-level-0/h1-with-table/input.native | 13 +++ .../slide-level-0/h1-with-table/moved-layouts.pptx | Bin 0 -> 39731 bytes test/pptx/slide-level-0/h1-with-table/output.pptx | Bin 0 -> 26166 bytes .../slide-level-0/h1-with-table/templated.pptx | Bin 0 -> 39232 bytes .../h2-with-image/deleted-layouts.pptx | Bin 0 -> 45433 bytes test/pptx/slide-level-0/h2-with-image/input.native | 2 + .../slide-level-0/h2-with-image/moved-layouts.pptx | Bin 0 -> 56156 bytes test/pptx/slide-level-0/h2-with-image/output.pptx | Bin 0 -> 42596 bytes .../slide-level-0/h2-with-image/templated.pptx | Bin 0 -> 55657 bytes test/pptx/slide_breaks.native | 7 -- test/pptx/slide_breaks.pptx | Bin 28531 -> 0 bytes test/pptx/slide_breaks_deleted_layouts.pptx | Bin 31378 -> 0 bytes test/pptx/slide_breaks_moved_layouts.pptx | Bin 42171 -> 0 bytes test/pptx/slide_breaks_slide_level_1.pptx | Bin 27705 -> 0 bytes ...slide_breaks_slide_level_1_deleted_layouts.pptx | Bin 30554 -> 0 bytes .../slide_breaks_slide_level_1_moved_layouts.pptx | Bin 41343 -> 0 bytes .../pptx/slide_breaks_slide_level_1_templated.pptx | Bin 40858 -> 0 bytes test/pptx/slide_breaks_templated.pptx | Bin 41683 -> 0 bytes test/pptx/slide_breaks_toc.pptx | Bin 29481 -> 0 bytes test/pptx/slide_breaks_toc_deleted_layouts.pptx | Bin 32328 -> 0 bytes test/pptx/slide_breaks_toc_moved_layouts.pptx | Bin 43118 -> 0 bytes test/pptx/slide_breaks_toc_templated.pptx | Bin 42634 -> 0 bytes .../deleted-layouts.pptx | Bin 0 -> 34473 bytes .../pptx/speaker-notes-after-metadata/input.native | 5 + .../moved-layouts.pptx | Bin 0 -> 45269 bytes test/pptx/speaker-notes-after-metadata/output.pptx | Bin 0 -> 31636 bytes .../speaker-notes-after-metadata/templated.pptx | Bin 0 -> 44775 bytes .../speaker-notes-afterheader/deleted-layouts.pptx | Bin 0 -> 33500 bytes test/pptx/speaker-notes-afterheader/input.native | 3 + .../speaker-notes-afterheader/moved-layouts.pptx | Bin 0 -> 44297 bytes test/pptx/speaker-notes-afterheader/output.pptx | Bin 0 -> 30657 bytes test/pptx/speaker-notes-afterheader/templated.pptx | Bin 0 -> 43803 bytes .../speaker-notes-afterseps/deleted-layouts.pptx | Bin 0 -> 54396 bytes test/pptx/speaker-notes-afterseps/input.native | 63 ++++++++++++ .../speaker-notes-afterseps/moved-layouts.pptx | Bin 0 -> 65121 bytes test/pptx/speaker-notes-afterseps/output.pptx | Bin 0 -> 51557 bytes test/pptx/speaker-notes-afterseps/templated.pptx | Bin 0 -> 64619 bytes test/pptx/speaker-notes/deleted-layouts.pptx | Bin 0 -> 38203 bytes test/pptx/speaker-notes/input.native | 17 +++ test/pptx/speaker-notes/moved-layouts.pptx | Bin 0 -> 49002 bytes test/pptx/speaker-notes/output.pptx | Bin 0 -> 35360 bytes test/pptx/speaker-notes/templated.pptx | Bin 0 -> 48507 bytes test/pptx/speaker_notes.native | 17 --- test/pptx/speaker_notes.pptx | Bin 35360 -> 0 bytes test/pptx/speaker_notes_after_metadata.native | 5 - test/pptx/speaker_notes_after_metadata.pptx | Bin 31636 -> 0 bytes ...eaker_notes_after_metadata_deleted_layouts.pptx | Bin 34473 -> 0 bytes ...speaker_notes_after_metadata_moved_layouts.pptx | Bin 45269 -> 0 bytes .../speaker_notes_after_metadata_templated.pptx | Bin 44775 -> 0 bytes test/pptx/speaker_notes_afterheader.native | 3 - test/pptx/speaker_notes_afterheader.pptx | Bin 30657 -> 0 bytes .../speaker_notes_afterheader_deleted_layouts.pptx | Bin 33500 -> 0 bytes .../speaker_notes_afterheader_moved_layouts.pptx | Bin 44297 -> 0 bytes test/pptx/speaker_notes_afterheader_templated.pptx | Bin 43803 -> 0 bytes test/pptx/speaker_notes_afterseps.native | 63 ------------ test/pptx/speaker_notes_afterseps.pptx | Bin 51557 -> 0 bytes .../speaker_notes_afterseps_deleted_layouts.pptx | Bin 54396 -> 0 bytes .../speaker_notes_afterseps_moved_layouts.pptx | Bin 65121 -> 0 bytes test/pptx/speaker_notes_afterseps_templated.pptx | Bin 64619 -> 0 bytes test/pptx/speaker_notes_deleted_layouts.pptx | Bin 38203 -> 0 bytes test/pptx/speaker_notes_moved_layouts.pptx | Bin 49002 -> 0 bytes test/pptx/speaker_notes_templated.pptx | Bin 48507 -> 0 bytes test/pptx/start-numbering-at/deleted-layouts.pptx | Bin 0 -> 29837 bytes test/pptx/start-numbering-at/input.native | 9 ++ test/pptx/start-numbering-at/moved-layouts.pptx | Bin 0 -> 40630 bytes test/pptx/start-numbering-at/output.pptx | Bin 0 -> 26991 bytes test/pptx/start-numbering-at/templated.pptx | Bin 0 -> 40142 bytes test/pptx/start_numbering_at.native | 9 -- test/pptx/start_numbering_at.pptx | Bin 26991 -> 0 bytes test/pptx/start_numbering_at_deleted_layouts.pptx | Bin 29837 -> 0 bytes test/pptx/start_numbering_at_moved_layouts.pptx | Bin 40630 -> 0 bytes test/pptx/start_numbering_at_templated.pptx | Bin 40142 -> 0 bytes test/pptx/tables.native | 95 ----------------- test/pptx/tables.pptx | Bin 27532 -> 0 bytes test/pptx/tables/deleted-layouts.pptx | Bin 0 -> 30381 bytes test/pptx/tables/input.native | 95 +++++++++++++++++ test/pptx/tables/moved-layouts.pptx | Bin 0 -> 41174 bytes test/pptx/tables/output.pptx | Bin 0 -> 27532 bytes test/pptx/tables/templated.pptx | Bin 0 -> 40686 bytes test/pptx/tables_deleted_layouts.pptx | Bin 30381 -> 0 bytes test/pptx/tables_moved_layouts.pptx | Bin 41174 -> 0 bytes test/pptx/tables_templated.pptx | Bin 40686 -> 0 bytes test/pptx/two-column/deleted-layouts.pptx | Bin 0 -> 28883 bytes test/pptx/two-column/input.native | 9 ++ test/pptx/two-column/moved-layouts.pptx | Bin 0 -> 39676 bytes test/pptx/two-column/output.pptx | Bin 0 -> 26038 bytes test/pptx/two-column/templated.pptx | Bin 0 -> 39189 bytes test/pptx/two_column.native | 9 -- test/pptx/two_column.pptx | Bin 26038 -> 0 bytes test/pptx/two_column_deleted_layouts.pptx | Bin 28883 -> 0 bytes test/pptx/two_column_moved_layouts.pptx | Bin 39676 -> 0 bytes test/pptx/two_column_templated.pptx | Bin 39189 -> 0 bytes 250 files changed, 413 insertions(+), 360 deletions(-) delete mode 100644 test/pptx/code-custom.pptx create mode 100644 test/pptx/code-custom/deleted-layouts.pptx create mode 100644 test/pptx/code-custom/moved-layouts.pptx create mode 100644 test/pptx/code-custom/output.pptx create mode 100644 test/pptx/code-custom/templated.pptx delete mode 100644 test/pptx/code-custom_deleted_layouts.pptx delete mode 100644 test/pptx/code-custom_moved_layouts.pptx delete mode 100644 test/pptx/code-custom_templated.pptx delete mode 100644 test/pptx/code.native delete mode 100644 test/pptx/code.pptx create mode 100644 test/pptx/code/deleted-layouts.pptx create mode 100644 test/pptx/code/input.native create mode 100644 test/pptx/code/moved-layouts.pptx create mode 100644 test/pptx/code/output.pptx create mode 100644 test/pptx/code/templated.pptx delete mode 100644 test/pptx/code_deleted_layouts.pptx delete mode 100644 test/pptx/code_moved_layouts.pptx delete mode 100644 test/pptx/code_templated.pptx delete mode 100644 test/pptx/document-properties-short-desc.native delete mode 100644 test/pptx/document-properties-short-desc.pptx create mode 100644 test/pptx/document-properties-short-desc/deleted-layouts.pptx create mode 100644 test/pptx/document-properties-short-desc/input.native create mode 100644 test/pptx/document-properties-short-desc/moved-layouts.pptx create mode 100644 test/pptx/document-properties-short-desc/output.pptx create mode 100644 test/pptx/document-properties-short-desc/templated.pptx delete mode 100644 test/pptx/document-properties-short-desc_deleted_layouts.pptx delete mode 100644 test/pptx/document-properties-short-desc_moved_layouts.pptx delete mode 100644 test/pptx/document-properties-short-desc_templated.pptx delete mode 100644 test/pptx/document-properties.native delete mode 100644 test/pptx/document-properties.pptx create mode 100644 test/pptx/document-properties/deleted-layouts.pptx create mode 100644 test/pptx/document-properties/input.native create mode 100644 test/pptx/document-properties/moved-layouts.pptx create mode 100644 test/pptx/document-properties/output.pptx create mode 100644 test/pptx/document-properties/templated.pptx delete mode 100644 test/pptx/document-properties_deleted_layouts.pptx delete mode 100644 test/pptx/document-properties_moved_layouts.pptx delete mode 100644 test/pptx/document-properties_templated.pptx create mode 100644 test/pptx/endnotes-toc/deleted-layouts.pptx create mode 100644 test/pptx/endnotes-toc/moved-layouts.pptx create mode 100644 test/pptx/endnotes-toc/output.pptx create mode 100644 test/pptx/endnotes-toc/templated.pptx delete mode 100644 test/pptx/endnotes.native delete mode 100644 test/pptx/endnotes.pptx create mode 100644 test/pptx/endnotes/deleted-layouts.pptx create mode 100644 test/pptx/endnotes/input.native create mode 100644 test/pptx/endnotes/moved-layouts.pptx create mode 100644 test/pptx/endnotes/output.pptx create mode 100644 test/pptx/endnotes/templated.pptx delete mode 100644 test/pptx/endnotes_deleted_layouts.pptx delete mode 100644 test/pptx/endnotes_moved_layouts.pptx delete mode 100644 test/pptx/endnotes_templated.pptx delete mode 100644 test/pptx/endnotes_toc.pptx delete mode 100644 test/pptx/endnotes_toc_deleted_layouts.pptx delete mode 100644 test/pptx/endnotes_toc_moved_layouts.pptx delete mode 100644 test/pptx/endnotes_toc_templated.pptx delete mode 100644 test/pptx/images.native delete mode 100644 test/pptx/images.pptx create mode 100644 test/pptx/images/deleted-layouts.pptx create mode 100644 test/pptx/images/input.native create mode 100644 test/pptx/images/moved-layouts.pptx create mode 100644 test/pptx/images/output.pptx create mode 100644 test/pptx/images/templated.pptx delete mode 100644 test/pptx/images_deleted_layouts.pptx delete mode 100644 test/pptx/images_moved_layouts.pptx delete mode 100644 test/pptx/images_templated.pptx create mode 100644 test/pptx/inline-formatting/deleted-layouts.pptx create mode 100644 test/pptx/inline-formatting/input.native create mode 100644 test/pptx/inline-formatting/moved-layouts.pptx create mode 100644 test/pptx/inline-formatting/output.pptx create mode 100644 test/pptx/inline-formatting/templated.pptx delete mode 100644 test/pptx/inline_formatting.native delete mode 100644 test/pptx/inline_formatting.pptx delete mode 100644 test/pptx/inline_formatting_deleted_layouts.pptx delete mode 100644 test/pptx/inline_formatting_moved_layouts.pptx delete mode 100644 test/pptx/inline_formatting_templated.pptx delete mode 100644 test/pptx/lists.native delete mode 100644 test/pptx/lists.pptx create mode 100644 test/pptx/lists/deleted-layouts.pptx create mode 100644 test/pptx/lists/input.native create mode 100644 test/pptx/lists/moved-layouts.pptx create mode 100644 test/pptx/lists/output.pptx create mode 100644 test/pptx/lists/templated.pptx delete mode 100644 test/pptx/lists_deleted_layouts.pptx delete mode 100644 test/pptx/lists_moved_layouts.pptx delete mode 100644 test/pptx/lists_templated.pptx create mode 100644 test/pptx/raw-ooxml/deleted-layouts.pptx create mode 100644 test/pptx/raw-ooxml/input.native create mode 100644 test/pptx/raw-ooxml/moved-layouts.pptx create mode 100644 test/pptx/raw-ooxml/output.pptx create mode 100644 test/pptx/raw-ooxml/templated.pptx delete mode 100644 test/pptx/raw_ooxml.native delete mode 100644 test/pptx/raw_ooxml.pptx delete mode 100644 test/pptx/raw_ooxml_deleted_layouts.pptx delete mode 100644 test/pptx/raw_ooxml_moved_layouts.pptx delete mode 100644 test/pptx/raw_ooxml_templated.pptx create mode 100644 test/pptx/reference-deleted-layouts.pptx create mode 100644 test/pptx/reference-depth.pptx create mode 100644 test/pptx/reference-moved-layouts.pptx delete mode 100644 test/pptx/reference_deleted_layouts.pptx delete mode 100644 test/pptx/reference_depth.pptx delete mode 100644 test/pptx/reference_moved_layouts.pptx create mode 100644 test/pptx/remove-empty-slides/deleted-layouts.pptx create mode 100644 test/pptx/remove-empty-slides/input.native create mode 100644 test/pptx/remove-empty-slides/moved-layouts.pptx create mode 100644 test/pptx/remove-empty-slides/output.pptx create mode 100644 test/pptx/remove-empty-slides/templated.pptx delete mode 100644 test/pptx/remove_empty_slides.native delete mode 100644 test/pptx/remove_empty_slides.pptx delete mode 100644 test/pptx/remove_empty_slides_deleted_layouts.pptx delete mode 100644 test/pptx/remove_empty_slides_moved_layouts.pptx delete mode 100644 test/pptx/remove_empty_slides_templated.pptx create mode 100644 test/pptx/slide-breaks-slide-level-1/deleted-layouts.pptx create mode 100644 test/pptx/slide-breaks-slide-level-1/moved-layouts.pptx create mode 100644 test/pptx/slide-breaks-slide-level-1/output.pptx create mode 100644 test/pptx/slide-breaks-slide-level-1/templated.pptx create mode 100644 test/pptx/slide-breaks-toc/deleted-layouts.pptx create mode 100644 test/pptx/slide-breaks-toc/moved-layouts.pptx create mode 100644 test/pptx/slide-breaks-toc/output.pptx create mode 100644 test/pptx/slide-breaks-toc/templated.pptx create mode 100644 test/pptx/slide-breaks/deleted-layouts.pptx create mode 100644 test/pptx/slide-breaks/input.native create mode 100644 test/pptx/slide-breaks/moved-layouts.pptx create mode 100644 test/pptx/slide-breaks/output.pptx create mode 100644 test/pptx/slide-breaks/templated.pptx delete mode 100644 test/pptx/slide-level-0-h1-h2-with-table.native delete mode 100644 test/pptx/slide-level-0-h1-h2-with-table.pptx delete mode 100644 test/pptx/slide-level-0-h1-h2-with-table_deleted_layouts.pptx delete mode 100644 test/pptx/slide-level-0-h1-h2-with-table_moved_layouts.pptx delete mode 100644 test/pptx/slide-level-0-h1-h2-with-table_templated.pptx delete mode 100644 test/pptx/slide-level-0-h1-with-image.native delete mode 100644 test/pptx/slide-level-0-h1-with-image.pptx delete mode 100644 test/pptx/slide-level-0-h1-with-image_deleted_layouts.pptx delete mode 100644 test/pptx/slide-level-0-h1-with-image_moved_layouts.pptx delete mode 100644 test/pptx/slide-level-0-h1-with-image_templated.pptx delete mode 100644 test/pptx/slide-level-0-h1-with-table.native delete mode 100644 test/pptx/slide-level-0-h1-with-table.pptx delete mode 100644 test/pptx/slide-level-0-h1-with-table_deleted_layouts.pptx delete mode 100644 test/pptx/slide-level-0-h1-with-table_moved_layouts.pptx delete mode 100644 test/pptx/slide-level-0-h1-with-table_templated.pptx delete mode 100644 test/pptx/slide-level-0-h2-with-image.native delete mode 100644 test/pptx/slide-level-0-h2-with-image.pptx delete mode 100644 test/pptx/slide-level-0-h2-with-image_deleted_layouts.pptx delete mode 100644 test/pptx/slide-level-0-h2-with-image_moved_layouts.pptx delete mode 100644 test/pptx/slide-level-0-h2-with-image_templated.pptx create mode 100644 test/pptx/slide-level-0/h1-h2-with-table/deleted-layouts.pptx create mode 100644 test/pptx/slide-level-0/h1-h2-with-table/input.native create mode 100644 test/pptx/slide-level-0/h1-h2-with-table/moved-layouts.pptx create mode 100644 test/pptx/slide-level-0/h1-h2-with-table/output.pptx create mode 100644 test/pptx/slide-level-0/h1-h2-with-table/templated.pptx create mode 100644 test/pptx/slide-level-0/h1-with-image/deleted-layouts.pptx create mode 100644 test/pptx/slide-level-0/h1-with-image/input.native create mode 100644 test/pptx/slide-level-0/h1-with-image/moved-layouts.pptx create mode 100644 test/pptx/slide-level-0/h1-with-image/output.pptx create mode 100644 test/pptx/slide-level-0/h1-with-image/templated.pptx create mode 100644 test/pptx/slide-level-0/h1-with-table/deleted-layouts.pptx create mode 100644 test/pptx/slide-level-0/h1-with-table/input.native create mode 100644 test/pptx/slide-level-0/h1-with-table/moved-layouts.pptx create mode 100644 test/pptx/slide-level-0/h1-with-table/output.pptx create mode 100644 test/pptx/slide-level-0/h1-with-table/templated.pptx create mode 100644 test/pptx/slide-level-0/h2-with-image/deleted-layouts.pptx create mode 100644 test/pptx/slide-level-0/h2-with-image/input.native create mode 100644 test/pptx/slide-level-0/h2-with-image/moved-layouts.pptx create mode 100644 test/pptx/slide-level-0/h2-with-image/output.pptx create mode 100644 test/pptx/slide-level-0/h2-with-image/templated.pptx delete mode 100644 test/pptx/slide_breaks.native delete mode 100644 test/pptx/slide_breaks.pptx delete mode 100644 test/pptx/slide_breaks_deleted_layouts.pptx delete mode 100644 test/pptx/slide_breaks_moved_layouts.pptx delete mode 100644 test/pptx/slide_breaks_slide_level_1.pptx delete mode 100644 test/pptx/slide_breaks_slide_level_1_deleted_layouts.pptx delete mode 100644 test/pptx/slide_breaks_slide_level_1_moved_layouts.pptx delete mode 100644 test/pptx/slide_breaks_slide_level_1_templated.pptx delete mode 100644 test/pptx/slide_breaks_templated.pptx delete mode 100644 test/pptx/slide_breaks_toc.pptx delete mode 100644 test/pptx/slide_breaks_toc_deleted_layouts.pptx delete mode 100644 test/pptx/slide_breaks_toc_moved_layouts.pptx delete mode 100644 test/pptx/slide_breaks_toc_templated.pptx create mode 100644 test/pptx/speaker-notes-after-metadata/deleted-layouts.pptx create mode 100644 test/pptx/speaker-notes-after-metadata/input.native create mode 100644 test/pptx/speaker-notes-after-metadata/moved-layouts.pptx create mode 100644 test/pptx/speaker-notes-after-metadata/output.pptx create mode 100644 test/pptx/speaker-notes-after-metadata/templated.pptx create mode 100644 test/pptx/speaker-notes-afterheader/deleted-layouts.pptx create mode 100644 test/pptx/speaker-notes-afterheader/input.native create mode 100644 test/pptx/speaker-notes-afterheader/moved-layouts.pptx create mode 100644 test/pptx/speaker-notes-afterheader/output.pptx create mode 100644 test/pptx/speaker-notes-afterheader/templated.pptx create mode 100644 test/pptx/speaker-notes-afterseps/deleted-layouts.pptx create mode 100644 test/pptx/speaker-notes-afterseps/input.native create mode 100644 test/pptx/speaker-notes-afterseps/moved-layouts.pptx create mode 100644 test/pptx/speaker-notes-afterseps/output.pptx create mode 100644 test/pptx/speaker-notes-afterseps/templated.pptx create mode 100644 test/pptx/speaker-notes/deleted-layouts.pptx create mode 100644 test/pptx/speaker-notes/input.native create mode 100644 test/pptx/speaker-notes/moved-layouts.pptx create mode 100644 test/pptx/speaker-notes/output.pptx create mode 100644 test/pptx/speaker-notes/templated.pptx delete mode 100644 test/pptx/speaker_notes.native delete mode 100644 test/pptx/speaker_notes.pptx delete mode 100644 test/pptx/speaker_notes_after_metadata.native delete mode 100644 test/pptx/speaker_notes_after_metadata.pptx delete mode 100644 test/pptx/speaker_notes_after_metadata_deleted_layouts.pptx delete mode 100644 test/pptx/speaker_notes_after_metadata_moved_layouts.pptx delete mode 100644 test/pptx/speaker_notes_after_metadata_templated.pptx delete mode 100644 test/pptx/speaker_notes_afterheader.native delete mode 100644 test/pptx/speaker_notes_afterheader.pptx delete mode 100644 test/pptx/speaker_notes_afterheader_deleted_layouts.pptx delete mode 100644 test/pptx/speaker_notes_afterheader_moved_layouts.pptx delete mode 100644 test/pptx/speaker_notes_afterheader_templated.pptx delete mode 100644 test/pptx/speaker_notes_afterseps.native delete mode 100644 test/pptx/speaker_notes_afterseps.pptx delete mode 100644 test/pptx/speaker_notes_afterseps_deleted_layouts.pptx delete mode 100644 test/pptx/speaker_notes_afterseps_moved_layouts.pptx delete mode 100644 test/pptx/speaker_notes_afterseps_templated.pptx delete mode 100644 test/pptx/speaker_notes_deleted_layouts.pptx delete mode 100644 test/pptx/speaker_notes_moved_layouts.pptx delete mode 100644 test/pptx/speaker_notes_templated.pptx create mode 100644 test/pptx/start-numbering-at/deleted-layouts.pptx create mode 100644 test/pptx/start-numbering-at/input.native create mode 100644 test/pptx/start-numbering-at/moved-layouts.pptx create mode 100644 test/pptx/start-numbering-at/output.pptx create mode 100644 test/pptx/start-numbering-at/templated.pptx delete mode 100644 test/pptx/start_numbering_at.native delete mode 100644 test/pptx/start_numbering_at.pptx delete mode 100644 test/pptx/start_numbering_at_deleted_layouts.pptx delete mode 100644 test/pptx/start_numbering_at_moved_layouts.pptx delete mode 100644 test/pptx/start_numbering_at_templated.pptx delete mode 100644 test/pptx/tables.native delete mode 100644 test/pptx/tables.pptx create mode 100644 test/pptx/tables/deleted-layouts.pptx create mode 100644 test/pptx/tables/input.native create mode 100644 test/pptx/tables/moved-layouts.pptx create mode 100644 test/pptx/tables/output.pptx create mode 100644 test/pptx/tables/templated.pptx delete mode 100644 test/pptx/tables_deleted_layouts.pptx delete mode 100644 test/pptx/tables_moved_layouts.pptx delete mode 100644 test/pptx/tables_templated.pptx create mode 100644 test/pptx/two-column/deleted-layouts.pptx create mode 100644 test/pptx/two-column/input.native create mode 100644 test/pptx/two-column/moved-layouts.pptx create mode 100644 test/pptx/two-column/output.pptx create mode 100644 test/pptx/two-column/templated.pptx delete mode 100644 test/pptx/two_column.native delete mode 100644 test/pptx/two_column.pptx delete mode 100644 test/pptx/two_column_deleted_layouts.pptx delete mode 100644 test/pptx/two_column_moved_layouts.pptx delete mode 100644 test/pptx/two_column_templated.pptx diff --git a/pandoc.cabal b/pandoc.cabal index da53cb1cd..7fb951488 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -380,7 +380,60 @@ extra-source-files: test/rtf/*.native test/rtf/*.rtf test/pptx/*.pptx - test/pptx/*.native + test/pptx/code-custom/*.pptx + test/pptx/code/input.native + test/pptx/code/*.pptx + test/pptx/comparison-both-columns/input.native + test/pptx/comparison-both-columns/*.pptx + test/pptx/comparison-extra-text/input.native + test/pptx/comparison-extra-text/*.pptx + test/pptx/comparison-non-text-first/input.native + test/pptx/comparison-non-text-first/*.pptx + test/pptx/comparison-one-column/input.native + test/pptx/comparison-one-column/*.pptx + test/pptx/document-properties-short-desc/input.native + test/pptx/document-properties-short-desc/*.pptx + test/pptx/document-properties/input.native + test/pptx/document-properties/*.pptx + test/pptx/endnotes-toc/*.pptx + test/pptx/endnotes/input.native + test/pptx/endnotes/*.pptx + test/pptx/images/input.native + test/pptx/images/*.pptx + test/pptx/inline-formatting/input.native + test/pptx/inline-formatting/*.pptx + test/pptx/lists/input.native + test/pptx/lists/*.pptx + test/pptx/raw-ooxml/input.native + test/pptx/raw-ooxml/*.pptx + test/pptx/remove-empty-slides/input.native + test/pptx/remove-empty-slides/*.pptx + test/pptx/slide-breaks-slide-level-1/*.pptx + test/pptx/slide-breaks-toc/*.pptx + test/pptx/slide-breaks/input.native + test/pptx/slide-breaks/*.pptx + test/pptx/slide-level-0/h1-h2-with-table/input.native + test/pptx/slide-level-0/h1-h2-with-table/*.pptx + test/pptx/slide-level-0/h1-with-image/input.native + test/pptx/slide-level-0/h1-with-image/*.pptx + test/pptx/slide-level-0/h1-with-table/input.native + test/pptx/slide-level-0/h1-with-table/*.pptx + test/pptx/slide-level-0/h2-with-image/input.native + test/pptx/slide-level-0/h2-with-image/*.pptx + test/pptx/speaker-notes-after-metadata/input.native + test/pptx/speaker-notes-after-metadata/*.pptx + test/pptx/speaker-notes-afterheader/input.native + test/pptx/speaker-notes-afterheader/*.pptx + test/pptx/speaker-notes-afterseps/input.native + test/pptx/speaker-notes-afterseps/*.pptx + test/pptx/speaker-notes/input.native + test/pptx/speaker-notes/*.pptx + test/pptx/start-numbering-at/input.native + test/pptx/start-numbering-at/*.pptx + test/pptx/tables/input.native + test/pptx/tables/*.pptx + test/pptx/two-column/input.native + test/pptx/two-column/*.pptx test/ipynb/*.in.native test/ipynb/*.out.native test/ipynb/*.ipynb diff --git a/test/Tests/Writers/Powerpoint.hs b/test/Tests/Writers/Powerpoint.hs index fd6d01d2d..fd9871659 100644 --- a/test/Tests/Writers/Powerpoint.hs +++ b/test/Tests/Writers/Powerpoint.hs @@ -15,13 +15,13 @@ import Data.List (unzip4) modifyPptxName :: FilePath -> String -> FilePath modifyPptxName fp suffix = - addExtension (dropExtension fp ++ suffix) "pptx" + addExtension (takeDirectory fp ++ suffix) "pptx" pptxTests :: String -> WriterOptions -> FilePath -> FilePath -> (TestTree, TestTree, TestTree, TestTree) pptxTests name opts native pptx = - let referenceDoc = "pptx/reference_depth.pptx" - movedLayoutsReferenceDoc = "pptx/reference_moved_layouts.pptx" - deletedLayoutsReferenceDoc = "pptx/reference_deleted_layouts.pptx" + let referenceDoc = "pptx/reference-depth.pptx" + movedLayoutsReferenceDoc = "pptx/reference-moved-layouts.pptx" + deletedLayoutsReferenceDoc = "pptx/reference-deleted-layouts.pptx" in ( ooxmlTest writePowerpoint @@ -34,19 +34,19 @@ pptxTests name opts native pptx = name opts{writerReferenceDoc=Just referenceDoc} native - (modifyPptxName pptx "_templated") + (modifyPptxName pptx "/templated") , ooxmlTest writePowerpoint name opts{writerReferenceDoc=Just movedLayoutsReferenceDoc} native - (modifyPptxName pptx "_moved_layouts") + (modifyPptxName pptx "/moved-layouts") , ooxmlTest writePowerpoint name opts{writerReferenceDoc=Just deletedLayoutsReferenceDoc} native - (modifyPptxName pptx "_deleted_layouts") + (modifyPptxName pptx "/deleted-layouts") ) groupPptxTests :: [(TestTree, TestTree, TestTree, TestTree)] -> [TestTree] @@ -63,112 +63,112 @@ groupPptxTests pairs = tests :: [TestTree] tests = groupPptxTests [ pptxTests "Inline formatting" def - "pptx/inline_formatting.native" - "pptx/inline_formatting.pptx" + "pptx/inline-formatting/input.native" + "pptx/inline-formatting/output.pptx" , pptxTests "Slide breaks (default slide-level)" def - "pptx/slide_breaks.native" - "pptx/slide_breaks.pptx" + "pptx/slide-breaks/input.native" + "pptx/slide-breaks/output.pptx" , pptxTests "slide breaks (slide-level set to 1)" def{ writerSlideLevel = Just 1 } - "pptx/slide_breaks.native" - "pptx/slide_breaks_slide_level_1.pptx" + "pptx/slide-breaks/input.native" + "pptx/slide-breaks-slide-level-1/output.pptx" , pptxTests "lists" def - "pptx/lists.native" - "pptx/lists.pptx" + "pptx/lists/input.native" + "pptx/lists/output.pptx" , pptxTests "start ordered list at specified num" def - "pptx/start_numbering_at.native" - "pptx/start_numbering_at.pptx" + "pptx/start-numbering-at/input.native" + "pptx/start-numbering-at/output.pptx" , pptxTests "tables" def - "pptx/tables.native" - "pptx/tables.pptx" + "pptx/tables/input.native" + "pptx/tables/output.pptx" , pptxTests "table of contents" def{ writerTableOfContents = True } - "pptx/slide_breaks.native" - "pptx/slide_breaks_toc.pptx" + "pptx/slide-breaks/input.native" + "pptx/slide-breaks-toc/output.pptx" , pptxTests "end notes" def - "pptx/endnotes.native" - "pptx/endnotes.pptx" + "pptx/endnotes/input.native" + "pptx/endnotes/output.pptx" , pptxTests "end notes, with table of contents" def { writerTableOfContents = True } - "pptx/endnotes.native" - "pptx/endnotes_toc.pptx" + "pptx/endnotes/input.native" + "pptx/endnotes-toc/output.pptx" , pptxTests "images" def - "pptx/images.native" - "pptx/images.pptx" + "pptx/images/input.native" + "pptx/images/output.pptx" , pptxTests "two-column layout" def - "pptx/two_column.native" - "pptx/two_column.pptx" + "pptx/two-column/input.native" + "pptx/two-column/output.pptx" , pptxTests "speaker notes" def - "pptx/speaker_notes.native" - "pptx/speaker_notes.pptx" + "pptx/speaker-notes/input.native" + "pptx/speaker-notes/output.pptx" , pptxTests "speaker notes after a separating block" def - "pptx/speaker_notes_afterseps.native" - "pptx/speaker_notes_afterseps.pptx" + "pptx/speaker-notes-afterseps/input.native" + "pptx/speaker-notes-afterseps/output.pptx" , pptxTests "speaker notes after a separating header" def - "pptx/speaker_notes_afterheader.native" - "pptx/speaker_notes_afterheader.pptx" + "pptx/speaker-notes-afterheader/input.native" + "pptx/speaker-notes-afterheader/output.pptx" , pptxTests "speaker notes after metadata" def - "pptx/speaker_notes_after_metadata.native" - "pptx/speaker_notes_after_metadata.pptx" + "pptx/speaker-notes-after-metadata/input.native" + "pptx/speaker-notes-after-metadata/output.pptx" , pptxTests "remove empty slides" def - "pptx/remove_empty_slides.native" - "pptx/remove_empty_slides.pptx" + "pptx/remove-empty-slides/input.native" + "pptx/remove-empty-slides/output.pptx" , pptxTests "raw ooxml" def - "pptx/raw_ooxml.native" - "pptx/raw_ooxml.pptx" + "pptx/raw-ooxml/input.native" + "pptx/raw-ooxml/output.pptx" , pptxTests "metadata, custom properties" def - "pptx/document-properties.native" - "pptx/document-properties.pptx" + "pptx/document-properties/input.native" + "pptx/document-properties/output.pptx" , pptxTests "metadata, short description" def - "pptx/document-properties-short-desc.native" - "pptx/document-properties-short-desc.pptx" + "pptx/document-properties-short-desc/input.native" + "pptx/document-properties-short-desc/output.pptx" , pptxTests "inline code and code blocks" def - "pptx/code.native" - "pptx/code.pptx" + "pptx/code/input.native" + "pptx/code/output.pptx" , pptxTests "inline code and code blocks, custom formatting" def { writerVariables = Context $ M.fromList [(pack "monofont", toVal $ pack "Consolas")] } - "pptx/code.native" - "pptx/code-custom.pptx" + "pptx/code/input.native" + "pptx/code-custom/output.pptx" , pptxTests ("Using slide level 0, if the first thing on " <> "a slide is a h1 it's used as the " <> "slide title") def { writerSlideLevel = Just 0 } - "pptx/slide-level-0-h1-with-image.native" - "pptx/slide-level-0-h1-with-image.pptx" + "pptx/slide-level-0/h1-with-image/input.native" + "pptx/slide-level-0/h1-with-image/output.pptx" , pptxTests ("Using slide level 0, if the first thing on " <> "a slide is a h2 it's used as the " <> "slide title") def { writerSlideLevel = Just 0 } - "pptx/slide-level-0-h2-with-image.native" - "pptx/slide-level-0-h2-with-image.pptx" + "pptx/slide-level-0/h2-with-image/input.native" + "pptx/slide-level-0/h2-with-image/output.pptx" , pptxTests ("Using slide level 0, if the first thing on " <> "a slide is a heading it's used as the " <> "slide title (works with a table)") def { writerSlideLevel = Just 0 } - "pptx/slide-level-0-h1-with-table.native" - "pptx/slide-level-0-h1-with-table.pptx" + "pptx/slide-level-0/h1-with-table/input.native" + "pptx/slide-level-0/h1-with-table/output.pptx" , pptxTests ("Using slide level 0, if the first thing on " <> "a slide is a heading it's used as the " <> "slide title (two headings forces a " <> "slide break though)") def { writerSlideLevel = Just 0 } - "pptx/slide-level-0-h1-h2-with-table.native" - "pptx/slide-level-0-h1-h2-with-table.pptx" + "pptx/slide-level-0/h1-h2-with-table/input.native" + "pptx/slide-level-0/h1-h2-with-table/output.pptx" ] diff --git a/test/pptx/code-custom.pptx b/test/pptx/code-custom.pptx deleted file mode 100644 index 5e9c2c630..000000000 Binary files a/test/pptx/code-custom.pptx and /dev/null differ diff --git a/test/pptx/code-custom/deleted-layouts.pptx b/test/pptx/code-custom/deleted-layouts.pptx new file mode 100644 index 000000000..9282e6354 Binary files /dev/null and b/test/pptx/code-custom/deleted-layouts.pptx differ diff --git a/test/pptx/code-custom/moved-layouts.pptx b/test/pptx/code-custom/moved-layouts.pptx new file mode 100644 index 000000000..a14eeb6c8 Binary files /dev/null and b/test/pptx/code-custom/moved-layouts.pptx differ diff --git a/test/pptx/code-custom/output.pptx b/test/pptx/code-custom/output.pptx new file mode 100644 index 000000000..5e9c2c630 Binary files /dev/null and b/test/pptx/code-custom/output.pptx differ diff --git a/test/pptx/code-custom/templated.pptx b/test/pptx/code-custom/templated.pptx new file mode 100644 index 000000000..0e640f373 Binary files /dev/null and b/test/pptx/code-custom/templated.pptx differ diff --git a/test/pptx/code-custom_deleted_layouts.pptx b/test/pptx/code-custom_deleted_layouts.pptx deleted file mode 100644 index 9282e6354..000000000 Binary files a/test/pptx/code-custom_deleted_layouts.pptx and /dev/null differ diff --git a/test/pptx/code-custom_moved_layouts.pptx b/test/pptx/code-custom_moved_layouts.pptx deleted file mode 100644 index a14eeb6c8..000000000 Binary files a/test/pptx/code-custom_moved_layouts.pptx and /dev/null differ diff --git a/test/pptx/code-custom_templated.pptx b/test/pptx/code-custom_templated.pptx deleted file mode 100644 index 0e640f373..000000000 Binary files a/test/pptx/code-custom_templated.pptx and /dev/null differ diff --git a/test/pptx/code.native b/test/pptx/code.native deleted file mode 100644 index be7f512f7..000000000 --- a/test/pptx/code.native +++ /dev/null @@ -1,21 +0,0 @@ -[Header 1 ("header-with-inline-code",[],[]) [Str "Header",Space,Str "with",Space,Code ("",[],[]) "inline code"] -,CodeBlock ("",[],[]) "Code at level 0" -,BulletList - [[Para [Str "Bullet",Space,Str "item",Space,Str "with",Space,Code ("",[],[]) "inline code"] - ,CodeBlock ("",[],[]) "Code block at level 1" - ,BulletList - [[Para [Str "with",Space,Code ("",[],[]) "nested"] - ,CodeBlock ("",[],[]) "lvl2\nlvl2\nlvl2" - ,Header 2 ("second-heading-level-with-code",[],[]) [Str "Second",Space,Str "heading",Space,Str "level",Space,Str "with",Space,Code ("",[],[]) "code"]]]]] -,Header 1 ("syntax-highlighting",[],[]) [Str "Syntax",Space,Str "highlighting"] -,CodeBlock ("",["haskell"],[]) "id :: a -> a\nid x = x" -,BulletList - [[Para [Str "Nested"] - ,CodeBlock ("",["haskell"],[]) "g :: Int -> Int\ng x = x * 3"]] -,Header 1 ("two-column-slide",[],[]) [Str "Two",Space,Str "column",Space,Str "slide"] -,Div ("",["columns"],[]) - [Div ("",["column"],[("width","50%")]) - [BulletList - [[Plain [Str "A",Space,Str "total",Space,Str "alternative",Space,Str "for",Space,Code ("",[],[]) "head"]]]] - ,Div ("",["column"],[("width","50%")]) - [CodeBlock ("",[],[]) "safeHead :: [a] -> Maybe a\nsafeHead [] = Nothing\nsafeHead (x:_) = Just x"]]] diff --git a/test/pptx/code.pptx b/test/pptx/code.pptx deleted file mode 100644 index aab0cc6f5..000000000 Binary files a/test/pptx/code.pptx and /dev/null differ diff --git a/test/pptx/code/deleted-layouts.pptx b/test/pptx/code/deleted-layouts.pptx new file mode 100644 index 000000000..0f503f553 Binary files /dev/null and b/test/pptx/code/deleted-layouts.pptx differ diff --git a/test/pptx/code/input.native b/test/pptx/code/input.native new file mode 100644 index 000000000..be7f512f7 --- /dev/null +++ b/test/pptx/code/input.native @@ -0,0 +1,21 @@ +[Header 1 ("header-with-inline-code",[],[]) [Str "Header",Space,Str "with",Space,Code ("",[],[]) "inline code"] +,CodeBlock ("",[],[]) "Code at level 0" +,BulletList + [[Para [Str "Bullet",Space,Str "item",Space,Str "with",Space,Code ("",[],[]) "inline code"] + ,CodeBlock ("",[],[]) "Code block at level 1" + ,BulletList + [[Para [Str "with",Space,Code ("",[],[]) "nested"] + ,CodeBlock ("",[],[]) "lvl2\nlvl2\nlvl2" + ,Header 2 ("second-heading-level-with-code",[],[]) [Str "Second",Space,Str "heading",Space,Str "level",Space,Str "with",Space,Code ("",[],[]) "code"]]]]] +,Header 1 ("syntax-highlighting",[],[]) [Str "Syntax",Space,Str "highlighting"] +,CodeBlock ("",["haskell"],[]) "id :: a -> a\nid x = x" +,BulletList + [[Para [Str "Nested"] + ,CodeBlock ("",["haskell"],[]) "g :: Int -> Int\ng x = x * 3"]] +,Header 1 ("two-column-slide",[],[]) [Str "Two",Space,Str "column",Space,Str "slide"] +,Div ("",["columns"],[]) + [Div ("",["column"],[("width","50%")]) + [BulletList + [[Plain [Str "A",Space,Str "total",Space,Str "alternative",Space,Str "for",Space,Code ("",[],[]) "head"]]]] + ,Div ("",["column"],[("width","50%")]) + [CodeBlock ("",[],[]) "safeHead :: [a] -> Maybe a\nsafeHead [] = Nothing\nsafeHead (x:_) = Just x"]]] diff --git a/test/pptx/code/moved-layouts.pptx b/test/pptx/code/moved-layouts.pptx new file mode 100644 index 000000000..4d66b1310 Binary files /dev/null and b/test/pptx/code/moved-layouts.pptx differ diff --git a/test/pptx/code/output.pptx b/test/pptx/code/output.pptx new file mode 100644 index 000000000..aab0cc6f5 Binary files /dev/null and b/test/pptx/code/output.pptx differ diff --git a/test/pptx/code/templated.pptx b/test/pptx/code/templated.pptx new file mode 100644 index 000000000..a03109217 Binary files /dev/null and b/test/pptx/code/templated.pptx differ diff --git a/test/pptx/code_deleted_layouts.pptx b/test/pptx/code_deleted_layouts.pptx deleted file mode 100644 index 0f503f553..000000000 Binary files a/test/pptx/code_deleted_layouts.pptx and /dev/null differ diff --git a/test/pptx/code_moved_layouts.pptx b/test/pptx/code_moved_layouts.pptx deleted file mode 100644 index 4d66b1310..000000000 Binary files a/test/pptx/code_moved_layouts.pptx and /dev/null differ diff --git a/test/pptx/code_templated.pptx b/test/pptx/code_templated.pptx deleted file mode 100644 index a03109217..000000000 Binary files a/test/pptx/code_templated.pptx and /dev/null differ diff --git a/test/pptx/document-properties-short-desc.native b/test/pptx/document-properties-short-desc.native deleted file mode 100644 index fe3193dc1..000000000 --- a/test/pptx/document-properties-short-desc.native +++ /dev/null @@ -1,2 +0,0 @@ -Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "A.",Space,Str "M."]]),("description",MetaInlines [Str "Short",Space,RawInline (Format "html") "",Str "description",RawInline (Format "html") "",Space,Str "&."]),("keywords",MetaList [MetaInlines [Str "keyword",Space,Str "1"],MetaInlines [Str "keyword",Space,Str "2"]]),("subject",MetaInlines [Str "This",Space,Str "is",Space,Str "the",Space,Str "subject"]),("title",MetaInlines [Str "Testing",Space,Str "custom",Space,Str "properties"])]}) -[Para [Str "Testing",Space,Str "document",Space,Str "properties"]] diff --git a/test/pptx/document-properties-short-desc.pptx b/test/pptx/document-properties-short-desc.pptx deleted file mode 100644 index de5e68151..000000000 Binary files a/test/pptx/document-properties-short-desc.pptx and /dev/null differ diff --git a/test/pptx/document-properties-short-desc/deleted-layouts.pptx b/test/pptx/document-properties-short-desc/deleted-layouts.pptx new file mode 100644 index 000000000..e4cf6bd7b Binary files /dev/null and b/test/pptx/document-properties-short-desc/deleted-layouts.pptx differ diff --git a/test/pptx/document-properties-short-desc/input.native b/test/pptx/document-properties-short-desc/input.native new file mode 100644 index 000000000..fe3193dc1 --- /dev/null +++ b/test/pptx/document-properties-short-desc/input.native @@ -0,0 +1,2 @@ +Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "A.",Space,Str "M."]]),("description",MetaInlines [Str "Short",Space,RawInline (Format "html") "",Str "description",RawInline (Format "html") "",Space,Str "&."]),("keywords",MetaList [MetaInlines [Str "keyword",Space,Str "1"],MetaInlines [Str "keyword",Space,Str "2"]]),("subject",MetaInlines [Str "This",Space,Str "is",Space,Str "the",Space,Str "subject"]),("title",MetaInlines [Str "Testing",Space,Str "custom",Space,Str "properties"])]}) +[Para [Str "Testing",Space,Str "document",Space,Str "properties"]] diff --git a/test/pptx/document-properties-short-desc/moved-layouts.pptx b/test/pptx/document-properties-short-desc/moved-layouts.pptx new file mode 100644 index 000000000..8834f885f Binary files /dev/null and b/test/pptx/document-properties-short-desc/moved-layouts.pptx differ diff --git a/test/pptx/document-properties-short-desc/output.pptx b/test/pptx/document-properties-short-desc/output.pptx new file mode 100644 index 000000000..de5e68151 Binary files /dev/null and b/test/pptx/document-properties-short-desc/output.pptx differ diff --git a/test/pptx/document-properties-short-desc/templated.pptx b/test/pptx/document-properties-short-desc/templated.pptx new file mode 100644 index 000000000..d39dc0c91 Binary files /dev/null and b/test/pptx/document-properties-short-desc/templated.pptx differ diff --git a/test/pptx/document-properties-short-desc_deleted_layouts.pptx b/test/pptx/document-properties-short-desc_deleted_layouts.pptx deleted file mode 100644 index e4cf6bd7b..000000000 Binary files a/test/pptx/document-properties-short-desc_deleted_layouts.pptx and /dev/null differ diff --git a/test/pptx/document-properties-short-desc_moved_layouts.pptx b/test/pptx/document-properties-short-desc_moved_layouts.pptx deleted file mode 100644 index 8834f885f..000000000 Binary files a/test/pptx/document-properties-short-desc_moved_layouts.pptx and /dev/null differ diff --git a/test/pptx/document-properties-short-desc_templated.pptx b/test/pptx/document-properties-short-desc_templated.pptx deleted file mode 100644 index d39dc0c91..000000000 Binary files a/test/pptx/document-properties-short-desc_templated.pptx and /dev/null differ diff --git a/test/pptx/document-properties.native b/test/pptx/document-properties.native deleted file mode 100644 index 59ca53f4d..000000000 --- a/test/pptx/document-properties.native +++ /dev/null @@ -1,2 +0,0 @@ -Pandoc (Meta {unMeta = fromList [("Company",MetaInlines [Str "My",Space,Str "Company"]),("Second Custom Property",MetaInlines [Str "Second",Space,Str "custom",Space,Str "property",Space,Str "value"]),("abstract",MetaBlocks [Plain [Str "Quite",Space,Str "a",Space,Str "long",Space,Str "description",SoftBreak,Str "spanning",Space,Str "several",Space,Str "lines"]]),("author",MetaList [MetaInlines [Str "A.",Space,Str "M."]]),("category",MetaInlines [Str "My",Space,Str "Category"]),("custom1",MetaInlines [Str "First",Space,Str "custom",Space,Str "property",Space,Str "value"]),("custom3",MetaInlines [Str "Escaping",Space,Str "amp",Space,Str "&",Space,Str "."]),("custom4",MetaInlines [Str "Escaping",Space,Str "LT,GT",Space,Str "<",Space,Str "asdf",Space,Str ">",Space,Str "<"]),("custom5",MetaInlines [Str "Escaping",Space,Str "html",Space,RawInline (Format "html") "",Str "asdf",RawInline (Format "html") ""]),("custom6",MetaInlines [Str "Escaping",Space,Emph [Str "MD"],Space,Str "\225",Space,Str "a"]),("custom9",MetaInlines [Str "Extended",Space,Str "chars:",Space,Str "\8364",Space,Str "\225",Space,Str "\233",Space,Str "\237",Space,Str "\243",Space,Str "\250",Space,Str "$"]),("description",MetaBlocks [Para [Str "Long",Space,Str "description",Space,Str "spanning",SoftBreak,Str "several",Space,Str "lines."],Plain [Str "This",Space,Str "is",Space,Str "\225",Space,Str "second",Space,RawInline (Format "html") "",Str "line",RawInline (Format "html") "",Str "."]]),("keywords",MetaList [MetaInlines [Str "keyword",Space,Str "1"],MetaInlines [Str "keyword",Space,Str "2"]]),("lang",MetaInlines [Str "en-US"]),("nested-custom",MetaList [MetaMap (fromList [("custom 7",MetaInlines [Str "Nested",Space,Str "Custom",Space,Str "value",Space,Str "7"])]),MetaMap (fromList [("custom 8",MetaInlines [Str "Nested",Space,Str "Custom",Space,Str "value",Space,Str "8"])])]),("subject",MetaInlines [Str "This",Space,Str "is",Space,Str "the",Space,Str "subject"]),("subtitle",MetaInlines [Str "This",Space,Str "is",Space,Str "a",Space,Str "subtitle"]),("title",MetaInlines [Str "Testing",Space,Str "custom",Space,Str "properties"])]}) -[Para [Str "Testing",Space,Str "document",Space,Str "properties"]] diff --git a/test/pptx/document-properties.pptx b/test/pptx/document-properties.pptx deleted file mode 100644 index 6bcbd1b9c..000000000 Binary files a/test/pptx/document-properties.pptx and /dev/null differ diff --git a/test/pptx/document-properties/deleted-layouts.pptx b/test/pptx/document-properties/deleted-layouts.pptx new file mode 100644 index 000000000..a00c8059d Binary files /dev/null and b/test/pptx/document-properties/deleted-layouts.pptx differ diff --git a/test/pptx/document-properties/input.native b/test/pptx/document-properties/input.native new file mode 100644 index 000000000..59ca53f4d --- /dev/null +++ b/test/pptx/document-properties/input.native @@ -0,0 +1,2 @@ +Pandoc (Meta {unMeta = fromList [("Company",MetaInlines [Str "My",Space,Str "Company"]),("Second Custom Property",MetaInlines [Str "Second",Space,Str "custom",Space,Str "property",Space,Str "value"]),("abstract",MetaBlocks [Plain [Str "Quite",Space,Str "a",Space,Str "long",Space,Str "description",SoftBreak,Str "spanning",Space,Str "several",Space,Str "lines"]]),("author",MetaList [MetaInlines [Str "A.",Space,Str "M."]]),("category",MetaInlines [Str "My",Space,Str "Category"]),("custom1",MetaInlines [Str "First",Space,Str "custom",Space,Str "property",Space,Str "value"]),("custom3",MetaInlines [Str "Escaping",Space,Str "amp",Space,Str "&",Space,Str "."]),("custom4",MetaInlines [Str "Escaping",Space,Str "LT,GT",Space,Str "<",Space,Str "asdf",Space,Str ">",Space,Str "<"]),("custom5",MetaInlines [Str "Escaping",Space,Str "html",Space,RawInline (Format "html") "",Str "asdf",RawInline (Format "html") ""]),("custom6",MetaInlines [Str "Escaping",Space,Emph [Str "MD"],Space,Str "\225",Space,Str "a"]),("custom9",MetaInlines [Str "Extended",Space,Str "chars:",Space,Str "\8364",Space,Str "\225",Space,Str "\233",Space,Str "\237",Space,Str "\243",Space,Str "\250",Space,Str "$"]),("description",MetaBlocks [Para [Str "Long",Space,Str "description",Space,Str "spanning",SoftBreak,Str "several",Space,Str "lines."],Plain [Str "This",Space,Str "is",Space,Str "\225",Space,Str "second",Space,RawInline (Format "html") "",Str "line",RawInline (Format "html") "",Str "."]]),("keywords",MetaList [MetaInlines [Str "keyword",Space,Str "1"],MetaInlines [Str "keyword",Space,Str "2"]]),("lang",MetaInlines [Str "en-US"]),("nested-custom",MetaList [MetaMap (fromList [("custom 7",MetaInlines [Str "Nested",Space,Str "Custom",Space,Str "value",Space,Str "7"])]),MetaMap (fromList [("custom 8",MetaInlines [Str "Nested",Space,Str "Custom",Space,Str "value",Space,Str "8"])])]),("subject",MetaInlines [Str "This",Space,Str "is",Space,Str "the",Space,Str "subject"]),("subtitle",MetaInlines [Str "This",Space,Str "is",Space,Str "a",Space,Str "subtitle"]),("title",MetaInlines [Str "Testing",Space,Str "custom",Space,Str "properties"])]}) +[Para [Str "Testing",Space,Str "document",Space,Str "properties"]] diff --git a/test/pptx/document-properties/moved-layouts.pptx b/test/pptx/document-properties/moved-layouts.pptx new file mode 100644 index 000000000..c1d2d5282 Binary files /dev/null and b/test/pptx/document-properties/moved-layouts.pptx differ diff --git a/test/pptx/document-properties/output.pptx b/test/pptx/document-properties/output.pptx new file mode 100644 index 000000000..6bcbd1b9c Binary files /dev/null and b/test/pptx/document-properties/output.pptx differ diff --git a/test/pptx/document-properties/templated.pptx b/test/pptx/document-properties/templated.pptx new file mode 100644 index 000000000..841ae8c42 Binary files /dev/null and b/test/pptx/document-properties/templated.pptx differ diff --git a/test/pptx/document-properties_deleted_layouts.pptx b/test/pptx/document-properties_deleted_layouts.pptx deleted file mode 100644 index a00c8059d..000000000 Binary files a/test/pptx/document-properties_deleted_layouts.pptx and /dev/null differ diff --git a/test/pptx/document-properties_moved_layouts.pptx b/test/pptx/document-properties_moved_layouts.pptx deleted file mode 100644 index c1d2d5282..000000000 Binary files a/test/pptx/document-properties_moved_layouts.pptx and /dev/null differ diff --git a/test/pptx/document-properties_templated.pptx b/test/pptx/document-properties_templated.pptx deleted file mode 100644 index 841ae8c42..000000000 Binary files a/test/pptx/document-properties_templated.pptx and /dev/null differ diff --git a/test/pptx/endnotes-toc/deleted-layouts.pptx b/test/pptx/endnotes-toc/deleted-layouts.pptx new file mode 100644 index 000000000..46708544c Binary files /dev/null and b/test/pptx/endnotes-toc/deleted-layouts.pptx differ diff --git a/test/pptx/endnotes-toc/moved-layouts.pptx b/test/pptx/endnotes-toc/moved-layouts.pptx new file mode 100644 index 000000000..d1200bd7d Binary files /dev/null and b/test/pptx/endnotes-toc/moved-layouts.pptx differ diff --git a/test/pptx/endnotes-toc/output.pptx b/test/pptx/endnotes-toc/output.pptx new file mode 100644 index 000000000..a028b346f Binary files /dev/null and b/test/pptx/endnotes-toc/output.pptx differ diff --git a/test/pptx/endnotes-toc/templated.pptx b/test/pptx/endnotes-toc/templated.pptx new file mode 100644 index 000000000..38a0c437d Binary files /dev/null and b/test/pptx/endnotes-toc/templated.pptx differ diff --git a/test/pptx/endnotes.native b/test/pptx/endnotes.native deleted file mode 100644 index f6caeb62f..000000000 --- a/test/pptx/endnotes.native +++ /dev/null @@ -1,2 +0,0 @@ -Pandoc (Meta {unMeta = fromList []}) -[Para [Str "Here",Space,Str "is",Space,Str "one",Space,Str "note.",Note [Para [Str "Here",Space,Str "is",Space,Str "the",Space,Str "note."]],Space,Str "And",Space,Str "one",Space,Str "more",Space,Str "note.",Note [Para [Str "And",Space,Str "another",Space,Str "note."]]]] diff --git a/test/pptx/endnotes.pptx b/test/pptx/endnotes.pptx deleted file mode 100644 index 9d46036fe..000000000 Binary files a/test/pptx/endnotes.pptx and /dev/null differ diff --git a/test/pptx/endnotes/deleted-layouts.pptx b/test/pptx/endnotes/deleted-layouts.pptx new file mode 100644 index 000000000..5c69a6310 Binary files /dev/null and b/test/pptx/endnotes/deleted-layouts.pptx differ diff --git a/test/pptx/endnotes/input.native b/test/pptx/endnotes/input.native new file mode 100644 index 000000000..f6caeb62f --- /dev/null +++ b/test/pptx/endnotes/input.native @@ -0,0 +1,2 @@ +Pandoc (Meta {unMeta = fromList []}) +[Para [Str "Here",Space,Str "is",Space,Str "one",Space,Str "note.",Note [Para [Str "Here",Space,Str "is",Space,Str "the",Space,Str "note."]],Space,Str "And",Space,Str "one",Space,Str "more",Space,Str "note.",Note [Para [Str "And",Space,Str "another",Space,Str "note."]]]] diff --git a/test/pptx/endnotes/moved-layouts.pptx b/test/pptx/endnotes/moved-layouts.pptx new file mode 100644 index 000000000..0d4c491b9 Binary files /dev/null and b/test/pptx/endnotes/moved-layouts.pptx differ diff --git a/test/pptx/endnotes/output.pptx b/test/pptx/endnotes/output.pptx new file mode 100644 index 000000000..9d46036fe Binary files /dev/null and b/test/pptx/endnotes/output.pptx differ diff --git a/test/pptx/endnotes/templated.pptx b/test/pptx/endnotes/templated.pptx new file mode 100644 index 000000000..863cc29d4 Binary files /dev/null and b/test/pptx/endnotes/templated.pptx differ diff --git a/test/pptx/endnotes_deleted_layouts.pptx b/test/pptx/endnotes_deleted_layouts.pptx deleted file mode 100644 index 5c69a6310..000000000 Binary files a/test/pptx/endnotes_deleted_layouts.pptx and /dev/null differ diff --git a/test/pptx/endnotes_moved_layouts.pptx b/test/pptx/endnotes_moved_layouts.pptx deleted file mode 100644 index 0d4c491b9..000000000 Binary files a/test/pptx/endnotes_moved_layouts.pptx and /dev/null differ diff --git a/test/pptx/endnotes_templated.pptx b/test/pptx/endnotes_templated.pptx deleted file mode 100644 index 863cc29d4..000000000 Binary files a/test/pptx/endnotes_templated.pptx and /dev/null differ diff --git a/test/pptx/endnotes_toc.pptx b/test/pptx/endnotes_toc.pptx deleted file mode 100644 index a028b346f..000000000 Binary files a/test/pptx/endnotes_toc.pptx and /dev/null differ diff --git a/test/pptx/endnotes_toc_deleted_layouts.pptx b/test/pptx/endnotes_toc_deleted_layouts.pptx deleted file mode 100644 index 46708544c..000000000 Binary files a/test/pptx/endnotes_toc_deleted_layouts.pptx and /dev/null differ diff --git a/test/pptx/endnotes_toc_moved_layouts.pptx b/test/pptx/endnotes_toc_moved_layouts.pptx deleted file mode 100644 index d1200bd7d..000000000 Binary files a/test/pptx/endnotes_toc_moved_layouts.pptx and /dev/null differ diff --git a/test/pptx/endnotes_toc_templated.pptx b/test/pptx/endnotes_toc_templated.pptx deleted file mode 100644 index 38a0c437d..000000000 Binary files a/test/pptx/endnotes_toc_templated.pptx and /dev/null differ diff --git a/test/pptx/images.native b/test/pptx/images.native deleted file mode 100644 index 54827e5cc..000000000 --- a/test/pptx/images.native +++ /dev/null @@ -1,5 +0,0 @@ -Pandoc (Meta {unMeta = fromList []}) -[Para [Image ("",[],[]) [] ("lalune.jpg","")] -,Para [Image ("",[],[]) [Str "The",Space,Str "Moon"] ("lalune.jpg","fig:")] -,Header 1 ("one-more",[],[]) [Str "One",Space,Str "More"] -,Para [Image ("",[],[]) [Str "The",Space,Str "Moon"] ("lalune.jpg","fig:")]] diff --git a/test/pptx/images.pptx b/test/pptx/images.pptx deleted file mode 100644 index 89325e577..000000000 Binary files a/test/pptx/images.pptx and /dev/null differ diff --git a/test/pptx/images/deleted-layouts.pptx b/test/pptx/images/deleted-layouts.pptx new file mode 100644 index 000000000..053928863 Binary files /dev/null and b/test/pptx/images/deleted-layouts.pptx differ diff --git a/test/pptx/images/input.native b/test/pptx/images/input.native new file mode 100644 index 000000000..54827e5cc --- /dev/null +++ b/test/pptx/images/input.native @@ -0,0 +1,5 @@ +Pandoc (Meta {unMeta = fromList []}) +[Para [Image ("",[],[]) [] ("lalune.jpg","")] +,Para [Image ("",[],[]) [Str "The",Space,Str "Moon"] ("lalune.jpg","fig:")] +,Header 1 ("one-more",[],[]) [Str "One",Space,Str "More"] +,Para [Image ("",[],[]) [Str "The",Space,Str "Moon"] ("lalune.jpg","fig:")]] diff --git a/test/pptx/images/moved-layouts.pptx b/test/pptx/images/moved-layouts.pptx new file mode 100644 index 000000000..7951a09f6 Binary files /dev/null and b/test/pptx/images/moved-layouts.pptx differ diff --git a/test/pptx/images/output.pptx b/test/pptx/images/output.pptx new file mode 100644 index 000000000..89325e577 Binary files /dev/null and b/test/pptx/images/output.pptx differ diff --git a/test/pptx/images/templated.pptx b/test/pptx/images/templated.pptx new file mode 100644 index 000000000..7c0ed9a17 Binary files /dev/null and b/test/pptx/images/templated.pptx differ diff --git a/test/pptx/images_deleted_layouts.pptx b/test/pptx/images_deleted_layouts.pptx deleted file mode 100644 index 053928863..000000000 Binary files a/test/pptx/images_deleted_layouts.pptx and /dev/null differ diff --git a/test/pptx/images_moved_layouts.pptx b/test/pptx/images_moved_layouts.pptx deleted file mode 100644 index 7951a09f6..000000000 Binary files a/test/pptx/images_moved_layouts.pptx and /dev/null differ diff --git a/test/pptx/images_templated.pptx b/test/pptx/images_templated.pptx deleted file mode 100644 index 7c0ed9a17..000000000 Binary files a/test/pptx/images_templated.pptx and /dev/null differ diff --git a/test/pptx/inline-formatting/deleted-layouts.pptx b/test/pptx/inline-formatting/deleted-layouts.pptx new file mode 100644 index 000000000..bbd5bfeb4 Binary files /dev/null and b/test/pptx/inline-formatting/deleted-layouts.pptx differ diff --git a/test/pptx/inline-formatting/input.native b/test/pptx/inline-formatting/input.native new file mode 100644 index 000000000..164176af2 --- /dev/null +++ b/test/pptx/inline-formatting/input.native @@ -0,0 +1,5 @@ +[Para [Str "Here",Space,Str "are",Space,Str "examples",Space,Str "of",Space,Emph [Str "italics"],Str ",",Space,Strong [Str "bold"],Str ",",Space,Str "and",Space,Strong [Emph [Str "bold",Space,Str "italics"]],Str "."] +,Para [Str "Here",Space,Str "is",Space,Strikeout [Str "strook-three"],Space,Str "strike-through",Space,Str "and",Space,SmallCaps [Str "small",Space,Str "caps"],Str "."] +,Para [Str "Here",Space,Str "is",Space,Span ("",["underline"],[]) [Str "some",Space,Emph [Str "underlined"],Space,Strong [Str "text"]],Str "."] +,Para [Str "We",Space,Str "can",Space,Str "also",Space,Str "do",Space,Str "subscripts",Space,Str "(H",Subscript [Str "2"],Str "0)",Space,Str "and",Space,Str "super",Superscript [Str "script"],Str "."] +,RawBlock (Format "html") ""] diff --git a/test/pptx/inline-formatting/moved-layouts.pptx b/test/pptx/inline-formatting/moved-layouts.pptx new file mode 100644 index 000000000..427492130 Binary files /dev/null and b/test/pptx/inline-formatting/moved-layouts.pptx differ diff --git a/test/pptx/inline-formatting/output.pptx b/test/pptx/inline-formatting/output.pptx new file mode 100644 index 000000000..473b9498d Binary files /dev/null and b/test/pptx/inline-formatting/output.pptx differ diff --git a/test/pptx/inline-formatting/templated.pptx b/test/pptx/inline-formatting/templated.pptx new file mode 100644 index 000000000..dd778a102 Binary files /dev/null and b/test/pptx/inline-formatting/templated.pptx differ diff --git a/test/pptx/inline_formatting.native b/test/pptx/inline_formatting.native deleted file mode 100644 index 164176af2..000000000 --- a/test/pptx/inline_formatting.native +++ /dev/null @@ -1,5 +0,0 @@ -[Para [Str "Here",Space,Str "are",Space,Str "examples",Space,Str "of",Space,Emph [Str "italics"],Str ",",Space,Strong [Str "bold"],Str ",",Space,Str "and",Space,Strong [Emph [Str "bold",Space,Str "italics"]],Str "."] -,Para [Str "Here",Space,Str "is",Space,Strikeout [Str "strook-three"],Space,Str "strike-through",Space,Str "and",Space,SmallCaps [Str "small",Space,Str "caps"],Str "."] -,Para [Str "Here",Space,Str "is",Space,Span ("",["underline"],[]) [Str "some",Space,Emph [Str "underlined"],Space,Strong [Str "text"]],Str "."] -,Para [Str "We",Space,Str "can",Space,Str "also",Space,Str "do",Space,Str "subscripts",Space,Str "(H",Subscript [Str "2"],Str "0)",Space,Str "and",Space,Str "super",Superscript [Str "script"],Str "."] -,RawBlock (Format "html") ""] diff --git a/test/pptx/inline_formatting.pptx b/test/pptx/inline_formatting.pptx deleted file mode 100644 index 473b9498d..000000000 Binary files a/test/pptx/inline_formatting.pptx and /dev/null differ diff --git a/test/pptx/inline_formatting_deleted_layouts.pptx b/test/pptx/inline_formatting_deleted_layouts.pptx deleted file mode 100644 index bbd5bfeb4..000000000 Binary files a/test/pptx/inline_formatting_deleted_layouts.pptx and /dev/null differ diff --git a/test/pptx/inline_formatting_moved_layouts.pptx b/test/pptx/inline_formatting_moved_layouts.pptx deleted file mode 100644 index 427492130..000000000 Binary files a/test/pptx/inline_formatting_moved_layouts.pptx and /dev/null differ diff --git a/test/pptx/inline_formatting_templated.pptx b/test/pptx/inline_formatting_templated.pptx deleted file mode 100644 index dd778a102..000000000 Binary files a/test/pptx/inline_formatting_templated.pptx and /dev/null differ diff --git a/test/pptx/lists.native b/test/pptx/lists.native deleted file mode 100644 index 61249c7fe..000000000 --- a/test/pptx/lists.native +++ /dev/null @@ -1,18 +0,0 @@ -[Header 1 ("lists",[],[]) [Str "Lists"] -,BulletList - [[Para [Str "Bulleted",Space,Str "bulleted",Space,Str "lists."]] - ,[Para [Str "And",Space,Str "go",Space,Str "to",Space,Str "arbitrary",Space,Str "depth."] - ,BulletList - [[Para [Str "Like",Space,Str "this"] - ,BulletList - [[Plain [Str "Or",Space,Str "this"]]]] - ,[Para [Str "Back",Space,Str "to",Space,Str "here."]]]]] -,Header 1 ("lists-continued",[],[]) [Str "Lists",Space,Str "(continued)"] -,Para [Str "Lists",Space,Str "can",Space,Str "also",Space,Str "be",Space,Str "numbered:"] -,OrderedList (1,Decimal,Period) - [[Para [Str "Tomatoes"]] - ,[Para [Str "Potatoes",Space,Str "of",Space,Str "various",Space,Str "sorts"] - ,OrderedList (1,LowerAlpha,Period) - [[Para [Str "sweet",Space,Str "potatoes"]] - ,[Para [Str "russet",Space,Str "potates"]]]] - ,[Para [Str "Tornadoes,",Space,Str "for",Space,Str "the",Space,Str "rhyme."]]]] diff --git a/test/pptx/lists.pptx b/test/pptx/lists.pptx deleted file mode 100644 index ffc2eb9f7..000000000 Binary files a/test/pptx/lists.pptx and /dev/null differ diff --git a/test/pptx/lists/deleted-layouts.pptx b/test/pptx/lists/deleted-layouts.pptx new file mode 100644 index 000000000..6512e44bb Binary files /dev/null and b/test/pptx/lists/deleted-layouts.pptx differ diff --git a/test/pptx/lists/input.native b/test/pptx/lists/input.native new file mode 100644 index 000000000..61249c7fe --- /dev/null +++ b/test/pptx/lists/input.native @@ -0,0 +1,18 @@ +[Header 1 ("lists",[],[]) [Str "Lists"] +,BulletList + [[Para [Str "Bulleted",Space,Str "bulleted",Space,Str "lists."]] + ,[Para [Str "And",Space,Str "go",Space,Str "to",Space,Str "arbitrary",Space,Str "depth."] + ,BulletList + [[Para [Str "Like",Space,Str "this"] + ,BulletList + [[Plain [Str "Or",Space,Str "this"]]]] + ,[Para [Str "Back",Space,Str "to",Space,Str "here."]]]]] +,Header 1 ("lists-continued",[],[]) [Str "Lists",Space,Str "(continued)"] +,Para [Str "Lists",Space,Str "can",Space,Str "also",Space,Str "be",Space,Str "numbered:"] +,OrderedList (1,Decimal,Period) + [[Para [Str "Tomatoes"]] + ,[Para [Str "Potatoes",Space,Str "of",Space,Str "various",Space,Str "sorts"] + ,OrderedList (1,LowerAlpha,Period) + [[Para [Str "sweet",Space,Str "potatoes"]] + ,[Para [Str "russet",Space,Str "potates"]]]] + ,[Para [Str "Tornadoes,",Space,Str "for",Space,Str "the",Space,Str "rhyme."]]]] diff --git a/test/pptx/lists/moved-layouts.pptx b/test/pptx/lists/moved-layouts.pptx new file mode 100644 index 000000000..2947c3211 Binary files /dev/null and b/test/pptx/lists/moved-layouts.pptx differ diff --git a/test/pptx/lists/output.pptx b/test/pptx/lists/output.pptx new file mode 100644 index 000000000..ffc2eb9f7 Binary files /dev/null and b/test/pptx/lists/output.pptx differ diff --git a/test/pptx/lists/templated.pptx b/test/pptx/lists/templated.pptx new file mode 100644 index 000000000..2493e7890 Binary files /dev/null and b/test/pptx/lists/templated.pptx differ diff --git a/test/pptx/lists_deleted_layouts.pptx b/test/pptx/lists_deleted_layouts.pptx deleted file mode 100644 index 6512e44bb..000000000 Binary files a/test/pptx/lists_deleted_layouts.pptx and /dev/null differ diff --git a/test/pptx/lists_moved_layouts.pptx b/test/pptx/lists_moved_layouts.pptx deleted file mode 100644 index 2947c3211..000000000 Binary files a/test/pptx/lists_moved_layouts.pptx and /dev/null differ diff --git a/test/pptx/lists_templated.pptx b/test/pptx/lists_templated.pptx deleted file mode 100644 index 2493e7890..000000000 Binary files a/test/pptx/lists_templated.pptx and /dev/null differ diff --git a/test/pptx/raw-ooxml/deleted-layouts.pptx b/test/pptx/raw-ooxml/deleted-layouts.pptx new file mode 100644 index 000000000..2ea155657 Binary files /dev/null and b/test/pptx/raw-ooxml/deleted-layouts.pptx differ diff --git a/test/pptx/raw-ooxml/input.native b/test/pptx/raw-ooxml/input.native new file mode 100644 index 000000000..ae5bdd140 --- /dev/null +++ b/test/pptx/raw-ooxml/input.native @@ -0,0 +1,3 @@ +[Para [Str "Here",Space,Str "is",Space,Str "some",Space,Str "text,",Space,Str "written",Space,Str "as",Space,Str "a",Space,Str "raw",Space,Str "inline:",Space,RawInline (Format "openxml") "Here are examples of italics, bold"] +,HorizontalRule +,RawBlock (Format "openxml") "\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n Bulleted bulleted lists.\n \n \n \n \n \n \n And go to arbitrary depth.\n \n \n \n \n \n \n Like this\n \n \n \n \n \n \n Or this\n \n \n \n \n \n \n Back to here.\n \n \n \n "] diff --git a/test/pptx/raw-ooxml/moved-layouts.pptx b/test/pptx/raw-ooxml/moved-layouts.pptx new file mode 100644 index 000000000..e58304172 Binary files /dev/null and b/test/pptx/raw-ooxml/moved-layouts.pptx differ diff --git a/test/pptx/raw-ooxml/output.pptx b/test/pptx/raw-ooxml/output.pptx new file mode 100644 index 000000000..29164af15 Binary files /dev/null and b/test/pptx/raw-ooxml/output.pptx differ diff --git a/test/pptx/raw-ooxml/templated.pptx b/test/pptx/raw-ooxml/templated.pptx new file mode 100644 index 000000000..0f20f9826 Binary files /dev/null and b/test/pptx/raw-ooxml/templated.pptx differ diff --git a/test/pptx/raw_ooxml.native b/test/pptx/raw_ooxml.native deleted file mode 100644 index ae5bdd140..000000000 --- a/test/pptx/raw_ooxml.native +++ /dev/null @@ -1,3 +0,0 @@ -[Para [Str "Here",Space,Str "is",Space,Str "some",Space,Str "text,",Space,Str "written",Space,Str "as",Space,Str "a",Space,Str "raw",Space,Str "inline:",Space,RawInline (Format "openxml") "Here are examples of italics, bold"] -,HorizontalRule -,RawBlock (Format "openxml") "\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n Bulleted bulleted lists.\n \n \n \n \n \n \n And go to arbitrary depth.\n \n \n \n \n \n \n Like this\n \n \n \n \n \n \n Or this\n \n \n \n \n \n \n Back to here.\n \n \n \n "] diff --git a/test/pptx/raw_ooxml.pptx b/test/pptx/raw_ooxml.pptx deleted file mode 100644 index 29164af15..000000000 Binary files a/test/pptx/raw_ooxml.pptx and /dev/null differ diff --git a/test/pptx/raw_ooxml_deleted_layouts.pptx b/test/pptx/raw_ooxml_deleted_layouts.pptx deleted file mode 100644 index 2ea155657..000000000 Binary files a/test/pptx/raw_ooxml_deleted_layouts.pptx and /dev/null differ diff --git a/test/pptx/raw_ooxml_moved_layouts.pptx b/test/pptx/raw_ooxml_moved_layouts.pptx deleted file mode 100644 index e58304172..000000000 Binary files a/test/pptx/raw_ooxml_moved_layouts.pptx and /dev/null differ diff --git a/test/pptx/raw_ooxml_templated.pptx b/test/pptx/raw_ooxml_templated.pptx deleted file mode 100644 index 0f20f9826..000000000 Binary files a/test/pptx/raw_ooxml_templated.pptx and /dev/null differ diff --git a/test/pptx/reference-deleted-layouts.pptx b/test/pptx/reference-deleted-layouts.pptx new file mode 100644 index 000000000..a9a74ecd5 Binary files /dev/null and b/test/pptx/reference-deleted-layouts.pptx differ diff --git a/test/pptx/reference-depth.pptx b/test/pptx/reference-depth.pptx new file mode 100644 index 000000000..97f444788 Binary files /dev/null and b/test/pptx/reference-depth.pptx differ diff --git a/test/pptx/reference-moved-layouts.pptx b/test/pptx/reference-moved-layouts.pptx new file mode 100644 index 000000000..72c4f3fd7 Binary files /dev/null and b/test/pptx/reference-moved-layouts.pptx differ diff --git a/test/pptx/reference_deleted_layouts.pptx b/test/pptx/reference_deleted_layouts.pptx deleted file mode 100644 index a9a74ecd5..000000000 Binary files a/test/pptx/reference_deleted_layouts.pptx and /dev/null differ diff --git a/test/pptx/reference_depth.pptx b/test/pptx/reference_depth.pptx deleted file mode 100644 index 97f444788..000000000 Binary files a/test/pptx/reference_depth.pptx and /dev/null differ diff --git a/test/pptx/reference_moved_layouts.pptx b/test/pptx/reference_moved_layouts.pptx deleted file mode 100644 index 72c4f3fd7..000000000 Binary files a/test/pptx/reference_moved_layouts.pptx and /dev/null differ diff --git a/test/pptx/remove-empty-slides/deleted-layouts.pptx b/test/pptx/remove-empty-slides/deleted-layouts.pptx new file mode 100644 index 000000000..7ae4a5fab Binary files /dev/null and b/test/pptx/remove-empty-slides/deleted-layouts.pptx differ diff --git a/test/pptx/remove-empty-slides/input.native b/test/pptx/remove-empty-slides/input.native new file mode 100644 index 000000000..51c042281 --- /dev/null +++ b/test/pptx/remove-empty-slides/input.native @@ -0,0 +1,5 @@ +[Para [Str "Content"] +,Para [Image ("",[],[]) [] ("lalune.jpg",""),Space,RawInline (Format "html") ""] +,HorizontalRule +,HorizontalRule +,Para [Str "More",Space,Str "content"]] diff --git a/test/pptx/remove-empty-slides/moved-layouts.pptx b/test/pptx/remove-empty-slides/moved-layouts.pptx new file mode 100644 index 000000000..2572f2447 Binary files /dev/null and b/test/pptx/remove-empty-slides/moved-layouts.pptx differ diff --git a/test/pptx/remove-empty-slides/output.pptx b/test/pptx/remove-empty-slides/output.pptx new file mode 100644 index 000000000..c6df8e18e Binary files /dev/null and b/test/pptx/remove-empty-slides/output.pptx differ diff --git a/test/pptx/remove-empty-slides/templated.pptx b/test/pptx/remove-empty-slides/templated.pptx new file mode 100644 index 000000000..1df48c5ad Binary files /dev/null and b/test/pptx/remove-empty-slides/templated.pptx differ diff --git a/test/pptx/remove_empty_slides.native b/test/pptx/remove_empty_slides.native deleted file mode 100644 index 51c042281..000000000 --- a/test/pptx/remove_empty_slides.native +++ /dev/null @@ -1,5 +0,0 @@ -[Para [Str "Content"] -,Para [Image ("",[],[]) [] ("lalune.jpg",""),Space,RawInline (Format "html") ""] -,HorizontalRule -,HorizontalRule -,Para [Str "More",Space,Str "content"]] diff --git a/test/pptx/remove_empty_slides.pptx b/test/pptx/remove_empty_slides.pptx deleted file mode 100644 index c6df8e18e..000000000 Binary files a/test/pptx/remove_empty_slides.pptx and /dev/null differ diff --git a/test/pptx/remove_empty_slides_deleted_layouts.pptx b/test/pptx/remove_empty_slides_deleted_layouts.pptx deleted file mode 100644 index 7ae4a5fab..000000000 Binary files a/test/pptx/remove_empty_slides_deleted_layouts.pptx and /dev/null differ diff --git a/test/pptx/remove_empty_slides_moved_layouts.pptx b/test/pptx/remove_empty_slides_moved_layouts.pptx deleted file mode 100644 index 2572f2447..000000000 Binary files a/test/pptx/remove_empty_slides_moved_layouts.pptx and /dev/null differ diff --git a/test/pptx/remove_empty_slides_templated.pptx b/test/pptx/remove_empty_slides_templated.pptx deleted file mode 100644 index 1df48c5ad..000000000 Binary files a/test/pptx/remove_empty_slides_templated.pptx and /dev/null differ diff --git a/test/pptx/slide-breaks-slide-level-1/deleted-layouts.pptx b/test/pptx/slide-breaks-slide-level-1/deleted-layouts.pptx new file mode 100644 index 000000000..2c7fd4d8b Binary files /dev/null and b/test/pptx/slide-breaks-slide-level-1/deleted-layouts.pptx differ diff --git a/test/pptx/slide-breaks-slide-level-1/moved-layouts.pptx b/test/pptx/slide-breaks-slide-level-1/moved-layouts.pptx new file mode 100644 index 000000000..8471b1d10 Binary files /dev/null and b/test/pptx/slide-breaks-slide-level-1/moved-layouts.pptx differ diff --git a/test/pptx/slide-breaks-slide-level-1/output.pptx b/test/pptx/slide-breaks-slide-level-1/output.pptx new file mode 100644 index 000000000..449339778 Binary files /dev/null and b/test/pptx/slide-breaks-slide-level-1/output.pptx differ diff --git a/test/pptx/slide-breaks-slide-level-1/templated.pptx b/test/pptx/slide-breaks-slide-level-1/templated.pptx new file mode 100644 index 000000000..e2815159a Binary files /dev/null and b/test/pptx/slide-breaks-slide-level-1/templated.pptx differ diff --git a/test/pptx/slide-breaks-toc/deleted-layouts.pptx b/test/pptx/slide-breaks-toc/deleted-layouts.pptx new file mode 100644 index 000000000..1e0b76d46 Binary files /dev/null and b/test/pptx/slide-breaks-toc/deleted-layouts.pptx differ diff --git a/test/pptx/slide-breaks-toc/moved-layouts.pptx b/test/pptx/slide-breaks-toc/moved-layouts.pptx new file mode 100644 index 000000000..918264bc5 Binary files /dev/null and b/test/pptx/slide-breaks-toc/moved-layouts.pptx differ diff --git a/test/pptx/slide-breaks-toc/output.pptx b/test/pptx/slide-breaks-toc/output.pptx new file mode 100644 index 000000000..9dbfa41a0 Binary files /dev/null and b/test/pptx/slide-breaks-toc/output.pptx differ diff --git a/test/pptx/slide-breaks-toc/templated.pptx b/test/pptx/slide-breaks-toc/templated.pptx new file mode 100644 index 000000000..b83f3f596 Binary files /dev/null and b/test/pptx/slide-breaks-toc/templated.pptx differ diff --git a/test/pptx/slide-breaks/deleted-layouts.pptx b/test/pptx/slide-breaks/deleted-layouts.pptx new file mode 100644 index 000000000..86dfad3b2 Binary files /dev/null and b/test/pptx/slide-breaks/deleted-layouts.pptx differ diff --git a/test/pptx/slide-breaks/input.native b/test/pptx/slide-breaks/input.native new file mode 100644 index 000000000..084c61737 --- /dev/null +++ b/test/pptx/slide-breaks/input.native @@ -0,0 +1,7 @@ +Pandoc (Meta {unMeta = fromList []}) +[Para [Str "Break",Space,Str "with",Space,Str "a",Space,Str "new",Space,Str "section-level",Space,Str "header"] +,Header 1 ("below-section-level",[],[]) [Str "Below",Space,Str "section-level"] +,Header 2 ("section-level",[],[]) [Str "Section-level"] +,Para [Str "Third",Space,Str "slide",Space,Str "(with",Space,Str "a",Space,Str "section-level",Space,Str "of",Space,Str "2)"] +,HorizontalRule +,Para [Str "This",Space,Str "is",Space,Str "another",Space,Str "slide."]] diff --git a/test/pptx/slide-breaks/moved-layouts.pptx b/test/pptx/slide-breaks/moved-layouts.pptx new file mode 100644 index 000000000..90b3b94a6 Binary files /dev/null and b/test/pptx/slide-breaks/moved-layouts.pptx differ diff --git a/test/pptx/slide-breaks/output.pptx b/test/pptx/slide-breaks/output.pptx new file mode 100644 index 000000000..e06d9079d Binary files /dev/null and b/test/pptx/slide-breaks/output.pptx differ diff --git a/test/pptx/slide-breaks/templated.pptx b/test/pptx/slide-breaks/templated.pptx new file mode 100644 index 000000000..71ba99701 Binary files /dev/null and b/test/pptx/slide-breaks/templated.pptx differ diff --git a/test/pptx/slide-level-0-h1-h2-with-table.native b/test/pptx/slide-level-0-h1-h2-with-table.native deleted file mode 100644 index c6e65ecf5..000000000 --- a/test/pptx/slide-level-0-h1-h2-with-table.native +++ /dev/null @@ -1,14 +0,0 @@ -[Header 1 ("hello",[],[]) [Str "Hello"] -,Header 2 ("there",[],[]) [Str "There"] -,Table ("",[],[]) (Caption Nothing - []) - [(AlignDefault,ColWidth 5.555555555555555e-2)] - (TableHead ("",[],[]) - []) - [(TableBody ("",[],[]) (RowHeadColumns 0) - [] - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "1"]]]])] - (TableFoot ("",[],[]) - [])] diff --git a/test/pptx/slide-level-0-h1-h2-with-table.pptx b/test/pptx/slide-level-0-h1-h2-with-table.pptx deleted file mode 100644 index 197a6833f..000000000 Binary files a/test/pptx/slide-level-0-h1-h2-with-table.pptx and /dev/null differ diff --git a/test/pptx/slide-level-0-h1-h2-with-table_deleted_layouts.pptx b/test/pptx/slide-level-0-h1-h2-with-table_deleted_layouts.pptx deleted file mode 100644 index 5e776e05c..000000000 Binary files a/test/pptx/slide-level-0-h1-h2-with-table_deleted_layouts.pptx and /dev/null differ diff --git a/test/pptx/slide-level-0-h1-h2-with-table_moved_layouts.pptx b/test/pptx/slide-level-0-h1-h2-with-table_moved_layouts.pptx deleted file mode 100644 index 35204de1b..000000000 Binary files a/test/pptx/slide-level-0-h1-h2-with-table_moved_layouts.pptx and /dev/null differ diff --git a/test/pptx/slide-level-0-h1-h2-with-table_templated.pptx b/test/pptx/slide-level-0-h1-h2-with-table_templated.pptx deleted file mode 100644 index 5c659952e..000000000 Binary files a/test/pptx/slide-level-0-h1-h2-with-table_templated.pptx and /dev/null differ diff --git a/test/pptx/slide-level-0-h1-with-image.native b/test/pptx/slide-level-0-h1-with-image.native deleted file mode 100644 index 0f5033b54..000000000 --- a/test/pptx/slide-level-0-h1-with-image.native +++ /dev/null @@ -1,2 +0,0 @@ -[Header 1 ("hello",[],[]) [Str "Hello"] -,Para [Image ("",[],[]) [Str "An",Space,Str "image"] ("lalune.jpg","fig:")]] diff --git a/test/pptx/slide-level-0-h1-with-image.pptx b/test/pptx/slide-level-0-h1-with-image.pptx deleted file mode 100644 index 2f3a53f5c..000000000 Binary files a/test/pptx/slide-level-0-h1-with-image.pptx and /dev/null differ diff --git a/test/pptx/slide-level-0-h1-with-image_deleted_layouts.pptx b/test/pptx/slide-level-0-h1-with-image_deleted_layouts.pptx deleted file mode 100644 index 16c61d1be..000000000 Binary files a/test/pptx/slide-level-0-h1-with-image_deleted_layouts.pptx and /dev/null differ diff --git a/test/pptx/slide-level-0-h1-with-image_moved_layouts.pptx b/test/pptx/slide-level-0-h1-with-image_moved_layouts.pptx deleted file mode 100644 index 395036069..000000000 Binary files a/test/pptx/slide-level-0-h1-with-image_moved_layouts.pptx and /dev/null differ diff --git a/test/pptx/slide-level-0-h1-with-image_templated.pptx b/test/pptx/slide-level-0-h1-with-image_templated.pptx deleted file mode 100644 index d306375e9..000000000 Binary files a/test/pptx/slide-level-0-h1-with-image_templated.pptx and /dev/null differ diff --git a/test/pptx/slide-level-0-h1-with-table.native b/test/pptx/slide-level-0-h1-with-table.native deleted file mode 100644 index b961e900d..000000000 --- a/test/pptx/slide-level-0-h1-with-table.native +++ /dev/null @@ -1,13 +0,0 @@ -[Header 1 ("hello",[],[]) [Str "Hello"] -,Table ("",[],[]) (Caption Nothing - []) - [(AlignDefault,ColWidth 5.555555555555555e-2)] - (TableHead ("",[],[]) - []) - [(TableBody ("",[],[]) (RowHeadColumns 0) - [] - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "1"]]]])] - (TableFoot ("",[],[]) - [])] diff --git a/test/pptx/slide-level-0-h1-with-table.pptx b/test/pptx/slide-level-0-h1-with-table.pptx deleted file mode 100644 index 44dbbf90c..000000000 Binary files a/test/pptx/slide-level-0-h1-with-table.pptx and /dev/null differ diff --git a/test/pptx/slide-level-0-h1-with-table_deleted_layouts.pptx b/test/pptx/slide-level-0-h1-with-table_deleted_layouts.pptx deleted file mode 100644 index 0eb7c0b08..000000000 Binary files a/test/pptx/slide-level-0-h1-with-table_deleted_layouts.pptx and /dev/null differ diff --git a/test/pptx/slide-level-0-h1-with-table_moved_layouts.pptx b/test/pptx/slide-level-0-h1-with-table_moved_layouts.pptx deleted file mode 100644 index 197499bc3..000000000 Binary files a/test/pptx/slide-level-0-h1-with-table_moved_layouts.pptx and /dev/null differ diff --git a/test/pptx/slide-level-0-h1-with-table_templated.pptx b/test/pptx/slide-level-0-h1-with-table_templated.pptx deleted file mode 100644 index 87b45dda2..000000000 Binary files a/test/pptx/slide-level-0-h1-with-table_templated.pptx and /dev/null differ diff --git a/test/pptx/slide-level-0-h2-with-image.native b/test/pptx/slide-level-0-h2-with-image.native deleted file mode 100644 index 5def0cb92..000000000 --- a/test/pptx/slide-level-0-h2-with-image.native +++ /dev/null @@ -1,2 +0,0 @@ -[Header 2 ("hello",[],[]) [Str "Hello"] -,Para [Image ("",[],[]) [Str "An",Space,Str "image"] ("lalune.jpg","fig:")]] diff --git a/test/pptx/slide-level-0-h2-with-image.pptx b/test/pptx/slide-level-0-h2-with-image.pptx deleted file mode 100644 index 948659d6a..000000000 Binary files a/test/pptx/slide-level-0-h2-with-image.pptx and /dev/null differ diff --git a/test/pptx/slide-level-0-h2-with-image_deleted_layouts.pptx b/test/pptx/slide-level-0-h2-with-image_deleted_layouts.pptx deleted file mode 100644 index afc096ce6..000000000 Binary files a/test/pptx/slide-level-0-h2-with-image_deleted_layouts.pptx and /dev/null differ diff --git a/test/pptx/slide-level-0-h2-with-image_moved_layouts.pptx b/test/pptx/slide-level-0-h2-with-image_moved_layouts.pptx deleted file mode 100644 index 395036069..000000000 Binary files a/test/pptx/slide-level-0-h2-with-image_moved_layouts.pptx and /dev/null differ diff --git a/test/pptx/slide-level-0-h2-with-image_templated.pptx b/test/pptx/slide-level-0-h2-with-image_templated.pptx deleted file mode 100644 index d306375e9..000000000 Binary files a/test/pptx/slide-level-0-h2-with-image_templated.pptx and /dev/null differ diff --git a/test/pptx/slide-level-0/h1-h2-with-table/deleted-layouts.pptx b/test/pptx/slide-level-0/h1-h2-with-table/deleted-layouts.pptx new file mode 100644 index 000000000..5e776e05c Binary files /dev/null and b/test/pptx/slide-level-0/h1-h2-with-table/deleted-layouts.pptx differ diff --git a/test/pptx/slide-level-0/h1-h2-with-table/input.native b/test/pptx/slide-level-0/h1-h2-with-table/input.native new file mode 100644 index 000000000..c6e65ecf5 --- /dev/null +++ b/test/pptx/slide-level-0/h1-h2-with-table/input.native @@ -0,0 +1,14 @@ +[Header 1 ("hello",[],[]) [Str "Hello"] +,Header 2 ("there",[],[]) [Str "There"] +,Table ("",[],[]) (Caption Nothing + []) + [(AlignDefault,ColWidth 5.555555555555555e-2)] + (TableHead ("",[],[]) + []) + [(TableBody ("",[],[]) (RowHeadColumns 0) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "1"]]]])] + (TableFoot ("",[],[]) + [])] diff --git a/test/pptx/slide-level-0/h1-h2-with-table/moved-layouts.pptx b/test/pptx/slide-level-0/h1-h2-with-table/moved-layouts.pptx new file mode 100644 index 000000000..35204de1b Binary files /dev/null and b/test/pptx/slide-level-0/h1-h2-with-table/moved-layouts.pptx differ diff --git a/test/pptx/slide-level-0/h1-h2-with-table/output.pptx b/test/pptx/slide-level-0/h1-h2-with-table/output.pptx new file mode 100644 index 000000000..197a6833f Binary files /dev/null and b/test/pptx/slide-level-0/h1-h2-with-table/output.pptx differ diff --git a/test/pptx/slide-level-0/h1-h2-with-table/templated.pptx b/test/pptx/slide-level-0/h1-h2-with-table/templated.pptx new file mode 100644 index 000000000..5c659952e Binary files /dev/null and b/test/pptx/slide-level-0/h1-h2-with-table/templated.pptx differ diff --git a/test/pptx/slide-level-0/h1-with-image/deleted-layouts.pptx b/test/pptx/slide-level-0/h1-with-image/deleted-layouts.pptx new file mode 100644 index 000000000..16c61d1be Binary files /dev/null and b/test/pptx/slide-level-0/h1-with-image/deleted-layouts.pptx differ diff --git a/test/pptx/slide-level-0/h1-with-image/input.native b/test/pptx/slide-level-0/h1-with-image/input.native new file mode 100644 index 000000000..0f5033b54 --- /dev/null +++ b/test/pptx/slide-level-0/h1-with-image/input.native @@ -0,0 +1,2 @@ +[Header 1 ("hello",[],[]) [Str "Hello"] +,Para [Image ("",[],[]) [Str "An",Space,Str "image"] ("lalune.jpg","fig:")]] diff --git a/test/pptx/slide-level-0/h1-with-image/moved-layouts.pptx b/test/pptx/slide-level-0/h1-with-image/moved-layouts.pptx new file mode 100644 index 000000000..395036069 Binary files /dev/null and b/test/pptx/slide-level-0/h1-with-image/moved-layouts.pptx differ diff --git a/test/pptx/slide-level-0/h1-with-image/output.pptx b/test/pptx/slide-level-0/h1-with-image/output.pptx new file mode 100644 index 000000000..2f3a53f5c Binary files /dev/null and b/test/pptx/slide-level-0/h1-with-image/output.pptx differ diff --git a/test/pptx/slide-level-0/h1-with-image/templated.pptx b/test/pptx/slide-level-0/h1-with-image/templated.pptx new file mode 100644 index 000000000..d306375e9 Binary files /dev/null and b/test/pptx/slide-level-0/h1-with-image/templated.pptx differ diff --git a/test/pptx/slide-level-0/h1-with-table/deleted-layouts.pptx b/test/pptx/slide-level-0/h1-with-table/deleted-layouts.pptx new file mode 100644 index 000000000..0eb7c0b08 Binary files /dev/null and b/test/pptx/slide-level-0/h1-with-table/deleted-layouts.pptx differ diff --git a/test/pptx/slide-level-0/h1-with-table/input.native b/test/pptx/slide-level-0/h1-with-table/input.native new file mode 100644 index 000000000..b961e900d --- /dev/null +++ b/test/pptx/slide-level-0/h1-with-table/input.native @@ -0,0 +1,13 @@ +[Header 1 ("hello",[],[]) [Str "Hello"] +,Table ("",[],[]) (Caption Nothing + []) + [(AlignDefault,ColWidth 5.555555555555555e-2)] + (TableHead ("",[],[]) + []) + [(TableBody ("",[],[]) (RowHeadColumns 0) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "1"]]]])] + (TableFoot ("",[],[]) + [])] diff --git a/test/pptx/slide-level-0/h1-with-table/moved-layouts.pptx b/test/pptx/slide-level-0/h1-with-table/moved-layouts.pptx new file mode 100644 index 000000000..197499bc3 Binary files /dev/null and b/test/pptx/slide-level-0/h1-with-table/moved-layouts.pptx differ diff --git a/test/pptx/slide-level-0/h1-with-table/output.pptx b/test/pptx/slide-level-0/h1-with-table/output.pptx new file mode 100644 index 000000000..44dbbf90c Binary files /dev/null and b/test/pptx/slide-level-0/h1-with-table/output.pptx differ diff --git a/test/pptx/slide-level-0/h1-with-table/templated.pptx b/test/pptx/slide-level-0/h1-with-table/templated.pptx new file mode 100644 index 000000000..87b45dda2 Binary files /dev/null and b/test/pptx/slide-level-0/h1-with-table/templated.pptx differ diff --git a/test/pptx/slide-level-0/h2-with-image/deleted-layouts.pptx b/test/pptx/slide-level-0/h2-with-image/deleted-layouts.pptx new file mode 100644 index 000000000..afc096ce6 Binary files /dev/null and b/test/pptx/slide-level-0/h2-with-image/deleted-layouts.pptx differ diff --git a/test/pptx/slide-level-0/h2-with-image/input.native b/test/pptx/slide-level-0/h2-with-image/input.native new file mode 100644 index 000000000..5def0cb92 --- /dev/null +++ b/test/pptx/slide-level-0/h2-with-image/input.native @@ -0,0 +1,2 @@ +[Header 2 ("hello",[],[]) [Str "Hello"] +,Para [Image ("",[],[]) [Str "An",Space,Str "image"] ("lalune.jpg","fig:")]] diff --git a/test/pptx/slide-level-0/h2-with-image/moved-layouts.pptx b/test/pptx/slide-level-0/h2-with-image/moved-layouts.pptx new file mode 100644 index 000000000..395036069 Binary files /dev/null and b/test/pptx/slide-level-0/h2-with-image/moved-layouts.pptx differ diff --git a/test/pptx/slide-level-0/h2-with-image/output.pptx b/test/pptx/slide-level-0/h2-with-image/output.pptx new file mode 100644 index 000000000..948659d6a Binary files /dev/null and b/test/pptx/slide-level-0/h2-with-image/output.pptx differ diff --git a/test/pptx/slide-level-0/h2-with-image/templated.pptx b/test/pptx/slide-level-0/h2-with-image/templated.pptx new file mode 100644 index 000000000..d306375e9 Binary files /dev/null and b/test/pptx/slide-level-0/h2-with-image/templated.pptx differ diff --git a/test/pptx/slide_breaks.native b/test/pptx/slide_breaks.native deleted file mode 100644 index 084c61737..000000000 --- a/test/pptx/slide_breaks.native +++ /dev/null @@ -1,7 +0,0 @@ -Pandoc (Meta {unMeta = fromList []}) -[Para [Str "Break",Space,Str "with",Space,Str "a",Space,Str "new",Space,Str "section-level",Space,Str "header"] -,Header 1 ("below-section-level",[],[]) [Str "Below",Space,Str "section-level"] -,Header 2 ("section-level",[],[]) [Str "Section-level"] -,Para [Str "Third",Space,Str "slide",Space,Str "(with",Space,Str "a",Space,Str "section-level",Space,Str "of",Space,Str "2)"] -,HorizontalRule -,Para [Str "This",Space,Str "is",Space,Str "another",Space,Str "slide."]] diff --git a/test/pptx/slide_breaks.pptx b/test/pptx/slide_breaks.pptx deleted file mode 100644 index e06d9079d..000000000 Binary files a/test/pptx/slide_breaks.pptx and /dev/null differ diff --git a/test/pptx/slide_breaks_deleted_layouts.pptx b/test/pptx/slide_breaks_deleted_layouts.pptx deleted file mode 100644 index 86dfad3b2..000000000 Binary files a/test/pptx/slide_breaks_deleted_layouts.pptx and /dev/null differ diff --git a/test/pptx/slide_breaks_moved_layouts.pptx b/test/pptx/slide_breaks_moved_layouts.pptx deleted file mode 100644 index 90b3b94a6..000000000 Binary files a/test/pptx/slide_breaks_moved_layouts.pptx and /dev/null differ diff --git a/test/pptx/slide_breaks_slide_level_1.pptx b/test/pptx/slide_breaks_slide_level_1.pptx deleted file mode 100644 index 449339778..000000000 Binary files a/test/pptx/slide_breaks_slide_level_1.pptx and /dev/null differ diff --git a/test/pptx/slide_breaks_slide_level_1_deleted_layouts.pptx b/test/pptx/slide_breaks_slide_level_1_deleted_layouts.pptx deleted file mode 100644 index 2c7fd4d8b..000000000 Binary files a/test/pptx/slide_breaks_slide_level_1_deleted_layouts.pptx and /dev/null differ diff --git a/test/pptx/slide_breaks_slide_level_1_moved_layouts.pptx b/test/pptx/slide_breaks_slide_level_1_moved_layouts.pptx deleted file mode 100644 index 8471b1d10..000000000 Binary files a/test/pptx/slide_breaks_slide_level_1_moved_layouts.pptx and /dev/null differ diff --git a/test/pptx/slide_breaks_slide_level_1_templated.pptx b/test/pptx/slide_breaks_slide_level_1_templated.pptx deleted file mode 100644 index e2815159a..000000000 Binary files a/test/pptx/slide_breaks_slide_level_1_templated.pptx and /dev/null differ diff --git a/test/pptx/slide_breaks_templated.pptx b/test/pptx/slide_breaks_templated.pptx deleted file mode 100644 index 71ba99701..000000000 Binary files a/test/pptx/slide_breaks_templated.pptx and /dev/null differ diff --git a/test/pptx/slide_breaks_toc.pptx b/test/pptx/slide_breaks_toc.pptx deleted file mode 100644 index 9dbfa41a0..000000000 Binary files a/test/pptx/slide_breaks_toc.pptx and /dev/null differ diff --git a/test/pptx/slide_breaks_toc_deleted_layouts.pptx b/test/pptx/slide_breaks_toc_deleted_layouts.pptx deleted file mode 100644 index 1e0b76d46..000000000 Binary files a/test/pptx/slide_breaks_toc_deleted_layouts.pptx and /dev/null differ diff --git a/test/pptx/slide_breaks_toc_moved_layouts.pptx b/test/pptx/slide_breaks_toc_moved_layouts.pptx deleted file mode 100644 index 918264bc5..000000000 Binary files a/test/pptx/slide_breaks_toc_moved_layouts.pptx and /dev/null differ diff --git a/test/pptx/slide_breaks_toc_templated.pptx b/test/pptx/slide_breaks_toc_templated.pptx deleted file mode 100644 index b83f3f596..000000000 Binary files a/test/pptx/slide_breaks_toc_templated.pptx and /dev/null differ diff --git a/test/pptx/speaker-notes-after-metadata/deleted-layouts.pptx b/test/pptx/speaker-notes-after-metadata/deleted-layouts.pptx new file mode 100644 index 000000000..1298870e2 Binary files /dev/null and b/test/pptx/speaker-notes-after-metadata/deleted-layouts.pptx differ diff --git a/test/pptx/speaker-notes-after-metadata/input.native b/test/pptx/speaker-notes-after-metadata/input.native new file mode 100644 index 000000000..6fda4b1ab --- /dev/null +++ b/test/pptx/speaker-notes-after-metadata/input.native @@ -0,0 +1,5 @@ +Pandoc (Meta {unMeta = fromList [("author",MetaInlines [Str "Jesse",Space,Str "Rosenthal"]),("title",MetaInlines [Str "Testing"])]}) +[Div ("",["notes"],[]) + [Para [Str "Some",Space,Str "speaker",Space,Str "notes"]] +,Header 1 ("a-header",[],[]) [Str "A",Space,Str "header"] +,Para [Str "And",Space,Str "a",Space,Str "new",Space,Str "slide."]] diff --git a/test/pptx/speaker-notes-after-metadata/moved-layouts.pptx b/test/pptx/speaker-notes-after-metadata/moved-layouts.pptx new file mode 100644 index 000000000..b844a0b51 Binary files /dev/null and b/test/pptx/speaker-notes-after-metadata/moved-layouts.pptx differ diff --git a/test/pptx/speaker-notes-after-metadata/output.pptx b/test/pptx/speaker-notes-after-metadata/output.pptx new file mode 100644 index 000000000..6343bffe4 Binary files /dev/null and b/test/pptx/speaker-notes-after-metadata/output.pptx differ diff --git a/test/pptx/speaker-notes-after-metadata/templated.pptx b/test/pptx/speaker-notes-after-metadata/templated.pptx new file mode 100644 index 000000000..8d27c4c68 Binary files /dev/null and b/test/pptx/speaker-notes-after-metadata/templated.pptx differ diff --git a/test/pptx/speaker-notes-afterheader/deleted-layouts.pptx b/test/pptx/speaker-notes-afterheader/deleted-layouts.pptx new file mode 100644 index 000000000..853b918cb Binary files /dev/null and b/test/pptx/speaker-notes-afterheader/deleted-layouts.pptx differ diff --git a/test/pptx/speaker-notes-afterheader/input.native b/test/pptx/speaker-notes-afterheader/input.native new file mode 100644 index 000000000..0f7dd95d7 --- /dev/null +++ b/test/pptx/speaker-notes-afterheader/input.native @@ -0,0 +1,3 @@ +[Header 1 ("here-is-a-single-header",[],[]) [Str "Here",Space,Str "is",Space,Str "a",Space,Str "single",Space,Str "header"] +,Div ("",["notes"],[]) + [Para [Str "and",Space,Str "here",Space,Str "are",Space,Str "some",Space,Str "notes"]]] diff --git a/test/pptx/speaker-notes-afterheader/moved-layouts.pptx b/test/pptx/speaker-notes-afterheader/moved-layouts.pptx new file mode 100644 index 000000000..9fff9f855 Binary files /dev/null and b/test/pptx/speaker-notes-afterheader/moved-layouts.pptx differ diff --git a/test/pptx/speaker-notes-afterheader/output.pptx b/test/pptx/speaker-notes-afterheader/output.pptx new file mode 100644 index 000000000..d581681aa Binary files /dev/null and b/test/pptx/speaker-notes-afterheader/output.pptx differ diff --git a/test/pptx/speaker-notes-afterheader/templated.pptx b/test/pptx/speaker-notes-afterheader/templated.pptx new file mode 100644 index 000000000..d8d8481df Binary files /dev/null and b/test/pptx/speaker-notes-afterheader/templated.pptx differ diff --git a/test/pptx/speaker-notes-afterseps/deleted-layouts.pptx b/test/pptx/speaker-notes-afterseps/deleted-layouts.pptx new file mode 100644 index 000000000..9fec1c279 Binary files /dev/null and b/test/pptx/speaker-notes-afterseps/deleted-layouts.pptx differ diff --git a/test/pptx/speaker-notes-afterseps/input.native b/test/pptx/speaker-notes-afterseps/input.native new file mode 100644 index 000000000..4fd7b1ccb --- /dev/null +++ b/test/pptx/speaker-notes-afterseps/input.native @@ -0,0 +1,63 @@ +[Para [Image ("",[],[]) [Str "The",Space,Str "moon"] ("lalune.jpg","fig:")] +,Div ("",["notes"],[]) + [Para [Str "chicken",Space,Str "and",Space,Str "dumplings"]] +,Table ("",[],[]) (Caption Nothing + [Para [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax,",Space,Str "with",Space,Str "alignment"]]) + [(AlignRight,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Right"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Left"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Center"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Default"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns 0) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "12"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "123"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "1"]]]])] + (TableFoot ("",[],[]) + []) +,Div ("",["notes"],[]) + [Para [Str "foo",Space,Str "bar"]] +,Div ("",["columns"],[]) + [Div ("",["column"],[]) + [BulletList + [[Para [Str "some",Space,Str "stuff"]] + ,[Para [Str "some",Space,Str "more",Space,Str "stuff"]]] + ,Div ("",["notes"],[]) + [Para [Str "Some",Space,Str "notes",Space,Str "inside",Space,Str "a",Space,Str "column"]]] + ,Div ("",["column"],[]) + [Para [Str "Some",Space,Str "other",Space,Emph [Str "stuff"]]]] +,Div ("",["notes"],[]) + [Para [Str "Some",Space,Str "notes",Space,Str "outside",Space,Str "the",Space,Str "column"]]] \ No newline at end of file diff --git a/test/pptx/speaker-notes-afterseps/moved-layouts.pptx b/test/pptx/speaker-notes-afterseps/moved-layouts.pptx new file mode 100644 index 000000000..de697cbd8 Binary files /dev/null and b/test/pptx/speaker-notes-afterseps/moved-layouts.pptx differ diff --git a/test/pptx/speaker-notes-afterseps/output.pptx b/test/pptx/speaker-notes-afterseps/output.pptx new file mode 100644 index 000000000..9542fe8b5 Binary files /dev/null and b/test/pptx/speaker-notes-afterseps/output.pptx differ diff --git a/test/pptx/speaker-notes-afterseps/templated.pptx b/test/pptx/speaker-notes-afterseps/templated.pptx new file mode 100644 index 000000000..5a3d15d57 Binary files /dev/null and b/test/pptx/speaker-notes-afterseps/templated.pptx differ diff --git a/test/pptx/speaker-notes/deleted-layouts.pptx b/test/pptx/speaker-notes/deleted-layouts.pptx new file mode 100644 index 000000000..6a5ad524f Binary files /dev/null and b/test/pptx/speaker-notes/deleted-layouts.pptx differ diff --git a/test/pptx/speaker-notes/input.native b/test/pptx/speaker-notes/input.native new file mode 100644 index 000000000..4eeca2107 --- /dev/null +++ b/test/pptx/speaker-notes/input.native @@ -0,0 +1,17 @@ +[Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "slide."] +,Div ("",["notes"],[]) + [Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "note."] + ,Para [Str "Here",Space,Str "is",Space,Emph [Str "some"],Space,Strong [Str "other"],Space,Str "formatting."]] +,HorizontalRule +,Para [Str "A",Space,Str "page",Space,Str "with",Space,Str "no",Space,Str "speaker",Space,Str "notes"] +,HorizontalRule +,Div ("",["notes"],[]) + [Para [Str "The",Space,Str "first",Space,Str "note",Space,Str "div"]] +,Para [Str "A",Space,Str "page",Space,Str "with",Space,Str "two",Space,Str "notes."] +,Div ("",["notes"],[]) + [Para [Str "The",Space,Str "second",Space,Str "note",Space,Str "div"]] +,HorizontalRule +,Para [Str "Strip",Space,Str "links",Space,Str "and",Space,Str "footnotes."] +,Div ("",["notes"],[]) + [Para [Str "No",Space,Link ("",[],[]) [Str "link"] ("https://www.google.com",""),Space,Str "here."] + ,Para [Str "No",Space,Str "note",Space,Str "here.",Note [Para [Str "You\8217ll",Space,Str "never",Space,Str "read",Space,Str "this"]]]]] diff --git a/test/pptx/speaker-notes/moved-layouts.pptx b/test/pptx/speaker-notes/moved-layouts.pptx new file mode 100644 index 000000000..f95df9622 Binary files /dev/null and b/test/pptx/speaker-notes/moved-layouts.pptx differ diff --git a/test/pptx/speaker-notes/output.pptx b/test/pptx/speaker-notes/output.pptx new file mode 100644 index 000000000..0ab1302da Binary files /dev/null and b/test/pptx/speaker-notes/output.pptx differ diff --git a/test/pptx/speaker-notes/templated.pptx b/test/pptx/speaker-notes/templated.pptx new file mode 100644 index 000000000..930377fbf Binary files /dev/null and b/test/pptx/speaker-notes/templated.pptx differ diff --git a/test/pptx/speaker_notes.native b/test/pptx/speaker_notes.native deleted file mode 100644 index 4eeca2107..000000000 --- a/test/pptx/speaker_notes.native +++ /dev/null @@ -1,17 +0,0 @@ -[Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "slide."] -,Div ("",["notes"],[]) - [Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "note."] - ,Para [Str "Here",Space,Str "is",Space,Emph [Str "some"],Space,Strong [Str "other"],Space,Str "formatting."]] -,HorizontalRule -,Para [Str "A",Space,Str "page",Space,Str "with",Space,Str "no",Space,Str "speaker",Space,Str "notes"] -,HorizontalRule -,Div ("",["notes"],[]) - [Para [Str "The",Space,Str "first",Space,Str "note",Space,Str "div"]] -,Para [Str "A",Space,Str "page",Space,Str "with",Space,Str "two",Space,Str "notes."] -,Div ("",["notes"],[]) - [Para [Str "The",Space,Str "second",Space,Str "note",Space,Str "div"]] -,HorizontalRule -,Para [Str "Strip",Space,Str "links",Space,Str "and",Space,Str "footnotes."] -,Div ("",["notes"],[]) - [Para [Str "No",Space,Link ("",[],[]) [Str "link"] ("https://www.google.com",""),Space,Str "here."] - ,Para [Str "No",Space,Str "note",Space,Str "here.",Note [Para [Str "You\8217ll",Space,Str "never",Space,Str "read",Space,Str "this"]]]]] diff --git a/test/pptx/speaker_notes.pptx b/test/pptx/speaker_notes.pptx deleted file mode 100644 index 0ab1302da..000000000 Binary files a/test/pptx/speaker_notes.pptx and /dev/null differ diff --git a/test/pptx/speaker_notes_after_metadata.native b/test/pptx/speaker_notes_after_metadata.native deleted file mode 100644 index 6fda4b1ab..000000000 --- a/test/pptx/speaker_notes_after_metadata.native +++ /dev/null @@ -1,5 +0,0 @@ -Pandoc (Meta {unMeta = fromList [("author",MetaInlines [Str "Jesse",Space,Str "Rosenthal"]),("title",MetaInlines [Str "Testing"])]}) -[Div ("",["notes"],[]) - [Para [Str "Some",Space,Str "speaker",Space,Str "notes"]] -,Header 1 ("a-header",[],[]) [Str "A",Space,Str "header"] -,Para [Str "And",Space,Str "a",Space,Str "new",Space,Str "slide."]] diff --git a/test/pptx/speaker_notes_after_metadata.pptx b/test/pptx/speaker_notes_after_metadata.pptx deleted file mode 100644 index 6343bffe4..000000000 Binary files a/test/pptx/speaker_notes_after_metadata.pptx and /dev/null differ diff --git a/test/pptx/speaker_notes_after_metadata_deleted_layouts.pptx b/test/pptx/speaker_notes_after_metadata_deleted_layouts.pptx deleted file mode 100644 index 1298870e2..000000000 Binary files a/test/pptx/speaker_notes_after_metadata_deleted_layouts.pptx and /dev/null differ diff --git a/test/pptx/speaker_notes_after_metadata_moved_layouts.pptx b/test/pptx/speaker_notes_after_metadata_moved_layouts.pptx deleted file mode 100644 index b844a0b51..000000000 Binary files a/test/pptx/speaker_notes_after_metadata_moved_layouts.pptx and /dev/null differ diff --git a/test/pptx/speaker_notes_after_metadata_templated.pptx b/test/pptx/speaker_notes_after_metadata_templated.pptx deleted file mode 100644 index 8d27c4c68..000000000 Binary files a/test/pptx/speaker_notes_after_metadata_templated.pptx and /dev/null differ diff --git a/test/pptx/speaker_notes_afterheader.native b/test/pptx/speaker_notes_afterheader.native deleted file mode 100644 index 0f7dd95d7..000000000 --- a/test/pptx/speaker_notes_afterheader.native +++ /dev/null @@ -1,3 +0,0 @@ -[Header 1 ("here-is-a-single-header",[],[]) [Str "Here",Space,Str "is",Space,Str "a",Space,Str "single",Space,Str "header"] -,Div ("",["notes"],[]) - [Para [Str "and",Space,Str "here",Space,Str "are",Space,Str "some",Space,Str "notes"]]] diff --git a/test/pptx/speaker_notes_afterheader.pptx b/test/pptx/speaker_notes_afterheader.pptx deleted file mode 100644 index d581681aa..000000000 Binary files a/test/pptx/speaker_notes_afterheader.pptx and /dev/null differ diff --git a/test/pptx/speaker_notes_afterheader_deleted_layouts.pptx b/test/pptx/speaker_notes_afterheader_deleted_layouts.pptx deleted file mode 100644 index 853b918cb..000000000 Binary files a/test/pptx/speaker_notes_afterheader_deleted_layouts.pptx and /dev/null differ diff --git a/test/pptx/speaker_notes_afterheader_moved_layouts.pptx b/test/pptx/speaker_notes_afterheader_moved_layouts.pptx deleted file mode 100644 index 9fff9f855..000000000 Binary files a/test/pptx/speaker_notes_afterheader_moved_layouts.pptx and /dev/null differ diff --git a/test/pptx/speaker_notes_afterheader_templated.pptx b/test/pptx/speaker_notes_afterheader_templated.pptx deleted file mode 100644 index d8d8481df..000000000 Binary files a/test/pptx/speaker_notes_afterheader_templated.pptx and /dev/null differ diff --git a/test/pptx/speaker_notes_afterseps.native b/test/pptx/speaker_notes_afterseps.native deleted file mode 100644 index 4fd7b1ccb..000000000 --- a/test/pptx/speaker_notes_afterseps.native +++ /dev/null @@ -1,63 +0,0 @@ -[Para [Image ("",[],[]) [Str "The",Space,Str "moon"] ("lalune.jpg","fig:")] -,Div ("",["notes"],[]) - [Para [Str "chicken",Space,Str "and",Space,Str "dumplings"]] -,Table ("",[],[]) (Caption Nothing - [Para [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax,",Space,Str "with",Space,Str "alignment"]]) - [(AlignRight,ColWidthDefault) - ,(AlignLeft,ColWidthDefault) - ,(AlignCenter,ColWidthDefault) - ,(AlignDefault,ColWidthDefault)] - (TableHead ("",[],[]) - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Right"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Left"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Center"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Default"]]]]) - [(TableBody ("",[],[]) (RowHeadColumns 0) - [] - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "12"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "12"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "12"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "12"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "123"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "123"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "123"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "123"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "1"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "1"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "1"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "1"]]]])] - (TableFoot ("",[],[]) - []) -,Div ("",["notes"],[]) - [Para [Str "foo",Space,Str "bar"]] -,Div ("",["columns"],[]) - [Div ("",["column"],[]) - [BulletList - [[Para [Str "some",Space,Str "stuff"]] - ,[Para [Str "some",Space,Str "more",Space,Str "stuff"]]] - ,Div ("",["notes"],[]) - [Para [Str "Some",Space,Str "notes",Space,Str "inside",Space,Str "a",Space,Str "column"]]] - ,Div ("",["column"],[]) - [Para [Str "Some",Space,Str "other",Space,Emph [Str "stuff"]]]] -,Div ("",["notes"],[]) - [Para [Str "Some",Space,Str "notes",Space,Str "outside",Space,Str "the",Space,Str "column"]]] \ No newline at end of file diff --git a/test/pptx/speaker_notes_afterseps.pptx b/test/pptx/speaker_notes_afterseps.pptx deleted file mode 100644 index 9542fe8b5..000000000 Binary files a/test/pptx/speaker_notes_afterseps.pptx and /dev/null differ diff --git a/test/pptx/speaker_notes_afterseps_deleted_layouts.pptx b/test/pptx/speaker_notes_afterseps_deleted_layouts.pptx deleted file mode 100644 index 9fec1c279..000000000 Binary files a/test/pptx/speaker_notes_afterseps_deleted_layouts.pptx and /dev/null differ diff --git a/test/pptx/speaker_notes_afterseps_moved_layouts.pptx b/test/pptx/speaker_notes_afterseps_moved_layouts.pptx deleted file mode 100644 index de697cbd8..000000000 Binary files a/test/pptx/speaker_notes_afterseps_moved_layouts.pptx and /dev/null differ diff --git a/test/pptx/speaker_notes_afterseps_templated.pptx b/test/pptx/speaker_notes_afterseps_templated.pptx deleted file mode 100644 index 5a3d15d57..000000000 Binary files a/test/pptx/speaker_notes_afterseps_templated.pptx and /dev/null differ diff --git a/test/pptx/speaker_notes_deleted_layouts.pptx b/test/pptx/speaker_notes_deleted_layouts.pptx deleted file mode 100644 index 6a5ad524f..000000000 Binary files a/test/pptx/speaker_notes_deleted_layouts.pptx and /dev/null differ diff --git a/test/pptx/speaker_notes_moved_layouts.pptx b/test/pptx/speaker_notes_moved_layouts.pptx deleted file mode 100644 index f95df9622..000000000 Binary files a/test/pptx/speaker_notes_moved_layouts.pptx and /dev/null differ diff --git a/test/pptx/speaker_notes_templated.pptx b/test/pptx/speaker_notes_templated.pptx deleted file mode 100644 index 930377fbf..000000000 Binary files a/test/pptx/speaker_notes_templated.pptx and /dev/null differ diff --git a/test/pptx/start-numbering-at/deleted-layouts.pptx b/test/pptx/start-numbering-at/deleted-layouts.pptx new file mode 100644 index 000000000..d9cf91804 Binary files /dev/null and b/test/pptx/start-numbering-at/deleted-layouts.pptx differ diff --git a/test/pptx/start-numbering-at/input.native b/test/pptx/start-numbering-at/input.native new file mode 100644 index 000000000..ecffbb0ef --- /dev/null +++ b/test/pptx/start-numbering-at/input.native @@ -0,0 +1,9 @@ +[Header 2 ("example-numbering-mwe",[],[]) [Str "Example",Space,Str "numbering",Space,Str "MWE"] +,Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "slide",Space,Str "with",Space,Str "examples",Space,Str "in",Space,Str "(1)",Space,Str "and",Space,Str "(2)"] +,OrderedList (1,Example,TwoParens) + [[Plain [Str "First"]] + ,[Plain [Str "Second"]]] +,Header 2 ("a-second-slide",[],[]) [Str "A",Space,Str "second",Space,Str "slide"] +,Para [Str "This",Space,Str "second",Space,Str "slide",Space,Str "has",Space,Str "a",Space,Str "third",Space,Str "example",Space,Str "in",Space,Str "(3)."] +,OrderedList (3,Example,TwoParens) + [[Plain [Str "Third"]]]] diff --git a/test/pptx/start-numbering-at/moved-layouts.pptx b/test/pptx/start-numbering-at/moved-layouts.pptx new file mode 100644 index 000000000..e1b2d4de8 Binary files /dev/null and b/test/pptx/start-numbering-at/moved-layouts.pptx differ diff --git a/test/pptx/start-numbering-at/output.pptx b/test/pptx/start-numbering-at/output.pptx new file mode 100644 index 000000000..4320128b3 Binary files /dev/null and b/test/pptx/start-numbering-at/output.pptx differ diff --git a/test/pptx/start-numbering-at/templated.pptx b/test/pptx/start-numbering-at/templated.pptx new file mode 100644 index 000000000..efc56ac7a Binary files /dev/null and b/test/pptx/start-numbering-at/templated.pptx differ diff --git a/test/pptx/start_numbering_at.native b/test/pptx/start_numbering_at.native deleted file mode 100644 index ecffbb0ef..000000000 --- a/test/pptx/start_numbering_at.native +++ /dev/null @@ -1,9 +0,0 @@ -[Header 2 ("example-numbering-mwe",[],[]) [Str "Example",Space,Str "numbering",Space,Str "MWE"] -,Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "slide",Space,Str "with",Space,Str "examples",Space,Str "in",Space,Str "(1)",Space,Str "and",Space,Str "(2)"] -,OrderedList (1,Example,TwoParens) - [[Plain [Str "First"]] - ,[Plain [Str "Second"]]] -,Header 2 ("a-second-slide",[],[]) [Str "A",Space,Str "second",Space,Str "slide"] -,Para [Str "This",Space,Str "second",Space,Str "slide",Space,Str "has",Space,Str "a",Space,Str "third",Space,Str "example",Space,Str "in",Space,Str "(3)."] -,OrderedList (3,Example,TwoParens) - [[Plain [Str "Third"]]]] diff --git a/test/pptx/start_numbering_at.pptx b/test/pptx/start_numbering_at.pptx deleted file mode 100644 index 4320128b3..000000000 Binary files a/test/pptx/start_numbering_at.pptx and /dev/null differ diff --git a/test/pptx/start_numbering_at_deleted_layouts.pptx b/test/pptx/start_numbering_at_deleted_layouts.pptx deleted file mode 100644 index d9cf91804..000000000 Binary files a/test/pptx/start_numbering_at_deleted_layouts.pptx and /dev/null differ diff --git a/test/pptx/start_numbering_at_moved_layouts.pptx b/test/pptx/start_numbering_at_moved_layouts.pptx deleted file mode 100644 index e1b2d4de8..000000000 Binary files a/test/pptx/start_numbering_at_moved_layouts.pptx and /dev/null differ diff --git a/test/pptx/start_numbering_at_templated.pptx b/test/pptx/start_numbering_at_templated.pptx deleted file mode 100644 index efc56ac7a..000000000 Binary files a/test/pptx/start_numbering_at_templated.pptx and /dev/null differ diff --git a/test/pptx/tables.native b/test/pptx/tables.native deleted file mode 100644 index 27b843f2b..000000000 --- a/test/pptx/tables.native +++ /dev/null @@ -1,95 +0,0 @@ -[Header 2 ("a-table-with-a-caption",[],[]) [Str "A",Space,Str "Table,",Space,Str "with",Space,Str "a",Space,Str "caption"] -,Table ("",[],[]) (Caption Nothing - [Para [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax,",Space,Str "with",Space,Str "alignment"]]) - [(AlignRight,ColWidthDefault) - ,(AlignLeft,ColWidthDefault) - ,(AlignCenter,ColWidthDefault) - ,(AlignDefault,ColWidthDefault)] - (TableHead ("",[],[]) - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Right"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Left"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Center"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Default"]]]]) - [(TableBody ("",[],[]) (RowHeadColumns 0) - [] - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "12"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "12"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "12"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "12"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "123"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "123"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "123"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "123"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "1"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "1"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "1"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "1"]]]])] - (TableFoot ("",[],[]) - []) -,Table ("",[],[]) (Caption Nothing - []) - [(AlignRight,ColWidthDefault) - ,(AlignLeft,ColWidthDefault) - ,(AlignCenter,ColWidthDefault) - ,(AlignDefault,ColWidthDefault)] - (TableHead ("",[],[]) - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Right"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Left"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Center"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Default"]]]]) - [(TableBody ("",[],[]) (RowHeadColumns 0) - [] - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "12"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "12"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "12"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "12"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "123"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "123"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "123"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "123"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "1"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "1"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "1"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "1"]]]])] - (TableFoot ("",[],[]) - [])] \ No newline at end of file diff --git a/test/pptx/tables.pptx b/test/pptx/tables.pptx deleted file mode 100644 index e41219844..000000000 Binary files a/test/pptx/tables.pptx and /dev/null differ diff --git a/test/pptx/tables/deleted-layouts.pptx b/test/pptx/tables/deleted-layouts.pptx new file mode 100644 index 000000000..a52222551 Binary files /dev/null and b/test/pptx/tables/deleted-layouts.pptx differ diff --git a/test/pptx/tables/input.native b/test/pptx/tables/input.native new file mode 100644 index 000000000..27b843f2b --- /dev/null +++ b/test/pptx/tables/input.native @@ -0,0 +1,95 @@ +[Header 2 ("a-table-with-a-caption",[],[]) [Str "A",Space,Str "Table,",Space,Str "with",Space,Str "a",Space,Str "caption"] +,Table ("",[],[]) (Caption Nothing + [Para [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax,",Space,Str "with",Space,Str "alignment"]]) + [(AlignRight,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Right"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Left"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Center"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Default"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns 0) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "12"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "123"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "1"]]]])] + (TableFoot ("",[],[]) + []) +,Table ("",[],[]) (Caption Nothing + []) + [(AlignRight,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Right"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Left"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Center"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "Default"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns 0) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "12"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "123"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "1"]]]])] + (TableFoot ("",[],[]) + [])] \ No newline at end of file diff --git a/test/pptx/tables/moved-layouts.pptx b/test/pptx/tables/moved-layouts.pptx new file mode 100644 index 000000000..56608a039 Binary files /dev/null and b/test/pptx/tables/moved-layouts.pptx differ diff --git a/test/pptx/tables/output.pptx b/test/pptx/tables/output.pptx new file mode 100644 index 000000000..e41219844 Binary files /dev/null and b/test/pptx/tables/output.pptx differ diff --git a/test/pptx/tables/templated.pptx b/test/pptx/tables/templated.pptx new file mode 100644 index 000000000..0a8c3e8d9 Binary files /dev/null and b/test/pptx/tables/templated.pptx differ diff --git a/test/pptx/tables_deleted_layouts.pptx b/test/pptx/tables_deleted_layouts.pptx deleted file mode 100644 index a52222551..000000000 Binary files a/test/pptx/tables_deleted_layouts.pptx and /dev/null differ diff --git a/test/pptx/tables_moved_layouts.pptx b/test/pptx/tables_moved_layouts.pptx deleted file mode 100644 index 56608a039..000000000 Binary files a/test/pptx/tables_moved_layouts.pptx and /dev/null differ diff --git a/test/pptx/tables_templated.pptx b/test/pptx/tables_templated.pptx deleted file mode 100644 index 0a8c3e8d9..000000000 Binary files a/test/pptx/tables_templated.pptx and /dev/null differ diff --git a/test/pptx/two-column/deleted-layouts.pptx b/test/pptx/two-column/deleted-layouts.pptx new file mode 100644 index 000000000..60a244f94 Binary files /dev/null and b/test/pptx/two-column/deleted-layouts.pptx differ diff --git a/test/pptx/two-column/input.native b/test/pptx/two-column/input.native new file mode 100644 index 000000000..086f74889 --- /dev/null +++ b/test/pptx/two-column/input.native @@ -0,0 +1,9 @@ +Pandoc (Meta {unMeta = fromList []}) +[Header 1 ("two-column-layout",[],[]) [Str "Two-Column",Space,Str "Layout"] +,Div ("",["columns"],[]) + [Div ("",["column"],[]) + [Para [Str "One",Space,Str "paragraph."] + ,Para [Str "Another",Space,Str "paragraph."]] + ,Div ("",["column"],[]) + [Para [Str "Second",Space,Str "column",Space,Str "paragraph."] + ,Para [Str "Another",Space,Str "second",Space,Str "paragraph."]]]] diff --git a/test/pptx/two-column/moved-layouts.pptx b/test/pptx/two-column/moved-layouts.pptx new file mode 100644 index 000000000..a17f96b18 Binary files /dev/null and b/test/pptx/two-column/moved-layouts.pptx differ diff --git a/test/pptx/two-column/output.pptx b/test/pptx/two-column/output.pptx new file mode 100644 index 000000000..270a7eeac Binary files /dev/null and b/test/pptx/two-column/output.pptx differ diff --git a/test/pptx/two-column/templated.pptx b/test/pptx/two-column/templated.pptx new file mode 100644 index 000000000..6d9470372 Binary files /dev/null and b/test/pptx/two-column/templated.pptx differ diff --git a/test/pptx/two_column.native b/test/pptx/two_column.native deleted file mode 100644 index 086f74889..000000000 --- a/test/pptx/two_column.native +++ /dev/null @@ -1,9 +0,0 @@ -Pandoc (Meta {unMeta = fromList []}) -[Header 1 ("two-column-layout",[],[]) [Str "Two-Column",Space,Str "Layout"] -,Div ("",["columns"],[]) - [Div ("",["column"],[]) - [Para [Str "One",Space,Str "paragraph."] - ,Para [Str "Another",Space,Str "paragraph."]] - ,Div ("",["column"],[]) - [Para [Str "Second",Space,Str "column",Space,Str "paragraph."] - ,Para [Str "Another",Space,Str "second",Space,Str "paragraph."]]]] diff --git a/test/pptx/two_column.pptx b/test/pptx/two_column.pptx deleted file mode 100644 index 270a7eeac..000000000 Binary files a/test/pptx/two_column.pptx and /dev/null differ diff --git a/test/pptx/two_column_deleted_layouts.pptx b/test/pptx/two_column_deleted_layouts.pptx deleted file mode 100644 index 60a244f94..000000000 Binary files a/test/pptx/two_column_deleted_layouts.pptx and /dev/null differ diff --git a/test/pptx/two_column_moved_layouts.pptx b/test/pptx/two_column_moved_layouts.pptx deleted file mode 100644 index a17f96b18..000000000 Binary files a/test/pptx/two_column_moved_layouts.pptx and /dev/null differ diff --git a/test/pptx/two_column_templated.pptx b/test/pptx/two_column_templated.pptx deleted file mode 100644 index 6d9470372..000000000 Binary files a/test/pptx/two_column_templated.pptx and /dev/null differ -- cgit v1.2.3 From b82a01b6883c1f6a9ce5d3edd80d5a2453ecef9e Mon Sep 17 00:00:00 2001 From: Emily Bourke Date: Thu, 19 Aug 2021 15:53:21 +0100 Subject: pptx: Add support for more layouts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Until now, the pptx writer only supported four slide layouts: “Title Slide” (used for the automatically generated metadata slide), “Section Header” (used for headings above the slide level), “Two Column” (used when there’s a columns div containing at least two column divs), and “Title and Content” (used for all other slides). This commit adds support for three more layouts: Comparison, Content with Caption, and Blank. - Support “Comparison” slide layout This layout is used when a slide contains at least two columns, at least one of which contains some text followed by some non-text (e.g. an image or table). The text in each column is inserted into the “body” placeholder for that column, and the non-text is inserted into the ObjType placeholder. Any extra content after the non-text is overlaid on top of the preceding content, rather than dropping it completely (as currently happens for the two-column layout). + Accept straightforward test changes Adding the new layout means the “-deleted-layouts” tests have an additional layout added to the master and master rels. + Add new tests for the comparison layout + Add new tests to pandoc.cabal - Support “Content with Caption” slide layout This layout is used when a slide’s body contains some text, followed by non-text (e.g. and image or a table). Before now, in this case the image or table would break onto a new slide: to get that output again, users can add a horizontal rule before the image or table. + Accept straightforward tests The “-deleted-layouts” tests all have an extra layout and relationship in the master for the Content with Caption layout. + Accept remove-empty-slides test Empty slides are still removed, but the Content with Caption layout is now used. + Change slide-level-0/h1-h2-with-text description This test now triggers the content with caption layout, giving a different (but still correct) result. + Add new tests for the new layout + Add new tests to the cabal file - Support “Blank” slide layout This layout is used when a slide contains only blank content (e.g. non-breaking spaces). No content is inserted into any placeholders in the layout. Fixes #5097. + Accept straightforward test changes Blank layout now copied over from reference doc as well, when layouts have been deleted. + Add some new tests A slide should use the blank layout if: - It contains only speaker notes - It contains only an empty heading with a body of nbsps - It contains only a heading containing only nbsps - Change ContentType -> Placeholder This type was starting to have a constructor for each placeholder on each slide (e.g. `ComparisonUpperLeftContent`). I’ve changed it instead to identify a placeholder by type and index, as I think that’s clearer and less redundant. - Describe layout-choosing logic in manual --- MANUAL.txt | 52 +++++- pandoc.cabal | 30 +++- src/Text/Pandoc/Writers/Powerpoint/Output.hs | 179 ++++++++++++++++--- src/Text/Pandoc/Writers/Powerpoint/Presentation.hs | 189 +++++++++++++++++---- test/Tests/Writers/Powerpoint.hs | 61 ++++++- .../blanks/just-speaker-notes/deleted-layouts.pptx | Bin 0 -> 35181 bytes test/pptx/blanks/just-speaker-notes/input.native | 7 + .../blanks/just-speaker-notes/moved-layouts.pptx | Bin 0 -> 45873 bytes test/pptx/blanks/just-speaker-notes/output.pptx | Bin 0 -> 32304 bytes test/pptx/blanks/just-speaker-notes/templated.pptx | Bin 0 -> 45369 bytes test/pptx/blanks/nbsp-in-body/deleted-layouts.pptx | Bin 0 -> 30444 bytes test/pptx/blanks/nbsp-in-body/input.native | 6 + test/pptx/blanks/nbsp-in-body/moved-layouts.pptx | Bin 0 -> 41131 bytes test/pptx/blanks/nbsp-in-body/output.pptx | Bin 0 -> 27562 bytes test/pptx/blanks/nbsp-in-body/templated.pptx | Bin 0 -> 40630 bytes .../blanks/nbsp-in-heading/deleted-layouts.pptx | Bin 0 -> 30444 bytes test/pptx/blanks/nbsp-in-heading/input.native | 5 + .../pptx/blanks/nbsp-in-heading/moved-layouts.pptx | Bin 0 -> 41131 bytes test/pptx/blanks/nbsp-in-heading/output.pptx | Bin 0 -> 27562 bytes test/pptx/blanks/nbsp-in-heading/templated.pptx | Bin 0 -> 40630 bytes test/pptx/code-custom/deleted-layouts.pptx | Bin 31033 -> 31069 bytes test/pptx/code/deleted-layouts.pptx | Bin 31032 -> 31068 bytes .../comparison/both-columns/deleted-layouts.pptx | Bin 0 -> 45804 bytes test/pptx/comparison/both-columns/input.native | 23 +++ .../comparison/both-columns/moved-layouts.pptx | Bin 0 -> 56524 bytes test/pptx/comparison/both-columns/output.pptx | Bin 0 -> 42932 bytes test/pptx/comparison/both-columns/templated.pptx | Bin 0 -> 56025 bytes .../comparison/extra-image/deleted-layouts.pptx | Bin 0 -> 45833 bytes test/pptx/comparison/extra-image/input.native | 24 +++ .../pptx/comparison/extra-image/moved-layouts.pptx | Bin 0 -> 56552 bytes test/pptx/comparison/extra-image/output.pptx | Bin 0 -> 42961 bytes test/pptx/comparison/extra-image/templated.pptx | Bin 0 -> 56053 bytes .../comparison/extra-text/deleted-layouts.pptx | Bin 0 -> 45804 bytes test/pptx/comparison/extra-text/input.native | 23 +++ test/pptx/comparison/extra-text/moved-layouts.pptx | Bin 0 -> 56524 bytes test/pptx/comparison/extra-text/output.pptx | Bin 0 -> 42932 bytes test/pptx/comparison/extra-text/templated.pptx | Bin 0 -> 56025 bytes .../comparison/non-text-first/deleted-layouts.pptx | Bin 0 -> 45717 bytes test/pptx/comparison/non-text-first/input.native | 21 +++ .../comparison/non-text-first/moved-layouts.pptx | Bin 0 -> 56417 bytes test/pptx/comparison/non-text-first/output.pptx | Bin 0 -> 42845 bytes test/pptx/comparison/non-text-first/templated.pptx | Bin 0 -> 55918 bytes .../comparison/one-column/deleted-layouts.pptx | Bin 0 -> 29136 bytes test/pptx/comparison/one-column/input.native | 21 +++ test/pptx/comparison/one-column/moved-layouts.pptx | Bin 0 -> 39856 bytes test/pptx/comparison/one-column/output.pptx | Bin 0 -> 26258 bytes test/pptx/comparison/one-column/templated.pptx | Bin 0 -> 39357 bytes .../heading-text-image/deleted-layouts.pptx | Bin 0 -> 45549 bytes .../heading-text-image/input.native | 3 + .../heading-text-image/moved-layouts.pptx | Bin 0 -> 56248 bytes .../heading-text-image/output.pptx | Bin 0 -> 42677 bytes .../heading-text-image/templated.pptx | Bin 0 -> 55749 bytes .../image-text/deleted-layouts.pptx | Bin 0 -> 46248 bytes .../content-with-caption/image-text/input.native | 2 + .../image-text/moved-layouts.pptx | Bin 0 -> 56934 bytes .../content-with-caption/image-text/output.pptx | Bin 0 -> 43374 bytes .../content-with-caption/image-text/templated.pptx | Bin 0 -> 56435 bytes .../text-image/deleted-layouts.pptx | Bin 0 -> 45488 bytes .../content-with-caption/text-image/input.native | 2 + .../text-image/moved-layouts.pptx | Bin 0 -> 56188 bytes .../content-with-caption/text-image/output.pptx | Bin 0 -> 42616 bytes .../content-with-caption/text-image/templated.pptx | Bin 0 -> 55689 bytes .../deleted-layouts.pptx | Bin 29806 -> 29842 bytes test/pptx/document-properties/deleted-layouts.pptx | Bin 30210 -> 30246 bytes test/pptx/endnotes-toc/deleted-layouts.pptx | Bin 30596 -> 30632 bytes test/pptx/endnotes/deleted-layouts.pptx | Bin 29774 -> 29810 bytes test/pptx/images/deleted-layouts.pptx | Bin 47437 -> 47473 bytes test/pptx/inline-formatting/deleted-layouts.pptx | Bin 28966 -> 29002 bytes test/pptx/lists/deleted-layouts.pptx | Bin 29861 -> 29897 bytes test/pptx/raw-ooxml/deleted-layouts.pptx | Bin 29754 -> 29790 bytes test/pptx/remove-empty-slides/deleted-layouts.pptx | Bin 46867 -> 46218 bytes test/pptx/remove-empty-slides/moved-layouts.pptx | Bin 57656 -> 56903 bytes test/pptx/remove-empty-slides/output.pptx | Bin 44025 -> 43346 bytes test/pptx/remove-empty-slides/templated.pptx | Bin 57172 -> 56404 bytes .../deleted-layouts.pptx | Bin 30554 -> 30590 bytes test/pptx/slide-breaks-toc/deleted-layouts.pptx | Bin 32328 -> 32364 bytes test/pptx/slide-breaks/deleted-layouts.pptx | Bin 31378 -> 31414 bytes .../h1-h2-with-table/deleted-layouts.pptx | Bin 29828 -> 29137 bytes .../h1-h2-with-table/moved-layouts.pptx | Bin 40552 -> 39829 bytes .../slide-level-0/h1-h2-with-table/output.pptx | Bin 26985 -> 26259 bytes .../slide-level-0/h1-h2-with-table/templated.pptx | Bin 40052 -> 39330 bytes .../h1-with-image/deleted-layouts.pptx | Bin 45433 -> 45469 bytes .../h1-with-table/deleted-layouts.pptx | Bin 29008 -> 29044 bytes .../h2-with-image/deleted-layouts.pptx | Bin 45433 -> 45469 bytes .../deleted-layouts.pptx | Bin 34473 -> 34509 bytes .../speaker-notes-afterheader/deleted-layouts.pptx | Bin 33500 -> 33536 bytes .../speaker-notes-afterseps/deleted-layouts.pptx | Bin 54396 -> 54432 bytes test/pptx/speaker-notes/deleted-layouts.pptx | Bin 38203 -> 38239 bytes test/pptx/start-numbering-at/deleted-layouts.pptx | Bin 29837 -> 29873 bytes test/pptx/tables/deleted-layouts.pptx | Bin 30381 -> 30417 bytes test/pptx/two-column/deleted-layouts.pptx | Bin 28883 -> 28919 bytes 91 files changed, 580 insertions(+), 68 deletions(-) create mode 100644 test/pptx/blanks/just-speaker-notes/deleted-layouts.pptx create mode 100644 test/pptx/blanks/just-speaker-notes/input.native create mode 100644 test/pptx/blanks/just-speaker-notes/moved-layouts.pptx create mode 100644 test/pptx/blanks/just-speaker-notes/output.pptx create mode 100644 test/pptx/blanks/just-speaker-notes/templated.pptx create mode 100644 test/pptx/blanks/nbsp-in-body/deleted-layouts.pptx create mode 100644 test/pptx/blanks/nbsp-in-body/input.native create mode 100644 test/pptx/blanks/nbsp-in-body/moved-layouts.pptx create mode 100644 test/pptx/blanks/nbsp-in-body/output.pptx create mode 100644 test/pptx/blanks/nbsp-in-body/templated.pptx create mode 100644 test/pptx/blanks/nbsp-in-heading/deleted-layouts.pptx create mode 100644 test/pptx/blanks/nbsp-in-heading/input.native create mode 100644 test/pptx/blanks/nbsp-in-heading/moved-layouts.pptx create mode 100644 test/pptx/blanks/nbsp-in-heading/output.pptx create mode 100644 test/pptx/blanks/nbsp-in-heading/templated.pptx create mode 100644 test/pptx/comparison/both-columns/deleted-layouts.pptx create mode 100644 test/pptx/comparison/both-columns/input.native create mode 100644 test/pptx/comparison/both-columns/moved-layouts.pptx create mode 100644 test/pptx/comparison/both-columns/output.pptx create mode 100644 test/pptx/comparison/both-columns/templated.pptx create mode 100644 test/pptx/comparison/extra-image/deleted-layouts.pptx create mode 100644 test/pptx/comparison/extra-image/input.native create mode 100644 test/pptx/comparison/extra-image/moved-layouts.pptx create mode 100644 test/pptx/comparison/extra-image/output.pptx create mode 100644 test/pptx/comparison/extra-image/templated.pptx create mode 100644 test/pptx/comparison/extra-text/deleted-layouts.pptx create mode 100644 test/pptx/comparison/extra-text/input.native create mode 100644 test/pptx/comparison/extra-text/moved-layouts.pptx create mode 100644 test/pptx/comparison/extra-text/output.pptx create mode 100644 test/pptx/comparison/extra-text/templated.pptx create mode 100644 test/pptx/comparison/non-text-first/deleted-layouts.pptx create mode 100644 test/pptx/comparison/non-text-first/input.native create mode 100644 test/pptx/comparison/non-text-first/moved-layouts.pptx create mode 100644 test/pptx/comparison/non-text-first/output.pptx create mode 100644 test/pptx/comparison/non-text-first/templated.pptx create mode 100644 test/pptx/comparison/one-column/deleted-layouts.pptx create mode 100644 test/pptx/comparison/one-column/input.native create mode 100644 test/pptx/comparison/one-column/moved-layouts.pptx create mode 100644 test/pptx/comparison/one-column/output.pptx create mode 100644 test/pptx/comparison/one-column/templated.pptx create mode 100644 test/pptx/content-with-caption/heading-text-image/deleted-layouts.pptx create mode 100644 test/pptx/content-with-caption/heading-text-image/input.native create mode 100644 test/pptx/content-with-caption/heading-text-image/moved-layouts.pptx create mode 100644 test/pptx/content-with-caption/heading-text-image/output.pptx create mode 100644 test/pptx/content-with-caption/heading-text-image/templated.pptx create mode 100644 test/pptx/content-with-caption/image-text/deleted-layouts.pptx create mode 100644 test/pptx/content-with-caption/image-text/input.native create mode 100644 test/pptx/content-with-caption/image-text/moved-layouts.pptx create mode 100644 test/pptx/content-with-caption/image-text/output.pptx create mode 100644 test/pptx/content-with-caption/image-text/templated.pptx create mode 100644 test/pptx/content-with-caption/text-image/deleted-layouts.pptx create mode 100644 test/pptx/content-with-caption/text-image/input.native create mode 100644 test/pptx/content-with-caption/text-image/moved-layouts.pptx create mode 100644 test/pptx/content-with-caption/text-image/output.pptx create mode 100644 test/pptx/content-with-caption/text-image/templated.pptx diff --git a/MANUAL.txt b/MANUAL.txt index f81f4c70b..afdd66ddd 100644 --- a/MANUAL.txt +++ b/MANUAL.txt @@ -1182,11 +1182,15 @@ header when requesting a document from a URL: - Title and Content - Section Header - Two Content + - Comparison + - Content with Caption + - Blank For each name, the first layout found with that name will be used. If no layout is found with one of the names, pandoc will output a warning and use the layout with that name from the default reference - doc instead. + doc instead. (How these layouts are used is described in [PowerPoint + layout choice](#powerpoint-layout-choice).) All templates included with a recent version of MS PowerPoint will fit these criteria. (You can click on `Layout` under the @@ -1195,8 +1199,8 @@ header when requesting a document from a URL: You can also modify the default `reference.pptx`: first run `pandoc -o custom-reference.pptx --print-default-data-file reference.pptx`, and then modify `custom-reference.pptx` - in MS PowerPoint (pandoc will use the first four layout - slides, as mentioned above). + in MS PowerPoint (pandoc will use the layouts with the names + listed above). `--epub-cover-image=`*FILE* @@ -5833,6 +5837,48 @@ you use deeper nesting of section levels with reveal.js unless you set `--slide-level=0` (which lets reveal.js produce a one-dimensional layout and only interprets horizontal rules as slide boundaries). +### PowerPoint layout choice + +When creating slides, the pptx writer chooses from a number of pre-defined +layouts, based on the content of the slide: + +Title Slide +: This layout is used for the initial slide, which is generated and + filled from the metadata fields `date`, `author`, and `title`, if + they are present. + +Section Header +: This layout is used for what pandoc calls “title slides”, i.e. + slides which start with a header which is above the slide level in + the hierarchy. + +Two Content +: This layout is used for two-column slides, i.e. slides containing a + div with class `columns` which contains at least two divs with class + `column`. + +Comparison +: This layout is used instead of “Two Content” for any two-column + slides in which at least one column contains text followed by + non-text (e.g. an image or a table). + +Content with Caption +: This layout is used for any non-two-column slides which contain text + followed by non-text (e.g. an image or a table). + +Blank +: This layout is used for any slides which only contain blank content, + e.g. a slide containing only speaker notes, or a slide containing + only a non-breaking space. + +Title and Content +: This layout is used for all slides which do not match the criteria + for another layout. + +These layouts are chosen from the default pptx reference doc included with +pandoc, unless an alternative reference doc is specified using +`--reference-doc`. + ## Incremental lists By default, these writers produce lists that display "all at once." diff --git a/pandoc.cabal b/pandoc.cabal index 7fb951488..3de7da39c 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -380,17 +380,31 @@ extra-source-files: test/rtf/*.native test/rtf/*.rtf test/pptx/*.pptx + test/pptx/blanks/just-speaker-notes/input.native + test/pptx/blanks/just-speaker-notes/*.pptx + test/pptx/blanks/nbsp-in-body/input.native + test/pptx/blanks/nbsp-in-body/*.pptx + test/pptx/blanks/nbsp-in-heading/input.native + test/pptx/blanks/nbsp-in-heading/*.pptx test/pptx/code-custom/*.pptx test/pptx/code/input.native test/pptx/code/*.pptx - test/pptx/comparison-both-columns/input.native - test/pptx/comparison-both-columns/*.pptx - test/pptx/comparison-extra-text/input.native - test/pptx/comparison-extra-text/*.pptx - test/pptx/comparison-non-text-first/input.native - test/pptx/comparison-non-text-first/*.pptx - test/pptx/comparison-one-column/input.native - test/pptx/comparison-one-column/*.pptx + test/pptx/content-with-caption/heading-text-image/input.native + test/pptx/content-with-caption/heading-text-image/*.pptx + test/pptx/content-with-caption/image-text/input.native + test/pptx/content-with-caption/image-text/*.pptx + test/pptx/content-with-caption/text-image/input.native + test/pptx/content-with-caption/text-image/*.pptx + test/pptx/comparison/both-columns/input.native + test/pptx/comparison/both-columns/*.pptx + test/pptx/comparison/extra-image/input.native + test/pptx/comparison/extra-image/*.pptx + test/pptx/comparison/extra-text/input.native + test/pptx/comparison/extra-text/*.pptx + test/pptx/comparison/non-text-first/input.native + test/pptx/comparison/non-text-first/*.pptx + test/pptx/comparison/one-column/input.native + test/pptx/comparison/one-column/*.pptx test/pptx/document-properties-short-desc/input.native test/pptx/document-properties-short-desc/*.pptx test/pptx/document-properties/input.native diff --git a/src/Text/Pandoc/Writers/Powerpoint/Output.hs b/src/Text/Pandoc/Writers/Powerpoint/Output.hs index 0e6a67861..d83fb2182 100644 --- a/src/Text/Pandoc/Writers/Powerpoint/Output.hs +++ b/src/Text/Pandoc/Writers/Powerpoint/Output.hs @@ -1,6 +1,7 @@ {-# LANGUAGE DeriveTraversable #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE PatternGuards #-} +{-# LANGUAGE RecordWildCards #-} {- | Module : Text.Pandoc.Writers.Powerpoint.Output Copyright : Copyright (C) 2017-2020 Jesse Rosenthal @@ -115,7 +116,7 @@ data WriterEnv = WriterEnv { envRefArchive :: Archive -- the end of the slide file name and -- the rId number , envSlideIdOffset :: Int - , envContentType :: ContentType + , envPlaceholder :: Placeholder , envSlideIdMap :: M.Map SlideId Int -- maps the slide number to the -- corresponding notes id number. If there @@ -139,7 +140,7 @@ instance Default WriterEnv where , envInNoteSlide = False , envCurSlideId = 1 , envSlideIdOffset = 1 - , envContentType = NormalContent + , envPlaceholder = Placeholder ObjType 0 , envSlideIdMap = mempty , envSpeakerNotesIdMap = mempty , envInSpeakerNotes = False @@ -153,6 +154,9 @@ data SlideLayoutsOf a = SlideLayouts , title :: a , content :: a , twoColumn :: a + , comparison :: a + , contentWithCaption :: a + , blank :: a } deriving (Show, Functor, Foldable, Traversable) data SlideLayout = SlideLayout @@ -170,10 +174,14 @@ getSlideLayouts = asks envSlideLayouts >>= maybe (throwError e) pure e = PandocSomeError ("Slide layouts aren't defined, even though they should " <> "always be. This is a bug in pandoc.") -data ContentType = NormalContent - | TwoColumnLeftContent - | TwoColumnRightContent - deriving (Show, Eq) +-- | A placeholder within a layout, identified by type and index. +-- +-- E.g., @Placeholder ObjType 2@ is the third placeholder of type 'ObjType' in +-- the layout. +data Placeholder = Placeholder + { placeholderType :: PHType + , index :: Int + } deriving (Show, Eq) data MediaInfo = MediaInfo { mInfoFilePath :: FilePath , mInfoLocalId :: Int @@ -446,6 +454,9 @@ presentationToArchive opts meta pres = do , title = "Section Header" , content = "Title and Content" , twoColumn = "Two Content" + , comparison = "Comparison" + , contentWithCaption = "Content with Caption" + , blank = "Blank" } layouts <- for layoutTitles $ \layoutTitle -> do let layout = M.lookup (CI.mk layoutTitle) referenceLayouts @@ -550,10 +561,13 @@ getLayout layout = getElement <$> getSlideLayouts where getElement = slElement . case layout of - MetadataSlide{} -> metadata - TitleSlide{} -> title - ContentSlide{} -> content - TwoColumnSlide{} -> twoColumn + MetadataSlide{} -> metadata + TitleSlide{} -> title + ContentSlide{} -> content + TwoColumnSlide{} -> twoColumn + ComparisonSlide{} -> comparison + ContentWithCaptionSlide{} -> contentWithCaption + BlankSlide{} -> blank shapeHasId :: NameSpaces -> T.Text -> Element -> Bool shapeHasId ns ident element @@ -566,17 +580,31 @@ shapeHasId ns ident element getContentShape :: PandocMonad m => NameSpaces -> Element -> P m Element getContentShape ns spTreeElem | isElem ns "p" "spTree" spTreeElem = do - contentType <- asks envContentType - let contentShapes = getShapesByPlaceHolderType ns spTreeElem ObjType - case contentType of - NormalContent | (sp : _) <- contentShapes -> return sp - TwoColumnLeftContent | (sp : _) <- contentShapes -> return sp - TwoColumnRightContent | (_ : sp : _) <- contentShapes -> return sp - _ -> throwError $ PandocSomeError - "Could not find shape for Powerpoint content" + ph@Placeholder{..} <- asks envPlaceholder + case drop index (getShapesByPlaceHolderType ns spTreeElem placeholderType) of + sp : _ -> return sp + [] -> throwError $ PandocSomeError $ missingPlaceholderMessage ph getContentShape _ _ = throwError $ PandocSomeError "Attempted to find content on non shapeTree" +missingPlaceholderMessage :: Placeholder -> Text +missingPlaceholderMessage Placeholder{..} = + "Could not find a " <> ordinal + <> " placeholder of type " <> placeholderText + where + ordinal = T.pack (show index) <> + case (index `mod` 100, index `mod` 10) of + (11, _) -> "th" + (12, _) -> "th" + (13, _) -> "th" + (_, 1) -> "st" + (_, 2) -> "nd" + (_, 3) -> "rd" + _ -> "th" + placeholderText = case placeholderType of + ObjType -> "obj (or nothing)" + PHType t -> t + getShapeDimensions :: NameSpaces -> Element -> Maybe ((Integer, Integer), (Integer, Integer)) @@ -1302,7 +1330,7 @@ contentToElement layout hdrShape shapes element <- nonBodyTextToElement layout [PHType "title"] hdrShape let hdrShapeElements = [Elem element | not (null hdrShape)] contentElements <- local - (\env -> env {envContentType = NormalContent}) + (\env -> env {envPlaceholder = Placeholder ObjType 0}) (shapesToElements layout shapes) return $ buildSpTree ns spTree (hdrShapeElements <> contentElements) contentToElement _ _ _ = return $ mknode "p:sp" [] () @@ -1315,10 +1343,10 @@ twoColumnToElement layout hdrShape shapesL shapesR element <- nonBodyTextToElement layout [PHType "title"] hdrShape let hdrShapeElements = [Elem element | not (null hdrShape)] contentElementsL <- local - (\env -> env {envContentType =TwoColumnLeftContent}) + (\env -> env {envPlaceholder = Placeholder ObjType 0}) (shapesToElements layout shapesL) contentElementsR <- local - (\env -> env {envContentType =TwoColumnRightContent}) + (\env -> env {envPlaceholder = Placeholder ObjType 1}) (shapesToElements layout shapesR) -- let contentElementsL' = map (setIdx ns "1") contentElementsL -- contentElementsR' = map (setIdx ns "2") contentElementsR @@ -1326,6 +1354,76 @@ twoColumnToElement layout hdrShape shapesL shapesR hdrShapeElements <> contentElementsL <> contentElementsR twoColumnToElement _ _ _ _= return $ mknode "p:sp" [] () +comparisonToElement :: + PandocMonad m => + Element -> + [ParaElem] -> + ([Shape], [Shape]) -> + ([Shape], [Shape]) -> + P m Element +comparisonToElement layout hdrShape (shapesL1, shapesL2) (shapesR1, shapesR2) + | ns <- elemToNameSpaces layout + , Just cSld <- findChild (elemName ns "p" "cSld") layout + , Just spTree <- findChild (elemName ns "p" "spTree") cSld = do + element <- nonBodyTextToElement layout [PHType "title"] hdrShape + let hdrShapeElements = [Elem element | not (null hdrShape)] + contentElementsL1 <- local + (\env -> env {envPlaceholder = Placeholder (PHType "body") 0}) + (shapesToElements layout shapesL1) + contentElementsL2 <- local + (\env -> env {envPlaceholder = Placeholder ObjType 0}) + (shapesToElements layout shapesL2) + contentElementsR1 <- local + (\env -> env {envPlaceholder = Placeholder (PHType "body") 1}) + (shapesToElements layout shapesR1) + contentElementsR2 <- local + (\env -> env {envPlaceholder = Placeholder ObjType 1}) + (shapesToElements layout shapesR2) + return $ buildSpTree ns spTree $ + mconcat [ hdrShapeElements + , contentElementsL1 + , contentElementsL2 + , contentElementsR1 + , contentElementsR2 + ] +comparisonToElement _ _ _ _= return $ mknode "p:sp" [] () + +contentWithCaptionToElement :: + PandocMonad m => + Element -> + [ParaElem] -> + [Shape] -> + [Shape] -> + P m Element +contentWithCaptionToElement layout hdrShape textShapes contentShapes + | ns <- elemToNameSpaces layout + , Just cSld <- findChild (elemName ns "p" "cSld") layout + , Just spTree <- findChild (elemName ns "p" "spTree") cSld = do + element <- nonBodyTextToElement layout [PHType "title"] hdrShape + let hdrShapeElements = [Elem element | not (null hdrShape)] + textElements <- local + (\env -> env {envPlaceholder = Placeholder (PHType "body") 0}) + (shapesToElements layout textShapes) + contentElements <- local + (\env -> env {envPlaceholder = Placeholder ObjType 0}) + (shapesToElements layout contentShapes) + return $ buildSpTree ns spTree $ + mconcat [ hdrShapeElements + , textElements + , contentElements + ] +contentWithCaptionToElement _ _ _ _ = return $ mknode "p:sp" [] () + +blankToElement :: + PandocMonad m => + Element -> + P m Element +blankToElement layout + | ns <- elemToNameSpaces layout + , Just cSld <- findChild (elemName ns "p" "cSld") layout + , Just spTree <- findChild (elemName ns "p" "spTree") cSld = do + return $ buildSpTree ns spTree [] +blankToElement _ = return $ mknode "p:sp" [] () titleToElement :: PandocMonad m => Element -> [ParaElem] -> P m Element titleToElement layout titleElems @@ -1380,6 +1478,17 @@ slideToElement (Slide _ l@(TwoColumnSlide hdrElems shapesL shapesR) _) = do ("xmlns:r", "http://schemas.openxmlformats.org/officeDocument/2006/relationships"), ("xmlns:p", "http://schemas.openxmlformats.org/presentationml/2006/main") ] [mknode "p:cSld" [] [spTree]] +slideToElement (Slide _ l@(ComparisonSlide hdrElems shapesL shapesR) _) = do + layout <- getLayout l + spTree <- local (\env -> if null hdrElems + then env + else env{envSlideHasHeader=True}) $ + comparisonToElement layout hdrElems shapesL shapesR + return $ mknode "p:sld" + [ ("xmlns:a", "http://schemas.openxmlformats.org/drawingml/2006/main"), + ("xmlns:r", "http://schemas.openxmlformats.org/officeDocument/2006/relationships"), + ("xmlns:p", "http://schemas.openxmlformats.org/presentationml/2006/main") + ] [mknode "p:cSld" [] [spTree]] slideToElement (Slide _ l@(TitleSlide hdrElems) _) = do layout <- getLayout l spTree <- titleToElement layout hdrElems @@ -1396,7 +1505,22 @@ slideToElement (Slide _ l@(MetadataSlide titleElems subtitleElems authorElems da ("xmlns:r", "http://schemas.openxmlformats.org/officeDocument/2006/relationships"), ("xmlns:p", "http://schemas.openxmlformats.org/presentationml/2006/main") ] [mknode "p:cSld" [] [spTree]] - +slideToElement (Slide _ l@(ContentWithCaptionSlide hdrElems captionShapes contentShapes) _) = do + layout <- getLayout l + spTree <- contentWithCaptionToElement layout hdrElems captionShapes contentShapes + return $ mknode "p:sld" + [ ("xmlns:a", "http://schemas.openxmlformats.org/drawingml/2006/main"), + ("xmlns:r", "http://schemas.openxmlformats.org/officeDocument/2006/relationships"), + ("xmlns:p", "http://schemas.openxmlformats.org/presentationml/2006/main") + ] [mknode "p:cSld" [] [spTree]] +slideToElement (Slide _ BlankSlide _) = do + layout <- getLayout BlankSlide + spTree <- blankToElement layout + return $ mknode "p:sld" + [ ("xmlns:a", "http://schemas.openxmlformats.org/drawingml/2006/main"), + ("xmlns:r", "http://schemas.openxmlformats.org/officeDocument/2006/relationships"), + ("xmlns:p", "http://schemas.openxmlformats.org/presentationml/2006/main") + ] [mknode "p:cSld" [] [spTree]] -------------------------------------------------------------------- -- Notes: @@ -1800,10 +1924,13 @@ slideToSlideRelElement slide = do target <- flip fmap getSlideLayouts $ T.pack . ("../slideLayouts/" <>) . takeFileName . slPath . case slide of - (Slide _ MetadataSlide{} _) -> metadata - (Slide _ TitleSlide{} _) -> title - (Slide _ ContentSlide{} _) -> content - (Slide _ TwoColumnSlide{} _) -> twoColumn + (Slide _ MetadataSlide{} _) -> metadata + (Slide _ TitleSlide{} _) -> title + (Slide _ ContentSlide{} _) -> content + (Slide _ TwoColumnSlide{} _) -> twoColumn + (Slide _ ComparisonSlide{} _) -> comparison + (Slide _ ContentWithCaptionSlide{} _) -> contentWithCaption + (Slide _ BlankSlide _) -> blank speakerNotesRels <- maybeToList <$> speakerNotesSlideRelElement slide diff --git a/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs b/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs index 284b9ae62..10060d975 100644 --- a/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs +++ b/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs @@ -2,6 +2,7 @@ {-# LANGUAGE PatternGuards #-} {-# LANGUAGE ViewPatterns #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-} +{-# LANGUAGE LambdaCase #-} {- | Module : Text.Pandoc.Writers.Powerpoint.Presentation Copyright : Copyright (C) 2017-2020 Jesse Rosenthal @@ -61,11 +62,13 @@ import Text.Pandoc.Writers.Shared (lookupMetaInlines, lookupMetaBlocks , toLegacyTable) import qualified Data.Map as M import qualified Data.Set as S -import Data.Maybe (maybeToList, fromMaybe) +import Data.Maybe (maybeToList, fromMaybe, listToMaybe) import Text.Pandoc.Highlighting import qualified Data.Text as T import Control.Applicative ((<|>)) import Skylighting +import Data.Bifunctor (bimap) +import Data.Char (isSpace) data WriterEnv = WriterEnv { envMetadata :: Meta , envRunProps :: RunProps @@ -195,6 +198,11 @@ data Layout = MetadataSlide [ParaElem] [ParaElem] [[ParaElem]] [ParaElem] -- heading content | TwoColumnSlide [ParaElem] [Shape] [Shape] -- heading left right + | ComparisonSlide [ParaElem] ([Shape], [Shape]) ([Shape], [Shape]) + -- heading left@(text, content) right@(text, content) + | ContentWithCaptionSlide [ParaElem] [Shape] [Shape] + -- heading text content + | BlankSlide deriving (Show, Eq) data Shape = Pic PicProps FilePath T.Text [ParaElem] @@ -584,7 +592,30 @@ isImage Image{} = True isImage (Link _ (Image{} : _) _) = True isImage _ = False -splitBlocks' :: [Block] -> [[Block]] -> [Block] -> Pres [[Block]] +plainOrPara :: Block -> Maybe [Inline] +plainOrPara (Plain ils) = Just ils +plainOrPara (Para ils) = Just ils +plainOrPara _ = Nothing + +notText :: Block -> Bool +notText block | startsWithImage block = True +notText Table{} = True +notText _ = False + +startsWithImage :: Block -> Bool +startsWithImage block = fromMaybe False $ do + inline <- plainOrPara block >>= listToMaybe + pure (isImage inline) + +-- | Group blocks into a number of "splits" +splitBlocks' :: + -- | Blocks so far in the current split + [Block] -> + -- | Splits so far + [[Block]] -> + -- | All remaining blocks + [Block] -> + Pres [[Block]] splitBlocks' cur acc [] = return $ acc ++ ([cur | not (null cur)]) splitBlocks' cur acc (HorizontalRule : blks) = splitBlocks' [] (acc ++ ([cur | not (null cur)])) blks @@ -609,7 +640,9 @@ splitBlocks' cur acc (Para (il:ils) : blks) | isImage il = do (acc ++ [cur ++ [Para [il]] ++ nts]) (if null ils then blks' else Para ils : blks') _ -> splitBlocks' [] - (acc ++ ([cur | not (null cur)]) ++ [Para [il] : nts]) + (if any notText cur + then acc ++ ([cur | not (null cur)]) ++ [Para [il] : nts] + else acc ++ [cur ++ [Para [il]] ++ nts]) (if null ils then blks' else Para ils : blks') splitBlocks' cur acc (tbl@Table{} : blks) = do slideLevel <- asks envSlideLevel @@ -617,7 +650,11 @@ splitBlocks' cur acc (tbl@Table{} : blks) = do case cur of [Header n _ _] | n == slideLevel || slideLevel == 0 -> splitBlocks' [] (acc ++ [cur ++ [tbl] ++ nts]) blks' - _ -> splitBlocks' [] (acc ++ ([cur | not (null cur)]) ++ [tbl : nts]) blks' + _ -> splitBlocks' [] + (if any notText cur + then acc ++ ([cur | not (null cur)]) ++ [tbl : nts] + else acc ++ ([cur ++ [tbl] ++ nts])) + blks' splitBlocks' cur acc (d@(Div (_, classes, _) _): blks) | "columns" `elem` classes = do slideLevel <- asks envSlideLevel let (nts, blks') = span isNotesDiv blks @@ -639,38 +676,56 @@ bodyBlocksToSlide _ (blk : blks) spkNotes , Div (_, clsL, _) blksL : Div (_, clsR, _) blksR : remaining <- divBlks , "column" `elem` clsL, "column" `elem` clsR = do mapM_ (addLogMessage . BlockNotRendered) (blks ++ remaining) - mbSplitBlksL <- splitBlocks blksL - mbSplitBlksR <- splitBlocks blksR - let blksL' = case mbSplitBlksL of - bs : _ -> bs - [] -> [] - let blksR' = case mbSplitBlksR of - bs : _ -> bs - [] -> [] - shapesL <- blocksToShapes blksL' - shapesR <- blocksToShapes blksR' - sldId <- asks envCurSlideId - return $ Slide - sldId - (TwoColumnSlide [] shapesL shapesR) - spkNotes + let mkTwoColumn left right = do + blksL' <- join . take 1 <$> splitBlocks left + blksR' <- join . take 1 <$> splitBlocks right + shapesL <- blocksToShapes blksL' + shapesR <- blocksToShapes blksR' + sldId <- asks envCurSlideId + return $ Slide + sldId + (TwoColumnSlide [] shapesL shapesR) + spkNotes + let mkComparison blksL1 blksL2 blksR1 blksR2 = do + shapesL1 <- blocksToShapes blksL1 + shapesL2 <- blocksToShapes blksL2 + shapesR1 <- blocksToShapes blksR1 + shapesR2 <- blocksToShapes blksR2 + sldId <- asks envCurSlideId + return $ Slide + sldId + (ComparisonSlide [] (shapesL1, shapesL2) (shapesR1, shapesR2)) + spkNotes + case (break notText blksL, break notText blksR) of + ((_, []), (_, [])) -> mkTwoColumn blksL blksR + (([], _), ([], _)) -> mkTwoColumn blksL blksR + ((blksL1, blksL2), (blksR1, blksR2)) -> mkComparison blksL1 blksL2 blksR1 blksR2 bodyBlocksToSlide _ (blk : blks) spkNotes = do - inNoteSlide <- asks envInNoteSlide - shapes <- if inNoteSlide - then forceFontSize noteSize $ blocksToShapes (blk : blks) - else blocksToShapes (blk : blks) sldId <- asks envCurSlideId - return $ - Slide - sldId - (ContentSlide [] shapes) - spkNotes + inNoteSlide <- asks envInNoteSlide + let mkSlide s = + Slide sldId s spkNotes + if inNoteSlide + then mkSlide . ContentSlide [] <$> + forceFontSize noteSize (blocksToShapes (blk : blks)) + else let + contentOrBlankSlide = + if makesBlankSlide (blk : blks) + then pure (mkSlide BlankSlide) + else mkSlide . ContentSlide [] <$> blocksToShapes (blk : blks) + in case break notText (blk : blks) of + ([], _) -> contentOrBlankSlide + (_, []) -> contentOrBlankSlide + (textBlocks, contentBlocks) -> do + textShapes <- blocksToShapes textBlocks + contentShapes <- blocksToShapes contentBlocks + return (mkSlide (ContentWithCaptionSlide [] textShapes contentShapes)) bodyBlocksToSlide _ [] spkNotes = do sldId <- asks envCurSlideId return $ Slide sldId - (ContentSlide [] []) + BlankSlide spkNotes blocksToSlide' :: Int -> [Block] -> SpeakerNotes -> Pres Slide @@ -689,6 +744,9 @@ blocksToSlide' lvl (Header n (ident, _, _) ils : blks) spkNotes let layout = case slideLayout slide of ContentSlide _ cont -> ContentSlide hdr cont TwoColumnSlide _ contL contR -> TwoColumnSlide hdr contL contR + ComparisonSlide _ contL contR -> ComparisonSlide hdr contL contR + ContentWithCaptionSlide _ text content -> ContentWithCaptionSlide hdr text content + BlankSlide -> if all inlineIsBlank ils then BlankSlide else ContentSlide hdr [] layout' -> layout' return $ slide{slideLayout = layout} blocksToSlide' lvl blks spkNotes = bodyBlocksToSlide lvl blks spkNotes @@ -834,6 +892,19 @@ applyToLayout f (TwoColumnSlide hdr contentL contentR) = do contentL' <- mapM (applyToShape f) contentL contentR' <- mapM (applyToShape f) contentR return $ TwoColumnSlide hdr' contentL' contentR' +applyToLayout f (ComparisonSlide hdr (contentL1, contentL2) (contentR1, contentR2)) = do + hdr' <- mapM f hdr + contentL1' <- mapM (applyToShape f) contentL1 + contentL2' <- mapM (applyToShape f) contentL2 + contentR1' <- mapM (applyToShape f) contentR1 + contentR2' <- mapM (applyToShape f) contentR2 + return $ ComparisonSlide hdr' (contentL1', contentL2') (contentR1', contentR2') +applyToLayout f (ContentWithCaptionSlide hdr textShapes contentShapes) = do + hdr' <- mapM f hdr + textShapes' <- mapM (applyToShape f) textShapes + contentShapes' <- mapM (applyToShape f) contentShapes + return $ ContentWithCaptionSlide hdr' textShapes' contentShapes' +applyToLayout _ BlankSlide = pure BlankSlide applyToSlide :: Monad m => (ParaElem -> m ParaElem) -> Slide -> m Slide applyToSlide f slide = do @@ -885,10 +956,70 @@ emptyLayout layout = case layout of all emptyParaElem hdr && all emptyShape shapes1 && all emptyShape shapes2 + ComparisonSlide hdr (shapesL1, shapesL2) (shapesR1, shapesR2) -> + all emptyParaElem hdr && + all emptyShape shapesL1 && + all emptyShape shapesL2 && + all emptyShape shapesR1 && + all emptyShape shapesR2 + ContentWithCaptionSlide hdr textShapes contentShapes -> + all emptyParaElem hdr && + all emptyShape textShapes && + all emptyShape contentShapes + BlankSlide -> False + emptySlide :: Slide -> Bool emptySlide (Slide _ layout notes) = (notes == mempty) && emptyLayout layout +makesBlankSlide :: [Block] -> Bool +makesBlankSlide = all blockIsBlank + +blockIsBlank :: Block -> Bool +blockIsBlank + = \case + Plain ins -> all inlineIsBlank ins + Para ins -> all inlineIsBlank ins + LineBlock inss -> all (all inlineIsBlank) inss + CodeBlock _ txt -> textIsBlank txt + RawBlock _ txt -> textIsBlank txt + BlockQuote bls -> all blockIsBlank bls + OrderedList _ blss -> all (all blockIsBlank) blss + BulletList blss -> all (all blockIsBlank) blss + DefinitionList ds -> all (uncurry (&&) . bimap (all inlineIsBlank) (all (all blockIsBlank))) ds + Header _ _ ils -> all inlineIsBlank ils + HorizontalRule -> True + Table{} -> False + Div _ bls -> all blockIsBlank bls + Null -> True + +textIsBlank :: T.Text -> Bool +textIsBlank = T.all isSpace + +inlineIsBlank :: Inline -> Bool +inlineIsBlank + = \case + (Str txt) -> textIsBlank txt + (Emph ins) -> all inlineIsBlank ins + (Underline ins) -> all inlineIsBlank ins + (Strong ins) -> all inlineIsBlank ins + (Strikeout ins) -> all inlineIsBlank ins + (Superscript ins) -> all inlineIsBlank ins + (Subscript ins) -> all inlineIsBlank ins + (SmallCaps ins) -> all inlineIsBlank ins + (Quoted _ ins) -> all inlineIsBlank ins + (Cite _ _) -> False + (Code _ txt) -> textIsBlank txt + Space -> True + SoftBreak -> True + LineBreak -> True + (Math _ txt) -> textIsBlank txt + (RawInline _ txt) -> textIsBlank txt + (Link _ ins (t1, t2)) -> all inlineIsBlank ins && textIsBlank t1 && textIsBlank t2 + (Image _ ins (t1, t2)) -> all inlineIsBlank ins && textIsBlank t1 && textIsBlank t2 + (Note bls) -> all blockIsBlank bls + (Span _ ins) -> all inlineIsBlank ins + blocksToPresentationSlides :: [Block] -> Pres [Slide] blocksToPresentationSlides blks = do opts <- asks envOpts diff --git a/test/Tests/Writers/Powerpoint.hs b/test/Tests/Writers/Powerpoint.hs index fd9871659..256ee1f7f 100644 --- a/test/Tests/Writers/Powerpoint.hs +++ b/test/Tests/Writers/Powerpoint.hs @@ -166,9 +166,66 @@ tests = groupPptxTests [ pptxTests "Inline formatting" "pptx/slide-level-0/h1-with-table/output.pptx" , pptxTests ("Using slide level 0, if the first thing on " <> "a slide is a heading it's used as the " - <> "slide title (two headings forces a " - <> "slide break though)") + <> "slide title (content with caption layout)") def { writerSlideLevel = Just 0 } "pptx/slide-level-0/h1-h2-with-table/input.native" "pptx/slide-level-0/h1-h2-with-table/output.pptx" + , pptxTests ("comparison layout used when two columns " + <> "contain text plus non-text") + def + "pptx/comparison/both-columns/input.native" + "pptx/comparison/both-columns/output.pptx" + , pptxTests ("comparison layout used even when only one " + <> "column contains text plus non-text") + def + "pptx/comparison/one-column/input.native" + "pptx/comparison/one-column/output.pptx" + , pptxTests ("extra text in one column in comparison " + <> "layout gets overlaid") + def + "pptx/comparison/extra-text/input.native" + "pptx/comparison/extra-text/output.pptx" + , pptxTests ("extra image in one column in comparison " + <> "layout gets overlaid") + def + "pptx/comparison/extra-image/input.native" + "pptx/comparison/extra-image/output.pptx" + , pptxTests "comparison not used if the non-text comes first" + def + "pptx/comparison/non-text-first/input.native" + "pptx/comparison/non-text-first/output.pptx" + , pptxTests ("Heading, text and an image on the same " + <> "slide uses the Content with Caption " + <> "layout") + def + "pptx/content-with-caption/heading-text-image/input.native" + "pptx/content-with-caption/heading-text-image/output.pptx" + , pptxTests ("Text and an image on the same " + <> "slide uses the Content with Caption " + <> "layout") + def + "pptx/content-with-caption/text-image/input.native" + "pptx/content-with-caption/text-image/output.pptx" + , pptxTests ("If the image comes first, Content with " + <> "Caption is not used") + def + "pptx/content-with-caption/image-text/input.native" + "pptx/content-with-caption/image-text/output.pptx" + , pptxTests ("If a slide contains only speaker notes, the " + <> "Blank layout is used") + def + "pptx/blanks/just-speaker-notes/input.native" + "pptx/blanks/just-speaker-notes/output.pptx" + , pptxTests ("If a slide contains only an empty heading " + <> "with a body of only non-breaking spaces" + <> ", the Blank layout is used") + def + "pptx/blanks/nbsp-in-body/input.native" + "pptx/blanks/nbsp-in-body/output.pptx" + , pptxTests ("If a slide contains only a heading " + <> "containing only non-breaking spaces, " + <> "the Blank layout is used") + def + "pptx/blanks/nbsp-in-heading/input.native" + "pptx/blanks/nbsp-in-heading/output.pptx" ] diff --git a/test/pptx/blanks/just-speaker-notes/deleted-layouts.pptx b/test/pptx/blanks/just-speaker-notes/deleted-layouts.pptx new file mode 100644 index 000000000..82800a074 Binary files /dev/null and b/test/pptx/blanks/just-speaker-notes/deleted-layouts.pptx differ diff --git a/test/pptx/blanks/just-speaker-notes/input.native b/test/pptx/blanks/just-speaker-notes/input.native new file mode 100644 index 000000000..d2e2cfbe2 --- /dev/null +++ b/test/pptx/blanks/just-speaker-notes/input.native @@ -0,0 +1,7 @@ +[Header 1 ("first-slide",[],[]) [Str "First",Space,Str "slide"] +,Para [Str "Nothing",Space,Str "to",Space,Str "see",Space,Str "here"] +,Header 1 ("section",[],[]) [] +,Div ("",["notes"],[]) + [Para [Str "Some",Space,Str "notes",Space,Str "here:",Space,Str "this",Space,Str "first",Space,Str "slide",Space,Str "should",Space,Str "use",Space,Str "the",Space,Str "Blank",Space,Str "template"]] +,Header 1 ("third-slide",[],[]) [Str "Third",Space,Str "slide"] +,Para [Str "The",Space,Str "second",Space,Str "slide",Space,Str "should",Space,Str "be",Space,Str "blank"]] diff --git a/test/pptx/blanks/just-speaker-notes/moved-layouts.pptx b/test/pptx/blanks/just-speaker-notes/moved-layouts.pptx new file mode 100644 index 000000000..f5ef1d7bd Binary files /dev/null and b/test/pptx/blanks/just-speaker-notes/moved-layouts.pptx differ diff --git a/test/pptx/blanks/just-speaker-notes/output.pptx b/test/pptx/blanks/just-speaker-notes/output.pptx new file mode 100644 index 000000000..59a643c3e Binary files /dev/null and b/test/pptx/blanks/just-speaker-notes/output.pptx differ diff --git a/test/pptx/blanks/just-speaker-notes/templated.pptx b/test/pptx/blanks/just-speaker-notes/templated.pptx new file mode 100644 index 000000000..8cc7be75b Binary files /dev/null and b/test/pptx/blanks/just-speaker-notes/templated.pptx differ diff --git a/test/pptx/blanks/nbsp-in-body/deleted-layouts.pptx b/test/pptx/blanks/nbsp-in-body/deleted-layouts.pptx new file mode 100644 index 000000000..98a1586df Binary files /dev/null and b/test/pptx/blanks/nbsp-in-body/deleted-layouts.pptx differ diff --git a/test/pptx/blanks/nbsp-in-body/input.native b/test/pptx/blanks/nbsp-in-body/input.native new file mode 100644 index 000000000..56c105fb0 --- /dev/null +++ b/test/pptx/blanks/nbsp-in-body/input.native @@ -0,0 +1,6 @@ +[Header 1 ("first-slide",[],[]) [Str "First",Space,Str "slide"] +,Para [Str "Uninteresting,",Space,Str "normal"] +,Header 1 ("section",[],[]) [] +,Para [Str "\160"] +,Header 1 ("third-slide",[],[]) [Str "Third",Space,Str "slide"] +,Para [Str "Was",Space,Str "the",Space,Str "previous",Space,Str "one",Space,Str "blank?"]] diff --git a/test/pptx/blanks/nbsp-in-body/moved-layouts.pptx b/test/pptx/blanks/nbsp-in-body/moved-layouts.pptx new file mode 100644 index 000000000..fca99b672 Binary files /dev/null and b/test/pptx/blanks/nbsp-in-body/moved-layouts.pptx differ diff --git a/test/pptx/blanks/nbsp-in-body/output.pptx b/test/pptx/blanks/nbsp-in-body/output.pptx new file mode 100644 index 000000000..ed5c77e05 Binary files /dev/null and b/test/pptx/blanks/nbsp-in-body/output.pptx differ diff --git a/test/pptx/blanks/nbsp-in-body/templated.pptx b/test/pptx/blanks/nbsp-in-body/templated.pptx new file mode 100644 index 000000000..4104f6230 Binary files /dev/null and b/test/pptx/blanks/nbsp-in-body/templated.pptx differ diff --git a/test/pptx/blanks/nbsp-in-heading/deleted-layouts.pptx b/test/pptx/blanks/nbsp-in-heading/deleted-layouts.pptx new file mode 100644 index 000000000..98a1586df Binary files /dev/null and b/test/pptx/blanks/nbsp-in-heading/deleted-layouts.pptx differ diff --git a/test/pptx/blanks/nbsp-in-heading/input.native b/test/pptx/blanks/nbsp-in-heading/input.native new file mode 100644 index 000000000..a5c7fc1ca --- /dev/null +++ b/test/pptx/blanks/nbsp-in-heading/input.native @@ -0,0 +1,5 @@ +[Header 1 ("first-slide",[],[]) [Str "First",Space,Str "slide"] +,Para [Str "Uninteresting,",Space,Str "normal"] +,Header 1 ("section",[],[]) [Str "\160"] +,Header 1 ("third-slide",[],[]) [Str "Third",Space,Str "slide"] +,Para [Str "Was",Space,Str "the",Space,Str "previous",Space,Str "one",Space,Str "blank?"]] diff --git a/test/pptx/blanks/nbsp-in-heading/moved-layouts.pptx b/test/pptx/blanks/nbsp-in-heading/moved-layouts.pptx new file mode 100644 index 000000000..fca99b672 Binary files /dev/null and b/test/pptx/blanks/nbsp-in-heading/moved-layouts.pptx differ diff --git a/test/pptx/blanks/nbsp-in-heading/output.pptx b/test/pptx/blanks/nbsp-in-heading/output.pptx new file mode 100644 index 000000000..ed5c77e05 Binary files /dev/null and b/test/pptx/blanks/nbsp-in-heading/output.pptx differ diff --git a/test/pptx/blanks/nbsp-in-heading/templated.pptx b/test/pptx/blanks/nbsp-in-heading/templated.pptx new file mode 100644 index 000000000..4104f6230 Binary files /dev/null and b/test/pptx/blanks/nbsp-in-heading/templated.pptx differ diff --git a/test/pptx/code-custom/deleted-layouts.pptx b/test/pptx/code-custom/deleted-layouts.pptx index 9282e6354..fdcc7ce1d 100644 Binary files a/test/pptx/code-custom/deleted-layouts.pptx and b/test/pptx/code-custom/deleted-layouts.pptx differ diff --git a/test/pptx/code/deleted-layouts.pptx b/test/pptx/code/deleted-layouts.pptx index 0f503f553..c7f78ac40 100644 Binary files a/test/pptx/code/deleted-layouts.pptx and b/test/pptx/code/deleted-layouts.pptx differ diff --git a/test/pptx/comparison/both-columns/deleted-layouts.pptx b/test/pptx/comparison/both-columns/deleted-layouts.pptx new file mode 100644 index 000000000..6a5affdbf Binary files /dev/null and b/test/pptx/comparison/both-columns/deleted-layouts.pptx differ diff --git a/test/pptx/comparison/both-columns/input.native b/test/pptx/comparison/both-columns/input.native new file mode 100644 index 000000000..2557880d4 --- /dev/null +++ b/test/pptx/comparison/both-columns/input.native @@ -0,0 +1,23 @@ +[Header 1 ("a-slide",[],[]) [Str "A",Space,Str "slide"] +,Div ("",["columns"],[]) + [Div ("",["column"],[]) + [Para [Str "A",Space,Str "paragraph",Space,Str "here"] + ,Table ("",[],[]) (Caption Nothing + []) + [(AlignDefault,ColWidth 0.125) + ,(AlignDefault,ColWidth 0.125)] + (TableHead ("",[],[]) + []) + [(TableBody ("",[],[]) (RowHeadColumns 0) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "plus"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "a",Space,Str "table"]]]])] + (TableFoot ("",[],[]) + []) + ,Para [Str "Then",Space,Str "some",Space,Str "more",Space,Str "text"]] + ,Div ("",["column"],[]) + [Para [Str "A",Space,Str "paragraph",Space,Str "here"] + ,Para [Image ("",[],[]) [Str "Plus",Space,Str "an",Space,Str "image"] ("lalune.jpg","fig:")]]]] diff --git a/test/pptx/comparison/both-columns/moved-layouts.pptx b/test/pptx/comparison/both-columns/moved-layouts.pptx new file mode 100644 index 000000000..88282fabb Binary files /dev/null and b/test/pptx/comparison/both-columns/moved-layouts.pptx differ diff --git a/test/pptx/comparison/both-columns/output.pptx b/test/pptx/comparison/both-columns/output.pptx new file mode 100644 index 000000000..477072fb4 Binary files /dev/null and b/test/pptx/comparison/both-columns/output.pptx differ diff --git a/test/pptx/comparison/both-columns/templated.pptx b/test/pptx/comparison/both-columns/templated.pptx new file mode 100644 index 000000000..431d22392 Binary files /dev/null and b/test/pptx/comparison/both-columns/templated.pptx differ diff --git a/test/pptx/comparison/extra-image/deleted-layouts.pptx b/test/pptx/comparison/extra-image/deleted-layouts.pptx new file mode 100644 index 000000000..beed077f7 Binary files /dev/null and b/test/pptx/comparison/extra-image/deleted-layouts.pptx differ diff --git a/test/pptx/comparison/extra-image/input.native b/test/pptx/comparison/extra-image/input.native new file mode 100644 index 000000000..34aeb8f2b --- /dev/null +++ b/test/pptx/comparison/extra-image/input.native @@ -0,0 +1,24 @@ +[Header 1 ("a-slide",[],[]) [Str "A",Space,Str "slide"] +,Div ("",["columns"],[]) + [Div ("",["column"],[]) + [Para [Str "A",Space,Str "paragraph",Space,Str "here"] + ,Table ("",[],[]) (Caption Nothing + []) + [(AlignDefault,ColWidth 0.125) + ,(AlignDefault,ColWidth 0.125)] + (TableHead ("",[],[]) + []) + [(TableBody ("",[],[]) (RowHeadColumns 0) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "plus"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "a",Space,Str "table"]]]])] + (TableFoot ("",[],[]) + []) + ,Para [Str "Then",Space,Str "some",Space,Str "more",Space,Str "text"]] + ,Div ("",["column"],[]) + [Para [Str "A",Space,Str "paragraph",Space,Str "here"] + ,Para [Image ("",[],[]) [Str "Plus",Space,Str "an",Space,Str "image"] ("lalune.jpg","fig:")] + ,Para [Image ("",[],[]) [Str "And",Space,Str "another",Space,Str "image"] ("lalune.jpg","fig:")]]]] diff --git a/test/pptx/comparison/extra-image/moved-layouts.pptx b/test/pptx/comparison/extra-image/moved-layouts.pptx new file mode 100644 index 000000000..f86f5b043 Binary files /dev/null and b/test/pptx/comparison/extra-image/moved-layouts.pptx differ diff --git a/test/pptx/comparison/extra-image/output.pptx b/test/pptx/comparison/extra-image/output.pptx new file mode 100644 index 000000000..a0eb5e847 Binary files /dev/null and b/test/pptx/comparison/extra-image/output.pptx differ diff --git a/test/pptx/comparison/extra-image/templated.pptx b/test/pptx/comparison/extra-image/templated.pptx new file mode 100644 index 000000000..a434ba29f Binary files /dev/null and b/test/pptx/comparison/extra-image/templated.pptx differ diff --git a/test/pptx/comparison/extra-text/deleted-layouts.pptx b/test/pptx/comparison/extra-text/deleted-layouts.pptx new file mode 100644 index 000000000..6a5affdbf Binary files /dev/null and b/test/pptx/comparison/extra-text/deleted-layouts.pptx differ diff --git a/test/pptx/comparison/extra-text/input.native b/test/pptx/comparison/extra-text/input.native new file mode 100644 index 000000000..2557880d4 --- /dev/null +++ b/test/pptx/comparison/extra-text/input.native @@ -0,0 +1,23 @@ +[Header 1 ("a-slide",[],[]) [Str "A",Space,Str "slide"] +,Div ("",["columns"],[]) + [Div ("",["column"],[]) + [Para [Str "A",Space,Str "paragraph",Space,Str "here"] + ,Table ("",[],[]) (Caption Nothing + []) + [(AlignDefault,ColWidth 0.125) + ,(AlignDefault,ColWidth 0.125)] + (TableHead ("",[],[]) + []) + [(TableBody ("",[],[]) (RowHeadColumns 0) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "plus"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "a",Space,Str "table"]]]])] + (TableFoot ("",[],[]) + []) + ,Para [Str "Then",Space,Str "some",Space,Str "more",Space,Str "text"]] + ,Div ("",["column"],[]) + [Para [Str "A",Space,Str "paragraph",Space,Str "here"] + ,Para [Image ("",[],[]) [Str "Plus",Space,Str "an",Space,Str "image"] ("lalune.jpg","fig:")]]]] diff --git a/test/pptx/comparison/extra-text/moved-layouts.pptx b/test/pptx/comparison/extra-text/moved-layouts.pptx new file mode 100644 index 000000000..88282fabb Binary files /dev/null and b/test/pptx/comparison/extra-text/moved-layouts.pptx differ diff --git a/test/pptx/comparison/extra-text/output.pptx b/test/pptx/comparison/extra-text/output.pptx new file mode 100644 index 000000000..8de7d23b2 Binary files /dev/null and b/test/pptx/comparison/extra-text/output.pptx differ diff --git a/test/pptx/comparison/extra-text/templated.pptx b/test/pptx/comparison/extra-text/templated.pptx new file mode 100644 index 000000000..431d22392 Binary files /dev/null and b/test/pptx/comparison/extra-text/templated.pptx differ diff --git a/test/pptx/comparison/non-text-first/deleted-layouts.pptx b/test/pptx/comparison/non-text-first/deleted-layouts.pptx new file mode 100644 index 000000000..bd7aa69b7 Binary files /dev/null and b/test/pptx/comparison/non-text-first/deleted-layouts.pptx differ diff --git a/test/pptx/comparison/non-text-first/input.native b/test/pptx/comparison/non-text-first/input.native new file mode 100644 index 000000000..a8caad151 --- /dev/null +++ b/test/pptx/comparison/non-text-first/input.native @@ -0,0 +1,21 @@ +[Header 1 ("a-slide",[],[]) [Str "A",Space,Str "slide"] +,Div ("",["columns"],[]) + [Div ("",["column"],[]) + [Table ("",[],[]) (Caption Nothing + []) + [(AlignDefault,ColWidth 0.125) + ,(AlignDefault,ColWidth 0.125)] + (TableHead ("",[],[]) + []) + [(TableBody ("",[],[]) (RowHeadColumns 0) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "a"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "table"]]]])] + (TableFoot ("",[],[]) + []) + ,Para [Str "Plus",Space,Str "a",Space,Str "paragraph",Space,Str "here"]] + ,Div ("",["column"],[]) + [Para [Image ("",[],[]) [Str "Just",Space,Str "an",Space,Str "image",Space,Str "on",Space,Str "this",Space,Str "side"] ("lalune.jpg","fig:")]]]] diff --git a/test/pptx/comparison/non-text-first/moved-layouts.pptx b/test/pptx/comparison/non-text-first/moved-layouts.pptx new file mode 100644 index 000000000..a01def95c Binary files /dev/null and b/test/pptx/comparison/non-text-first/moved-layouts.pptx differ diff --git a/test/pptx/comparison/non-text-first/output.pptx b/test/pptx/comparison/non-text-first/output.pptx new file mode 100644 index 000000000..cb7843fce Binary files /dev/null and b/test/pptx/comparison/non-text-first/output.pptx differ diff --git a/test/pptx/comparison/non-text-first/templated.pptx b/test/pptx/comparison/non-text-first/templated.pptx new file mode 100644 index 000000000..32db19cbf Binary files /dev/null and b/test/pptx/comparison/non-text-first/templated.pptx differ diff --git a/test/pptx/comparison/one-column/deleted-layouts.pptx b/test/pptx/comparison/one-column/deleted-layouts.pptx new file mode 100644 index 000000000..5fd7cf9b6 Binary files /dev/null and b/test/pptx/comparison/one-column/deleted-layouts.pptx differ diff --git a/test/pptx/comparison/one-column/input.native b/test/pptx/comparison/one-column/input.native new file mode 100644 index 000000000..b99740a14 --- /dev/null +++ b/test/pptx/comparison/one-column/input.native @@ -0,0 +1,21 @@ +[Header 1 ("a-slide",[],[]) [Str "A",Space,Str "slide"] +,Div ("",["columns"],[]) + [Div ("",["column"],[]) + [Para [Str "A",Space,Str "paragraph",Space,Str "here"] + ,Table ("",[],[]) (Caption Nothing + []) + [(AlignDefault,ColWidth 0.125) + ,(AlignDefault,ColWidth 0.125)] + (TableHead ("",[],[]) + []) + [(TableBody ("",[],[]) (RowHeadColumns 0) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "plus"]] + ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "a",Space,Str "table"]]]])] + (TableFoot ("",[],[]) + [])] + ,Div ("",["column"],[]) + [Para [Str "Only",Space,Str "a",Space,Str "paragraph",Space,Str "here"]]]] diff --git a/test/pptx/comparison/one-column/moved-layouts.pptx b/test/pptx/comparison/one-column/moved-layouts.pptx new file mode 100644 index 000000000..d5df2b751 Binary files /dev/null and b/test/pptx/comparison/one-column/moved-layouts.pptx differ diff --git a/test/pptx/comparison/one-column/output.pptx b/test/pptx/comparison/one-column/output.pptx new file mode 100644 index 000000000..6914162ff Binary files /dev/null and b/test/pptx/comparison/one-column/output.pptx differ diff --git a/test/pptx/comparison/one-column/templated.pptx b/test/pptx/comparison/one-column/templated.pptx new file mode 100644 index 000000000..a30a24453 Binary files /dev/null and b/test/pptx/comparison/one-column/templated.pptx differ diff --git a/test/pptx/content-with-caption/heading-text-image/deleted-layouts.pptx b/test/pptx/content-with-caption/heading-text-image/deleted-layouts.pptx new file mode 100644 index 000000000..b5afcc021 Binary files /dev/null and b/test/pptx/content-with-caption/heading-text-image/deleted-layouts.pptx differ diff --git a/test/pptx/content-with-caption/heading-text-image/input.native b/test/pptx/content-with-caption/heading-text-image/input.native new file mode 100644 index 000000000..576bc1658 --- /dev/null +++ b/test/pptx/content-with-caption/heading-text-image/input.native @@ -0,0 +1,3 @@ +[Header 1 ("a-slide",[],[]) [Str "A",Space,Str "slide"] +,Para [Str "Some",Space,Str "text",Space,Str "here"] +,Para [Image ("",[],[]) [Str "Followed",Space,Str "by",Space,Str "a",Space,Str "picture"] ("lalune.jpg","fig:")]] diff --git a/test/pptx/content-with-caption/heading-text-image/moved-layouts.pptx b/test/pptx/content-with-caption/heading-text-image/moved-layouts.pptx new file mode 100644 index 000000000..05806a767 Binary files /dev/null and b/test/pptx/content-with-caption/heading-text-image/moved-layouts.pptx differ diff --git a/test/pptx/content-with-caption/heading-text-image/output.pptx b/test/pptx/content-with-caption/heading-text-image/output.pptx new file mode 100644 index 000000000..b3e89757b Binary files /dev/null and b/test/pptx/content-with-caption/heading-text-image/output.pptx differ diff --git a/test/pptx/content-with-caption/heading-text-image/templated.pptx b/test/pptx/content-with-caption/heading-text-image/templated.pptx new file mode 100644 index 000000000..3b0fe64c3 Binary files /dev/null and b/test/pptx/content-with-caption/heading-text-image/templated.pptx differ diff --git a/test/pptx/content-with-caption/image-text/deleted-layouts.pptx b/test/pptx/content-with-caption/image-text/deleted-layouts.pptx new file mode 100644 index 000000000..e9e0551ac Binary files /dev/null and b/test/pptx/content-with-caption/image-text/deleted-layouts.pptx differ diff --git a/test/pptx/content-with-caption/image-text/input.native b/test/pptx/content-with-caption/image-text/input.native new file mode 100644 index 000000000..2ffbf0888 --- /dev/null +++ b/test/pptx/content-with-caption/image-text/input.native @@ -0,0 +1,2 @@ +[Para [Image ("",[],[]) [Str "The",Space,Str "picture",Space,Str "first"] ("lalune.jpg","fig:")] +,Para [Str "Then",Space,Str "some",Space,Str "text",Space,Str "here"]] diff --git a/test/pptx/content-with-caption/image-text/moved-layouts.pptx b/test/pptx/content-with-caption/image-text/moved-layouts.pptx new file mode 100644 index 000000000..77d706ed3 Binary files /dev/null and b/test/pptx/content-with-caption/image-text/moved-layouts.pptx differ diff --git a/test/pptx/content-with-caption/image-text/output.pptx b/test/pptx/content-with-caption/image-text/output.pptx new file mode 100644 index 000000000..94a2e8b88 Binary files /dev/null and b/test/pptx/content-with-caption/image-text/output.pptx differ diff --git a/test/pptx/content-with-caption/image-text/templated.pptx b/test/pptx/content-with-caption/image-text/templated.pptx new file mode 100644 index 000000000..bef1921a7 Binary files /dev/null and b/test/pptx/content-with-caption/image-text/templated.pptx differ diff --git a/test/pptx/content-with-caption/text-image/deleted-layouts.pptx b/test/pptx/content-with-caption/text-image/deleted-layouts.pptx new file mode 100644 index 000000000..68d3d7b9b Binary files /dev/null and b/test/pptx/content-with-caption/text-image/deleted-layouts.pptx differ diff --git a/test/pptx/content-with-caption/text-image/input.native b/test/pptx/content-with-caption/text-image/input.native new file mode 100644 index 000000000..762d18426 --- /dev/null +++ b/test/pptx/content-with-caption/text-image/input.native @@ -0,0 +1,2 @@ +[Para [Str "Some",Space,Str "text",Space,Str "here"] +,Para [Image ("",[],[]) [Str "Followed",Space,Str "by",Space,Str "a",Space,Str "picture"] ("lalune.jpg","fig:")]] diff --git a/test/pptx/content-with-caption/text-image/moved-layouts.pptx b/test/pptx/content-with-caption/text-image/moved-layouts.pptx new file mode 100644 index 000000000..feade1096 Binary files /dev/null and b/test/pptx/content-with-caption/text-image/moved-layouts.pptx differ diff --git a/test/pptx/content-with-caption/text-image/output.pptx b/test/pptx/content-with-caption/text-image/output.pptx new file mode 100644 index 000000000..efa814d65 Binary files /dev/null and b/test/pptx/content-with-caption/text-image/output.pptx differ diff --git a/test/pptx/content-with-caption/text-image/templated.pptx b/test/pptx/content-with-caption/text-image/templated.pptx new file mode 100644 index 000000000..ebd552252 Binary files /dev/null and b/test/pptx/content-with-caption/text-image/templated.pptx differ diff --git a/test/pptx/document-properties-short-desc/deleted-layouts.pptx b/test/pptx/document-properties-short-desc/deleted-layouts.pptx index e4cf6bd7b..a866f3c1f 100644 Binary files a/test/pptx/document-properties-short-desc/deleted-layouts.pptx and b/test/pptx/document-properties-short-desc/deleted-layouts.pptx differ diff --git a/test/pptx/document-properties/deleted-layouts.pptx b/test/pptx/document-properties/deleted-layouts.pptx index a00c8059d..1f52481f3 100644 Binary files a/test/pptx/document-properties/deleted-layouts.pptx and b/test/pptx/document-properties/deleted-layouts.pptx differ diff --git a/test/pptx/endnotes-toc/deleted-layouts.pptx b/test/pptx/endnotes-toc/deleted-layouts.pptx index 46708544c..60110a64e 100644 Binary files a/test/pptx/endnotes-toc/deleted-layouts.pptx and b/test/pptx/endnotes-toc/deleted-layouts.pptx differ diff --git a/test/pptx/endnotes/deleted-layouts.pptx b/test/pptx/endnotes/deleted-layouts.pptx index 5c69a6310..0b0bd2f53 100644 Binary files a/test/pptx/endnotes/deleted-layouts.pptx and b/test/pptx/endnotes/deleted-layouts.pptx differ diff --git a/test/pptx/images/deleted-layouts.pptx b/test/pptx/images/deleted-layouts.pptx index 053928863..2f8754e90 100644 Binary files a/test/pptx/images/deleted-layouts.pptx and b/test/pptx/images/deleted-layouts.pptx differ diff --git a/test/pptx/inline-formatting/deleted-layouts.pptx b/test/pptx/inline-formatting/deleted-layouts.pptx index bbd5bfeb4..2fbe21a45 100644 Binary files a/test/pptx/inline-formatting/deleted-layouts.pptx and b/test/pptx/inline-formatting/deleted-layouts.pptx differ diff --git a/test/pptx/lists/deleted-layouts.pptx b/test/pptx/lists/deleted-layouts.pptx index 6512e44bb..e527d3c5f 100644 Binary files a/test/pptx/lists/deleted-layouts.pptx and b/test/pptx/lists/deleted-layouts.pptx differ diff --git a/test/pptx/raw-ooxml/deleted-layouts.pptx b/test/pptx/raw-ooxml/deleted-layouts.pptx index 2ea155657..2da1b7a63 100644 Binary files a/test/pptx/raw-ooxml/deleted-layouts.pptx and b/test/pptx/raw-ooxml/deleted-layouts.pptx differ diff --git a/test/pptx/remove-empty-slides/deleted-layouts.pptx b/test/pptx/remove-empty-slides/deleted-layouts.pptx index 7ae4a5fab..51981b241 100644 Binary files a/test/pptx/remove-empty-slides/deleted-layouts.pptx and b/test/pptx/remove-empty-slides/deleted-layouts.pptx differ diff --git a/test/pptx/remove-empty-slides/moved-layouts.pptx b/test/pptx/remove-empty-slides/moved-layouts.pptx index 2572f2447..ddca32a52 100644 Binary files a/test/pptx/remove-empty-slides/moved-layouts.pptx and b/test/pptx/remove-empty-slides/moved-layouts.pptx differ diff --git a/test/pptx/remove-empty-slides/output.pptx b/test/pptx/remove-empty-slides/output.pptx index c6df8e18e..9e8b5eed2 100644 Binary files a/test/pptx/remove-empty-slides/output.pptx and b/test/pptx/remove-empty-slides/output.pptx differ diff --git a/test/pptx/remove-empty-slides/templated.pptx b/test/pptx/remove-empty-slides/templated.pptx index 1df48c5ad..579467452 100644 Binary files a/test/pptx/remove-empty-slides/templated.pptx and b/test/pptx/remove-empty-slides/templated.pptx differ diff --git a/test/pptx/slide-breaks-slide-level-1/deleted-layouts.pptx b/test/pptx/slide-breaks-slide-level-1/deleted-layouts.pptx index 2c7fd4d8b..2c891cd1d 100644 Binary files a/test/pptx/slide-breaks-slide-level-1/deleted-layouts.pptx and b/test/pptx/slide-breaks-slide-level-1/deleted-layouts.pptx differ diff --git a/test/pptx/slide-breaks-toc/deleted-layouts.pptx b/test/pptx/slide-breaks-toc/deleted-layouts.pptx index 1e0b76d46..b63994cce 100644 Binary files a/test/pptx/slide-breaks-toc/deleted-layouts.pptx and b/test/pptx/slide-breaks-toc/deleted-layouts.pptx differ diff --git a/test/pptx/slide-breaks/deleted-layouts.pptx b/test/pptx/slide-breaks/deleted-layouts.pptx index 86dfad3b2..fbf4054be 100644 Binary files a/test/pptx/slide-breaks/deleted-layouts.pptx and b/test/pptx/slide-breaks/deleted-layouts.pptx differ diff --git a/test/pptx/slide-level-0/h1-h2-with-table/deleted-layouts.pptx b/test/pptx/slide-level-0/h1-h2-with-table/deleted-layouts.pptx index 5e776e05c..217b000b6 100644 Binary files a/test/pptx/slide-level-0/h1-h2-with-table/deleted-layouts.pptx and b/test/pptx/slide-level-0/h1-h2-with-table/deleted-layouts.pptx differ diff --git a/test/pptx/slide-level-0/h1-h2-with-table/moved-layouts.pptx b/test/pptx/slide-level-0/h1-h2-with-table/moved-layouts.pptx index 35204de1b..d8a6c90fe 100644 Binary files a/test/pptx/slide-level-0/h1-h2-with-table/moved-layouts.pptx and b/test/pptx/slide-level-0/h1-h2-with-table/moved-layouts.pptx differ diff --git a/test/pptx/slide-level-0/h1-h2-with-table/output.pptx b/test/pptx/slide-level-0/h1-h2-with-table/output.pptx index 197a6833f..512b324bf 100644 Binary files a/test/pptx/slide-level-0/h1-h2-with-table/output.pptx and b/test/pptx/slide-level-0/h1-h2-with-table/output.pptx differ diff --git a/test/pptx/slide-level-0/h1-h2-with-table/templated.pptx b/test/pptx/slide-level-0/h1-h2-with-table/templated.pptx index 5c659952e..5ab88e94c 100644 Binary files a/test/pptx/slide-level-0/h1-h2-with-table/templated.pptx and b/test/pptx/slide-level-0/h1-h2-with-table/templated.pptx differ diff --git a/test/pptx/slide-level-0/h1-with-image/deleted-layouts.pptx b/test/pptx/slide-level-0/h1-with-image/deleted-layouts.pptx index 16c61d1be..5be799e3b 100644 Binary files a/test/pptx/slide-level-0/h1-with-image/deleted-layouts.pptx and b/test/pptx/slide-level-0/h1-with-image/deleted-layouts.pptx differ diff --git a/test/pptx/slide-level-0/h1-with-table/deleted-layouts.pptx b/test/pptx/slide-level-0/h1-with-table/deleted-layouts.pptx index 0eb7c0b08..127dcea01 100644 Binary files a/test/pptx/slide-level-0/h1-with-table/deleted-layouts.pptx and b/test/pptx/slide-level-0/h1-with-table/deleted-layouts.pptx differ diff --git a/test/pptx/slide-level-0/h2-with-image/deleted-layouts.pptx b/test/pptx/slide-level-0/h2-with-image/deleted-layouts.pptx index afc096ce6..5be799e3b 100644 Binary files a/test/pptx/slide-level-0/h2-with-image/deleted-layouts.pptx and b/test/pptx/slide-level-0/h2-with-image/deleted-layouts.pptx differ diff --git a/test/pptx/speaker-notes-after-metadata/deleted-layouts.pptx b/test/pptx/speaker-notes-after-metadata/deleted-layouts.pptx index 1298870e2..33304ae3e 100644 Binary files a/test/pptx/speaker-notes-after-metadata/deleted-layouts.pptx and b/test/pptx/speaker-notes-after-metadata/deleted-layouts.pptx differ diff --git a/test/pptx/speaker-notes-afterheader/deleted-layouts.pptx b/test/pptx/speaker-notes-afterheader/deleted-layouts.pptx index 853b918cb..00f05fae5 100644 Binary files a/test/pptx/speaker-notes-afterheader/deleted-layouts.pptx and b/test/pptx/speaker-notes-afterheader/deleted-layouts.pptx differ diff --git a/test/pptx/speaker-notes-afterseps/deleted-layouts.pptx b/test/pptx/speaker-notes-afterseps/deleted-layouts.pptx index 9fec1c279..139af783b 100644 Binary files a/test/pptx/speaker-notes-afterseps/deleted-layouts.pptx and b/test/pptx/speaker-notes-afterseps/deleted-layouts.pptx differ diff --git a/test/pptx/speaker-notes/deleted-layouts.pptx b/test/pptx/speaker-notes/deleted-layouts.pptx index 6a5ad524f..c63125d8a 100644 Binary files a/test/pptx/speaker-notes/deleted-layouts.pptx and b/test/pptx/speaker-notes/deleted-layouts.pptx differ diff --git a/test/pptx/start-numbering-at/deleted-layouts.pptx b/test/pptx/start-numbering-at/deleted-layouts.pptx index d9cf91804..68b4215df 100644 Binary files a/test/pptx/start-numbering-at/deleted-layouts.pptx and b/test/pptx/start-numbering-at/deleted-layouts.pptx differ diff --git a/test/pptx/tables/deleted-layouts.pptx b/test/pptx/tables/deleted-layouts.pptx index a52222551..d533d3c28 100644 Binary files a/test/pptx/tables/deleted-layouts.pptx and b/test/pptx/tables/deleted-layouts.pptx differ diff --git a/test/pptx/two-column/deleted-layouts.pptx b/test/pptx/two-column/deleted-layouts.pptx index 60a244f94..9622ed2cd 100644 Binary files a/test/pptx/two-column/deleted-layouts.pptx and b/test/pptx/two-column/deleted-layouts.pptx differ -- cgit v1.2.3 From e5d0b702c7d8b11f8ed4ecf10afa320103473dd0 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Fri, 3 Sep 2021 19:52:52 -0700 Subject: RTF reader: Ignore `\pgdsc` group. Otherwise we get style names treated as test. --- src/Text/Pandoc/Readers/RTF.hs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Text/Pandoc/Readers/RTF.hs b/src/Text/Pandoc/Readers/RTF.hs index 0e7fbac5a..5e5799b49 100644 --- a/src/Text/Pandoc/Readers/RTF.hs +++ b/src/Text/Pandoc/Readers/RTF.hs @@ -411,6 +411,7 @@ processTok bs (Tok pos tok') = do -- eject any previous list items...sometimes TextEdit -- doesn't put in a \par emitBlocks bs + Grouped (Tok _ (ControlWord "pgdsc" _) : _) -> pure bs Grouped (Tok _ (ControlWord "colortbl" _) : _) -> pure bs Grouped (Tok _ (ControlWord "listtable" _) : toks) -> bs <$ inGroup (handleListTable toks) -- cgit v1.2.3 From 10c471907693aac3e01e9550ce203834ff367de1 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Fri, 3 Sep 2021 21:50:30 -0700 Subject: RTF reader: if doc begins with {\rtf1 ... } only parse its contents. Some documents seem to have non-RTF (e.g. XML) material after the `{\rtf1 ... }` group. --- src/Text/Pandoc/Readers/RTF.hs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Text/Pandoc/Readers/RTF.hs b/src/Text/Pandoc/Readers/RTF.hs index 5e5799b49..e577ee70b 100644 --- a/src/Text/Pandoc/Readers/RTF.hs +++ b/src/Text/Pandoc/Readers/RTF.hs @@ -204,7 +204,13 @@ parseRTF = do skipMany nl toks <- many tok -- return $! traceShowId toks - bs <- (foldM processTok mempty toks >>= emitBlocks) + bs <- (case toks of + -- if we start with {\rtf1...}, parse that and ignore + -- what follows (which in certain cases can be non-RTF content) + tok@(Tok _ (Grouped (Tok _ (ControlWord "rtf" (Just 1)) : _))) : _ + -> foldM processTok mempty [tok] + _ -> foldM processTok mempty toks) + >>= emitBlocks unclosed <- closeContainers let doc = B.doc $ bs <> unclosed kvs <- sMetadata <$> getState -- cgit v1.2.3 From 531eb2a92a6c1f54acc01d5867e819f172060e22 Mon Sep 17 00:00:00 2001 From: Quinn <78063175+quinn-dev@users.noreply.github.com> Date: Fri, 3 Sep 2021 14:17:23 +0000 Subject: Add missing type for Image title --- doc/lua-filters.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/lua-filters.md b/doc/lua-filters.md index 52e54cb5b..61c26dc2c 100644 --- a/doc/lua-filters.md +++ b/doc/lua-filters.md @@ -1216,7 +1216,7 @@ Fields: : path to the image file (string) `title` -: brief image description +: brief image description (string) `identifier` : alias for `attr.identifier` (string) -- cgit v1.2.3 From db03e75e279696c29e7b749c79add60b9083d571 Mon Sep 17 00:00:00 2001 From: Quinn <78063175+quinn-dev@users.noreply.github.com> Date: Fri, 3 Sep 2021 14:24:03 +0000 Subject: Improve order of Image fields Ensure consistency throughout docs --- doc/lua-filters.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/lua-filters.md b/doc/lua-filters.md index 61c26dc2c..11059bd7a 100644 --- a/doc/lua-filters.md +++ b/doc/lua-filters.md @@ -1206,9 +1206,6 @@ Values of this type can be created with the Fields: -`attr` -: attributes ([Attr]) - `caption` : text used to describe the image ([List] of [Inlines]) @@ -1218,6 +1215,9 @@ Fields: `title` : brief image description (string) +`attr` +: attributes ([Attr]) + `identifier` : alias for `attr.identifier` (string) -- cgit v1.2.3 From 481ff8ac44cff104494b89589326b6cb78565cbf Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sat, 4 Sep 2021 09:59:48 -0700 Subject: Extensions: put Ext_short_subsuperscripts in alphabetical order. --- src/Text/Pandoc/Extensions.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Text/Pandoc/Extensions.hs b/src/Text/Pandoc/Extensions.hs index 2ef8f64e9..f11e67723 100644 --- a/src/Text/Pandoc/Extensions.hs +++ b/src/Text/Pandoc/Extensions.hs @@ -124,7 +124,6 @@ data Extension = | Ext_mmd_header_identifiers -- ^ Multimarkdown style header identifiers [myid] | Ext_mmd_link_attributes -- ^ MMD style reference link attributes | Ext_mmd_title_block -- ^ Multimarkdown metadata block - | Ext_short_subsuperscripts -- ^ sub-&superscripts w/o closing char (v~i) | Ext_multiline_tables -- ^ Pandoc-style multiline tables | Ext_native_divs -- ^ Use Div blocks for contents of

tags | Ext_native_spans -- ^ Use Span inlines for contents of @@ -139,6 +138,7 @@ data Extension = | Ext_raw_markdown -- ^ Parse markdown in ipynb as raw markdown | Ext_rebase_relative_paths -- ^ Rebase relative image and link paths, -- relative to directory of containing file + | Ext_short_subsuperscripts -- ^ sub-&superscripts w/o closing char (v~i) | Ext_shortcut_reference_links -- ^ Shortcut reference links | Ext_simple_tables -- ^ Pandoc-style simple tables | Ext_smart -- ^ "Smart" quotes, apostrophes, ellipses, dashes -- cgit v1.2.3 From aaef51707c1b7612232d1d97276862ec473bb686 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sat, 4 Sep 2021 10:02:08 -0700 Subject: Minor renaming to avoid shadowing. --- src/Text/Pandoc/Readers/RTF.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Text/Pandoc/Readers/RTF.hs b/src/Text/Pandoc/Readers/RTF.hs index e577ee70b..26a132758 100644 --- a/src/Text/Pandoc/Readers/RTF.hs +++ b/src/Text/Pandoc/Readers/RTF.hs @@ -207,8 +207,8 @@ parseRTF = do bs <- (case toks of -- if we start with {\rtf1...}, parse that and ignore -- what follows (which in certain cases can be non-RTF content) - tok@(Tok _ (Grouped (Tok _ (ControlWord "rtf" (Just 1)) : _))) : _ - -> foldM processTok mempty [tok] + rtftok@(Tok _ (Grouped (Tok _ (ControlWord "rtf" (Just 1)) : _))) : _ + -> foldM processTok mempty [rtftok] _ -> foldM processTok mempty toks) >>= emitBlocks unclosed <- closeContainers -- cgit v1.2.3 From b185560a8ec1fd8a0b578de4d94ea72a3d3e2943 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sat, 4 Sep 2021 10:02:38 -0700 Subject: RTF reader: better handling of `\*` and bookmarks. We now ensure that groups starting with `\*` never cause text to be added to the document. In addition, bookmarks now create a span between the start and end of the bookmark, rather than an empty span. --- src/Text/Pandoc/Readers/RTF.hs | 16 ++++++++-------- test/rtf/bookmark.native | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Text/Pandoc/Readers/RTF.hs b/src/Text/Pandoc/Readers/RTF.hs index 26a132758..4eeab1312 100644 --- a/src/Text/Pandoc/Readers/RTF.hs +++ b/src/Text/Pandoc/Readers/RTF.hs @@ -395,15 +395,15 @@ isUnderline _ = False processTok :: PandocMonad m => Blocks -> Tok -> RTFParser m Blocks processTok bs (Tok pos tok') = do setPosition pos - -- ignore \* at beginning of group: - let tok'' = case tok' of - Grouped (Tok _ (ControlSymbol '*') : toks) -> Grouped toks - _ -> tok' - case tok'' of + case tok' of HexVal{} -> return () UnformattedText{} -> return () _ -> updateState $ \s -> s{ sEatChars = 0 } - case tok'' of + case tok' of + Grouped (Tok _ (ControlSymbol '*') : toks) -> + bs <$ (do oldTextContent <- sTextContent <$> getState + processTok mempty (Tok pos (Grouped toks)) + updateState $ \st -> st{ sTextContent = oldTextContent }) Grouped (Tok _ (ControlWord "fonttbl" _) : toks) -> inGroup $ do updateState $ \s -> s{ sFontTable = processFontTable toks } pure bs @@ -440,10 +440,10 @@ processTok bs (Tok pos tok') = do -- TODO ideally we'd put the span around bkmkstart/end, but this -- is good for now: modifyGroup (\g -> g{ gAnchor = Just $ T.strip t }) - addText "" + pure bs + Grouped (Tok _ (ControlWord "bkmkend" _) : _) -> do modifyGroup (\g -> g{ gAnchor = Nothing }) pure bs - Grouped (Tok _ (ControlWord "bkmkend" _) : _) -> pure bs -- TODO Grouped (Tok _ (ControlWord f _) : _) | isHeaderFooter f -> pure bs Grouped (Tok _ (ControlWord "footnote" _) : toks) -> do noteBs <- inGroup $ processDestinationToks toks diff --git a/test/rtf/bookmark.native b/test/rtf/bookmark.native index bc5b67afc..f142f1c5c 100644 --- a/test/rtf/bookmark.native +++ b/test/rtf/bookmark.native @@ -1,3 +1,3 @@ Pandoc (Meta {unMeta = fromList []}) -[Para [Span ("bookmark_1",[],[]) [],Str "Bookmark_1"] +[Para [Span ("bookmark_1",[],[]) [Str "Bookmark_1"]] ,Para [Link ("",[],[]) [Str "click",Space,Str "me"] ("#bookmark_1","")]] -- cgit v1.2.3 From 2b427331d9906ee52e4c818375614f1931028de7 Mon Sep 17 00:00:00 2001 From: Quinn <78063175+quinn-dev@users.noreply.github.com> Date: Sun, 5 Sep 2021 05:47:01 +0000 Subject: Rephrase pandoc.path docs (#7548) --- doc/lua-filters.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/lua-filters.md b/doc/lua-filters.md index 11059bd7a..e7cdd256d 100644 --- a/doc/lua-filters.md +++ b/doc/lua-filters.md @@ -3442,7 +3442,7 @@ filepath Returns: -- `true` iff `filepath` is an absolute path, `false` otherwise. +- `true` if `filepath` is an absolute path, `false` otherwise. (boolean) ### is_relative (filepath) {#pandoc.path.is_relative} @@ -3456,7 +3456,7 @@ filepath Returns: -- `true` iff `filepath` is a relative path, `false` otherwise. +- `true` if `filepath` is a relative path, `false` otherwise. (boolean) ### join (filepaths) {#pandoc.path.join} -- cgit v1.2.3 From d87c44ed3a63e6536adb02b9663ad2a63dfbd58a Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Wed, 8 Sep 2021 09:01:02 -0700 Subject: Makefile: disable ansi tricks for tasty; use v2- instead of new-. --- Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 6ae6ab491..47acb80dd 100644 --- a/Makefile +++ b/Makefile @@ -22,20 +22,20 @@ REVISION?=1 BENCHARGS?=--csv bench_$(TIMESTAMP).csv $(BASELINECMD) --timeout=6 +RTS -T -RTS $(if $(PATTERN),--pattern "$(PATTERN)",) quick: - stack install --ghc-options='$(GHCOPTS)' --install-ghc --flag 'pandoc:embed_data_files' --fast --test --ghc-options='$(GHCOPTS)' --test-arguments='-j4 --hide-successes $(TESTARGS)' + stack install --ghc-options='$(GHCOPTS)' --install-ghc --flag 'pandoc:embed_data_files' --fast --test --ghc-options='$(GHCOPTS)' --test-arguments='-j4 --hide-successes --ansi-tricks=false $(TESTARGS)' quick-cabal: - cabal new-configure . --ghc-options '$(GHCOPTS)' --disable-optimization --enable-tests - cabal new-build -j4 . --disable-optimization - cabal new-run test-pandoc --disable-optimization -- --hide-successes $(TESTARGS) + cabal v2-configure . --ghc-options '$(GHCOPTS)' --disable-optimization --enable-tests + cabal v2-build -j4 . --disable-optimization + cabal v2-run test-pandoc --disable-optimization -- --hide-successes --ansi-tricks=false $(TESTARGS) full-cabal: - cabal new-configure . --ghc-options '$(GHCOPTS)' --flags '+embed_data_files +trypandoc' --enable-tests --enable-benchmarks - cabal new-build . --disable-optimization - cabal new-run test-pandoc --disable-optimization -- --hide-successes $(TESTARGS) + cabal v2-configure . --ghc-options '$(GHCOPTS)' --flags '+embed_data_files +trypandoc' --enable-tests --enable-benchmarks + cabal v2-build . --disable-optimization + cabal v2-run test-pandoc --disable-optimization -- --hide-successes --ansi-tricks=false $(TESTARGS) full: - stack install --flag 'pandoc:embed_data_files' --flag 'pandoc:trypandoc' --bench --no-run-benchmarks --test --test-arguments='-j4 --hide-successes' --ghc-options '-Wall -Werror -fno-warn-unused-do-bind -O0 $(GHCOPTS)' + stack install --flag 'pandoc:embed_data_files' --flag 'pandoc:trypandoc' --bench --no-run-benchmarks --test --test-arguments='-j4 --hide-successes--ansi-tricks-false' --ghc-options '-Wall -Werror -fno-warn-unused-do-bind -O0 $(GHCOPTS)' ghci: stack ghci --flag 'pandoc:embed_data_files' @@ -46,7 +46,7 @@ haddock: # Note: to accept current results of golden tests, # make test TESTARGS='--accept' test: - stack test --flag 'pandoc:embed_data_files' --fast --test-arguments='-j4 --hide-successes $(TESTARGS)' --ghc-options '$(GHCOPTS)' + stack test --flag 'pandoc:embed_data_files' --fast --test-arguments='-j4 --hide-successes --ansi-tricks=false $(TESTARGS)' --ghc-options '$(GHCOPTS)' ghcid: ghcid -c "stack repl --flag 'pandoc:embed_data_files'" -- cgit v1.2.3 From 395d65fdbe398e42270acfe6a76ad98a00ecb35d Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Wed, 8 Sep 2021 09:01:25 -0700 Subject: CI: disable ansi-tricks in tasty. This will prevent the test output from being overwhelmed with headings from passing tests. --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3b8a72efa..c75fcd213 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,22 +62,22 @@ jobs: cabal: '3.2' prefix: '' cabalopts: '' - testopts: '--test-option=--hide-successes' + testopts: '--test-option=--hide-successes --test-option=--ansi-tricks=false' - ghc: '8.8.4' cabal: '3.2' prefix: '' cabalopts: '' - testopts: '--test-option=--hide-successes' + testopts: '--test-option=--hide-successes --test-option=--ansi-tricks=false' - ghc: '8.10.4' cabal: '3.2' prefix: '' cabalopts: '-ftrypandoc' - testopts: '--test-option=--hide-successes' + testopts: '--test-option=--hide-successes --test-option=--ansi-tricks=false' - ghc: '9.0.1' cabal: '3.4' prefix: '' cabalopts: '' - testopts: '--test-option=--hide-successes' + testopts: '--test-option=--hide-successes --test-option=--ansi-tricks=false' steps: - uses: actions/checkout@v2 @@ -166,7 +166,7 @@ jobs: - name: Build and test shell: cmd run: | - stack test --fast --test-arguments=--hide-successes + stack test --fast --test-arguments="--hide-successes --ansi-tricks=false" macos: @@ -216,7 +216,7 @@ jobs: cabal v2-build --enable-tests --disable-optimization 2>&1 | tee build.log # fail if warnings in local build ! grep -q ": *[Ww]arning:" build.log || exit 1 - cabal v2-test --disable-optimization + cabal v2-test --disable-optimization --test-option=--hide-successes --test-option=--ansi-tricks=false benchmark: -- cgit v1.2.3 From dee30e2a1b455650dbbbec3bfab3dda43582a5fe Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Wed, 8 Sep 2021 09:29:46 -0700 Subject: Logging: add NotUTF8Encoded constructor to LogMessage. [API change] --- src/Text/Pandoc/Logging.hs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Text/Pandoc/Logging.hs b/src/Text/Pandoc/Logging.hs index c49726040..bb2fb5d36 100644 --- a/src/Text/Pandoc/Logging.hs +++ b/src/Text/Pandoc/Logging.hs @@ -105,6 +105,7 @@ data LogMessage = | ATXHeadingInLHS Int Text | EnvironmentVariableUndefined Text | DuplicateAttribute Text Text + | NotUTF8Encoded FilePath deriving (Show, Eq, Data, Ord, Typeable, Generic) instance ToJSON LogMessage where @@ -244,6 +245,8 @@ instance ToJSON LogMessage where DuplicateAttribute attr val -> ["attribute" .= attr ,"value" .= val] + NotUTF8Encoded src -> + ["source" .= src] showPos :: SourcePos -> Text showPos pos = Text.pack $ sn ++ "line " ++ @@ -370,6 +373,9 @@ showLogMessage msg = "Undefined environment variable " <> var <> " in defaults file." DuplicateAttribute attr val -> "Ignoring duplicate attribute " <> attr <> "=" <> tshow val <> "." + NotUTF8Encoded src -> + Text.pack src <> + " is not UTF-8 encoded: falling back to latin1." messageVerbosity :: LogMessage -> Verbosity messageVerbosity msg = @@ -420,3 +426,4 @@ messageVerbosity msg = ATXHeadingInLHS{} -> WARNING EnvironmentVariableUndefined{}-> WARNING DuplicateAttribute{} -> WARNING + NotUTF8Encoded{} -> WARNING -- cgit v1.2.3 From ddfa7b2a630bd123c7b6291769c6ae1fe347aff4 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Wed, 8 Sep 2021 09:30:16 -0700 Subject: App: Issue NotUTF8Encoded warning when falling back to latin1. --- src/Text/Pandoc/App.hs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Text/Pandoc/App.hs b/src/Text/Pandoc/App.hs index f7c1f218d..b639a97b7 100644 --- a/src/Text/Pandoc/App.hs +++ b/src/Text/Pandoc/App.hs @@ -426,8 +426,12 @@ inputToText convTabs (fp, (bs,mt)) = Nothing -> catchError (utf8ToText fp bs) (\case - PandocUTF8DecodingError{} -> - return $ T.pack $ B8.unpack bs + PandocUTF8DecodingError{} -> do + report $ NotUTF8Encoded + (if null fp + then "input" + else fp) + return $ T.pack $ B8.unpack bs e -> throwError e) inputToLazyByteString :: (FilePath, (BS.ByteString, Maybe MimeType)) -- cgit v1.2.3 From 0b1c5a87da1117a4dc4a04e308c9edbdc0ea1ec6 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Wed, 8 Sep 2021 09:30:58 -0700 Subject: RTF reader: support `\binN` for binary image data. --- src/Text/Pandoc/Readers/RTF.hs | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/src/Text/Pandoc/Readers/RTF.hs b/src/Text/Pandoc/Readers/RTF.hs index 4eeab1312..72d1f51d2 100644 --- a/src/Text/Pandoc/Readers/RTF.hs +++ b/src/Text/Pandoc/Readers/RTF.hs @@ -31,7 +31,7 @@ import Text.Pandoc.Definition import Text.Pandoc.Options import Text.Pandoc.Parsing import Text.Pandoc.Shared (safeRead, tshow) -import Data.Char (isAlphaNum, chr, digitToInt, isAscii, isLetter, isSpace) +import Data.Char (isAlphaNum, chr, digitToInt, isAscii, isLetter, isSpace, ord) import qualified Data.ByteString.Lazy as BL import Data.Digest.Pure.SHA (sha1, showDigest) import Data.Maybe (mapMaybe, fromMaybe) @@ -223,6 +223,7 @@ data TokContents = ControlWord Text (Maybe Int) | ControlSymbol Char | UnformattedText Text + | BinData BL.ByteString | HexVal Word8 | Grouped [Tok] deriving (Show, Eq) @@ -234,9 +235,22 @@ tok = do where controlThing = do char '\\' *> - ( (ControlWord <$> letterSequence <*> (parameter <* optional delimChar)) + ( binData + <|> (ControlWord <$> letterSequence <*> (parameter <* optional delimChar)) <|> (HexVal <$> hexVal) <|> (ControlSymbol <$> anyChar) ) + binData = try $ do + string "bin" <* notFollowedBy letter + n <- fromMaybe 0 <$> parameter + spaces + -- NOTE: We assume here that if the document contains binary + -- data, it will not be valid UTF-8 and hence it will have been + -- read as latin1, so we can recover the data in the following + -- way. This is probably not completely reliable, but I don't + -- know if we can do better without making this reader take + -- a ByteString input. + dat <- BL.pack . map (fromIntegral . ord) <$> count n anyChar + return $ BinData dat parameter = do hyph <- string "-" <|> pure "" rest <- many digit @@ -860,14 +874,10 @@ handlePict :: PandocMonad m => [Tok] -> RTFParser m () handlePict toks = do let pict = foldl' getPictData def toks let altText = "image" - let binToWord = T.foldl' (\acc x -> acc * 2 + fromIntegral (digitToInt x)) 0 - let isBinaryDigit '0' = True - isBinaryDigit '1' = True - isBinaryDigit _ = False - let bytes = BL.pack $ - if picBinary pict && T.all isBinaryDigit (picData pict) - then map binToWord $ T.chunksOf 8 $ picData pict - else map hexToWord $ T.chunksOf 2 $ picData pict + let bytes = + if picBinary pict + then picBytes pict + else BL.pack $ map hexToWord $ T.chunksOf 2 $ picData pict let (mimetype, ext) = case picType pict of Just Emfblip -> (Just "image/x-emf", ".emf") @@ -894,7 +904,8 @@ handlePict toks = do ControlWord "pich" (Just h) -> pict{ picHeight = Just h } ControlWord "picwgoal" (Just w) -> pict{ picWidthGoal = Just w } ControlWord "pichgoal" (Just h) -> pict{ picHeightGoal = Just h } - ControlWord "bin" _ -> pict{ picBinary = True } + BinData d | not (BL.null d) + -> pict{ picBinary = True, picBytes = picBytes pict <> d } UnformattedText t -> pict{ picData = t } _ -> pict -- cgit v1.2.3 From 37e30560ad546055d17f56df468cd35976b3218a Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Thu, 9 Sep 2021 23:27:58 -0700 Subject: Use dev version of citeproc. --- cabal.project | 5 +++++ stack.yaml | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/cabal.project b/cabal.project index 26373c616..55026979e 100644 --- a/cabal.project +++ b/cabal.project @@ -2,3 +2,8 @@ packages: pandoc.cabal tests: True flags: +embed_data_files +source-repository-package + type: git + location: https://github.com/jgm/citeproc.git + tag: 59e98e8d1e13ddb53bef9f90adbd1c64652f0173 + diff --git a/stack.yaml b/stack.yaml index a8df254d7..9b73f2bd1 100644 --- a/stack.yaml +++ b/stack.yaml @@ -13,7 +13,8 @@ extra-deps: - skylighting-0.11 - doctemplates-0.10 - texmath-0.12.3.1 -- citeproc-0.5 +- git: https://github.com/jgm/citeproc.git + commit: 59e98e8d1e13ddb53bef9f90adbd1c64652f0173 ghc-options: "$locals": -fhide-source-paths -Wno-missing-home-modules resolver: lts-18.0 -- cgit v1.2.3 From 1481dae629b97c5b7ad28cd162e22a52c7647784 Mon Sep 17 00:00:00 2001 From: Kolen Cheung Date: Fri, 10 Sep 2021 09:26:55 -0700 Subject: Ipynb reader handleData: support text/markdown (#7561) `text/markdown` is now a supported mime type for raw output. --- src/Text/Pandoc/Readers/Ipynb.hs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Text/Pandoc/Readers/Ipynb.hs b/src/Text/Pandoc/Readers/Ipynb.hs index cd1093109..9d46111c3 100644 --- a/src/Text/Pandoc/Readers/Ipynb.hs +++ b/src/Text/Pandoc/Readers/Ipynb.hs @@ -192,6 +192,9 @@ handleData metadata (MimeBundle mb) = dataBlock ("text/latex", TextualData t) = return $ B.rawBlock "latex" t + dataBlock ("text/markdown", TextualData t) + = return $ B.rawBlock "markdown" t + dataBlock ("text/plain", TextualData t) = return $ B.codeBlock t -- cgit v1.2.3 From 99a4d1d0b06bb68e4d7a10acd642d439842004d1 Mon Sep 17 00:00:00 2001 From: Francesco Mazzoli Date: Fri, 10 Sep 2021 18:30:05 +0200 Subject: Support `--reference-location` for HTML output (#7461) The HTML writer now supports `EndOfBlock`, `EndOfSection`, and `EndOfDocument` for reference locations. EPUB and HTML slide show formats are also affected by this change. This works similarly to the markdown writer, but with special care taken to skipping section divs with what regards to the block level. The change also takes care to not modify the output if `EndOfDocument` is used. --- MANUAL.txt | 2 +- man/pandoc.1 | 2 +- src/Text/Pandoc/Writers/HTML.hs | 121 +++++++++++++++++++++++++++++----------- test/Tests/Writers/HTML.hs | 75 ++++++++++++++++++++++++- test/command/4235.md | 2 +- test/command/7006.md | 2 +- test/writer.html4 | 2 +- test/writer.html5 | 2 +- 8 files changed, 169 insertions(+), 39 deletions(-) diff --git a/MANUAL.txt b/MANUAL.txt index afdd66ddd..57b9f3b2c 100644 --- a/MANUAL.txt +++ b/MANUAL.txt @@ -972,7 +972,7 @@ header when requesting a document from a URL: : Specify whether footnotes (and references, if `reference-links` is set) are placed at the end of the current (top-level) block, the current section, or the document. The default is - `document`. Currently only affects the markdown writer. + `document`. Currently only affects the markdown and HTML writers. `--markdown-headings=setext`|`atx` diff --git a/man/pandoc.1 b/man/pandoc.1 index a0092b385..e901f60b3 100644 --- a/man/pandoc.1 +++ b/man/pandoc.1 @@ -995,7 +995,7 @@ Specify whether footnotes (and references, if \f[C]reference-links\f[R] is set) are placed at the end of the current (top-level) block, the current section, or the document. The default is \f[C]document\f[R]. -Currently only affects the markdown writer. +Currently only affects the markdown and HTML writers. .TP \f[B]\f[CB]--markdown-headings=setext\f[B]\f[R]|\f[B]\f[CB]atx\f[B]\f[R] Specify whether to use ATX-style (\f[C]#\f[R]-prefixed) or Setext-style diff --git a/src/Text/Pandoc/Writers/HTML.hs b/src/Text/Pandoc/Writers/HTML.hs index 89fc110ef..c96d4622a 100644 --- a/src/Text/Pandoc/Writers/HTML.hs +++ b/src/Text/Pandoc/Writers/HTML.hs @@ -74,9 +74,11 @@ import Text.TeXMath import Text.XML.Light (elChildren, unode, unqual) import qualified Text.XML.Light as XML import Text.XML.Light.Output +import Data.String (fromString) data WriterState = WriterState { stNotes :: [Html] -- ^ List of notes + , stEmittedNotes :: Int -- ^ How many notes we've already pushed out to the HTML , stMath :: Bool -- ^ Math is used in document , stQuotes :: Bool -- ^ tag is used , stHighlighting :: Bool -- ^ Syntax highlighting is used @@ -88,10 +90,11 @@ data WriterState = WriterState , stCodeBlockNum :: Int -- ^ Number of code block , stCsl :: Bool -- ^ Has CSL references , stCslEntrySpacing :: Maybe Int -- ^ CSL entry spacing + , stBlockLevel :: Int -- ^ Current block depth, excluding section divs } defaultWriterState :: WriterState -defaultWriterState = WriterState {stNotes= [], stMath = False, stQuotes = False, +defaultWriterState = WriterState {stNotes= [], stEmittedNotes = 0, stMath = False, stQuotes = False, stHighlighting = False, stHtml5 = False, stEPUBVersion = Nothing, @@ -100,7 +103,8 @@ defaultWriterState = WriterState {stNotes= [], stMath = False, stQuotes = False, stInSection = False, stCodeBlockNum = 0, stCsl = False, - stCslEntrySpacing = Nothing} + stCslEntrySpacing = Nothing, + stBlockLevel = 0} -- Helpers to render HTML with the appropriate function. @@ -266,8 +270,16 @@ pandocToHtml opts (Pandoc meta blocks) = do then fmap renderHtml' <$> tableOfContents opts sects else return Nothing blocks' <- blockListToHtml opts sects + notes <- do + -- make the st private just to be safe, since we modify it right afterwards + st <- get + if null (stNotes st) + then return mempty + else do + notes <- footnoteSection opts EndOfDocument (stEmittedNotes st + 1) (reverse (stNotes st)) + modify (\st' -> st'{ stNotes = mempty, stEmittedNotes = stEmittedNotes st' + length (stNotes st') }) + return notes st <- get - notes <- footnoteSection opts (reverse (stNotes st)) let thebody = blocks' >> notes let math = case writerHTMLMathMethod opts of MathJax url @@ -490,28 +502,43 @@ tableOfContents opts sects = do -- | Convert list of Note blocks to a footnote

. -- Assumes notes are sorted. -footnoteSection :: PandocMonad m - => WriterOptions -> [Html] -> StateT WriterState m Html -footnoteSection opts notes = do +footnoteSection :: + PandocMonad m => WriterOptions -> ReferenceLocation -> Int -> [Html] -> StateT WriterState m Html +footnoteSection opts refLocation startCounter notes = do html5 <- gets stHtml5 slideVariant <- gets stSlideVariant - let hrtag = if html5 then H5.hr else H.hr + let hrtag = if refLocation /= EndOfBlock then (if html5 then H5.hr else H.hr) else mempty + let additionalClassName = case refLocation of + EndOfBlock -> "footnotes-end-of-block" + EndOfDocument -> "footnotes-end-of-document" + EndOfSection -> "footnotes-end-of-section" + let className = "footnotes " <> additionalClassName epubVersion <- gets stEPUBVersion let container x | html5 , epubVersion == Just EPUB3 - = H5.section ! A.class_ "footnotes" + = H5.section ! A.class_ className ! customAttribute "epub:type" "footnotes" $ x - | html5 = H5.section ! A.class_ "footnotes" + | html5 = H5.section ! A.class_ className ! customAttribute "role" "doc-endnotes" $ x | slideVariant /= NoSlides = H.div ! A.class_ "footnotes slide" $ x - | otherwise = H.div ! A.class_ "footnotes" $ x + | otherwise = H.div ! A.class_ className $ x return $ if null notes then mempty - else nl opts >> container (nl opts >> hrtag >> nl opts >> - H.ol (mconcat notes >> nl opts) >> nl opts) + else do + nl opts + container $ do + nl opts + hrtag + nl opts + -- Keep the previous output exactly the same if we don't + -- have multiple notes sections + if startCounter == 1 + then H.ol $ mconcat notes >> nl opts + else H.ol ! A.start (fromString (show startCounter)) $ mconcat notes >> nl opts + nl opts -- | Parse a mailto link; return Just (name, domain) or Nothing. parseMailto :: Text -> Maybe (Text, Text) @@ -702,11 +729,10 @@ adjustNumbers opts doc = fixnum x = x showSecNum = T.intercalate "." . map tshow --- | Convert Pandoc block element to HTML. -blockToHtml :: PandocMonad m => WriterOptions -> Block -> StateT WriterState m Html -blockToHtml _ Null = return mempty -blockToHtml opts (Plain lst) = inlineListToHtml opts lst -blockToHtml opts (Para [Image attr@(_,classes,_) txt (src,tit)]) +blockToHtmlInner :: PandocMonad m => WriterOptions -> Block -> StateT WriterState m Html +blockToHtmlInner _ Null = return mempty +blockToHtmlInner opts (Plain lst) = inlineListToHtml opts lst +blockToHtmlInner opts (Para [Image attr@(_,classes,_) txt (src,tit)]) | "stretch" `elem` classes = do slideVariant <- gets stSlideVariant case slideVariant of @@ -716,20 +742,20 @@ blockToHtml opts (Para [Image attr@(_,classes,_) txt (src,tit)]) inlineToHtml opts (Image attr txt (src, tit)) _ -> figure opts attr txt (src, tit) -- title beginning with fig: indicates that the image is a figure -blockToHtml opts (Para [Image attr txt (s,T.stripPrefix "fig:" -> Just tit)]) = +blockToHtmlInner opts (Para [Image attr txt (s,T.stripPrefix "fig:" -> Just tit)]) = figure opts attr txt (s,tit) -blockToHtml opts (Para lst) = do +blockToHtmlInner opts (Para lst) = do contents <- inlineListToHtml opts lst case contents of Empty _ | not (isEnabled Ext_empty_paragraphs opts) -> return mempty _ -> return $ H.p contents -blockToHtml opts (LineBlock lns) = +blockToHtmlInner opts (LineBlock lns) = if writerWrapText opts == WrapNone then blockToHtml opts $ linesToPara lns else do htmlLines <- inlineListToHtml opts $ intercalate [LineBreak] lns return $ H.div ! A.class_ "line-block" $ htmlLines -blockToHtml opts (Div (ident, "section":dclasses, dkvs) +blockToHtmlInner opts (Div (ident, "section":dclasses, dkvs) (Header level hattr@(hident,hclasses,hkvs) ils : xs)) = do slideVariant <- gets stSlideVariant @@ -810,7 +836,7 @@ blockToHtml opts (Div (ident, "section":dclasses, dkvs) if null innerSecs then mempty else nl opts <> innerContents -blockToHtml opts (Div attr@(ident, classes, kvs') bs) = do +blockToHtmlInner opts (Div attr@(ident, classes, kvs') bs) = do html5 <- gets stHtml5 slideVariant <- gets stSlideVariant let isCslBibBody = ident == "refs" || "csl-bib-body" `elem` classes @@ -864,7 +890,7 @@ blockToHtml opts (Div attr@(ident, classes, kvs') bs) = do _ -> return mempty else addAttrs opts (ident, classes'', kvs) $ divtag contents' -blockToHtml opts (RawBlock f str) = do +blockToHtmlInner opts (RawBlock f str) = do ishtml <- isRawHtml f if ishtml then return $ preEscapedText str @@ -875,10 +901,10 @@ blockToHtml opts (RawBlock f str) = do else do report $ BlockNotRendered (RawBlock f str) return mempty -blockToHtml _ HorizontalRule = do +blockToHtmlInner _ HorizontalRule = do html5 <- gets stHtml5 return $ if html5 then H5.hr else H.hr -blockToHtml opts (CodeBlock (id',classes,keyvals) rawCode) = do +blockToHtmlInner opts (CodeBlock (id',classes,keyvals) rawCode) = do id'' <- if T.null id' then do modify $ \st -> st{ stCodeBlockNum = stCodeBlockNum st + 1 } @@ -910,7 +936,7 @@ blockToHtml opts (CodeBlock (id',classes,keyvals) rawCode) = do -- we set writerIdentifierPrefix to "" since id'' already -- includes it: addAttrs opts{writerIdentifierPrefix = ""} (id'',[],keyvals) h -blockToHtml opts (BlockQuote blocks) = do +blockToHtmlInner opts (BlockQuote blocks) = do -- in S5, treat list in blockquote specially -- if default is incremental, make it nonincremental; -- otherwise incremental @@ -932,7 +958,7 @@ blockToHtml opts (BlockQuote blocks) = do else do contents <- blockListToHtml opts blocks return $ H.blockquote $ nl opts >> contents >> nl opts -blockToHtml opts (Header level (ident,classes,kvs) lst) = do +blockToHtmlInner opts (Header level (ident,classes,kvs) lst) = do contents <- inlineListToHtml opts lst let secnum = fromMaybe mempty $ lookup "number" kvs let contents' = if writerNumberSections opts && not (T.null secnum) @@ -955,12 +981,12 @@ blockToHtml opts (Header level (ident,classes,kvs) lst) = do 5 -> H.h5 contents' 6 -> H.h6 contents' _ -> H.p ! A.class_ "heading" $ contents' -blockToHtml opts (BulletList lst) = do +blockToHtmlInner opts (BulletList lst) = do contents <- mapM (listItemToHtml opts) lst let isTaskList = not (null lst) && all isTaskListItem lst (if isTaskList then (! A.class_ "task-list") else id) <$> unordList opts contents -blockToHtml opts (OrderedList (startnum, numstyle, _) lst) = do +blockToHtmlInner opts (OrderedList (startnum, numstyle, _) lst) = do contents <- mapM (listItemToHtml opts) lst html5 <- gets stHtml5 let numstyle' = case numstyle of @@ -983,7 +1009,7 @@ blockToHtml opts (OrderedList (startnum, numstyle, _) lst) = do else []) l <- ordList opts contents return $ foldl' (!) l attribs -blockToHtml opts (DefinitionList lst) = do +blockToHtmlInner opts (DefinitionList lst) = do contents <- mapM (\(term, defs) -> do term' <- liftM H.dt $ inlineListToHtml opts term defs' <- mapM (liftM (\x -> H.dd (x >> nl opts)) . @@ -991,9 +1017,39 @@ blockToHtml opts (DefinitionList lst) = do return $ mconcat $ nl opts : term' : nl opts : intersperse (nl opts) defs') lst defList opts contents -blockToHtml opts (Table attr caption colspecs thead tbody tfoot) = +blockToHtmlInner opts (Table attr caption colspecs thead tbody tfoot) = tableToHtml opts (Ann.toTable attr caption colspecs thead tbody tfoot) +-- | Convert Pandoc block element to HTML. All the legwork is done by +-- 'blockToHtmlInner', this just takes care of emitting the notes after +-- the block if necessary. +blockToHtml :: PandocMonad m => WriterOptions -> Block -> StateT WriterState m Html +blockToHtml opts block = do + -- Ignore inserted section divs -- they are not blocks as they came from + -- the document itself (at least not when coming from markdown) + let isSection = case block of + Div (_, classes, _) _ | "section" `elem` classes -> True + _ -> False + let increaseLevel = not isSection + when increaseLevel $ + modify (\st -> st{ stBlockLevel = stBlockLevel st + 1 }) + doc <- blockToHtmlInner opts block + st <- get + let emitNotes = + (writerReferenceLocation opts == EndOfBlock && stBlockLevel st == 1) || + (writerReferenceLocation opts == EndOfSection && isSection) + res <- if emitNotes + then do + notes <- if null (stNotes st) + then return mempty + else footnoteSection opts (writerReferenceLocation opts) (stEmittedNotes st + 1) (reverse (stNotes st)) + modify (\st' -> st'{ stNotes = mempty, stEmittedNotes = stEmittedNotes st' + length (stNotes st') }) + return (doc <> notes) + else return doc + when increaseLevel $ + modify (\st' -> st'{ stBlockLevel = stBlockLevel st' - 1 }) + return res + tableToHtml :: PandocMonad m => WriterOptions -> Ann.Table @@ -1468,7 +1524,8 @@ inlineToHtml opts inline = do -- note: null title included, as in Markdown.pl (Note contents) -> do notes <- gets stNotes - let number = length notes + 1 + emittedNotes <- gets stEmittedNotes + let number = emittedNotes + length notes + 1 let ref = tshow number htmlContents <- blockListToNote opts ref contents epubVersion <- gets stEPUBVersion diff --git a/test/Tests/Writers/HTML.hs b/test/Tests/Writers/HTML.hs index 404f6da98..50775b171 100644 --- a/test/Tests/Writers/HTML.hs +++ b/test/Tests/Writers/HTML.hs @@ -8,8 +8,11 @@ import Text.Pandoc import Text.Pandoc.Arbitrary () import Text.Pandoc.Builder +htmlWithOpts :: (ToPandoc a) => WriterOptions -> a -> String +htmlWithOpts opts = unpack . purely (writeHtml4String opts{ writerWrapText = WrapNone }) . toPandoc + html :: (ToPandoc a) => a -> String -html = unpack . purely (writeHtml4String def{ writerWrapText = WrapNone }) . toPandoc +html = htmlWithOpts def htmlQTags :: (ToPandoc a) => a -> String htmlQTags = unpack @@ -33,6 +36,21 @@ infix 4 =: => String -> (a, String) -> TestTree (=:) = test html +noteTestDoc :: Blocks +noteTestDoc = + header 1 "Page title" <> + header 2 "First section" <> + para ("This is a footnote." <> + note (para "Down here.") <> + " And this is a " <> + link "https://www.google.com" "" "link" <> + ".") <> + blockQuote (para ("A note inside a block quote." <> + note (para "The second note.")) <> + para "A second paragraph.") <> + header 2 "Second section" <> + para "Some more text." + tests :: [TestTree] tests = [ testGroup "inline code" @@ -86,6 +104,61 @@ tests = =?> ("" ++ ">>=") ] + , testGroup "footnotes" + [ test (htmlWithOpts def{writerReferenceLocation=EndOfDocument}) + "at the end of a document" $ + noteTestDoc =?> + concat + [ "

Page title

" + , "

First section

" + , "

This is a footnote.¹ And this is a link.

" + , "

A note inside a block quote.²
A second paragraph.

" + , "

Second section

" + , "

Some more text.

" + , "

Down here.↩︎
The second note.↩︎

" + ] + , test (htmlWithOpts def{writerReferenceLocation=EndOfBlock}) + "at the end of a block" $ + noteTestDoc =?> + concat + [ "

Page title

" + , "

First section

" + , "

This is a footnote.¹ And this is a link.

" + , "

Down here.↩︎

" + , "

A note inside a block quote.²
A second paragraph.

" + , "

The second note.↩︎

" + , "

Second section

" + , "

Some more text.

" + ] + , test (htmlWithOpts def{writerReferenceLocation=EndOfSection}) + "at the end of a section" $ + noteTestDoc =?> + concat + [ "

Page title

" + , "

First section

" + , "

This is a footnote.¹ And this is a link.

" + , "

A note inside a block quote.²
A second paragraph.

" + , "

Down here.↩︎
The second note.↩︎

" + , "

Second section

" + , "

Some more text.

" + ] + , test (htmlWithOpts def{writerReferenceLocation=EndOfSection, writerSectionDivs=True}) + "at the end of a section, with section divs" $ + noteTestDoc =?> + -- Footnotes are rendered _after_ their section (in this case after the level2 section + -- that contains it). + concat + [ "

" + , "

Page title

" + , "

First section

" + , "

This is a footnote.¹ And this is a link.

A note inside a block quote.²
A second paragraph.

" + , "

Down here.↩︎
The second note.↩︎

" + , "

Second section

Some more text.

" + , "

" + ] + ] ] where tQ :: (ToString a, ToPandoc a) diff --git a/test/command/4235.md b/test/command/4235.md index 8bbf43ff9..4f2644dd6 100644 --- a/test/command/4235.md +++ b/test/command/4235.md @@ -3,7 +3,7 @@ This.^[Has a footnote.] ^D

This.¹

Has a footnote.↩︎

Test.¹

Foo:
diff --git a/test/writer.html4 b/test/writer.html4 index 215a1efb9..257d86ddb 100644 --- a/test/writer.html4 +++ b/test/writer.html4 @@ -665,7 +665,7 @@ Blah
And in list items.⁵

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 in list items.⁵

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.↩︎

Date: Fri, 10 Sep 2021 09:32:51 -0700 Subject: MANUAL: Document formats affected by `--reference-location`. --- MANUAL.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/MANUAL.txt b/MANUAL.txt index 57b9f3b2c..f0d3c8965 100644 --- a/MANUAL.txt +++ b/MANUAL.txt @@ -972,7 +972,9 @@ header when requesting a document from a URL: : Specify whether footnotes (and references, if `reference-links` is set) are placed at the end of the current (top-level) block, the current section, or the document. The default is - `document`. Currently only affects the markdown and HTML writers. + `document`. Currently this option only affects the + `markdown`, `muse`, `html`, `epub`, `slidy`, `s5`, `slideous`, + `dzslides`, and `revealjs` writers. `--markdown-headings=setext`|`atx` -- cgit v1.2.3 From 0216a2f5047dd78ecc3c26659281a8b629a83de0 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Fri, 10 Sep 2021 09:50:05 -0700 Subject: Org reader: don't parse a list as first item in a list item. Closes #7557. --- src/Text/Pandoc/Readers/Org/Blocks.hs | 5 ++++- test/command/7557.md | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 test/command/7557.md diff --git a/src/Text/Pandoc/Readers/Org/Blocks.hs b/src/Text/Pandoc/Readers/Org/Blocks.hs index f18d2f9a7..2ec97d903 100644 --- a/src/Text/Pandoc/Readers/Org/Blocks.hs +++ b/src/Text/Pandoc/Readers/Org/Blocks.hs @@ -889,7 +889,10 @@ listItem parseIndentedMarker = try . withContext ListItemState $ do firstLine <- anyLineNewline blank <- option "" ("\n" <$ blankline) rest <- T.concat <$> many (listContinuation markerLength) - contents <- parseFromString blocks $ firstLine <> blank <> rest + contents <- parseFromString (do initial <- paraOrPlain <|> pure mempty + subsequent <- blocks + return $ initial <> subsequent) + (firstLine <> blank <> rest) return (maybe id (prependInlines . checkboxToInlines) box <$> contents) -- | Prepend inlines to blocks, adding them to the first paragraph or diff --git a/test/command/7557.md b/test/command/7557.md new file mode 100644 index 000000000..a62a3f14b --- /dev/null +++ b/test/command/7557.md @@ -0,0 +1,7 @@ +``` +% pandoc -f org -t native +- 11. and 12. 09. meeting +- ^D +[BulletList + [[Plain [Str "11.",Space,Str "and",Space,Str "12.",Space,Str "09.",Space,Str "meeting"]]]] +``` -- cgit v1.2.3 From 78b2d747565e33e5f7e460532c1b070072cf6d6b Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Fri, 10 Sep 2021 11:02:22 -0700 Subject: Remove redundant import. --- src/Text/Pandoc/Readers/RTF.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Text/Pandoc/Readers/RTF.hs b/src/Text/Pandoc/Readers/RTF.hs index 72d1f51d2..3938681f4 100644 --- a/src/Text/Pandoc/Readers/RTF.hs +++ b/src/Text/Pandoc/Readers/RTF.hs @@ -31,7 +31,7 @@ import Text.Pandoc.Definition import Text.Pandoc.Options import Text.Pandoc.Parsing import Text.Pandoc.Shared (safeRead, tshow) -import Data.Char (isAlphaNum, chr, digitToInt, isAscii, isLetter, isSpace, ord) +import Data.Char (isAlphaNum, chr, isAscii, isLetter, isSpace, ord) import qualified Data.ByteString.Lazy as BL import Data.Digest.Pure.SHA (sha1, showDigest) import Data.Maybe (mapMaybe, fromMaybe) -- cgit v1.2.3 From 8beca46611f42ff0fed67e5a6420175cf744d32e Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Fri, 10 Sep 2021 12:07:11 -0700 Subject: Fix command test for #7557. --- test/command/7557.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/command/7557.md b/test/command/7557.md index a62a3f14b..26e2df740 100644 --- a/test/command/7557.md +++ b/test/command/7557.md @@ -1,7 +1,7 @@ ``` % pandoc -f org -t native - 11. and 12. 09. meeting -- ^D +^D [BulletList [[Plain [Str "11.",Space,Str "and",Space,Str "12.",Space,Str "09.",Space,Str "meeting"]]]] ``` -- cgit v1.2.3 From 8ec9b884f1005e2935181045339614937159a0ad Mon Sep 17 00:00:00 2001 From: Emily Bourke Date: Wed, 1 Sep 2021 14:40:26 +0100 Subject: pptx: Fix capitalisation of notesMasterId MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I don’t think this has caused any problems, but before now it’s been "NotesMasterId", which is incorrect according to [ECMA-376]. [ECMA-376]: https://www.ecma-international.org/publications-and-standards/standards/ecma-376/ --- src/Text/Pandoc/Writers/Powerpoint/Output.hs | 2 +- .../blanks/just-speaker-notes/deleted-layouts.pptx | Bin 35181 -> 35233 bytes .../blanks/just-speaker-notes/moved-layouts.pptx | Bin 45873 -> 45925 bytes test/pptx/blanks/just-speaker-notes/output.pptx | Bin 32304 -> 32356 bytes test/pptx/blanks/just-speaker-notes/templated.pptx | Bin 45369 -> 45421 bytes .../deleted-layouts.pptx | Bin 34509 -> 34561 bytes .../speaker-notes-after-metadata/moved-layouts.pptx | Bin 45269 -> 45321 bytes test/pptx/speaker-notes-after-metadata/output.pptx | Bin 31636 -> 31688 bytes .../speaker-notes-after-metadata/templated.pptx | Bin 44775 -> 44828 bytes .../speaker-notes-afterheader/deleted-layouts.pptx | Bin 33536 -> 33588 bytes .../speaker-notes-afterheader/moved-layouts.pptx | Bin 44297 -> 44349 bytes test/pptx/speaker-notes-afterheader/output.pptx | Bin 30657 -> 30709 bytes test/pptx/speaker-notes-afterheader/templated.pptx | Bin 43803 -> 43855 bytes .../speaker-notes-afterseps/deleted-layouts.pptx | Bin 54432 -> 54484 bytes .../pptx/speaker-notes-afterseps/moved-layouts.pptx | Bin 65121 -> 65173 bytes test/pptx/speaker-notes-afterseps/output.pptx | Bin 51557 -> 51609 bytes test/pptx/speaker-notes-afterseps/templated.pptx | Bin 64619 -> 64671 bytes test/pptx/speaker-notes/deleted-layouts.pptx | Bin 38239 -> 38291 bytes test/pptx/speaker-notes/moved-layouts.pptx | Bin 49002 -> 49054 bytes test/pptx/speaker-notes/output.pptx | Bin 35360 -> 35412 bytes test/pptx/speaker-notes/templated.pptx | Bin 48507 -> 48560 bytes 21 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Text/Pandoc/Writers/Powerpoint/Output.hs b/src/Text/Pandoc/Writers/Powerpoint/Output.hs index d83fb2182..a28eaf54c 100644 --- a/src/Text/Pandoc/Writers/Powerpoint/Output.hs +++ b/src/Text/Pandoc/Writers/Powerpoint/Output.hs @@ -1981,7 +1981,7 @@ presentationToPresentationElement pres@(Presentation _ slds) = do notesMasterElem = mknode "p:notesMasterIdLst" [] [ mknode - "p:NotesMasterId" + "p:notesMasterId" [("r:id", "rId" <> tshow notesMasterRId)] () ] diff --git a/test/pptx/blanks/just-speaker-notes/deleted-layouts.pptx b/test/pptx/blanks/just-speaker-notes/deleted-layouts.pptx index 82800a074..100da7c7f 100644 Binary files a/test/pptx/blanks/just-speaker-notes/deleted-layouts.pptx and b/test/pptx/blanks/just-speaker-notes/deleted-layouts.pptx differ diff --git a/test/pptx/blanks/just-speaker-notes/moved-layouts.pptx b/test/pptx/blanks/just-speaker-notes/moved-layouts.pptx index f5ef1d7bd..d142f045b 100644 Binary files a/test/pptx/blanks/just-speaker-notes/moved-layouts.pptx and b/test/pptx/blanks/just-speaker-notes/moved-layouts.pptx differ diff --git a/test/pptx/blanks/just-speaker-notes/output.pptx b/test/pptx/blanks/just-speaker-notes/output.pptx index 59a643c3e..18f44c4cd 100644 Binary files a/test/pptx/blanks/just-speaker-notes/output.pptx and b/test/pptx/blanks/just-speaker-notes/output.pptx differ diff --git a/test/pptx/blanks/just-speaker-notes/templated.pptx b/test/pptx/blanks/just-speaker-notes/templated.pptx index 8cc7be75b..8beb704a4 100644 Binary files a/test/pptx/blanks/just-speaker-notes/templated.pptx and b/test/pptx/blanks/just-speaker-notes/templated.pptx differ diff --git a/test/pptx/speaker-notes-after-metadata/deleted-layouts.pptx b/test/pptx/speaker-notes-after-metadata/deleted-layouts.pptx index 33304ae3e..48f75ae42 100644 Binary files a/test/pptx/speaker-notes-after-metadata/deleted-layouts.pptx and b/test/pptx/speaker-notes-after-metadata/deleted-layouts.pptx differ diff --git a/test/pptx/speaker-notes-after-metadata/moved-layouts.pptx b/test/pptx/speaker-notes-after-metadata/moved-layouts.pptx index b844a0b51..8f7aee710 100644 Binary files a/test/pptx/speaker-notes-after-metadata/moved-layouts.pptx and b/test/pptx/speaker-notes-after-metadata/moved-layouts.pptx differ diff --git a/test/pptx/speaker-notes-after-metadata/output.pptx b/test/pptx/speaker-notes-after-metadata/output.pptx index 6343bffe4..7fe3d3ae7 100644 Binary files a/test/pptx/speaker-notes-after-metadata/output.pptx and b/test/pptx/speaker-notes-after-metadata/output.pptx differ diff --git a/test/pptx/speaker-notes-after-metadata/templated.pptx b/test/pptx/speaker-notes-after-metadata/templated.pptx index 8d27c4c68..a9e883ada 100644 Binary files a/test/pptx/speaker-notes-after-metadata/templated.pptx and b/test/pptx/speaker-notes-after-metadata/templated.pptx differ diff --git a/test/pptx/speaker-notes-afterheader/deleted-layouts.pptx b/test/pptx/speaker-notes-afterheader/deleted-layouts.pptx index 00f05fae5..831d37446 100644 Binary files a/test/pptx/speaker-notes-afterheader/deleted-layouts.pptx and b/test/pptx/speaker-notes-afterheader/deleted-layouts.pptx differ diff --git a/test/pptx/speaker-notes-afterheader/moved-layouts.pptx b/test/pptx/speaker-notes-afterheader/moved-layouts.pptx index 9fff9f855..7ba1c3a11 100644 Binary files a/test/pptx/speaker-notes-afterheader/moved-layouts.pptx and b/test/pptx/speaker-notes-afterheader/moved-layouts.pptx differ diff --git a/test/pptx/speaker-notes-afterheader/output.pptx b/test/pptx/speaker-notes-afterheader/output.pptx index d581681aa..bcb5dd214 100644 Binary files a/test/pptx/speaker-notes-afterheader/output.pptx and b/test/pptx/speaker-notes-afterheader/output.pptx differ diff --git a/test/pptx/speaker-notes-afterheader/templated.pptx b/test/pptx/speaker-notes-afterheader/templated.pptx index d8d8481df..010c4cce4 100644 Binary files a/test/pptx/speaker-notes-afterheader/templated.pptx and b/test/pptx/speaker-notes-afterheader/templated.pptx differ diff --git a/test/pptx/speaker-notes-afterseps/deleted-layouts.pptx b/test/pptx/speaker-notes-afterseps/deleted-layouts.pptx index 139af783b..de607ae41 100644 Binary files a/test/pptx/speaker-notes-afterseps/deleted-layouts.pptx and b/test/pptx/speaker-notes-afterseps/deleted-layouts.pptx differ diff --git a/test/pptx/speaker-notes-afterseps/moved-layouts.pptx b/test/pptx/speaker-notes-afterseps/moved-layouts.pptx index de697cbd8..8eb81bee1 100644 Binary files a/test/pptx/speaker-notes-afterseps/moved-layouts.pptx and b/test/pptx/speaker-notes-afterseps/moved-layouts.pptx differ diff --git a/test/pptx/speaker-notes-afterseps/output.pptx b/test/pptx/speaker-notes-afterseps/output.pptx index 9542fe8b5..4288b84b6 100644 Binary files a/test/pptx/speaker-notes-afterseps/output.pptx and b/test/pptx/speaker-notes-afterseps/output.pptx differ diff --git a/test/pptx/speaker-notes-afterseps/templated.pptx b/test/pptx/speaker-notes-afterseps/templated.pptx index 5a3d15d57..96338a2b5 100644 Binary files a/test/pptx/speaker-notes-afterseps/templated.pptx and b/test/pptx/speaker-notes-afterseps/templated.pptx differ diff --git a/test/pptx/speaker-notes/deleted-layouts.pptx b/test/pptx/speaker-notes/deleted-layouts.pptx index c63125d8a..558bb7930 100644 Binary files a/test/pptx/speaker-notes/deleted-layouts.pptx and b/test/pptx/speaker-notes/deleted-layouts.pptx differ diff --git a/test/pptx/speaker-notes/moved-layouts.pptx b/test/pptx/speaker-notes/moved-layouts.pptx index f95df9622..283170569 100644 Binary files a/test/pptx/speaker-notes/moved-layouts.pptx and b/test/pptx/speaker-notes/moved-layouts.pptx differ diff --git a/test/pptx/speaker-notes/output.pptx b/test/pptx/speaker-notes/output.pptx index 0ab1302da..f0e51e597 100644 Binary files a/test/pptx/speaker-notes/output.pptx and b/test/pptx/speaker-notes/output.pptx differ diff --git a/test/pptx/speaker-notes/templated.pptx b/test/pptx/speaker-notes/templated.pptx index 930377fbf..27df2d994 100644 Binary files a/test/pptx/speaker-notes/templated.pptx and b/test/pptx/speaker-notes/templated.pptx differ -- cgit v1.2.3 From b60c6157fecd868671baf055045a324ffe20c233 Mon Sep 17 00:00:00 2001 From: Emily Bourke Date: Thu, 2 Sep 2021 10:54:55 +0100 Subject: pptx: Don’t add relationships unnecessarily MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Before now, for any layouts added to the output from the default reference doc, the relationships were unconditionally added to the output. However, if there was already a layout in slideMaster1 at the same index then that results in duplicate relationships. This commit checks first, and only adds the relationship if it doesn’t already exist. --- src/Text/Pandoc/Writers/Powerpoint/Output.hs | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/Text/Pandoc/Writers/Powerpoint/Output.hs b/src/Text/Pandoc/Writers/Powerpoint/Output.hs index a28eaf54c..0b6ca50c2 100644 --- a/src/Text/Pandoc/Writers/Powerpoint/Output.hs +++ b/src/Text/Pandoc/Writers/Powerpoint/Output.hs @@ -384,9 +384,11 @@ updateMasterElems layouts master masterRels = (updatedMaster, updatedMasterRels) Element -> ([Text], Element) addLayoutRels e = let - layoutsToAdd = filter (not . slInReferenceDoc) (toList layouts) + layoutsToAdd = filter (\l -> not (slInReferenceDoc l) && isNew e l) + (toList layouts) newRelationships = snd (foldr mkRelationship (maxIdNumber e, []) layoutsToAdd) - newRelationshipIds = mapMaybe getRelationshipId newRelationships + newRelationshipIds = + mapMaybe (findElemAttr (QName "Id" Nothing Nothing)) newRelationships mkRelationship layout (lastId, relationships) = let thisId = lastId + 1 slideLayoutPath = "../slideLayouts/" <> T.pack (takeFileName (slPath layout)) @@ -403,9 +405,16 @@ updateMasterElems layouts master masterRels = (updatedMaster, updatedMasterRels) in (thisId, Elem newRelationship : relationships) in (newRelationshipIds, e {elContent = elContent e <> newRelationships}) - getRelationshipId :: Content -> Maybe Text - getRelationshipId (Elem e) = findAttr (QName "Id" Nothing Nothing) e - getRelationshipId _ = Nothing + -- | Whether the layout needs to be added to the Relationships element. + isNew :: Element -> SlideLayout -> Bool + isNew relationships SlideLayout{..} = let + toDetails = fmap (takeFileName . T.unpack) + . findElemAttr (QName "Target" Nothing Nothing) + in takeFileName slPath `notElem` mapMaybe toDetails (elContent relationships) + + findElemAttr :: QName -> Content -> Maybe Text + findElemAttr attr (Elem e) = findAttr attr e + findElemAttr _ _ = Nothing maxIdNumber :: Element -> Integer maxIdNumber relationships = maximum (0 : idNumbers) -- cgit v1.2.3 From 2b98991551a95f9f91fd6b643f52bf6065f5057a Mon Sep 17 00:00:00 2001 From: Emily Bourke Date: Thu, 2 Sep 2021 16:56:40 +0100 Subject: pptx: Include all themes in output archive MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Accept test changes: they’re adding the second theme (for all tests not containing speaker notes), or changing its position in the XML (for the ones containing speaker notes). --- src/Text/Pandoc/Writers/Powerpoint/Output.hs | 6 ++---- .../blanks/just-speaker-notes/deleted-layouts.pptx | Bin 35233 -> 35178 bytes .../blanks/just-speaker-notes/moved-layouts.pptx | Bin 45925 -> 45870 bytes test/pptx/blanks/just-speaker-notes/output.pptx | Bin 32356 -> 32297 bytes test/pptx/blanks/just-speaker-notes/templated.pptx | Bin 45421 -> 45365 bytes test/pptx/blanks/nbsp-in-body/deleted-layouts.pptx | Bin 30444 -> 32092 bytes test/pptx/blanks/nbsp-in-body/moved-layouts.pptx | Bin 41131 -> 42780 bytes test/pptx/blanks/nbsp-in-body/output.pptx | Bin 27562 -> 29211 bytes test/pptx/blanks/nbsp-in-body/templated.pptx | Bin 40630 -> 42280 bytes .../blanks/nbsp-in-heading/deleted-layouts.pptx | Bin 30444 -> 32092 bytes test/pptx/blanks/nbsp-in-heading/moved-layouts.pptx | Bin 41131 -> 42780 bytes test/pptx/blanks/nbsp-in-heading/output.pptx | Bin 27562 -> 29211 bytes test/pptx/blanks/nbsp-in-heading/templated.pptx | Bin 40630 -> 42280 bytes test/pptx/code-custom/deleted-layouts.pptx | Bin 31069 -> 32717 bytes test/pptx/code-custom/moved-layouts.pptx | Bin 41822 -> 43405 bytes test/pptx/code-custom/output.pptx | Bin 28184 -> 29836 bytes test/pptx/code-custom/templated.pptx | Bin 41337 -> 42905 bytes test/pptx/code/deleted-layouts.pptx | Bin 31068 -> 32716 bytes test/pptx/code/moved-layouts.pptx | Bin 41826 -> 43405 bytes test/pptx/code/output.pptx | Bin 28183 -> 29835 bytes test/pptx/code/templated.pptx | Bin 41337 -> 42905 bytes .../comparison/both-columns/deleted-layouts.pptx | Bin 45804 -> 47453 bytes .../pptx/comparison/both-columns/moved-layouts.pptx | Bin 56524 -> 58172 bytes test/pptx/comparison/both-columns/output.pptx | Bin 42932 -> 44581 bytes test/pptx/comparison/both-columns/templated.pptx | Bin 56025 -> 57674 bytes .../comparison/extra-image/deleted-layouts.pptx | Bin 45833 -> 47482 bytes test/pptx/comparison/extra-image/moved-layouts.pptx | Bin 56552 -> 58200 bytes test/pptx/comparison/extra-image/output.pptx | Bin 42961 -> 44610 bytes test/pptx/comparison/extra-image/templated.pptx | Bin 56053 -> 57702 bytes .../pptx/comparison/extra-text/deleted-layouts.pptx | Bin 45804 -> 47453 bytes test/pptx/comparison/extra-text/moved-layouts.pptx | Bin 56524 -> 58172 bytes test/pptx/comparison/extra-text/output.pptx | Bin 42932 -> 44581 bytes test/pptx/comparison/extra-text/templated.pptx | Bin 56025 -> 57674 bytes .../comparison/non-text-first/deleted-layouts.pptx | Bin 45717 -> 47366 bytes .../comparison/non-text-first/moved-layouts.pptx | Bin 56417 -> 58065 bytes test/pptx/comparison/non-text-first/output.pptx | Bin 42845 -> 44494 bytes test/pptx/comparison/non-text-first/templated.pptx | Bin 55918 -> 57567 bytes .../pptx/comparison/one-column/deleted-layouts.pptx | Bin 29136 -> 30785 bytes test/pptx/comparison/one-column/moved-layouts.pptx | Bin 39856 -> 41506 bytes test/pptx/comparison/one-column/output.pptx | Bin 26258 -> 27906 bytes test/pptx/comparison/one-column/templated.pptx | Bin 39357 -> 41006 bytes .../heading-text-image/deleted-layouts.pptx | Bin 45549 -> 47198 bytes .../heading-text-image/moved-layouts.pptx | Bin 56248 -> 57896 bytes .../heading-text-image/output.pptx | Bin 42677 -> 44326 bytes .../heading-text-image/templated.pptx | Bin 55749 -> 57398 bytes .../image-text/deleted-layouts.pptx | Bin 46248 -> 47896 bytes .../image-text/moved-layouts.pptx | Bin 56934 -> 58584 bytes .../content-with-caption/image-text/output.pptx | Bin 43374 -> 45022 bytes .../content-with-caption/image-text/templated.pptx | Bin 56435 -> 58084 bytes .../text-image/deleted-layouts.pptx | Bin 45488 -> 47137 bytes .../text-image/moved-layouts.pptx | Bin 56188 -> 57836 bytes .../content-with-caption/text-image/output.pptx | Bin 42616 -> 44265 bytes .../content-with-caption/text-image/templated.pptx | Bin 55689 -> 57338 bytes .../deleted-layouts.pptx | Bin 29842 -> 31490 bytes .../moved-layouts.pptx | Bin 40600 -> 42178 bytes .../pptx/document-properties-short-desc/output.pptx | Bin 26967 -> 28619 bytes .../document-properties-short-desc/templated.pptx | Bin 40113 -> 41678 bytes test/pptx/document-properties/deleted-layouts.pptx | Bin 30246 -> 31894 bytes test/pptx/document-properties/moved-layouts.pptx | Bin 41004 -> 42582 bytes test/pptx/document-properties/output.pptx | Bin 27375 -> 29025 bytes test/pptx/document-properties/templated.pptx | Bin 40517 -> 42082 bytes test/pptx/endnotes-toc/deleted-layouts.pptx | Bin 30632 -> 32280 bytes test/pptx/endnotes-toc/moved-layouts.pptx | Bin 41384 -> 42967 bytes test/pptx/endnotes-toc/output.pptx | Bin 27747 -> 29399 bytes test/pptx/endnotes-toc/templated.pptx | Bin 40899 -> 42467 bytes test/pptx/endnotes/deleted-layouts.pptx | Bin 29810 -> 31458 bytes test/pptx/endnotes/moved-layouts.pptx | Bin 40566 -> 42146 bytes test/pptx/endnotes/output.pptx | Bin 26928 -> 28580 bytes test/pptx/endnotes/templated.pptx | Bin 40078 -> 41645 bytes test/pptx/images/deleted-layouts.pptx | Bin 47473 -> 49121 bytes test/pptx/images/moved-layouts.pptx | Bin 58160 -> 59809 bytes test/pptx/images/output.pptx | Bin 44596 -> 46244 bytes test/pptx/images/templated.pptx | Bin 57660 -> 59308 bytes test/pptx/inline-formatting/deleted-layouts.pptx | Bin 29002 -> 30651 bytes test/pptx/inline-formatting/moved-layouts.pptx | Bin 39758 -> 41339 bytes test/pptx/inline-formatting/output.pptx | Bin 26121 -> 27772 bytes test/pptx/inline-formatting/templated.pptx | Bin 39272 -> 40839 bytes test/pptx/lists/deleted-layouts.pptx | Bin 29897 -> 31545 bytes test/pptx/lists/moved-layouts.pptx | Bin 40653 -> 42233 bytes test/pptx/lists/output.pptx | Bin 27015 -> 28667 bytes test/pptx/lists/templated.pptx | Bin 40166 -> 41733 bytes test/pptx/raw-ooxml/deleted-layouts.pptx | Bin 29790 -> 31438 bytes test/pptx/raw-ooxml/moved-layouts.pptx | Bin 40546 -> 42126 bytes test/pptx/raw-ooxml/output.pptx | Bin 26908 -> 28560 bytes test/pptx/raw-ooxml/templated.pptx | Bin 40059 -> 41626 bytes test/pptx/remove-empty-slides/deleted-layouts.pptx | Bin 46218 -> 47866 bytes test/pptx/remove-empty-slides/moved-layouts.pptx | Bin 56903 -> 58553 bytes test/pptx/remove-empty-slides/output.pptx | Bin 43346 -> 44994 bytes test/pptx/remove-empty-slides/templated.pptx | Bin 56404 -> 58053 bytes .../slide-breaks-slide-level-1/deleted-layouts.pptx | Bin 30590 -> 32238 bytes .../slide-breaks-slide-level-1/moved-layouts.pptx | Bin 41343 -> 42926 bytes test/pptx/slide-breaks-slide-level-1/output.pptx | Bin 27705 -> 29357 bytes test/pptx/slide-breaks-slide-level-1/templated.pptx | Bin 40858 -> 42426 bytes test/pptx/slide-breaks-toc/deleted-layouts.pptx | Bin 32364 -> 34012 bytes test/pptx/slide-breaks-toc/moved-layouts.pptx | Bin 43118 -> 44701 bytes test/pptx/slide-breaks-toc/output.pptx | Bin 29481 -> 31133 bytes test/pptx/slide-breaks-toc/templated.pptx | Bin 42634 -> 44201 bytes test/pptx/slide-breaks/deleted-layouts.pptx | Bin 31414 -> 33062 bytes test/pptx/slide-breaks/moved-layouts.pptx | Bin 42171 -> 43751 bytes test/pptx/slide-breaks/output.pptx | Bin 28531 -> 30183 bytes test/pptx/slide-breaks/templated.pptx | Bin 41683 -> 43250 bytes .../h1-h2-with-table/deleted-layouts.pptx | Bin 29137 -> 30786 bytes .../h1-h2-with-table/moved-layouts.pptx | Bin 39829 -> 41479 bytes .../pptx/slide-level-0/h1-h2-with-table/output.pptx | Bin 26259 -> 27907 bytes .../slide-level-0/h1-h2-with-table/templated.pptx | Bin 39330 -> 40979 bytes .../h1-with-image/deleted-layouts.pptx | Bin 45469 -> 47118 bytes .../slide-level-0/h1-with-image/moved-layouts.pptx | Bin 56156 -> 57804 bytes test/pptx/slide-level-0/h1-with-image/output.pptx | Bin 42596 -> 44245 bytes .../pptx/slide-level-0/h1-with-image/templated.pptx | Bin 55657 -> 57306 bytes .../h1-with-table/deleted-layouts.pptx | Bin 29044 -> 30693 bytes .../slide-level-0/h1-with-table/moved-layouts.pptx | Bin 39731 -> 41381 bytes test/pptx/slide-level-0/h1-with-table/output.pptx | Bin 26166 -> 27814 bytes .../pptx/slide-level-0/h1-with-table/templated.pptx | Bin 39232 -> 40881 bytes .../h2-with-image/deleted-layouts.pptx | Bin 45469 -> 47118 bytes .../slide-level-0/h2-with-image/moved-layouts.pptx | Bin 56156 -> 57804 bytes test/pptx/slide-level-0/h2-with-image/output.pptx | Bin 42596 -> 44245 bytes .../pptx/slide-level-0/h2-with-image/templated.pptx | Bin 55657 -> 57306 bytes .../deleted-layouts.pptx | Bin 34561 -> 34504 bytes .../speaker-notes-after-metadata/moved-layouts.pptx | Bin 45321 -> 45193 bytes test/pptx/speaker-notes-after-metadata/output.pptx | Bin 31688 -> 31634 bytes .../speaker-notes-after-metadata/templated.pptx | Bin 44828 -> 44690 bytes .../speaker-notes-afterheader/deleted-layouts.pptx | Bin 33588 -> 33532 bytes .../speaker-notes-afterheader/moved-layouts.pptx | Bin 44349 -> 44220 bytes test/pptx/speaker-notes-afterheader/output.pptx | Bin 30709 -> 30653 bytes test/pptx/speaker-notes-afterheader/templated.pptx | Bin 43855 -> 43719 bytes .../speaker-notes-afterseps/deleted-layouts.pptx | Bin 54484 -> 54429 bytes .../pptx/speaker-notes-afterseps/moved-layouts.pptx | Bin 65173 -> 65119 bytes test/pptx/speaker-notes-afterseps/output.pptx | Bin 51609 -> 51548 bytes test/pptx/speaker-notes-afterseps/templated.pptx | Bin 64671 -> 64614 bytes test/pptx/speaker-notes/deleted-layouts.pptx | Bin 38291 -> 38236 bytes test/pptx/speaker-notes/moved-layouts.pptx | Bin 49054 -> 48929 bytes test/pptx/speaker-notes/output.pptx | Bin 35412 -> 35358 bytes test/pptx/speaker-notes/templated.pptx | Bin 48560 -> 48423 bytes test/pptx/start-numbering-at/deleted-layouts.pptx | Bin 29873 -> 31521 bytes test/pptx/start-numbering-at/moved-layouts.pptx | Bin 40630 -> 42209 bytes test/pptx/start-numbering-at/output.pptx | Bin 26991 -> 28643 bytes test/pptx/start-numbering-at/templated.pptx | Bin 40142 -> 41709 bytes test/pptx/tables/deleted-layouts.pptx | Bin 30417 -> 32065 bytes test/pptx/tables/moved-layouts.pptx | Bin 41174 -> 42753 bytes test/pptx/tables/output.pptx | Bin 27532 -> 29184 bytes test/pptx/tables/templated.pptx | Bin 40686 -> 42253 bytes test/pptx/two-column/deleted-layouts.pptx | Bin 28919 -> 30568 bytes test/pptx/two-column/moved-layouts.pptx | Bin 39676 -> 41256 bytes test/pptx/two-column/output.pptx | Bin 26038 -> 27689 bytes test/pptx/two-column/templated.pptx | Bin 39189 -> 40756 bytes 145 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Text/Pandoc/Writers/Powerpoint/Output.hs b/src/Text/Pandoc/Writers/Powerpoint/Output.hs index 0b6ca50c2..43f94b247 100644 --- a/src/Text/Pandoc/Writers/Powerpoint/Output.hs +++ b/src/Text/Pandoc/Writers/Powerpoint/Output.hs @@ -239,8 +239,8 @@ alwaysInheritedPatterns = , "ppt/slideLayouts/_rels/slideLayout*.xml.rels" , "ppt/slideMasters/slideMaster1.xml" , "ppt/slideMasters/_rels/slideMaster1.xml.rels" - , "ppt/theme/theme1.xml" - , "ppt/theme/_rels/theme1.xml.rels" + , "ppt/theme/theme*.xml" + , "ppt/theme/_rels/theme*.xml.rels" , "ppt/presProps.xml" , "ppt/tableStyles.xml" , "ppt/media/image*" @@ -252,8 +252,6 @@ contingentInheritedPatterns pres = [] <> if presHasSpeakerNotes pres then map compile [ "ppt/notesMasters/notesMaster*.xml" , "ppt/notesMasters/_rels/notesMaster*.xml.rels" - , "ppt/theme/theme2.xml" - , "ppt/theme/_rels/theme2.xml.rels" ] else [] diff --git a/test/pptx/blanks/just-speaker-notes/deleted-layouts.pptx b/test/pptx/blanks/just-speaker-notes/deleted-layouts.pptx index 100da7c7f..5038f2aaf 100644 Binary files a/test/pptx/blanks/just-speaker-notes/deleted-layouts.pptx and b/test/pptx/blanks/just-speaker-notes/deleted-layouts.pptx differ diff --git a/test/pptx/blanks/just-speaker-notes/moved-layouts.pptx b/test/pptx/blanks/just-speaker-notes/moved-layouts.pptx index d142f045b..90353a560 100644 Binary files a/test/pptx/blanks/just-speaker-notes/moved-layouts.pptx and b/test/pptx/blanks/just-speaker-notes/moved-layouts.pptx differ diff --git a/test/pptx/blanks/just-speaker-notes/output.pptx b/test/pptx/blanks/just-speaker-notes/output.pptx index 18f44c4cd..799c0f14a 100644 Binary files a/test/pptx/blanks/just-speaker-notes/output.pptx and b/test/pptx/blanks/just-speaker-notes/output.pptx differ diff --git a/test/pptx/blanks/just-speaker-notes/templated.pptx b/test/pptx/blanks/just-speaker-notes/templated.pptx index 8beb704a4..5e3afb5f8 100644 Binary files a/test/pptx/blanks/just-speaker-notes/templated.pptx and b/test/pptx/blanks/just-speaker-notes/templated.pptx differ diff --git a/test/pptx/blanks/nbsp-in-body/deleted-layouts.pptx b/test/pptx/blanks/nbsp-in-body/deleted-layouts.pptx index 98a1586df..7716e1cbf 100644 Binary files a/test/pptx/blanks/nbsp-in-body/deleted-layouts.pptx and b/test/pptx/blanks/nbsp-in-body/deleted-layouts.pptx differ diff --git a/test/pptx/blanks/nbsp-in-body/moved-layouts.pptx b/test/pptx/blanks/nbsp-in-body/moved-layouts.pptx index fca99b672..3dc6c817e 100644 Binary files a/test/pptx/blanks/nbsp-in-body/moved-layouts.pptx and b/test/pptx/blanks/nbsp-in-body/moved-layouts.pptx differ diff --git a/test/pptx/blanks/nbsp-in-body/output.pptx b/test/pptx/blanks/nbsp-in-body/output.pptx index ed5c77e05..1df3f9574 100644 Binary files a/test/pptx/blanks/nbsp-in-body/output.pptx and b/test/pptx/blanks/nbsp-in-body/output.pptx differ diff --git a/test/pptx/blanks/nbsp-in-body/templated.pptx b/test/pptx/blanks/nbsp-in-body/templated.pptx index 4104f6230..1cf58a1bb 100644 Binary files a/test/pptx/blanks/nbsp-in-body/templated.pptx and b/test/pptx/blanks/nbsp-in-body/templated.pptx differ diff --git a/test/pptx/blanks/nbsp-in-heading/deleted-layouts.pptx b/test/pptx/blanks/nbsp-in-heading/deleted-layouts.pptx index 98a1586df..7716e1cbf 100644 Binary files a/test/pptx/blanks/nbsp-in-heading/deleted-layouts.pptx and b/test/pptx/blanks/nbsp-in-heading/deleted-layouts.pptx differ diff --git a/test/pptx/blanks/nbsp-in-heading/moved-layouts.pptx b/test/pptx/blanks/nbsp-in-heading/moved-layouts.pptx index fca99b672..3dc6c817e 100644 Binary files a/test/pptx/blanks/nbsp-in-heading/moved-layouts.pptx and b/test/pptx/blanks/nbsp-in-heading/moved-layouts.pptx differ diff --git a/test/pptx/blanks/nbsp-in-heading/output.pptx b/test/pptx/blanks/nbsp-in-heading/output.pptx index ed5c77e05..e528091d7 100644 Binary files a/test/pptx/blanks/nbsp-in-heading/output.pptx and b/test/pptx/blanks/nbsp-in-heading/output.pptx differ diff --git a/test/pptx/blanks/nbsp-in-heading/templated.pptx b/test/pptx/blanks/nbsp-in-heading/templated.pptx index 4104f6230..1f2d91399 100644 Binary files a/test/pptx/blanks/nbsp-in-heading/templated.pptx and b/test/pptx/blanks/nbsp-in-heading/templated.pptx differ diff --git a/test/pptx/code-custom/deleted-layouts.pptx b/test/pptx/code-custom/deleted-layouts.pptx index fdcc7ce1d..b49cd4896 100644 Binary files a/test/pptx/code-custom/deleted-layouts.pptx and b/test/pptx/code-custom/deleted-layouts.pptx differ diff --git a/test/pptx/code-custom/moved-layouts.pptx b/test/pptx/code-custom/moved-layouts.pptx index a14eeb6c8..c6806f37f 100644 Binary files a/test/pptx/code-custom/moved-layouts.pptx and b/test/pptx/code-custom/moved-layouts.pptx differ diff --git a/test/pptx/code-custom/output.pptx b/test/pptx/code-custom/output.pptx index 5e9c2c630..a72bebbe2 100644 Binary files a/test/pptx/code-custom/output.pptx and b/test/pptx/code-custom/output.pptx differ diff --git a/test/pptx/code-custom/templated.pptx b/test/pptx/code-custom/templated.pptx index 0e640f373..2bdb526fa 100644 Binary files a/test/pptx/code-custom/templated.pptx and b/test/pptx/code-custom/templated.pptx differ diff --git a/test/pptx/code/deleted-layouts.pptx b/test/pptx/code/deleted-layouts.pptx index c7f78ac40..df7814599 100644 Binary files a/test/pptx/code/deleted-layouts.pptx and b/test/pptx/code/deleted-layouts.pptx differ diff --git a/test/pptx/code/moved-layouts.pptx b/test/pptx/code/moved-layouts.pptx index 4d66b1310..71e8560bd 100644 Binary files a/test/pptx/code/moved-layouts.pptx and b/test/pptx/code/moved-layouts.pptx differ diff --git a/test/pptx/code/output.pptx b/test/pptx/code/output.pptx index aab0cc6f5..4b70df2c7 100644 Binary files a/test/pptx/code/output.pptx and b/test/pptx/code/output.pptx differ diff --git a/test/pptx/code/templated.pptx b/test/pptx/code/templated.pptx index a03109217..1285a9273 100644 Binary files a/test/pptx/code/templated.pptx and b/test/pptx/code/templated.pptx differ diff --git a/test/pptx/comparison/both-columns/deleted-layouts.pptx b/test/pptx/comparison/both-columns/deleted-layouts.pptx index 6a5affdbf..27f9d9ac7 100644 Binary files a/test/pptx/comparison/both-columns/deleted-layouts.pptx and b/test/pptx/comparison/both-columns/deleted-layouts.pptx differ diff --git a/test/pptx/comparison/both-columns/moved-layouts.pptx b/test/pptx/comparison/both-columns/moved-layouts.pptx index 88282fabb..a658045ef 100644 Binary files a/test/pptx/comparison/both-columns/moved-layouts.pptx and b/test/pptx/comparison/both-columns/moved-layouts.pptx differ diff --git a/test/pptx/comparison/both-columns/output.pptx b/test/pptx/comparison/both-columns/output.pptx index 477072fb4..560c7d41a 100644 Binary files a/test/pptx/comparison/both-columns/output.pptx and b/test/pptx/comparison/both-columns/output.pptx differ diff --git a/test/pptx/comparison/both-columns/templated.pptx b/test/pptx/comparison/both-columns/templated.pptx index 431d22392..2fb38880d 100644 Binary files a/test/pptx/comparison/both-columns/templated.pptx and b/test/pptx/comparison/both-columns/templated.pptx differ diff --git a/test/pptx/comparison/extra-image/deleted-layouts.pptx b/test/pptx/comparison/extra-image/deleted-layouts.pptx index beed077f7..267c7cb69 100644 Binary files a/test/pptx/comparison/extra-image/deleted-layouts.pptx and b/test/pptx/comparison/extra-image/deleted-layouts.pptx differ diff --git a/test/pptx/comparison/extra-image/moved-layouts.pptx b/test/pptx/comparison/extra-image/moved-layouts.pptx index f86f5b043..b7023026c 100644 Binary files a/test/pptx/comparison/extra-image/moved-layouts.pptx and b/test/pptx/comparison/extra-image/moved-layouts.pptx differ diff --git a/test/pptx/comparison/extra-image/output.pptx b/test/pptx/comparison/extra-image/output.pptx index a0eb5e847..06d632ee7 100644 Binary files a/test/pptx/comparison/extra-image/output.pptx and b/test/pptx/comparison/extra-image/output.pptx differ diff --git a/test/pptx/comparison/extra-image/templated.pptx b/test/pptx/comparison/extra-image/templated.pptx index a434ba29f..af84388c4 100644 Binary files a/test/pptx/comparison/extra-image/templated.pptx and b/test/pptx/comparison/extra-image/templated.pptx differ diff --git a/test/pptx/comparison/extra-text/deleted-layouts.pptx b/test/pptx/comparison/extra-text/deleted-layouts.pptx index 6a5affdbf..27f9d9ac7 100644 Binary files a/test/pptx/comparison/extra-text/deleted-layouts.pptx and b/test/pptx/comparison/extra-text/deleted-layouts.pptx differ diff --git a/test/pptx/comparison/extra-text/moved-layouts.pptx b/test/pptx/comparison/extra-text/moved-layouts.pptx index 88282fabb..a658045ef 100644 Binary files a/test/pptx/comparison/extra-text/moved-layouts.pptx and b/test/pptx/comparison/extra-text/moved-layouts.pptx differ diff --git a/test/pptx/comparison/extra-text/output.pptx b/test/pptx/comparison/extra-text/output.pptx index 8de7d23b2..560c7d41a 100644 Binary files a/test/pptx/comparison/extra-text/output.pptx and b/test/pptx/comparison/extra-text/output.pptx differ diff --git a/test/pptx/comparison/extra-text/templated.pptx b/test/pptx/comparison/extra-text/templated.pptx index 431d22392..2fb38880d 100644 Binary files a/test/pptx/comparison/extra-text/templated.pptx and b/test/pptx/comparison/extra-text/templated.pptx differ diff --git a/test/pptx/comparison/non-text-first/deleted-layouts.pptx b/test/pptx/comparison/non-text-first/deleted-layouts.pptx index bd7aa69b7..be30d8368 100644 Binary files a/test/pptx/comparison/non-text-first/deleted-layouts.pptx and b/test/pptx/comparison/non-text-first/deleted-layouts.pptx differ diff --git a/test/pptx/comparison/non-text-first/moved-layouts.pptx b/test/pptx/comparison/non-text-first/moved-layouts.pptx index a01def95c..c4879b7d5 100644 Binary files a/test/pptx/comparison/non-text-first/moved-layouts.pptx and b/test/pptx/comparison/non-text-first/moved-layouts.pptx differ diff --git a/test/pptx/comparison/non-text-first/output.pptx b/test/pptx/comparison/non-text-first/output.pptx index cb7843fce..099cf6729 100644 Binary files a/test/pptx/comparison/non-text-first/output.pptx and b/test/pptx/comparison/non-text-first/output.pptx differ diff --git a/test/pptx/comparison/non-text-first/templated.pptx b/test/pptx/comparison/non-text-first/templated.pptx index 32db19cbf..31ac01f18 100644 Binary files a/test/pptx/comparison/non-text-first/templated.pptx and b/test/pptx/comparison/non-text-first/templated.pptx differ diff --git a/test/pptx/comparison/one-column/deleted-layouts.pptx b/test/pptx/comparison/one-column/deleted-layouts.pptx index 5fd7cf9b6..27620f05f 100644 Binary files a/test/pptx/comparison/one-column/deleted-layouts.pptx and b/test/pptx/comparison/one-column/deleted-layouts.pptx differ diff --git a/test/pptx/comparison/one-column/moved-layouts.pptx b/test/pptx/comparison/one-column/moved-layouts.pptx index d5df2b751..fc64d3af5 100644 Binary files a/test/pptx/comparison/one-column/moved-layouts.pptx and b/test/pptx/comparison/one-column/moved-layouts.pptx differ diff --git a/test/pptx/comparison/one-column/output.pptx b/test/pptx/comparison/one-column/output.pptx index 6914162ff..854a968af 100644 Binary files a/test/pptx/comparison/one-column/output.pptx and b/test/pptx/comparison/one-column/output.pptx differ diff --git a/test/pptx/comparison/one-column/templated.pptx b/test/pptx/comparison/one-column/templated.pptx index a30a24453..9e671af1d 100644 Binary files a/test/pptx/comparison/one-column/templated.pptx and b/test/pptx/comparison/one-column/templated.pptx differ diff --git a/test/pptx/content-with-caption/heading-text-image/deleted-layouts.pptx b/test/pptx/content-with-caption/heading-text-image/deleted-layouts.pptx index b5afcc021..3cd09a916 100644 Binary files a/test/pptx/content-with-caption/heading-text-image/deleted-layouts.pptx and b/test/pptx/content-with-caption/heading-text-image/deleted-layouts.pptx differ diff --git a/test/pptx/content-with-caption/heading-text-image/moved-layouts.pptx b/test/pptx/content-with-caption/heading-text-image/moved-layouts.pptx index 05806a767..8e76bc94c 100644 Binary files a/test/pptx/content-with-caption/heading-text-image/moved-layouts.pptx and b/test/pptx/content-with-caption/heading-text-image/moved-layouts.pptx differ diff --git a/test/pptx/content-with-caption/heading-text-image/output.pptx b/test/pptx/content-with-caption/heading-text-image/output.pptx index b3e89757b..5c680e878 100644 Binary files a/test/pptx/content-with-caption/heading-text-image/output.pptx and b/test/pptx/content-with-caption/heading-text-image/output.pptx differ diff --git a/test/pptx/content-with-caption/heading-text-image/templated.pptx b/test/pptx/content-with-caption/heading-text-image/templated.pptx index 3b0fe64c3..bdde384a4 100644 Binary files a/test/pptx/content-with-caption/heading-text-image/templated.pptx and b/test/pptx/content-with-caption/heading-text-image/templated.pptx differ diff --git a/test/pptx/content-with-caption/image-text/deleted-layouts.pptx b/test/pptx/content-with-caption/image-text/deleted-layouts.pptx index e9e0551ac..376880b41 100644 Binary files a/test/pptx/content-with-caption/image-text/deleted-layouts.pptx and b/test/pptx/content-with-caption/image-text/deleted-layouts.pptx differ diff --git a/test/pptx/content-with-caption/image-text/moved-layouts.pptx b/test/pptx/content-with-caption/image-text/moved-layouts.pptx index 77d706ed3..9e33d3163 100644 Binary files a/test/pptx/content-with-caption/image-text/moved-layouts.pptx and b/test/pptx/content-with-caption/image-text/moved-layouts.pptx differ diff --git a/test/pptx/content-with-caption/image-text/output.pptx b/test/pptx/content-with-caption/image-text/output.pptx index 94a2e8b88..c88030b94 100644 Binary files a/test/pptx/content-with-caption/image-text/output.pptx and b/test/pptx/content-with-caption/image-text/output.pptx differ diff --git a/test/pptx/content-with-caption/image-text/templated.pptx b/test/pptx/content-with-caption/image-text/templated.pptx index bef1921a7..a22e9ae3e 100644 Binary files a/test/pptx/content-with-caption/image-text/templated.pptx and b/test/pptx/content-with-caption/image-text/templated.pptx differ diff --git a/test/pptx/content-with-caption/text-image/deleted-layouts.pptx b/test/pptx/content-with-caption/text-image/deleted-layouts.pptx index 68d3d7b9b..2dcb8b78e 100644 Binary files a/test/pptx/content-with-caption/text-image/deleted-layouts.pptx and b/test/pptx/content-with-caption/text-image/deleted-layouts.pptx differ diff --git a/test/pptx/content-with-caption/text-image/moved-layouts.pptx b/test/pptx/content-with-caption/text-image/moved-layouts.pptx index feade1096..7d187a168 100644 Binary files a/test/pptx/content-with-caption/text-image/moved-layouts.pptx and b/test/pptx/content-with-caption/text-image/moved-layouts.pptx differ diff --git a/test/pptx/content-with-caption/text-image/output.pptx b/test/pptx/content-with-caption/text-image/output.pptx index efa814d65..751121cf2 100644 Binary files a/test/pptx/content-with-caption/text-image/output.pptx and b/test/pptx/content-with-caption/text-image/output.pptx differ diff --git a/test/pptx/content-with-caption/text-image/templated.pptx b/test/pptx/content-with-caption/text-image/templated.pptx index ebd552252..4f0aaaa7a 100644 Binary files a/test/pptx/content-with-caption/text-image/templated.pptx and b/test/pptx/content-with-caption/text-image/templated.pptx differ diff --git a/test/pptx/document-properties-short-desc/deleted-layouts.pptx b/test/pptx/document-properties-short-desc/deleted-layouts.pptx index a866f3c1f..79517481a 100644 Binary files a/test/pptx/document-properties-short-desc/deleted-layouts.pptx and b/test/pptx/document-properties-short-desc/deleted-layouts.pptx differ diff --git a/test/pptx/document-properties-short-desc/moved-layouts.pptx b/test/pptx/document-properties-short-desc/moved-layouts.pptx index 8834f885f..51608c2e9 100644 Binary files a/test/pptx/document-properties-short-desc/moved-layouts.pptx and b/test/pptx/document-properties-short-desc/moved-layouts.pptx differ diff --git a/test/pptx/document-properties-short-desc/output.pptx b/test/pptx/document-properties-short-desc/output.pptx index de5e68151..02c241b89 100644 Binary files a/test/pptx/document-properties-short-desc/output.pptx and b/test/pptx/document-properties-short-desc/output.pptx differ diff --git a/test/pptx/document-properties-short-desc/templated.pptx b/test/pptx/document-properties-short-desc/templated.pptx index d39dc0c91..82ccc072c 100644 Binary files a/test/pptx/document-properties-short-desc/templated.pptx and b/test/pptx/document-properties-short-desc/templated.pptx differ diff --git a/test/pptx/document-properties/deleted-layouts.pptx b/test/pptx/document-properties/deleted-layouts.pptx index 1f52481f3..12f6570cf 100644 Binary files a/test/pptx/document-properties/deleted-layouts.pptx and b/test/pptx/document-properties/deleted-layouts.pptx differ diff --git a/test/pptx/document-properties/moved-layouts.pptx b/test/pptx/document-properties/moved-layouts.pptx index c1d2d5282..9a9d4ac3e 100644 Binary files a/test/pptx/document-properties/moved-layouts.pptx and b/test/pptx/document-properties/moved-layouts.pptx differ diff --git a/test/pptx/document-properties/output.pptx b/test/pptx/document-properties/output.pptx index 6bcbd1b9c..cfd3261bc 100644 Binary files a/test/pptx/document-properties/output.pptx and b/test/pptx/document-properties/output.pptx differ diff --git a/test/pptx/document-properties/templated.pptx b/test/pptx/document-properties/templated.pptx index 841ae8c42..3d52d22df 100644 Binary files a/test/pptx/document-properties/templated.pptx and b/test/pptx/document-properties/templated.pptx differ diff --git a/test/pptx/endnotes-toc/deleted-layouts.pptx b/test/pptx/endnotes-toc/deleted-layouts.pptx index 60110a64e..3e613e038 100644 Binary files a/test/pptx/endnotes-toc/deleted-layouts.pptx and b/test/pptx/endnotes-toc/deleted-layouts.pptx differ diff --git a/test/pptx/endnotes-toc/moved-layouts.pptx b/test/pptx/endnotes-toc/moved-layouts.pptx index d1200bd7d..e64cd9c77 100644 Binary files a/test/pptx/endnotes-toc/moved-layouts.pptx and b/test/pptx/endnotes-toc/moved-layouts.pptx differ diff --git a/test/pptx/endnotes-toc/output.pptx b/test/pptx/endnotes-toc/output.pptx index a028b346f..bb431f511 100644 Binary files a/test/pptx/endnotes-toc/output.pptx and b/test/pptx/endnotes-toc/output.pptx differ diff --git a/test/pptx/endnotes-toc/templated.pptx b/test/pptx/endnotes-toc/templated.pptx index 38a0c437d..63b066f0d 100644 Binary files a/test/pptx/endnotes-toc/templated.pptx and b/test/pptx/endnotes-toc/templated.pptx differ diff --git a/test/pptx/endnotes/deleted-layouts.pptx b/test/pptx/endnotes/deleted-layouts.pptx index 0b0bd2f53..1d7ccb928 100644 Binary files a/test/pptx/endnotes/deleted-layouts.pptx and b/test/pptx/endnotes/deleted-layouts.pptx differ diff --git a/test/pptx/endnotes/moved-layouts.pptx b/test/pptx/endnotes/moved-layouts.pptx index 0d4c491b9..0f071207c 100644 Binary files a/test/pptx/endnotes/moved-layouts.pptx and b/test/pptx/endnotes/moved-layouts.pptx differ diff --git a/test/pptx/endnotes/output.pptx b/test/pptx/endnotes/output.pptx index 9d46036fe..e4e661804 100644 Binary files a/test/pptx/endnotes/output.pptx and b/test/pptx/endnotes/output.pptx differ diff --git a/test/pptx/endnotes/templated.pptx b/test/pptx/endnotes/templated.pptx index 863cc29d4..a97a7eed8 100644 Binary files a/test/pptx/endnotes/templated.pptx and b/test/pptx/endnotes/templated.pptx differ diff --git a/test/pptx/images/deleted-layouts.pptx b/test/pptx/images/deleted-layouts.pptx index 2f8754e90..9f0f41c37 100644 Binary files a/test/pptx/images/deleted-layouts.pptx and b/test/pptx/images/deleted-layouts.pptx differ diff --git a/test/pptx/images/moved-layouts.pptx b/test/pptx/images/moved-layouts.pptx index 7951a09f6..f26ac9e8f 100644 Binary files a/test/pptx/images/moved-layouts.pptx and b/test/pptx/images/moved-layouts.pptx differ diff --git a/test/pptx/images/output.pptx b/test/pptx/images/output.pptx index 89325e577..993209a45 100644 Binary files a/test/pptx/images/output.pptx and b/test/pptx/images/output.pptx differ diff --git a/test/pptx/images/templated.pptx b/test/pptx/images/templated.pptx index 7c0ed9a17..06b337538 100644 Binary files a/test/pptx/images/templated.pptx and b/test/pptx/images/templated.pptx differ diff --git a/test/pptx/inline-formatting/deleted-layouts.pptx b/test/pptx/inline-formatting/deleted-layouts.pptx index 2fbe21a45..ac9fa4725 100644 Binary files a/test/pptx/inline-formatting/deleted-layouts.pptx and b/test/pptx/inline-formatting/deleted-layouts.pptx differ diff --git a/test/pptx/inline-formatting/moved-layouts.pptx b/test/pptx/inline-formatting/moved-layouts.pptx index 427492130..49a2409d1 100644 Binary files a/test/pptx/inline-formatting/moved-layouts.pptx and b/test/pptx/inline-formatting/moved-layouts.pptx differ diff --git a/test/pptx/inline-formatting/output.pptx b/test/pptx/inline-formatting/output.pptx index 473b9498d..f1a4a0a36 100644 Binary files a/test/pptx/inline-formatting/output.pptx and b/test/pptx/inline-formatting/output.pptx differ diff --git a/test/pptx/inline-formatting/templated.pptx b/test/pptx/inline-formatting/templated.pptx index dd778a102..6930b785c 100644 Binary files a/test/pptx/inline-formatting/templated.pptx and b/test/pptx/inline-formatting/templated.pptx differ diff --git a/test/pptx/lists/deleted-layouts.pptx b/test/pptx/lists/deleted-layouts.pptx index e527d3c5f..1670eada1 100644 Binary files a/test/pptx/lists/deleted-layouts.pptx and b/test/pptx/lists/deleted-layouts.pptx differ diff --git a/test/pptx/lists/moved-layouts.pptx b/test/pptx/lists/moved-layouts.pptx index 2947c3211..f7590c5f9 100644 Binary files a/test/pptx/lists/moved-layouts.pptx and b/test/pptx/lists/moved-layouts.pptx differ diff --git a/test/pptx/lists/output.pptx b/test/pptx/lists/output.pptx index ffc2eb9f7..95510e92e 100644 Binary files a/test/pptx/lists/output.pptx and b/test/pptx/lists/output.pptx differ diff --git a/test/pptx/lists/templated.pptx b/test/pptx/lists/templated.pptx index 2493e7890..7af437bfe 100644 Binary files a/test/pptx/lists/templated.pptx and b/test/pptx/lists/templated.pptx differ diff --git a/test/pptx/raw-ooxml/deleted-layouts.pptx b/test/pptx/raw-ooxml/deleted-layouts.pptx index 2da1b7a63..a7bd12281 100644 Binary files a/test/pptx/raw-ooxml/deleted-layouts.pptx and b/test/pptx/raw-ooxml/deleted-layouts.pptx differ diff --git a/test/pptx/raw-ooxml/moved-layouts.pptx b/test/pptx/raw-ooxml/moved-layouts.pptx index e58304172..614682671 100644 Binary files a/test/pptx/raw-ooxml/moved-layouts.pptx and b/test/pptx/raw-ooxml/moved-layouts.pptx differ diff --git a/test/pptx/raw-ooxml/output.pptx b/test/pptx/raw-ooxml/output.pptx index 29164af15..841495315 100644 Binary files a/test/pptx/raw-ooxml/output.pptx and b/test/pptx/raw-ooxml/output.pptx differ diff --git a/test/pptx/raw-ooxml/templated.pptx b/test/pptx/raw-ooxml/templated.pptx index 0f20f9826..1dd23da2e 100644 Binary files a/test/pptx/raw-ooxml/templated.pptx and b/test/pptx/raw-ooxml/templated.pptx differ diff --git a/test/pptx/remove-empty-slides/deleted-layouts.pptx b/test/pptx/remove-empty-slides/deleted-layouts.pptx index 51981b241..488abc02a 100644 Binary files a/test/pptx/remove-empty-slides/deleted-layouts.pptx and b/test/pptx/remove-empty-slides/deleted-layouts.pptx differ diff --git a/test/pptx/remove-empty-slides/moved-layouts.pptx b/test/pptx/remove-empty-slides/moved-layouts.pptx index ddca32a52..1e1cf1e44 100644 Binary files a/test/pptx/remove-empty-slides/moved-layouts.pptx and b/test/pptx/remove-empty-slides/moved-layouts.pptx differ diff --git a/test/pptx/remove-empty-slides/output.pptx b/test/pptx/remove-empty-slides/output.pptx index 9e8b5eed2..e2871a882 100644 Binary files a/test/pptx/remove-empty-slides/output.pptx and b/test/pptx/remove-empty-slides/output.pptx differ diff --git a/test/pptx/remove-empty-slides/templated.pptx b/test/pptx/remove-empty-slides/templated.pptx index 579467452..c730b2103 100644 Binary files a/test/pptx/remove-empty-slides/templated.pptx and b/test/pptx/remove-empty-slides/templated.pptx differ diff --git a/test/pptx/slide-breaks-slide-level-1/deleted-layouts.pptx b/test/pptx/slide-breaks-slide-level-1/deleted-layouts.pptx index 2c891cd1d..334fdea9c 100644 Binary files a/test/pptx/slide-breaks-slide-level-1/deleted-layouts.pptx and b/test/pptx/slide-breaks-slide-level-1/deleted-layouts.pptx differ diff --git a/test/pptx/slide-breaks-slide-level-1/moved-layouts.pptx b/test/pptx/slide-breaks-slide-level-1/moved-layouts.pptx index 8471b1d10..3faabfd93 100644 Binary files a/test/pptx/slide-breaks-slide-level-1/moved-layouts.pptx and b/test/pptx/slide-breaks-slide-level-1/moved-layouts.pptx differ diff --git a/test/pptx/slide-breaks-slide-level-1/output.pptx b/test/pptx/slide-breaks-slide-level-1/output.pptx index 449339778..96b9907cc 100644 Binary files a/test/pptx/slide-breaks-slide-level-1/output.pptx and b/test/pptx/slide-breaks-slide-level-1/output.pptx differ diff --git a/test/pptx/slide-breaks-slide-level-1/templated.pptx b/test/pptx/slide-breaks-slide-level-1/templated.pptx index e2815159a..9f23f1d9f 100644 Binary files a/test/pptx/slide-breaks-slide-level-1/templated.pptx and b/test/pptx/slide-breaks-slide-level-1/templated.pptx differ diff --git a/test/pptx/slide-breaks-toc/deleted-layouts.pptx b/test/pptx/slide-breaks-toc/deleted-layouts.pptx index b63994cce..0492ee2ec 100644 Binary files a/test/pptx/slide-breaks-toc/deleted-layouts.pptx and b/test/pptx/slide-breaks-toc/deleted-layouts.pptx differ diff --git a/test/pptx/slide-breaks-toc/moved-layouts.pptx b/test/pptx/slide-breaks-toc/moved-layouts.pptx index 918264bc5..f3e56652c 100644 Binary files a/test/pptx/slide-breaks-toc/moved-layouts.pptx and b/test/pptx/slide-breaks-toc/moved-layouts.pptx differ diff --git a/test/pptx/slide-breaks-toc/output.pptx b/test/pptx/slide-breaks-toc/output.pptx index 9dbfa41a0..b3063b15e 100644 Binary files a/test/pptx/slide-breaks-toc/output.pptx and b/test/pptx/slide-breaks-toc/output.pptx differ diff --git a/test/pptx/slide-breaks-toc/templated.pptx b/test/pptx/slide-breaks-toc/templated.pptx index b83f3f596..bcb2f8276 100644 Binary files a/test/pptx/slide-breaks-toc/templated.pptx and b/test/pptx/slide-breaks-toc/templated.pptx differ diff --git a/test/pptx/slide-breaks/deleted-layouts.pptx b/test/pptx/slide-breaks/deleted-layouts.pptx index fbf4054be..827c7dfda 100644 Binary files a/test/pptx/slide-breaks/deleted-layouts.pptx and b/test/pptx/slide-breaks/deleted-layouts.pptx differ diff --git a/test/pptx/slide-breaks/moved-layouts.pptx b/test/pptx/slide-breaks/moved-layouts.pptx index 90b3b94a6..241605754 100644 Binary files a/test/pptx/slide-breaks/moved-layouts.pptx and b/test/pptx/slide-breaks/moved-layouts.pptx differ diff --git a/test/pptx/slide-breaks/output.pptx b/test/pptx/slide-breaks/output.pptx index e06d9079d..55c09a80e 100644 Binary files a/test/pptx/slide-breaks/output.pptx and b/test/pptx/slide-breaks/output.pptx differ diff --git a/test/pptx/slide-breaks/templated.pptx b/test/pptx/slide-breaks/templated.pptx index 71ba99701..f60f7da06 100644 Binary files a/test/pptx/slide-breaks/templated.pptx and b/test/pptx/slide-breaks/templated.pptx differ diff --git a/test/pptx/slide-level-0/h1-h2-with-table/deleted-layouts.pptx b/test/pptx/slide-level-0/h1-h2-with-table/deleted-layouts.pptx index 217b000b6..c315a7a7a 100644 Binary files a/test/pptx/slide-level-0/h1-h2-with-table/deleted-layouts.pptx and b/test/pptx/slide-level-0/h1-h2-with-table/deleted-layouts.pptx differ diff --git a/test/pptx/slide-level-0/h1-h2-with-table/moved-layouts.pptx b/test/pptx/slide-level-0/h1-h2-with-table/moved-layouts.pptx index d8a6c90fe..81b49936d 100644 Binary files a/test/pptx/slide-level-0/h1-h2-with-table/moved-layouts.pptx and b/test/pptx/slide-level-0/h1-h2-with-table/moved-layouts.pptx differ diff --git a/test/pptx/slide-level-0/h1-h2-with-table/output.pptx b/test/pptx/slide-level-0/h1-h2-with-table/output.pptx index 512b324bf..3f815d830 100644 Binary files a/test/pptx/slide-level-0/h1-h2-with-table/output.pptx and b/test/pptx/slide-level-0/h1-h2-with-table/output.pptx differ diff --git a/test/pptx/slide-level-0/h1-h2-with-table/templated.pptx b/test/pptx/slide-level-0/h1-h2-with-table/templated.pptx index 5ab88e94c..b270d2d4f 100644 Binary files a/test/pptx/slide-level-0/h1-h2-with-table/templated.pptx and b/test/pptx/slide-level-0/h1-h2-with-table/templated.pptx differ diff --git a/test/pptx/slide-level-0/h1-with-image/deleted-layouts.pptx b/test/pptx/slide-level-0/h1-with-image/deleted-layouts.pptx index 5be799e3b..7bc7cfeee 100644 Binary files a/test/pptx/slide-level-0/h1-with-image/deleted-layouts.pptx and b/test/pptx/slide-level-0/h1-with-image/deleted-layouts.pptx differ diff --git a/test/pptx/slide-level-0/h1-with-image/moved-layouts.pptx b/test/pptx/slide-level-0/h1-with-image/moved-layouts.pptx index 395036069..602df1c77 100644 Binary files a/test/pptx/slide-level-0/h1-with-image/moved-layouts.pptx and b/test/pptx/slide-level-0/h1-with-image/moved-layouts.pptx differ diff --git a/test/pptx/slide-level-0/h1-with-image/output.pptx b/test/pptx/slide-level-0/h1-with-image/output.pptx index 2f3a53f5c..f725760dc 100644 Binary files a/test/pptx/slide-level-0/h1-with-image/output.pptx and b/test/pptx/slide-level-0/h1-with-image/output.pptx differ diff --git a/test/pptx/slide-level-0/h1-with-image/templated.pptx b/test/pptx/slide-level-0/h1-with-image/templated.pptx index d306375e9..b203ff671 100644 Binary files a/test/pptx/slide-level-0/h1-with-image/templated.pptx and b/test/pptx/slide-level-0/h1-with-image/templated.pptx differ diff --git a/test/pptx/slide-level-0/h1-with-table/deleted-layouts.pptx b/test/pptx/slide-level-0/h1-with-table/deleted-layouts.pptx index 127dcea01..9d58c2c52 100644 Binary files a/test/pptx/slide-level-0/h1-with-table/deleted-layouts.pptx and b/test/pptx/slide-level-0/h1-with-table/deleted-layouts.pptx differ diff --git a/test/pptx/slide-level-0/h1-with-table/moved-layouts.pptx b/test/pptx/slide-level-0/h1-with-table/moved-layouts.pptx index 197499bc3..62424de73 100644 Binary files a/test/pptx/slide-level-0/h1-with-table/moved-layouts.pptx and b/test/pptx/slide-level-0/h1-with-table/moved-layouts.pptx differ diff --git a/test/pptx/slide-level-0/h1-with-table/output.pptx b/test/pptx/slide-level-0/h1-with-table/output.pptx index 44dbbf90c..d30fd88c3 100644 Binary files a/test/pptx/slide-level-0/h1-with-table/output.pptx and b/test/pptx/slide-level-0/h1-with-table/output.pptx differ diff --git a/test/pptx/slide-level-0/h1-with-table/templated.pptx b/test/pptx/slide-level-0/h1-with-table/templated.pptx index 87b45dda2..eb2a78647 100644 Binary files a/test/pptx/slide-level-0/h1-with-table/templated.pptx and b/test/pptx/slide-level-0/h1-with-table/templated.pptx differ diff --git a/test/pptx/slide-level-0/h2-with-image/deleted-layouts.pptx b/test/pptx/slide-level-0/h2-with-image/deleted-layouts.pptx index 5be799e3b..7bc7cfeee 100644 Binary files a/test/pptx/slide-level-0/h2-with-image/deleted-layouts.pptx and b/test/pptx/slide-level-0/h2-with-image/deleted-layouts.pptx differ diff --git a/test/pptx/slide-level-0/h2-with-image/moved-layouts.pptx b/test/pptx/slide-level-0/h2-with-image/moved-layouts.pptx index 395036069..602df1c77 100644 Binary files a/test/pptx/slide-level-0/h2-with-image/moved-layouts.pptx and b/test/pptx/slide-level-0/h2-with-image/moved-layouts.pptx differ diff --git a/test/pptx/slide-level-0/h2-with-image/output.pptx b/test/pptx/slide-level-0/h2-with-image/output.pptx index 948659d6a..f725760dc 100644 Binary files a/test/pptx/slide-level-0/h2-with-image/output.pptx and b/test/pptx/slide-level-0/h2-with-image/output.pptx differ diff --git a/test/pptx/slide-level-0/h2-with-image/templated.pptx b/test/pptx/slide-level-0/h2-with-image/templated.pptx index d306375e9..b203ff671 100644 Binary files a/test/pptx/slide-level-0/h2-with-image/templated.pptx and b/test/pptx/slide-level-0/h2-with-image/templated.pptx differ diff --git a/test/pptx/speaker-notes-after-metadata/deleted-layouts.pptx b/test/pptx/speaker-notes-after-metadata/deleted-layouts.pptx index 48f75ae42..9010ba04a 100644 Binary files a/test/pptx/speaker-notes-after-metadata/deleted-layouts.pptx and b/test/pptx/speaker-notes-after-metadata/deleted-layouts.pptx differ diff --git a/test/pptx/speaker-notes-after-metadata/moved-layouts.pptx b/test/pptx/speaker-notes-after-metadata/moved-layouts.pptx index 8f7aee710..ca53605b7 100644 Binary files a/test/pptx/speaker-notes-after-metadata/moved-layouts.pptx and b/test/pptx/speaker-notes-after-metadata/moved-layouts.pptx differ diff --git a/test/pptx/speaker-notes-after-metadata/output.pptx b/test/pptx/speaker-notes-after-metadata/output.pptx index 7fe3d3ae7..607115858 100644 Binary files a/test/pptx/speaker-notes-after-metadata/output.pptx and b/test/pptx/speaker-notes-after-metadata/output.pptx differ diff --git a/test/pptx/speaker-notes-after-metadata/templated.pptx b/test/pptx/speaker-notes-after-metadata/templated.pptx index a9e883ada..3be3ed0af 100644 Binary files a/test/pptx/speaker-notes-after-metadata/templated.pptx and b/test/pptx/speaker-notes-after-metadata/templated.pptx differ diff --git a/test/pptx/speaker-notes-afterheader/deleted-layouts.pptx b/test/pptx/speaker-notes-afterheader/deleted-layouts.pptx index 831d37446..2c2a0936b 100644 Binary files a/test/pptx/speaker-notes-afterheader/deleted-layouts.pptx and b/test/pptx/speaker-notes-afterheader/deleted-layouts.pptx differ diff --git a/test/pptx/speaker-notes-afterheader/moved-layouts.pptx b/test/pptx/speaker-notes-afterheader/moved-layouts.pptx index 7ba1c3a11..a9c8bfa0a 100644 Binary files a/test/pptx/speaker-notes-afterheader/moved-layouts.pptx and b/test/pptx/speaker-notes-afterheader/moved-layouts.pptx differ diff --git a/test/pptx/speaker-notes-afterheader/output.pptx b/test/pptx/speaker-notes-afterheader/output.pptx index bcb5dd214..ff403aa1c 100644 Binary files a/test/pptx/speaker-notes-afterheader/output.pptx and b/test/pptx/speaker-notes-afterheader/output.pptx differ diff --git a/test/pptx/speaker-notes-afterheader/templated.pptx b/test/pptx/speaker-notes-afterheader/templated.pptx index 010c4cce4..15435c45a 100644 Binary files a/test/pptx/speaker-notes-afterheader/templated.pptx and b/test/pptx/speaker-notes-afterheader/templated.pptx differ diff --git a/test/pptx/speaker-notes-afterseps/deleted-layouts.pptx b/test/pptx/speaker-notes-afterseps/deleted-layouts.pptx index de607ae41..f6abb0b27 100644 Binary files a/test/pptx/speaker-notes-afterseps/deleted-layouts.pptx and b/test/pptx/speaker-notes-afterseps/deleted-layouts.pptx differ diff --git a/test/pptx/speaker-notes-afterseps/moved-layouts.pptx b/test/pptx/speaker-notes-afterseps/moved-layouts.pptx index 8eb81bee1..6a770fc75 100644 Binary files a/test/pptx/speaker-notes-afterseps/moved-layouts.pptx and b/test/pptx/speaker-notes-afterseps/moved-layouts.pptx differ diff --git a/test/pptx/speaker-notes-afterseps/output.pptx b/test/pptx/speaker-notes-afterseps/output.pptx index 4288b84b6..7e56147f1 100644 Binary files a/test/pptx/speaker-notes-afterseps/output.pptx and b/test/pptx/speaker-notes-afterseps/output.pptx differ diff --git a/test/pptx/speaker-notes-afterseps/templated.pptx b/test/pptx/speaker-notes-afterseps/templated.pptx index 96338a2b5..3184ff74e 100644 Binary files a/test/pptx/speaker-notes-afterseps/templated.pptx and b/test/pptx/speaker-notes-afterseps/templated.pptx differ diff --git a/test/pptx/speaker-notes/deleted-layouts.pptx b/test/pptx/speaker-notes/deleted-layouts.pptx index 558bb7930..5429b88e0 100644 Binary files a/test/pptx/speaker-notes/deleted-layouts.pptx and b/test/pptx/speaker-notes/deleted-layouts.pptx differ diff --git a/test/pptx/speaker-notes/moved-layouts.pptx b/test/pptx/speaker-notes/moved-layouts.pptx index 283170569..13e34698d 100644 Binary files a/test/pptx/speaker-notes/moved-layouts.pptx and b/test/pptx/speaker-notes/moved-layouts.pptx differ diff --git a/test/pptx/speaker-notes/output.pptx b/test/pptx/speaker-notes/output.pptx index f0e51e597..74041a40d 100644 Binary files a/test/pptx/speaker-notes/output.pptx and b/test/pptx/speaker-notes/output.pptx differ diff --git a/test/pptx/speaker-notes/templated.pptx b/test/pptx/speaker-notes/templated.pptx index 27df2d994..80a3e3dea 100644 Binary files a/test/pptx/speaker-notes/templated.pptx and b/test/pptx/speaker-notes/templated.pptx differ diff --git a/test/pptx/start-numbering-at/deleted-layouts.pptx b/test/pptx/start-numbering-at/deleted-layouts.pptx index 68b4215df..7bfe9868f 100644 Binary files a/test/pptx/start-numbering-at/deleted-layouts.pptx and b/test/pptx/start-numbering-at/deleted-layouts.pptx differ diff --git a/test/pptx/start-numbering-at/moved-layouts.pptx b/test/pptx/start-numbering-at/moved-layouts.pptx index e1b2d4de8..0100365ec 100644 Binary files a/test/pptx/start-numbering-at/moved-layouts.pptx and b/test/pptx/start-numbering-at/moved-layouts.pptx differ diff --git a/test/pptx/start-numbering-at/output.pptx b/test/pptx/start-numbering-at/output.pptx index 4320128b3..3ba9a236a 100644 Binary files a/test/pptx/start-numbering-at/output.pptx and b/test/pptx/start-numbering-at/output.pptx differ diff --git a/test/pptx/start-numbering-at/templated.pptx b/test/pptx/start-numbering-at/templated.pptx index efc56ac7a..8a144d601 100644 Binary files a/test/pptx/start-numbering-at/templated.pptx and b/test/pptx/start-numbering-at/templated.pptx differ diff --git a/test/pptx/tables/deleted-layouts.pptx b/test/pptx/tables/deleted-layouts.pptx index d533d3c28..163d4ca5e 100644 Binary files a/test/pptx/tables/deleted-layouts.pptx and b/test/pptx/tables/deleted-layouts.pptx differ diff --git a/test/pptx/tables/moved-layouts.pptx b/test/pptx/tables/moved-layouts.pptx index 56608a039..1b0e606da 100644 Binary files a/test/pptx/tables/moved-layouts.pptx and b/test/pptx/tables/moved-layouts.pptx differ diff --git a/test/pptx/tables/output.pptx b/test/pptx/tables/output.pptx index e41219844..1c89d8032 100644 Binary files a/test/pptx/tables/output.pptx and b/test/pptx/tables/output.pptx differ diff --git a/test/pptx/tables/templated.pptx b/test/pptx/tables/templated.pptx index 0a8c3e8d9..5755bfe9d 100644 Binary files a/test/pptx/tables/templated.pptx and b/test/pptx/tables/templated.pptx differ diff --git a/test/pptx/two-column/deleted-layouts.pptx b/test/pptx/two-column/deleted-layouts.pptx index 9622ed2cd..1d7bd87d3 100644 Binary files a/test/pptx/two-column/deleted-layouts.pptx and b/test/pptx/two-column/deleted-layouts.pptx differ diff --git a/test/pptx/two-column/moved-layouts.pptx b/test/pptx/two-column/moved-layouts.pptx index a17f96b18..71760268c 100644 Binary files a/test/pptx/two-column/moved-layouts.pptx and b/test/pptx/two-column/moved-layouts.pptx differ diff --git a/test/pptx/two-column/output.pptx b/test/pptx/two-column/output.pptx index 270a7eeac..396dc2a74 100644 Binary files a/test/pptx/two-column/output.pptx and b/test/pptx/two-column/output.pptx differ diff --git a/test/pptx/two-column/templated.pptx b/test/pptx/two-column/templated.pptx index 6d9470372..8901695b1 100644 Binary files a/test/pptx/two-column/templated.pptx and b/test/pptx/two-column/templated.pptx differ -- cgit v1.2.3 From ec7cea294dce270f358594c33018c2d8bdadf8a8 Mon Sep 17 00:00:00 2001 From: Emily Bourke Date: Thu, 2 Sep 2021 16:57:02 +0100 Subject: pptx: Fix presentation rel numbering Before now, the numbering of rIds was inconsistent when making the presentation XML and when making the presentation relationships XML. For the relationships, the slides were inserted into the rId order after the first master, and everything else was moved up out of the way. However, this change was then missed in the presentation XML, I think because `envSlideOffset` was never set. The result was that any slide masters after the first would have the wrong rIds in the presentation XML, clashing with the slides, which would lead PowerPoint to view produced files as corrupt. As well, other relationships (like embedded fonts) would have their rId changed in the relationships XML but not in the presentation XML. This commit: - Removes `envSlideOffset` in favour of directly passed function arguments - Inserts the slides into the rId order after all masters rather than after the first - Updates any other rIds in presentation.xml that need to be changed --- src/Text/Pandoc/Writers/Powerpoint/Output.hs | 194 ++++++++++++++++++--------- 1 file changed, 131 insertions(+), 63 deletions(-) diff --git a/src/Text/Pandoc/Writers/Powerpoint/Output.hs b/src/Text/Pandoc/Writers/Powerpoint/Output.hs index 43f94b247..d86ab32bc 100644 --- a/src/Text/Pandoc/Writers/Powerpoint/Output.hs +++ b/src/Text/Pandoc/Writers/Powerpoint/Output.hs @@ -115,7 +115,6 @@ data WriterEnv = WriterEnv { envRefArchive :: Archive -- the difference between the number at -- the end of the slide file name and -- the rId number - , envSlideIdOffset :: Int , envPlaceholder :: Placeholder , envSlideIdMap :: M.Map SlideId Int -- maps the slide number to the @@ -139,7 +138,6 @@ instance Default WriterEnv where , envInList = False , envInNoteSlide = False , envCurSlideId = 1 - , envSlideIdOffset = 1 , envPlaceholder = Placeholder ObjType 0 , envSlideIdMap = mempty , envSpeakerNotesIdMap = mempty @@ -329,10 +327,9 @@ presentationToArchiveP p@(Presentation docProps slides) = do -- we make this ourself in case there's something unexpected in the -- one in the reference doc. relsEntry <- topLevelRelsEntry - -- presentation entry and rels. We have to do the rels first to make - -- sure we know the correct offset for the rIds. - presEntry <- presentationToPresEntry p - presRelsEntry <- presentationToRelsEntry p + -- presentation entry and rels. + (presentationRIdUpdateData, presRelsEntry) <- presentationToRelsEntry p + presEntry <- presentationToPresEntry presentationRIdUpdateData p slideEntries <- mapM slideToEntry slides slideRelEntries <- mapM slideToSlideRelEntry slides spkNotesEntries <- catMaybes <$> mapM slideToSpeakerNotesEntry slides @@ -430,8 +427,8 @@ updateMasterElems layouts master masterRels = (updatedMaster, updatedMasterRels) getIdAttribute (Elem e) = findAttr (QName "id" Nothing Nothing) e getIdAttribute _ = Nothing - hush :: Either a b -> Maybe b - hush = either (const Nothing) Just +hush :: Either a b -> Maybe b +hush = either (const Nothing) Just makeSlideIdMap :: Presentation -> M.Map SlideId Int makeSlideIdMap (Presentation _ slides) = @@ -1695,11 +1692,14 @@ slideToFilePath slide = do idNum <- slideNum slide return $ "slide" <> show idNum <> ".xml" -slideToRelId :: PandocMonad m => Slide -> P m T.Text -slideToRelId slide = do +slideToRelId :: + PandocMonad m => + MinimumRId -> + Slide -> + P m T.Text +slideToRelId minSlideRId slide = do n <- slideNum slide - offset <- asks envSlideIdOffset - return $ "rId" <> tshow (n + offset) + return $ "rId" <> tshow (n + minSlideRId - 1) data Relationship = Relationship { relId :: Int @@ -1718,19 +1718,18 @@ elementToRel element return $ Relationship num type' (T.unpack target) | otherwise = Nothing -slideToPresRel :: PandocMonad m => Slide -> P m Relationship -slideToPresRel slide = do +slideToPresRel :: PandocMonad m => Int -> Slide -> P m Relationship +slideToPresRel minimumSlideRId slide = do idNum <- slideNum slide - n <- asks envSlideIdOffset - let rId = idNum + n + let rId = idNum + minimumSlideRId - 1 fp = "slides/" <> idNumToFilePath idNum return $ Relationship { relId = rId , relType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/slide" , relTarget = fp } -getRels :: PandocMonad m => P m [Relationship] -getRels = do +getPresentationRels :: PandocMonad m => P m [Relationship] +getPresentationRels = do refArchive <- asks envRefArchive distArchive <- asks envDistArchive relsElem <- parseXml refArchive distArchive "ppt/_rels/presentation.xml.rels" @@ -1738,42 +1737,77 @@ getRels = do let relElems = findChildren (QName "Relationship" (Just globalNS) Nothing) relsElem return $ mapMaybe elementToRel relElems -presentationToRels :: PandocMonad m => Presentation -> P m [Relationship] +-- | Info required to update a presentation rId from the reference doc for the +-- output. +type PresentationRIdUpdateData = (ReferenceMinRIdAfterSlides, NewRIdBounds) + +-- | The minimum and maximum rIds for presentation relationships created from +-- the presentation content (as opposed to from the reference doc). +-- +-- Relationships taken from the reference doc should have their rId number +-- adjusted to make sure it sits outside this range. +type NewRIdBounds = (MinimumRId, MaximumRId) + +-- | The minimum presentation rId from the reference doc which comes after the +-- first slide rId (in the reference doc). +type ReferenceMinRIdAfterSlides = Int +type MinimumRId = Int +type MaximumRId = Int + +-- | Given a presentation rId from the reference doc, return the value it should +-- have in the output. +updatePresentationRId :: PresentationRIdUpdateData -> Int -> Int +updatePresentationRId (minOverlappingRId, (minNewId, maxNewId)) n + | n < minNewId = n + | otherwise = n - minOverlappingRId + maxNewId + 1 + +presentationToRels :: + PandocMonad m => + Presentation -> + P m (PresentationRIdUpdateData, [Relationship]) presentationToRels pres@(Presentation _ slides) = do - mySlideRels <- mapM slideToPresRel slides - let notesMasterRels = - [Relationship { relId = length mySlideRels + 2 - , relType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/notesMaster" - , relTarget = "notesMasters/notesMaster1.xml" - } | presHasSpeakerNotes pres] - insertedRels = mySlideRels <> notesMasterRels - rels <- getRels - -- we remove the slide rels and the notesmaster (if it's - -- there). We'll put these back in ourselves, if necessary. - let relsWeKeep = filter + rels <- getPresentationRels + + -- We want to make room for the slides in the id space. We'll assume the slide + -- masters come first (this seems to be what PowerPoint does by default, and + -- is true of the reference doc), and we'll put the slides next. So we find + -- the starting rId for the slides by finding the maximum rId for the masters + -- and adding 1. + -- + -- Then: + -- 1. We look to see what the minimum rId which is greater than or equal to + -- the minimum slide rId is, in the rels we're keeping from the reference + -- doc (i.e. the minimum rId which might overlap with the slides). + -- 2. We increase this minimum overlapping rId to 1 higher than the last slide + -- rId (or the notesMaster rel, if we're including one), and increase all + -- rIds higher than this minimum by the same amount. + + let masterRels = filter (T.isSuffixOf "slideMaster" . relType) rels + slideStartId = maybe 1 ((+ 1) . maximum . fmap relId) (nonEmpty masterRels) + -- we remove the slide rels and the notesmaster (if it's + -- there). We'll put these back in ourselves, if necessary. + relsWeKeep = filter (\r -> relType r /= "http://schemas.openxmlformats.org/officeDocument/2006/relationships/slide" && relType r /= "http://schemas.openxmlformats.org/officeDocument/2006/relationships/notesMaster") rels - -- We want to make room for the slides in the id space. The slides - -- will start at Id2 (since Id1 is for the slide master). There are - -- two slides in the data file, but that might change in the future, - -- so we will do this: - -- - -- 1. We look to see what the minimum relWithoutSlide id (greater than 1) is. - -- 2. We add the difference between this and the number of slides to - -- all relWithoutSlide rels (unless they're 1) - -- 3. If we have a notesmaster slide, we make space for that as well. + minOverlappingRel = maybe 0 minimum + (nonEmpty (filter (slideStartId <=) + (relId <$> relsWeKeep))) - let minRelNotOne = maybe 0 minimum $ nonEmpty - $ filter (1 <) $ map relId relsWeKeep + mySlideRels <- mapM (slideToPresRel slideStartId) slides - modifyRelNum :: Int -> Int - modifyRelNum 1 = 1 - modifyRelNum n = n - minRelNotOne + 2 + length insertedRels + let notesMasterRels = + [Relationship { relId = slideStartId + length mySlideRels + , relType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/notesMaster" + , relTarget = "notesMasters/notesMaster1.xml" + } | presHasSpeakerNotes pres] + insertedRels = mySlideRels <> notesMasterRels + newRIdBounds = (slideStartId, slideStartId + length insertedRels - 1) + updateRId = updatePresentationRId (minOverlappingRel, newRIdBounds) - relsWeKeep' = map (\r -> r{relId = modifyRelNum $ relId r}) relsWeKeep + relsWeKeep' = map (\r -> r{relId = updateRId $ relId r}) relsWeKeep - return $ insertedRels <> relsWeKeep' + return ((minOverlappingRel, newRIdBounds), insertedRels <> relsWeKeep') -- We make this ourselves, in case there's a thumbnail in the one from -- the template. @@ -1810,10 +1844,14 @@ relsToElement rels = mknode "Relationships" [("xmlns", "http://schemas.openxmlformats.org/package/2006/relationships")] (map relToElement rels) -presentationToRelsEntry :: PandocMonad m => Presentation -> P m Entry +presentationToRelsEntry :: + PandocMonad m => + Presentation -> + P m (PresentationRIdUpdateData, Entry) presentationToRelsEntry pres = do - rels <- presentationToRels pres - elemToEntry "ppt/_rels/presentation.xml.rels" $ relsToElement rels + (presentationRIdUpdateData, rels) <- presentationToRels pres + element <- elemToEntry "ppt/_rels/presentation.xml.rels" $ relsToElement rels + pure (presentationRIdUpdateData, element) elemToEntry :: PandocMonad m => FilePath -> Element -> P m Entry elemToEntry fp element = do @@ -1959,24 +1997,37 @@ slideToSlideRelElement slide = do , ("Target", target)] () ] <> speakerNotesRels <> linkRels <> mediaRels) -slideToSldIdElement :: PandocMonad m => Slide -> P m Element -slideToSldIdElement slide = do +slideToSldIdElement :: + PandocMonad m => + MinimumRId -> + Slide -> + P m Element +slideToSldIdElement minimumSlideRId slide = do n <- slideNum slide let id' = tshow $ n + 255 - rId <- slideToRelId slide + rId <- slideToRelId minimumSlideRId slide return $ mknode "p:sldId" [("id", id'), ("r:id", rId)] () -presentationToSldIdLst :: PandocMonad m => Presentation -> P m Element -presentationToSldIdLst (Presentation _ slides) = do - ids <- mapM slideToSldIdElement slides +presentationToSldIdLst :: + PandocMonad m => + MinimumRId -> + Presentation -> + P m Element +presentationToSldIdLst minimumSlideRId (Presentation _ slides) = do + ids <- mapM (slideToSldIdElement minimumSlideRId) slides return $ mknode "p:sldIdLst" [] ids -presentationToPresentationElement :: PandocMonad m => Presentation -> P m Element -presentationToPresentationElement pres@(Presentation _ slds) = do +presentationToPresentationElement :: + PandocMonad m => + PresentationRIdUpdateData -> + Presentation -> + P m Element +presentationToPresentationElement presentationUpdateRIdData pres = do + let (_, (minSlideRId, maxSlideRId)) = presentationUpdateRIdData refArchive <- asks envRefArchive distArchive <- asks envDistArchive element <- parseXml refArchive distArchive "ppt/presentation.xml" - sldIdLst <- presentationToSldIdLst pres + sldIdLst <- presentationToSldIdLst minSlideRId pres let modifySldIdLst :: Content -> Content modifySldIdLst (Elem e) = case elName e of @@ -1984,7 +2035,7 @@ presentationToPresentationElement pres@(Presentation _ slds) = do _ -> Elem e modifySldIdLst ct = ct - notesMasterRId = length slds + 2 + notesMasterRId = maxSlideRId notesMasterElem = mknode "p:notesMasterIdLst" [] [ mknode @@ -2019,16 +2070,33 @@ presentationToPresentationElement pres@(Presentation _ slds) = do then concatMap insertNotesMaster' else id + updateRIds :: Content -> Content + updateRIds (Elem el) = + Elem (el { elAttribs = fmap updateRIdAttribute (elAttribs el) + , elContent = fmap updateRIds (elContent el) + }) + updateRIds content = content + + updateRIdAttribute :: XML.Attr -> XML.Attr + updateRIdAttribute attr = fromMaybe attr $ do + (oldValue, _) <- case attrKey attr of + QName "id" _ (Just "r") -> + T.stripPrefix "rId" (attrVal attr) >>= (hush . decimal) + _ -> Nothing + let newValue = updatePresentationRId presentationUpdateRIdData oldValue + pure attr {attrVal = "rId" <> T.pack (show newValue)} + newContent = insertNotesMaster $ removeUnwantedMaster $ - map modifySldIdLst $ + (modifySldIdLst . updateRIds) <$> elContent element return $ element{elContent = newContent} -presentationToPresEntry :: PandocMonad m => Presentation -> P m Entry -presentationToPresEntry pres = presentationToPresentationElement pres >>= - elemToEntry "ppt/presentation.xml" +presentationToPresEntry :: PandocMonad m => PresentationRIdUpdateData -> Presentation -> P m Entry +presentationToPresEntry presentationRIdUpdateData pres = + presentationToPresentationElement presentationRIdUpdateData pres >>= + elemToEntry "ppt/presentation.xml" -- adapted from the Docx writer docPropsElement :: PandocMonad m => DocProps -> P m Element -- cgit v1.2.3 From 1dba1e6dc881e606beae6323e6cab74db5153bd0 Mon Sep 17 00:00:00 2001 From: Emily Bourke Date: Fri, 3 Sep 2021 15:19:25 +0100 Subject: pptx: Copy embedded fonts from reference doc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We already copy the relationships and elements in presentation.xml for embedded fonts, so at the moment using a reference doc with embedded fonts is broken, producing a pptx that PowerPoint says needs repairing. This commit copies the fonts over, which I believe is all that’s needed to work correctly with reference docs with embedded fonts. --- src/Text/Pandoc/Writers/Powerpoint/Output.hs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Text/Pandoc/Writers/Powerpoint/Output.hs b/src/Text/Pandoc/Writers/Powerpoint/Output.hs index d86ab32bc..14cd82fdf 100644 --- a/src/Text/Pandoc/Writers/Powerpoint/Output.hs +++ b/src/Text/Pandoc/Writers/Powerpoint/Output.hs @@ -242,6 +242,7 @@ alwaysInheritedPatterns = , "ppt/presProps.xml" , "ppt/tableStyles.xml" , "ppt/media/image*" + , "ppt/fonts/*" ] -- We only look for these under special conditions -- cgit v1.2.3 From 6aa1087b97466bd733e10c8e826c522e6acf874b Mon Sep 17 00:00:00 2001 From: Kolen Cheung Date: Fri, 10 Sep 2021 18:33:03 -0700 Subject: fix!: rst mime type BREAKING CHANGE: fix rst mime type according to https://docutils.sourceforge.io/FAQ.html --- src/Text/Pandoc/Readers/Ipynb.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Text/Pandoc/Readers/Ipynb.hs b/src/Text/Pandoc/Readers/Ipynb.hs index 9d46111c3..dc2c61f56 100644 --- a/src/Text/Pandoc/Readers/Ipynb.hs +++ b/src/Text/Pandoc/Readers/Ipynb.hs @@ -101,7 +101,7 @@ cellToBlocks opts lang c = do "text/latex" -> "latex" "application/pdf" -> "latex" "text/markdown" -> "markdown" - "text/x-rsrt" -> "rst" + "text/x-rst" -> "rst" _ -> format return $ B.divWith ("",["cell","raw"],kvs) $ B.rawBlock format' source Ipynb.Code{ codeOutputs = outputs, codeExecutionCount = ec } -> do -- cgit v1.2.3 From e6bf1626d2088d95827e8cce43fddd6bbd422e74 Mon Sep 17 00:00:00 2001 From: Kolen Cheung Date: Fri, 10 Sep 2021 18:33:24 -0700 Subject: feat(ipynb reader): add more Jupyter's "Raw NBConvert Format" This adds most of the available formats selectable from Jupyter's interface "Raw NBConvert Format". --- src/Text/Pandoc/Readers/Ipynb.hs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/Text/Pandoc/Readers/Ipynb.hs b/src/Text/Pandoc/Readers/Ipynb.hs index dc2c61f56..dbb58fbe5 100644 --- a/src/Text/Pandoc/Readers/Ipynb.hs +++ b/src/Text/Pandoc/Readers/Ipynb.hs @@ -97,12 +97,16 @@ cellToBlocks opts lang c = do let format = fromMaybe "ipynb" $ lookup "format" kvs let format' = case format of - "text/html" -> "html" - "text/latex" -> "latex" - "application/pdf" -> "latex" - "text/markdown" -> "markdown" - "text/x-rst" -> "rst" - _ -> format + "text/html" -> "html" + "slides" -> "html" + "text/latex" -> "latex" + "application/pdf" -> "latex" + "pdf" -> "latex" + "text/markdown" -> "markdown" + "text/x-rst" -> "rst" + "text/restructuredtext" -> "rst" + "text/asciidoc" -> "asciidoc" + _ -> format return $ B.divWith ("",["cell","raw"],kvs) $ B.rawBlock format' source Ipynb.Code{ codeOutputs = outputs, codeExecutionCount = ec } -> do outputBlocks <- mconcat <$> mapM outputToBlock outputs -- cgit v1.2.3 From 3483a54c72b4ebe9de0e7aea5b3168f65b24d958 Mon Sep 17 00:00:00 2001 From: Kolen Cheung Date: Fri, 10 Sep 2021 18:34:26 -0700 Subject: feat(ipynb reader): get cell output mime from raw_mimetype too While the spec defined format, in practice raw_mimetype is used. See jupyter/nbformat#229 --- src/Text/Pandoc/Readers/Ipynb.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Text/Pandoc/Readers/Ipynb.hs b/src/Text/Pandoc/Readers/Ipynb.hs index dbb58fbe5..e6de29b44 100644 --- a/src/Text/Pandoc/Readers/Ipynb.hs +++ b/src/Text/Pandoc/Readers/Ipynb.hs @@ -19,6 +19,7 @@ import Data.Char (isDigit) import Data.Maybe (fromMaybe) import Data.Digest.Pure.SHA (sha1, showDigest) import Text.Pandoc.Options +import Control.Applicative ((<|>)) import qualified Data.Scientific as Scientific import qualified Text.Pandoc.Builder as B import Text.Pandoc.Logging @@ -94,7 +95,7 @@ cellToBlocks opts lang c = do $ B.fromList bs Ipynb.Raw -> do -- we use ipynb to indicate no format given (a wildcard in nbformat) - let format = fromMaybe "ipynb" $ lookup "format" kvs + let format = fromMaybe "ipynb" $ lookup "raw_mimetype" kvs <|> lookup "format" kvs let format' = case format of "text/html" -> "html" -- cgit v1.2.3 From 17092454c5ba0e16f26b8787e6a9b9c8a35b7b67 Mon Sep 17 00:00:00 2001 From: Kolen Cheung Date: Fri, 10 Sep 2021 18:34:45 -0700 Subject: feat(ipynb writer): add more Jupyter's "Raw NBConvert Format" Adds more formats that Jupyter's "Raw NBConvert Format" uses natively (asciidoc), and maps more formats to text/html whenever it makes sense. --- src/Text/Pandoc/Writers/Ipynb.hs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Text/Pandoc/Writers/Ipynb.hs b/src/Text/Pandoc/Writers/Ipynb.hs index 2613851c5..3c3bdb3a5 100644 --- a/src/Text/Pandoc/Writers/Ipynb.hs +++ b/src/Text/Pandoc/Writers/Ipynb.hs @@ -138,10 +138,17 @@ extractCells opts (Div (_id,classes,kvs) xs : bs) let format' = case T.toLower f of "html" -> "text/html" + "html4" -> "text/html" + "html5" -> "text/html" + "s5" -> "text/html" + "slidy" -> "text/html" + "slideous" -> "text/html" + "dzslides" -> "text/html" "revealjs" -> "text/html" "latex" -> "text/latex" "markdown" -> "text/markdown" "rst" -> "text/x-rst" + "asciidoc" -> "text/asciidoc" _ -> f (Ipynb.Cell{ cellType = Raw -- cgit v1.2.3 From c66cedaa7137f1f731677b13e4b883be02573b9e Mon Sep 17 00:00:00 2001 From: Kolen Cheung Date: Fri, 10 Sep 2021 18:35:22 -0700 Subject: fix!(ipynb writer): improve round trip identity for raw cell output BREAKING CHANGE: The Jupyter ecosystem, including nbconvert, lab and notebook, deviated from their own spec in nbformat, where they used the key `raw_mimetype` instead of `format`. Moreover, the mime-type of rst used in Jupyter deviated from that suggested by https://docutils.sourceforge.io/FAQ.html and is defined as `text/restructuredtext` when chosen from "Raw NBConvert Format" in Jupyter. So while this is backward-compatible, it should matches the real world usage better, hence improving the round-trip "identity" in raw-cell. See #229, jupyter/nbformat#229. --- src/Text/Pandoc/Writers/Ipynb.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Text/Pandoc/Writers/Ipynb.hs b/src/Text/Pandoc/Writers/Ipynb.hs index 3c3bdb3a5..30ef100ad 100644 --- a/src/Text/Pandoc/Writers/Ipynb.hs +++ b/src/Text/Pandoc/Writers/Ipynb.hs @@ -147,7 +147,7 @@ extractCells opts (Div (_id,classes,kvs) xs : bs) "revealjs" -> "text/html" "latex" -> "text/latex" "markdown" -> "text/markdown" - "rst" -> "text/x-rst" + "rst" -> "text/restructuredtext" "asciidoc" -> "text/asciidoc" _ -> f (Ipynb.Cell{ @@ -155,7 +155,7 @@ extractCells opts (Div (_id,classes,kvs) xs : bs) , cellSource = Source $ breakLines raw , cellMetadata = if format' == "ipynb" -- means no format given then mempty - else M.insert "format" + else M.insert "raw_mimetype" (Aeson.String format') mempty , cellAttachments = Nothing } :) <$> extractCells opts bs _ -> extractCells opts bs -- cgit v1.2.3 From 84b5c55448cbbfc4b8d9433d61d46b57a1ba5876 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Fri, 10 Sep 2021 17:06:54 -0700 Subject: Use latest dev citeproc. --- cabal.project | 2 +- stack.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cabal.project b/cabal.project index 55026979e..7256c16ec 100644 --- a/cabal.project +++ b/cabal.project @@ -5,5 +5,5 @@ flags: +embed_data_files source-repository-package type: git location: https://github.com/jgm/citeproc.git - tag: 59e98e8d1e13ddb53bef9f90adbd1c64652f0173 + tag: b27201c3ac48ffd2853f77152df19b6e2cf36987 diff --git a/stack.yaml b/stack.yaml index 9b73f2bd1..e93b6b0a7 100644 --- a/stack.yaml +++ b/stack.yaml @@ -14,7 +14,7 @@ extra-deps: - doctemplates-0.10 - texmath-0.12.3.1 - git: https://github.com/jgm/citeproc.git - commit: 59e98e8d1e13ddb53bef9f90adbd1c64652f0173 + commit: b27201c3ac48ffd2853f77152df19b6e2cf36987 ghc-options: "$locals": -fhide-source-paths -Wno-missing-home-modules resolver: lts-18.0 -- cgit v1.2.3 From d43f9cf4146400721cf8dca15a411c2ecc1342fb Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sun, 12 Sep 2021 11:10:05 -0700 Subject: Add note to Security section that commonmark is better... than markdown as far as pathological performance goes. --- MANUAL.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/MANUAL.txt b/MANUAL.txt index f0d3c8965..b65e45bfe 100644 --- a/MANUAL.txt +++ b/MANUAL.txt @@ -6624,7 +6624,10 @@ application, here are some things to keep in mind: a timeout, to avoid DOS attacks that exploit these issues. If you are using the pandoc executable, you can add the command line options `+RTS -M512M -RTS` (for example) to limit - the heap size to 512MB. + the heap size to 512MB. Note that the `commonmark` parser + (including `commonmark_x` and `gfm`) is much less vulnerable + to pathological performance than the `markdown` parser, so + it is a better choice when processing untrusted input. 6. The HTML generated by pandoc is not guaranteed to be safe. If `raw_html` is enabled for the Markdown input, users can -- cgit v1.2.3 From 6271b09c50444b107d8595f553700fa382718246 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sun, 12 Sep 2021 15:30:29 -0700 Subject: Docx writer: make id used in native_numbering predictable. If the image has the id IMAGEID, then we use the id ref_IMAGEID for the figure number. Closes #7551. This allows one to create a filter that adds a figure number with figure name, e.g. Figure X For this to be possible it must be possible to predict the figure number id from the image id. If images lack an id, an id of the form `ref_fig1` is used. --- src/Text/Pandoc/Writers/Docx.hs | 9 ++++++--- test/docx/golden/image.docx | Bin 26811 -> 26816 bytes 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Text/Pandoc/Writers/Docx.hs b/src/Text/Pandoc/Writers/Docx.hs index 78d0840a4..686a2f662 100644 --- a/src/Text/Pandoc/Writers/Docx.hs +++ b/src/Text/Pandoc/Writers/Docx.hs @@ -854,11 +854,14 @@ blockToOpenXML' opts (Plain lst) = do then withParaProp prop block else block -- title beginning with fig: indicates that the image is a figure -blockToOpenXML' opts (Para [Image attr alt (src,T.stripPrefix "fig:" -> Just tit)]) = do +blockToOpenXML' opts (Para [Image attr@(imgident,_,_) alt + (src,T.stripPrefix "fig:" -> Just tit)]) = do setFirstPara fignum <- gets stNextFigureNum unless (null alt) $ modify $ \st -> st{ stNextFigureNum = fignum + 1 } - let figid = "fig" <> tshow fignum + let refid = if T.null imgident + then "ref_fig" <> tshow fignum + else "ref_" <> imgident figname <- translateTerm Term.Figure prop <- pStyleM $ if null alt @@ -872,7 +875,7 @@ blockToOpenXML' opts (Para [Image attr alt (src,T.stripPrefix "fig:" -> Just tit $ blockToOpenXML opts $ Para $ if isEnabled Ext_native_numbering opts - then Span (figid,[],[]) + then Span (refid,[],[]) [Str (figname <> "\160"), RawInline (Format "openxml") (" Date: Wed, 8 Sep 2021 14:05:22 +0100 Subject: pptx: Fix logic for choosing Comparison layout There was a mistake in the logic used to choose between the Comparison and Two Content layouts: if one column contained only non-text (an image or a table) and the other contained only text, the Comparison layout was chosen instead of the desired Two Content layout. This commit fixes that logic: > If either column contains text followed by non-text, use Comparison. Otherwise, use Two Content. It also adds a test asserting this behaviour. --- pandoc.cabal | 6 ++++-- src/Text/Pandoc/Writers/Powerpoint/Presentation.hs | 9 +++++---- test/Tests/Writers/Powerpoint.hs | 8 ++++++-- test/pptx/two-column/all-text/deleted-layouts.pptx | Bin 0 -> 30568 bytes test/pptx/two-column/all-text/input.native | 9 +++++++++ test/pptx/two-column/all-text/moved-layouts.pptx | Bin 0 -> 41256 bytes test/pptx/two-column/all-text/output.pptx | Bin 0 -> 27689 bytes test/pptx/two-column/all-text/templated.pptx | Bin 0 -> 40756 bytes test/pptx/two-column/deleted-layouts.pptx | Bin 30568 -> 0 bytes test/pptx/two-column/input.native | 9 --------- test/pptx/two-column/moved-layouts.pptx | Bin 41256 -> 0 bytes test/pptx/two-column/output.pptx | Bin 27689 -> 0 bytes test/pptx/two-column/templated.pptx | Bin 40756 -> 0 bytes .../pptx/two-column/text-and-image/deleted-layouts.pptx | Bin 0 -> 48392 bytes test/pptx/two-column/text-and-image/input.native | 12 ++++++++++++ test/pptx/two-column/text-and-image/moved-layouts.pptx | Bin 0 -> 59086 bytes test/pptx/two-column/text-and-image/output.pptx | Bin 0 -> 45520 bytes test/pptx/two-column/text-and-image/templated.pptx | Bin 0 -> 58586 bytes 18 files changed, 36 insertions(+), 17 deletions(-) create mode 100644 test/pptx/two-column/all-text/deleted-layouts.pptx create mode 100644 test/pptx/two-column/all-text/input.native create mode 100644 test/pptx/two-column/all-text/moved-layouts.pptx create mode 100644 test/pptx/two-column/all-text/output.pptx create mode 100644 test/pptx/two-column/all-text/templated.pptx delete mode 100644 test/pptx/two-column/deleted-layouts.pptx delete mode 100644 test/pptx/two-column/input.native delete mode 100644 test/pptx/two-column/moved-layouts.pptx delete mode 100644 test/pptx/two-column/output.pptx delete mode 100644 test/pptx/two-column/templated.pptx create mode 100644 test/pptx/two-column/text-and-image/deleted-layouts.pptx create mode 100644 test/pptx/two-column/text-and-image/input.native create mode 100644 test/pptx/two-column/text-and-image/moved-layouts.pptx create mode 100644 test/pptx/two-column/text-and-image/output.pptx create mode 100644 test/pptx/two-column/text-and-image/templated.pptx diff --git a/pandoc.cabal b/pandoc.cabal index 3de7da39c..347c33d51 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -446,8 +446,10 @@ extra-source-files: test/pptx/start-numbering-at/*.pptx test/pptx/tables/input.native test/pptx/tables/*.pptx - test/pptx/two-column/input.native - test/pptx/two-column/*.pptx + test/pptx/two-column/all-text/input.native + test/pptx/two-column/all-text/*.pptx + test/pptx/two-column/text-and-image/input.native + test/pptx/two-column/text-and-image/*.pptx test/ipynb/*.in.native test/ipynb/*.out.native test/ipynb/*.ipynb diff --git a/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs b/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs index 10060d975..015e2cbdd 100644 --- a/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs +++ b/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs @@ -696,10 +696,11 @@ bodyBlocksToSlide _ (blk : blks) spkNotes sldId (ComparisonSlide [] (shapesL1, shapesL2) (shapesR1, shapesR2)) spkNotes - case (break notText blksL, break notText blksR) of - ((_, []), (_, [])) -> mkTwoColumn blksL blksR - (([], _), ([], _)) -> mkTwoColumn blksL blksR - ((blksL1, blksL2), (blksR1, blksR2)) -> mkComparison blksL1 blksL2 blksR1 blksR2 + let (blksL1, blksL2) = break notText blksL + (blksR1, blksR2) = break notText blksR + if (any null [blksL1, blksL2]) && (any null [blksR1, blksR2]) + then mkTwoColumn blksL blksR + else mkComparison blksL1 blksL2 blksR1 blksR2 bodyBlocksToSlide _ (blk : blks) spkNotes = do sldId <- asks envCurSlideId inNoteSlide <- asks envInNoteSlide diff --git a/test/Tests/Writers/Powerpoint.hs b/test/Tests/Writers/Powerpoint.hs index 256ee1f7f..dd3846fef 100644 --- a/test/Tests/Writers/Powerpoint.hs +++ b/test/Tests/Writers/Powerpoint.hs @@ -103,8 +103,12 @@ tests = groupPptxTests [ pptxTests "Inline formatting" "pptx/images/output.pptx" , pptxTests "two-column layout" def - "pptx/two-column/input.native" - "pptx/two-column/output.pptx" + "pptx/two-column/all-text/input.native" + "pptx/two-column/all-text/output.pptx" + , pptxTests "two-column (not comparison)" + def + "pptx/two-column/text-and-image/input.native" + "pptx/two-column/text-and-image/output.pptx" , pptxTests "speaker notes" def "pptx/speaker-notes/input.native" diff --git a/test/pptx/two-column/all-text/deleted-layouts.pptx b/test/pptx/two-column/all-text/deleted-layouts.pptx new file mode 100644 index 000000000..1d7bd87d3 Binary files /dev/null and b/test/pptx/two-column/all-text/deleted-layouts.pptx differ diff --git a/test/pptx/two-column/all-text/input.native b/test/pptx/two-column/all-text/input.native new file mode 100644 index 000000000..086f74889 --- /dev/null +++ b/test/pptx/two-column/all-text/input.native @@ -0,0 +1,9 @@ +Pandoc (Meta {unMeta = fromList []}) +[Header 1 ("two-column-layout",[],[]) [Str "Two-Column",Space,Str "Layout"] +,Div ("",["columns"],[]) + [Div ("",["column"],[]) + [Para [Str "One",Space,Str "paragraph."] + ,Para [Str "Another",Space,Str "paragraph."]] + ,Div ("",["column"],[]) + [Para [Str "Second",Space,Str "column",Space,Str "paragraph."] + ,Para [Str "Another",Space,Str "second",Space,Str "paragraph."]]]] diff --git a/test/pptx/two-column/all-text/moved-layouts.pptx b/test/pptx/two-column/all-text/moved-layouts.pptx new file mode 100644 index 000000000..71760268c Binary files /dev/null and b/test/pptx/two-column/all-text/moved-layouts.pptx differ diff --git a/test/pptx/two-column/all-text/output.pptx b/test/pptx/two-column/all-text/output.pptx new file mode 100644 index 000000000..396dc2a74 Binary files /dev/null and b/test/pptx/two-column/all-text/output.pptx differ diff --git a/test/pptx/two-column/all-text/templated.pptx b/test/pptx/two-column/all-text/templated.pptx new file mode 100644 index 000000000..8901695b1 Binary files /dev/null and b/test/pptx/two-column/all-text/templated.pptx differ diff --git a/test/pptx/two-column/deleted-layouts.pptx b/test/pptx/two-column/deleted-layouts.pptx deleted file mode 100644 index 1d7bd87d3..000000000 Binary files a/test/pptx/two-column/deleted-layouts.pptx and /dev/null differ diff --git a/test/pptx/two-column/input.native b/test/pptx/two-column/input.native deleted file mode 100644 index 086f74889..000000000 --- a/test/pptx/two-column/input.native +++ /dev/null @@ -1,9 +0,0 @@ -Pandoc (Meta {unMeta = fromList []}) -[Header 1 ("two-column-layout",[],[]) [Str "Two-Column",Space,Str "Layout"] -,Div ("",["columns"],[]) - [Div ("",["column"],[]) - [Para [Str "One",Space,Str "paragraph."] - ,Para [Str "Another",Space,Str "paragraph."]] - ,Div ("",["column"],[]) - [Para [Str "Second",Space,Str "column",Space,Str "paragraph."] - ,Para [Str "Another",Space,Str "second",Space,Str "paragraph."]]]] diff --git a/test/pptx/two-column/moved-layouts.pptx b/test/pptx/two-column/moved-layouts.pptx deleted file mode 100644 index 71760268c..000000000 Binary files a/test/pptx/two-column/moved-layouts.pptx and /dev/null differ diff --git a/test/pptx/two-column/output.pptx b/test/pptx/two-column/output.pptx deleted file mode 100644 index 396dc2a74..000000000 Binary files a/test/pptx/two-column/output.pptx and /dev/null differ diff --git a/test/pptx/two-column/templated.pptx b/test/pptx/two-column/templated.pptx deleted file mode 100644 index 8901695b1..000000000 Binary files a/test/pptx/two-column/templated.pptx and /dev/null differ diff --git a/test/pptx/two-column/text-and-image/deleted-layouts.pptx b/test/pptx/two-column/text-and-image/deleted-layouts.pptx new file mode 100644 index 000000000..297fd6bad Binary files /dev/null and b/test/pptx/two-column/text-and-image/deleted-layouts.pptx differ diff --git a/test/pptx/two-column/text-and-image/input.native b/test/pptx/two-column/text-and-image/input.native new file mode 100644 index 000000000..796c2c7f4 --- /dev/null +++ b/test/pptx/two-column/text-and-image/input.native @@ -0,0 +1,12 @@ +[Header 1 ("slide-1",[],[]) [Str "Slide",Space,Str "1"] +,Div ("",["columns"],[]) + [Div ("",["column"],[]) + [Para [Image ("",[],[]) [Str "an",Space,Str "image"] ("lalune.jpg","fig:")]] + ,Div ("",["column"],[]) + [Para [Str "This",Space,Str "should",Space,Str "use",Space,Str "Two",Space,Str "Content,",Space,Emph [Str "not"],Space,Str "Comparison!"]]] +,Header 1 ("slide-2",[],[]) [Str "Slide",Space,Str "2"] +,Div ("",["columns"],[]) + [Div ("",["column"],[]) + [Para [Str "This",Space,Str "should",Space,Str "also",Space,Str "use",Space,Str "Two",Space,Str "Content"]] + ,Div ("",["column"],[]) + [Para [Image ("",[],[]) [Str "an",Space,Str "image"] ("lalune.jpg","fig:")]]]] diff --git a/test/pptx/two-column/text-and-image/moved-layouts.pptx b/test/pptx/two-column/text-and-image/moved-layouts.pptx new file mode 100644 index 000000000..c9a6e577e Binary files /dev/null and b/test/pptx/two-column/text-and-image/moved-layouts.pptx differ diff --git a/test/pptx/two-column/text-and-image/output.pptx b/test/pptx/two-column/text-and-image/output.pptx new file mode 100644 index 000000000..bfd532ed9 Binary files /dev/null and b/test/pptx/two-column/text-and-image/output.pptx differ diff --git a/test/pptx/two-column/text-and-image/templated.pptx b/test/pptx/two-column/text-and-image/templated.pptx new file mode 100644 index 000000000..23e6b283f Binary files /dev/null and b/test/pptx/two-column/text-and-image/templated.pptx differ -- cgit v1.2.3 From 7b863ba04ef6b995e15d197f81af1421e33772a5 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Mon, 13 Sep 2021 22:36:09 -0700 Subject: Modernize quick-cabal Makefile target --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 47acb80dd..58dc8c9c6 100644 --- a/Makefile +++ b/Makefile @@ -25,9 +25,8 @@ quick: stack install --ghc-options='$(GHCOPTS)' --install-ghc --flag 'pandoc:embed_data_files' --fast --test --ghc-options='$(GHCOPTS)' --test-arguments='-j4 --hide-successes --ansi-tricks=false $(TESTARGS)' quick-cabal: - cabal v2-configure . --ghc-options '$(GHCOPTS)' --disable-optimization --enable-tests - cabal v2-build -j4 . --disable-optimization - cabal v2-run test-pandoc --disable-optimization -- --hide-successes --ansi-tricks=false $(TESTARGS) + cabal v2-build -j8 --ghc-options '$(GHCOPTS)' --disable-optimization --enable-tests + cabal v2-test --hide-successes --ansi-tricks=false $(TESTARGS) full-cabal: cabal v2-configure . --ghc-options '$(GHCOPTS)' --flags '+embed_data_files +trypandoc' --enable-tests --enable-benchmarks -- cgit v1.2.3 From b34dc28926c11701f61e91e6f64244b438e8f701 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Mon, 13 Sep 2021 22:36:14 -0700 Subject: Use latest dev version of texmath. --- cabal.project | 5 +++++ stack.yaml | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/cabal.project b/cabal.project index 7256c16ec..7c94a74af 100644 --- a/cabal.project +++ b/cabal.project @@ -7,3 +7,8 @@ source-repository-package location: https://github.com/jgm/citeproc.git tag: b27201c3ac48ffd2853f77152df19b6e2cf36987 +source-repository-package + type: git + location: https://github.com/jgm/texmath.git + tag: 19700530733707284bb41f24add757f19ca23430 + diff --git a/stack.yaml b/stack.yaml index e93b6b0a7..90735215e 100644 --- a/stack.yaml +++ b/stack.yaml @@ -12,7 +12,8 @@ extra-deps: - skylighting-core-0.11 - skylighting-0.11 - doctemplates-0.10 -- texmath-0.12.3.1 +- git: https://github.com/jgm/texmath.git + commit: 19700530733707284bb41f24add757f19ca23430 - git: https://github.com/jgm/citeproc.git commit: b27201c3ac48ffd2853f77152df19b6e2cf36987 ghc-options: -- cgit v1.2.3 From a3162d341b2937113514b5f515cbc86141fbfcf2 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Mon, 13 Sep 2021 22:57:08 -0700 Subject: RST reader: handle escaped colons in reference definitions. Cloess #7568. --- src/Text/Pandoc/Readers/RST.hs | 3 ++- test/command/7568.md | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 test/command/7568.md diff --git a/src/Text/Pandoc/Readers/RST.hs b/src/Text/Pandoc/Readers/RST.hs index ff891d3c6..458a2d48b 100644 --- a/src/Text/Pandoc/Readers/RST.hs +++ b/src/Text/Pandoc/Readers/RST.hs @@ -1155,10 +1155,11 @@ referenceNames = do let rn = try $ do string ".. _" ref <- quotedReferenceName - <|> manyChar ( noneOf ":\n" + <|> manyChar ( noneOf "\\:\n" <|> try (char '\n' <* string " " <* notFollowedBy blankline) + <|> try (char '\\' *> char ':') <|> try (char ':' <* lookAhead alphaNum) ) char ':' diff --git a/test/command/7568.md b/test/command/7568.md new file mode 100644 index 000000000..42f1e37b1 --- /dev/null +++ b/test/command/7568.md @@ -0,0 +1,11 @@ +``` +% pandoc -f rst +While `Labyrinth Lord: Revised Edition`_ (LLRE; PDF and POD) has been +criticized for not being a completely faithful retro-clone of the +Moldvay/Cook/Marsh Basic/Expert D&D rules (B/X), I think it still +holds a useful spot. + +.. _Labyrinth Lord\: Revised Edition: https://www.drivethrurpg.com/product/64332/Labyrinth-Lord-Revised-Edition +^D +

While Labyrinth Lord: Revised Edition (LLRE; PDF and POD) has been criticized for not being a completely faithful retro-clone of the Moldvay/Cook/Marsh Basic/Expert D&D rules (B/X), I think it still holds a useful spot.

+``` -- cgit v1.2.3 From 0fb6474a55427b52bf9aebd179f7b26f30c7dbaf Mon Sep 17 00:00:00 2001 From: Emily Bourke Date: Tue, 7 Sep 2021 13:38:47 +0100 Subject: pptx: Add support for incremental lists MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Support -i option - Support incremental/noincremental divs - Support older block quote syntax - Add tests One thing not clear from the manual is what should happen when the input uses a combination of these things. For example, what should the following produce? ```md ::: {.incremental .nonincremental} - are - these - incremental? ::: ::: incremental ::::: nonincremental - or - these? ::::: ::: ::: nonincremental > - how > - about > - these? ::: ``` In this commit I’ve taken the following approach, matching the observed behaviour for beamer and reveal.js output: - if a div with both classes, incremental wins - the innermost incremental/nonincremental div is the one which takes effect - a block quote containing a list as its first element inverts whether the list is incremental, whether or not the quote is inside an incremental/non-incremental div I’ve added some tests to verify this behaviour. This commit closes issue #5689 (https://github.com/jgm/pandoc/issues/5689). --- MANUAL.txt | 3 - pandoc.cabal | 4 + src/Text/Pandoc/Writers/Powerpoint/Output.hs | 566 +++++++++++++++------ src/Text/Pandoc/Writers/Powerpoint/Presentation.hs | 51 +- test/Tests/Writers/Powerpoint.hs | 8 + .../with-flag/deleted-layouts.pptx | Bin 0 -> 80172 bytes test/pptx/incremental-lists/with-flag/input.native | 139 +++++ .../incremental-lists/with-flag/moved-layouts.pptx | Bin 0 -> 90917 bytes test/pptx/incremental-lists/with-flag/output.pptx | Bin 0 -> 77298 bytes .../incremental-lists/with-flag/templated.pptx | Bin 0 -> 90414 bytes .../without-flag/deleted-layouts.pptx | Bin 0 -> 78405 bytes .../incremental-lists/without-flag/input.native | 137 +++++ .../without-flag/moved-layouts.pptx | Bin 0 -> 89148 bytes .../incremental-lists/without-flag/output.pptx | Bin 0 -> 75533 bytes .../incremental-lists/without-flag/templated.pptx | Bin 0 -> 88645 bytes 15 files changed, 743 insertions(+), 165 deletions(-) create mode 100644 test/pptx/incremental-lists/with-flag/deleted-layouts.pptx create mode 100644 test/pptx/incremental-lists/with-flag/input.native create mode 100644 test/pptx/incremental-lists/with-flag/moved-layouts.pptx create mode 100644 test/pptx/incremental-lists/with-flag/output.pptx create mode 100644 test/pptx/incremental-lists/with-flag/templated.pptx create mode 100644 test/pptx/incremental-lists/without-flag/deleted-layouts.pptx create mode 100644 test/pptx/incremental-lists/without-flag/input.native create mode 100644 test/pptx/incremental-lists/without-flag/moved-layouts.pptx create mode 100644 test/pptx/incremental-lists/without-flag/output.pptx create mode 100644 test/pptx/incremental-lists/without-flag/templated.pptx diff --git a/MANUAL.txt b/MANUAL.txt index b65e45bfe..82fc21684 100644 --- a/MANUAL.txt +++ b/MANUAL.txt @@ -5919,9 +5919,6 @@ option): Both methods allow incremental and nonincremental lists to be mixed in a single document. -Note: Neither the `-i/--incremental` option nor any of the -methods described here currently works for PowerPoint output. - ## Inserting pauses You can add "pauses" within a slide by including a paragraph containing diff --git a/pandoc.cabal b/pandoc.cabal index 347c33d51..6fcc384f9 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -414,6 +414,10 @@ extra-source-files: test/pptx/endnotes/*.pptx test/pptx/images/input.native test/pptx/images/*.pptx + test/pptx/incremental-lists/with-flag/input.native + test/pptx/incremental-lists/with-flag/*.pptx + test/pptx/incremental-lists/without-flag/input.native + test/pptx/incremental-lists/without-flag/*.pptx test/pptx/inline-formatting/input.native test/pptx/inline-formatting/*.pptx test/pptx/lists/input.native diff --git a/src/Text/Pandoc/Writers/Powerpoint/Output.hs b/src/Text/Pandoc/Writers/Powerpoint/Output.hs index 14cd82fdf..5eadf1312 100644 --- a/src/Text/Pandoc/Writers/Powerpoint/Output.hs +++ b/src/Text/Pandoc/Writers/Powerpoint/Output.hs @@ -1,7 +1,9 @@ {-# LANGUAGE DeriveTraversable #-} +{-# LANGUAGE NamedFieldPuns #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE PatternGuards #-} {-# LANGUAGE RecordWildCards #-} +{-# LANGUAGE TupleSections #-} {- | Module : Text.Pandoc.Writers.Powerpoint.Output Copyright : Copyright (C) 2017-2020 Jesse Rosenthal @@ -23,6 +25,7 @@ import Control.Monad.Reader import Control.Monad.State import Codec.Archive.Zip import Data.List (intercalate, stripPrefix, nub, union, isPrefixOf, intersperse) +import Data.Bifunctor (bimap) import Data.CaseInsensitive (CI) import qualified Data.CaseInsensitive as CI import Data.Default @@ -415,7 +418,7 @@ updateMasterElems layouts master masterRels = (updatedMaster, updatedMasterRels) maxIdNumber :: Element -> Integer maxIdNumber relationships = maximum (0 : idNumbers) where - idNumbers = fst <$> mapMaybe (hush . decimal . T.drop 3) idAttributes + idNumbers = mapMaybe (readTextAsInteger . T.drop 3) idAttributes idAttributes = mapMaybe getIdAttribute (elContent relationships) getIdAttribute (Elem e) = findAttr (QName "Id" Nothing Nothing) e getIdAttribute _ = Nothing @@ -423,14 +426,11 @@ updateMasterElems layouts master masterRels = (updatedMaster, updatedMasterRels) maxIdNumber' :: Element -> Integer maxIdNumber' sldLayouts = maximum (0 : idNumbers) where - idNumbers = fst <$> mapMaybe (hush . decimal) idAttributes + idNumbers = mapMaybe readTextAsInteger idAttributes idAttributes = mapMaybe getIdAttribute (elContent sldLayouts) getIdAttribute (Elem e) = findAttr (QName "id" Nothing Nothing) e getIdAttribute _ = Nothing -hush :: Either a b -> Maybe b -hush = either (const Nothing) Just - makeSlideIdMap :: Presentation -> M.Map SlideId Int makeSlideIdMap (Presentation _ slides) = M.fromList $ map slideId slides `zip` [1..] @@ -575,19 +575,24 @@ getLayout layout = getElement <$> getSlideLayouts BlankSlide{} -> blank shapeHasId :: NameSpaces -> T.Text -> Element -> Bool -shapeHasId ns ident element - | Just nvSpPr <- findChild (elemName ns "p" "nvSpPr") element - , Just cNvPr <- findChild (elemName ns "p" "cNvPr") nvSpPr - , Just nm <- findAttr (QName "id" Nothing Nothing) cNvPr = - nm == ident - | otherwise = False +shapeHasId ns ident element = getShapeId ns element == Just ident + +getShapeId :: NameSpaces -> Element -> Maybe Text +getShapeId ns element = do + nvSpPr <- findChild (elemName ns "p" "nvSpPr") element + cNvPr <- findChild (elemName ns "p" "cNvPr") nvSpPr + findAttr (QName "id" Nothing Nothing) cNvPr -getContentShape :: PandocMonad m => NameSpaces -> Element -> P m Element +type ShapeId = Integer + +getContentShape :: PandocMonad m => NameSpaces -> Element -> P m (Maybe ShapeId, Element) getContentShape ns spTreeElem | isElem ns "p" "spTree" spTreeElem = do - ph@Placeholder{..} <- asks envPlaceholder + ph@Placeholder{index, placeholderType} <- asks envPlaceholder case drop index (getShapesByPlaceHolderType ns spTreeElem placeholderType) of - sp : _ -> return sp + sp : _ -> let + shapeId = getShapeId ns sp >>= readTextAsInteger + in return (shapeId, sp) [] -> throwError $ PandocSomeError $ missingPlaceholderMessage ph getContentShape _ _ = throwError $ PandocSomeError "Attempted to find content on non shapeTree" @@ -651,7 +656,7 @@ getContentShapeSize ns layout master | isElem ns "p" "sldLayout" layout , Just cSld <- findChild (elemName ns "p" "cSld") layout , Just spTree <- findChild (elemName ns "p" "spTree") cSld = do - sp <- getContentShape ns spTree + (_, sp) <- getContentShape ns spTree case getShapeDimensions ns sp of Just sz -> return sz Nothing -> do let mbSz = @@ -873,33 +878,35 @@ captionHeight = 40 createCaption :: PandocMonad m => ((Integer, Integer), (Integer, Integer)) -> [ParaElem] - -> P m Element + -> P m (ShapeId, Element) createCaption contentShapeDimensions paraElements = do let para = Paragraph def{pPropAlign = Just AlgnCenter} paraElements elements <- mapM paragraphToElement [para] let ((x, y), (cx, cy)) = contentShapeDimensions let txBody = mknode "p:txBody" [] $ [mknode "a:bodyPr" [] (), mknode "a:lstStyle" [] ()] <> elements - return $ - mknode "p:sp" [] [ mknode "p:nvSpPr" [] - [ mknode "p:cNvPr" [("id","1"), ("name","TextBox 3")] () - , mknode "p:cNvSpPr" [("txBox", "1")] () - , mknode "p:nvPr" [] () - ] - , mknode "p:spPr" [] - [ mknode "a:xfrm" [] - [ mknode "a:off" [("x", tshow $ 12700 * x), - ("y", tshow $ 12700 * (y + cy - captionHeight))] () - , mknode "a:ext" [("cx", tshow $ 12700 * cx), - ("cy", tshow $ 12700 * captionHeight)] () - ] - , mknode "a:prstGeom" [("prst", "rect")] - [ mknode "a:avLst" [] () - ] - , mknode "a:noFill" [] () - ] - , txBody - ] + return + ( 1 + , mknode "p:sp" [] [ mknode "p:nvSpPr" [] + [ mknode "p:cNvPr" [("id","1"), ("name","TextBox 3")] () + , mknode "p:cNvSpPr" [("txBox", "1")] () + , mknode "p:nvPr" [] () + ] + , mknode "p:spPr" [] + [ mknode "a:xfrm" [] + [ mknode "a:off" [("x", tshow $ 12700 * x), + ("y", tshow $ 12700 * (y + cy - captionHeight))] () + , mknode "a:ext" [("cx", tshow $ 12700 * cx), + ("cy", tshow $ 12700 * captionHeight)] () + ] + , mknode "a:prstGeom" [("prst", "rect")] + [ mknode "a:avLst" [] () + ] + , mknode "a:noFill" [] () + ] + , txBody + ] + ) makePicElements :: PandocMonad m => Element @@ -907,7 +914,7 @@ makePicElements :: PandocMonad m -> MediaInfo -> Text -> [ParaElem] - -> P m [Element] + -> P m [(ShapeId, Element)] makePicElements layout picProps mInfo titleText alt = do opts <- asks envOpts (pageWidth, pageHeight) <- asks envPresentationSize @@ -975,10 +982,12 @@ makePicElements layout picProps mInfo titleText alt = do let spPr = mknode "p:spPr" [("bwMode","auto")] [xfrm, prstGeom, mknode "a:noFill" [] (), ln] - let picShape = mknode "p:pic" [] - [ nvPicPr - , blipFill - , spPr ] + let picShape = ( 0 + , mknode "p:pic" [] + [ nvPicPr + , blipFill + , spPr ] + ) -- And now, maybe create the caption: if hasCaption @@ -1125,44 +1134,50 @@ paragraphToElement par = do return $ mknode "a:p" [] $ [Elem $ mknode "a:pPr" attrs props] <> concat paras -shapeToElement :: PandocMonad m => Element -> Shape -> P m Element +shapeToElement :: PandocMonad m => Element -> Shape -> P m (Maybe ShapeId, Element) shapeToElement layout (TextBox paras) | ns <- elemToNameSpaces layout , Just cSld <- findChild (elemName ns "p" "cSld") layout , Just spTree <- findChild (elemName ns "p" "spTree") cSld = do - sp <- getContentShape ns spTree + (shapeId, sp) <- getContentShape ns spTree elements <- mapM paragraphToElement paras let txBody = mknode "p:txBody" [] $ [mknode "a:bodyPr" [] (), mknode "a:lstStyle" [] ()] <> elements emptySpPr = mknode "p:spPr" [] () return + . (shapeId,) . surroundWithMathAlternate . replaceNamedChildren ns "p" "txBody" [txBody] . replaceNamedChildren ns "p" "spPr" [emptySpPr] $ sp -- GraphicFrame and Pic should never reach this. -shapeToElement _ _ = return $ mknode "p:sp" [] () +shapeToElement _ _ = return (Nothing, mknode "p:sp" [] ()) -shapeToElements :: PandocMonad m => Element -> Shape -> P m [Content] +shapeToElements :: PandocMonad m => Element -> Shape -> P m [(Maybe ShapeId, Content)] shapeToElements layout (Pic picProps fp titleText alt) = do mInfo <- registerMedia fp alt case mInfoExt mInfo of - Just _ -> map Elem <$> + Just _ -> map (bimap Just Elem) <$> makePicElements layout picProps mInfo titleText alt Nothing -> shapeToElements layout $ TextBox [Paragraph def alt] -shapeToElements layout (GraphicFrame tbls cptn) = map Elem <$> +shapeToElements layout (GraphicFrame tbls cptn) = map (bimap Just Elem) <$> graphicFrameToElements layout tbls cptn shapeToElements _ (RawOOXMLShape str) = return - [Text (CData CDataRaw str Nothing)] + [(Nothing, Text (CData CDataRaw str Nothing))] shapeToElements layout shp = do - element <- shapeToElement layout shp - return [Elem element] + (shapeId, element) <- shapeToElement layout shp + return [(shapeId, Elem element)] -shapesToElements :: PandocMonad m => Element -> [Shape] -> P m [Content] +shapesToElements :: PandocMonad m => Element -> [Shape] -> P m [(Maybe ShapeId, Content)] shapesToElements layout shps = concat <$> mapM (shapeToElements layout) shps -graphicFrameToElements :: PandocMonad m => Element -> [Graphic] -> [ParaElem] -> P m [Element] +graphicFrameToElements :: + PandocMonad m => + Element -> + [Graphic] -> + [ParaElem] -> + P m [(ShapeId, Element)] graphicFrameToElements layout tbls caption = do -- get the sizing master <- getMaster @@ -1176,21 +1191,23 @@ graphicFrameToElements layout tbls caption = do elements <- mapM (graphicToElement cx) tbls let graphicFrameElts = - mknode "p:graphicFrame" [] $ - [ mknode "p:nvGraphicFramePr" [] - [ mknode "p:cNvPr" [("id", "6"), ("name", "Content Placeholder 5")] () - , mknode "p:cNvGraphicFramePr" [] - [mknode "a:graphicFrameLocks" [("noGrp", "1")] ()] - , mknode "p:nvPr" [] - [mknode "p:ph" [("idx", "1")] ()] - ] - , mknode "p:xfrm" [] - [ mknode "a:off" [("x", tshow $ 12700 * x), - ("y", tshow $ 12700 * y)] () - , mknode "a:ext" [("cx", tshow $ 12700 * cx), - ("cy", tshow $ 12700 * cy)] () - ] - ] <> elements + ( 6 + , mknode "p:graphicFrame" [] $ + [ mknode "p:nvGraphicFramePr" [] + [ mknode "p:cNvPr" [("id", "6"), ("name", "Content Placeholder 5")] () + , mknode "p:cNvGraphicFramePr" [] + [mknode "a:graphicFrameLocks" [("noGrp", "1")] ()] + , mknode "p:nvPr" [] + [mknode "p:ph" [("idx", "1")] ()] + ] + , mknode "p:xfrm" [] + [ mknode "a:off" [("x", tshow $ 12700 * x), + ("y", tshow $ 12700 * y)] () + , mknode "a:ext" [("cx", tshow $ 12700 * cx), + ("cy", tshow $ 12700 * cy)] () + ] + ] <> elements + ) if not $ null caption then do capElt <- createCaption ((x, y), (cx, cytmp)) caption @@ -1312,52 +1329,101 @@ getShapeByPlaceHolderTypes ns spTreeElem (s:ss) = Just element -> Just element Nothing -> getShapeByPlaceHolderTypes ns spTreeElem ss -nonBodyTextToElement :: PandocMonad m => Element -> [PHType] -> [ParaElem] -> P m Element +nonBodyTextToElement :: + PandocMonad m => + Element -> + [PHType] -> + [ParaElem] -> + P m (Maybe ShapeId, Element) nonBodyTextToElement layout phTypes paraElements | ns <- elemToNameSpaces layout , Just cSld <- findChild (elemName ns "p" "cSld") layout , Just spTree <- findChild (elemName ns "p" "spTree") cSld - , Just sp <- getShapeByPlaceHolderTypes ns spTree phTypes = do + , Just sp <- getShapeByPlaceHolderTypes ns spTree phTypes + , Just nvSpPr <- findChild (elemName ns "p" "nvSpPr") sp + , Just cNvPr <- findChild (elemName ns "p" "cNvPr") nvSpPr + , Just shapeId <- findAttr (nodename "id") cNvPr + , Right (shapeIdNum, _) <- decimal shapeId = do let hdrPara = Paragraph def paraElements element <- paragraphToElement hdrPara let txBody = mknode "p:txBody" [] $ [mknode "a:bodyPr" [] (), mknode "a:lstStyle" [] ()] <> [element] - return $ replaceNamedChildren ns "p" "txBody" [txBody] sp + return (Just shapeIdNum, replaceNamedChildren ns "p" "txBody" [txBody] sp) -- XXX: TODO - | otherwise = return $ mknode "p:sp" [] () + | otherwise = return (Nothing, mknode "p:sp" [] ()) -contentToElement :: PandocMonad m => Element -> [ParaElem] -> [Shape] -> P m Element +data ContentShapeIds = ContentShapeIds + { contentHeaderId :: Maybe ShapeId + , contentContentIds :: [ShapeId] + } + +contentToElement :: + PandocMonad m => + Element -> + [ParaElem] -> + [Shape] -> + P m (Maybe ContentShapeIds, Element) contentToElement layout hdrShape shapes | ns <- elemToNameSpaces layout , Just cSld <- findChild (elemName ns "p" "cSld") layout , Just spTree <- findChild (elemName ns "p" "spTree") cSld = do - element <- nonBodyTextToElement layout [PHType "title"] hdrShape + (shapeId, element) <- nonBodyTextToElement layout [PHType "title"] hdrShape let hdrShapeElements = [Elem element | not (null hdrShape)] - contentElements <- local + contentHeaderId = if null hdrShape then Nothing else shapeId + content <- local (\env -> env {envPlaceholder = Placeholder ObjType 0}) (shapesToElements layout shapes) - return $ buildSpTree ns spTree (hdrShapeElements <> contentElements) -contentToElement _ _ _ = return $ mknode "p:sp" [] () - -twoColumnToElement :: PandocMonad m => Element -> [ParaElem] -> [Shape] -> [Shape] -> P m Element + let contentContentIds = mapMaybe fst content + contentElements = snd <$> content + return ( Just ContentShapeIds{..} + , buildSpTree ns spTree (hdrShapeElements <> contentElements) + ) +contentToElement _ _ _ = return (Nothing, mknode "p:sp" [] ()) + +data TwoColumnShapeIds = TwoColumnShapeIds + { twoColumnHeaderId :: Maybe ShapeId + , twoColumnLeftIds :: [ShapeId] + , twoColumnRightIds :: [ShapeId] + } + +twoColumnToElement :: + PandocMonad m => + Element -> + [ParaElem] -> + [Shape] -> + [Shape] -> + P m (Maybe TwoColumnShapeIds, Element) twoColumnToElement layout hdrShape shapesL shapesR | ns <- elemToNameSpaces layout , Just cSld <- findChild (elemName ns "p" "cSld") layout , Just spTree <- findChild (elemName ns "p" "spTree") cSld = do - element <- nonBodyTextToElement layout [PHType "title"] hdrShape + (headerId, element) <- nonBodyTextToElement layout [PHType "title"] hdrShape let hdrShapeElements = [Elem element | not (null hdrShape)] - contentElementsL <- local - (\env -> env {envPlaceholder = Placeholder ObjType 0}) - (shapesToElements layout shapesL) - contentElementsR <- local - (\env -> env {envPlaceholder = Placeholder ObjType 1}) - (shapesToElements layout shapesR) + twoColumnHeaderId = if null hdrShape then Nothing else headerId + contentL <- local (\env -> env {envPlaceholder = Placeholder ObjType 0}) + (shapesToElements layout shapesL) + let twoColumnLeftIds = mapMaybe fst contentL + contentElementsL = snd <$> contentL + contentR <- local (\env -> env {envPlaceholder = Placeholder ObjType 1}) + (shapesToElements layout shapesR) + let (twoColumnRightIds) = (mapMaybe fst contentR) + contentElementsR = snd <$> contentR -- let contentElementsL' = map (setIdx ns "1") contentElementsL -- contentElementsR' = map (setIdx ns "2") contentElementsR - return $ buildSpTree ns spTree $ - hdrShapeElements <> contentElementsL <> contentElementsR -twoColumnToElement _ _ _ _= return $ mknode "p:sp" [] () + return + $ (Just TwoColumnShapeIds{..}, ) + $ buildSpTree ns spTree + $ hdrShapeElements <> contentElementsL <> contentElementsR +twoColumnToElement _ _ _ _ = return (Nothing, mknode "p:sp" [] ()) + +data ComparisonShapeIds = ComparisonShapeIds + { comparisonHeaderId :: Maybe ShapeId + , comparisonLeftTextIds :: [ShapeId] + , comparisonLeftContentIds :: [ShapeId] + , comparisonRightTextIds :: [ShapeId] + , comparisonRightContentIds :: [ShapeId] + } comparisonToElement :: PandocMonad m => @@ -1365,33 +1431,46 @@ comparisonToElement :: [ParaElem] -> ([Shape], [Shape]) -> ([Shape], [Shape]) -> - P m Element + P m (Maybe ComparisonShapeIds, Element) comparisonToElement layout hdrShape (shapesL1, shapesL2) (shapesR1, shapesR2) | ns <- elemToNameSpaces layout , Just cSld <- findChild (elemName ns "p" "cSld") layout , Just spTree <- findChild (elemName ns "p" "spTree") cSld = do - element <- nonBodyTextToElement layout [PHType "title"] hdrShape + (headerShapeId, element) <- nonBodyTextToElement layout [PHType "title"] hdrShape let hdrShapeElements = [Elem element | not (null hdrShape)] - contentElementsL1 <- local - (\env -> env {envPlaceholder = Placeholder (PHType "body") 0}) - (shapesToElements layout shapesL1) - contentElementsL2 <- local - (\env -> env {envPlaceholder = Placeholder ObjType 0}) - (shapesToElements layout shapesL2) - contentElementsR1 <- local - (\env -> env {envPlaceholder = Placeholder (PHType "body") 1}) - (shapesToElements layout shapesR1) - contentElementsR2 <- local - (\env -> env {envPlaceholder = Placeholder ObjType 1}) - (shapesToElements layout shapesR2) - return $ buildSpTree ns spTree $ - mconcat [ hdrShapeElements - , contentElementsL1 - , contentElementsL2 - , contentElementsR1 - , contentElementsR2 - ] -comparisonToElement _ _ _ _= return $ mknode "p:sp" [] () + comparisonHeaderId = if null hdrShape then Nothing else headerShapeId + contentL1 <- local (\env -> env {envPlaceholder = Placeholder (PHType "body") 0}) + (shapesToElements layout shapesL1) + let comparisonLeftTextIds = mapMaybe fst contentL1 + contentElementsL1 = snd <$> contentL1 + contentL2 <- local (\env -> env {envPlaceholder = Placeholder ObjType 0}) + (shapesToElements layout shapesL2) + let comparisonLeftContentIds = mapMaybe fst contentL2 + contentElementsL2 = snd <$> contentL2 + contentR1 <- local (\env -> env {envPlaceholder = Placeholder (PHType "body") 1}) + (shapesToElements layout shapesR1) + let comparisonRightTextIds = mapMaybe fst contentR1 + contentElementsR1 = snd <$> contentR1 + contentR2 <- local (\env -> env {envPlaceholder = Placeholder ObjType 1}) + (shapesToElements layout shapesR2) + let comparisonRightContentIds = mapMaybe fst contentR2 + contentElementsR2 = snd <$> contentR2 + return + $ (Just ComparisonShapeIds{..}, ) + $ buildSpTree ns spTree + $ mconcat [ hdrShapeElements + , contentElementsL1 + , contentElementsL2 + , contentElementsR1 + , contentElementsR2 + ] +comparisonToElement _ _ _ _= return (Nothing, mknode "p:sp" [] ()) + +data ContentWithCaptionShapeIds = ContentWithCaptionShapeIds + { contentWithCaptionHeaderId :: Maybe ShapeId + , contentWithCaptionCaptionIds :: [ShapeId] + , contentWithCaptionContentIds :: [ShapeId] + } contentWithCaptionToElement :: PandocMonad m => @@ -1399,25 +1478,30 @@ contentWithCaptionToElement :: [ParaElem] -> [Shape] -> [Shape] -> - P m Element + P m (Maybe ContentWithCaptionShapeIds, Element) contentWithCaptionToElement layout hdrShape textShapes contentShapes | ns <- elemToNameSpaces layout , Just cSld <- findChild (elemName ns "p" "cSld") layout , Just spTree <- findChild (elemName ns "p" "spTree") cSld = do - element <- nonBodyTextToElement layout [PHType "title"] hdrShape + (shapeId, element) <- nonBodyTextToElement layout [PHType "title"] hdrShape let hdrShapeElements = [Elem element | not (null hdrShape)] - textElements <- local - (\env -> env {envPlaceholder = Placeholder (PHType "body") 0}) - (shapesToElements layout textShapes) - contentElements <- local - (\env -> env {envPlaceholder = Placeholder ObjType 0}) - (shapesToElements layout contentShapes) - return $ buildSpTree ns spTree $ - mconcat [ hdrShapeElements - , textElements - , contentElements - ] -contentWithCaptionToElement _ _ _ _ = return $ mknode "p:sp" [] () + contentWithCaptionHeaderId = if null hdrShape then Nothing else shapeId + text <- local (\env -> env {envPlaceholder = Placeholder (PHType "body") 0}) + (shapesToElements layout textShapes) + let contentWithCaptionCaptionIds = mapMaybe fst text + textElements = snd <$> text + content <- local (\env -> env {envPlaceholder = Placeholder ObjType 0}) + (shapesToElements layout contentShapes) + let contentWithCaptionContentIds = mapMaybe fst content + contentElements = snd <$> content + return + $ (Just ContentWithCaptionShapeIds{..}, ) + $ buildSpTree ns spTree + $ mconcat [ hdrShapeElements + , textElements + , contentElements + ] +contentWithCaptionToElement _ _ _ _ = return (Nothing, mknode "p:sp" [] ()) blankToElement :: PandocMonad m => @@ -1430,73 +1514,116 @@ blankToElement layout return $ buildSpTree ns spTree [] blankToElement _ = return $ mknode "p:sp" [] () -titleToElement :: PandocMonad m => Element -> [ParaElem] -> P m Element +newtype TitleShapeIds = TitleShapeIds + { titleHeaderId :: Maybe ShapeId + } + +titleToElement :: + PandocMonad m => + Element -> + [ParaElem] -> + P m (Maybe TitleShapeIds, Element) titleToElement layout titleElems | ns <- elemToNameSpaces layout , Just cSld <- findChild (elemName ns "p" "cSld") layout , Just spTree <- findChild (elemName ns "p" "spTree") cSld = do - element <- nonBodyTextToElement layout [PHType "title", PHType "ctrTitle"] titleElems + (shapeId, element) <- nonBodyTextToElement layout [PHType "title", PHType "ctrTitle"] titleElems let titleShapeElements = [Elem element | not (null titleElems)] - return $ buildSpTree ns spTree titleShapeElements -titleToElement _ _ = return $ mknode "p:sp" [] () + titleHeaderId = if null titleElems then Nothing else shapeId + return $ (Just TitleShapeIds{..}, ) $ buildSpTree ns spTree titleShapeElements +titleToElement _ _ = return (Nothing, mknode "p:sp" [] ()) + +data MetadataShapeIds = MetadataShapeIds + { metadataTitleId :: Maybe ShapeId + , metadataSubtitleId :: Maybe ShapeId + , metadataDateId :: Maybe ShapeId + } -metadataToElement :: PandocMonad m => Element -> [ParaElem] -> [ParaElem] -> [[ParaElem]] -> [ParaElem] -> P m Element +metadataToElement :: + PandocMonad m => + Element -> + [ParaElem] -> + [ParaElem] -> + [[ParaElem]] -> + [ParaElem] -> + P m (Maybe MetadataShapeIds, Element) metadataToElement layout titleElems subtitleElems authorsElems dateElems | ns <- elemToNameSpaces layout , Just cSld <- findChild (elemName ns "p" "cSld") layout , Just spTree <- findChild (elemName ns "p" "spTree") cSld = do - titleShapeElements <- if null titleElems - then return [] - else sequence [nonBodyTextToElement layout [PHType "ctrTitle"] titleElems] let combinedAuthorElems = intercalate [Break] authorsElems subtitleAndAuthorElems = intercalate [Break, Break] [subtitleElems, combinedAuthorElems] - subtitleShapeElements <- if null subtitleAndAuthorElems - then return [] - else sequence [nonBodyTextToElement layout [PHType "subTitle"] subtitleAndAuthorElems] - dateShapeElements <- if null dateElems - then return [] - else sequence [nonBodyTextToElement layout [PHType "dt"] dateElems] - return . buildSpTree ns spTree . map Elem $ - (titleShapeElements <> subtitleShapeElements <> dateShapeElements) -metadataToElement _ _ _ _ _ = return $ mknode "p:sp" [] () + (titleId, titleElement) <- nonBodyTextToElement layout [PHType "ctrTitle"] titleElems + (subtitleId, subtitleElement) <- nonBodyTextToElement layout [PHType "subTitle"] subtitleAndAuthorElems + (dateId, dateElement) <- nonBodyTextToElement layout [PHType "dt"] dateElems + let titleShapeElements = [titleElement | not (null titleElems)] + metadataTitleId = if null titleElems then Nothing else titleId + subtitleShapeElements = [subtitleElement | not (null subtitleAndAuthorElems)] + metadataSubtitleId = if null subtitleAndAuthorElems then Nothing else subtitleId + dateShapeElements = [dateElement | not (null dateElems)] + metadataDateId = if null dateElems then Nothing else dateId + return + $ (Just MetadataShapeIds{..}, ) + $ buildSpTree ns spTree + $ map Elem + $ titleShapeElements <> subtitleShapeElements <> dateShapeElements +metadataToElement _ _ _ _ _ = return (Nothing, mknode "p:sp" [] ()) slideToElement :: PandocMonad m => Slide -> P m Element slideToElement (Slide _ l@(ContentSlide hdrElems shapes) _ )= do layout <- getLayout l - spTree <- local (\env -> if null hdrElems - then env - else env{envSlideHasHeader=True}) $ - contentToElement layout hdrElems shapes + (shapeIds, spTree) + <- local (\env -> if null hdrElems + then env + else env{envSlideHasHeader=True}) + (contentToElement layout hdrElems shapes) + let animations = case shapeIds of + Nothing -> [] + Just ContentShapeIds{..} -> + slideToIncrementalAnimations (zip contentContentIds shapes) return $ mknode "p:sld" [ ("xmlns:a", "http://schemas.openxmlformats.org/drawingml/2006/main"), ("xmlns:r", "http://schemas.openxmlformats.org/officeDocument/2006/relationships"), ("xmlns:p", "http://schemas.openxmlformats.org/presentationml/2006/main") - ] [mknode "p:cSld" [] [spTree]] + ] (mknode "p:cSld" [] [spTree] : animations) slideToElement (Slide _ l@(TwoColumnSlide hdrElems shapesL shapesR) _) = do layout <- getLayout l - spTree <- local (\env -> if null hdrElems + (shapeIds, spTree) <- local (\env -> if null hdrElems then env else env{envSlideHasHeader=True}) $ twoColumnToElement layout hdrElems shapesL shapesR + let animations = case shapeIds of + Nothing -> [] + Just TwoColumnShapeIds{..} -> + slideToIncrementalAnimations (zip twoColumnLeftIds shapesL + <> zip twoColumnRightIds shapesR) return $ mknode "p:sld" [ ("xmlns:a", "http://schemas.openxmlformats.org/drawingml/2006/main"), ("xmlns:r", "http://schemas.openxmlformats.org/officeDocument/2006/relationships"), ("xmlns:p", "http://schemas.openxmlformats.org/presentationml/2006/main") - ] [mknode "p:cSld" [] [spTree]] + ] (mknode "p:cSld" [] [spTree] : animations) slideToElement (Slide _ l@(ComparisonSlide hdrElems shapesL shapesR) _) = do layout <- getLayout l - spTree <- local (\env -> if null hdrElems + (shapeIds, spTree) <- local (\env -> if null hdrElems then env else env{envSlideHasHeader=True}) $ comparisonToElement layout hdrElems shapesL shapesR + let animations = case shapeIds of + Nothing -> [] + Just ComparisonShapeIds{..} -> + slideToIncrementalAnimations + (zip comparisonLeftTextIds (fst shapesL) + <> zip comparisonLeftContentIds (snd shapesL) + <> zip comparisonRightTextIds (fst shapesR) + <> zip comparisonRightContentIds (snd shapesR)) return $ mknode "p:sld" [ ("xmlns:a", "http://schemas.openxmlformats.org/drawingml/2006/main"), ("xmlns:r", "http://schemas.openxmlformats.org/officeDocument/2006/relationships"), ("xmlns:p", "http://schemas.openxmlformats.org/presentationml/2006/main") - ] [mknode "p:cSld" [] [spTree]] + ] (mknode "p:cSld" [] [spTree] : animations) slideToElement (Slide _ l@(TitleSlide hdrElems) _) = do layout <- getLayout l - spTree <- titleToElement layout hdrElems + (_, spTree) <- titleToElement layout hdrElems return $ mknode "p:sld" [ ("xmlns:a", "http://schemas.openxmlformats.org/drawingml/2006/main"), ("xmlns:r", "http://schemas.openxmlformats.org/officeDocument/2006/relationships"), @@ -1504,7 +1631,7 @@ slideToElement (Slide _ l@(TitleSlide hdrElems) _) = do ] [mknode "p:cSld" [] [spTree]] slideToElement (Slide _ l@(MetadataSlide titleElems subtitleElems authorElems dateElems) _) = do layout <- getLayout l - spTree <- metadataToElement layout titleElems subtitleElems authorElems dateElems + (_, spTree) <- metadataToElement layout titleElems subtitleElems authorElems dateElems return $ mknode "p:sld" [ ("xmlns:a", "http://schemas.openxmlformats.org/drawingml/2006/main"), ("xmlns:r", "http://schemas.openxmlformats.org/officeDocument/2006/relationships"), @@ -1512,12 +1639,18 @@ slideToElement (Slide _ l@(MetadataSlide titleElems subtitleElems authorElems da ] [mknode "p:cSld" [] [spTree]] slideToElement (Slide _ l@(ContentWithCaptionSlide hdrElems captionShapes contentShapes) _) = do layout <- getLayout l - spTree <- contentWithCaptionToElement layout hdrElems captionShapes contentShapes + (shapeIds, spTree) <- contentWithCaptionToElement layout hdrElems captionShapes contentShapes + let animations = case shapeIds of + Nothing -> [] + Just ContentWithCaptionShapeIds{..} -> + slideToIncrementalAnimations + (zip contentWithCaptionCaptionIds captionShapes + <> zip contentWithCaptionContentIds contentShapes) return $ mknode "p:sld" [ ("xmlns:a", "http://schemas.openxmlformats.org/drawingml/2006/main"), ("xmlns:r", "http://schemas.openxmlformats.org/officeDocument/2006/relationships"), ("xmlns:p", "http://schemas.openxmlformats.org/presentationml/2006/main") - ] [mknode "p:cSld" [] [spTree]] + ] (mknode "p:cSld" [] [spTree] : animations) slideToElement (Slide _ BlankSlide _) = do layout <- getLayout BlankSlide spTree <- blankToElement layout @@ -1527,6 +1660,27 @@ slideToElement (Slide _ BlankSlide _) = do ("xmlns:p", "http://schemas.openxmlformats.org/presentationml/2006/main") ] [mknode "p:cSld" [] [spTree]] +slideToIncrementalAnimations :: + [(ShapeId, Shape)] -> + [Element] +slideToIncrementalAnimations shapes = let + incrementals :: [(ShapeId, [Bool])] + incrementals = do + (shapeId, TextBox ps) <- shapes + pure . (shapeId,) $ do + Paragraph ParaProps{pPropIncremental} _ <- ps + pure pPropIncremental + toIndices :: [Bool] -> Maybe (NonEmpty (Integer, Integer)) + toIndices bs = do + let indexed = zip [0..] bs + ts <- nonEmpty (filter snd indexed) + pure (fmap (\(n, _) -> (n, n)) ts) + indices :: [(ShapeId, NonEmpty (Integer, Integer))] + indices = do + (shapeId, bs) <- incrementals + toList ((,) shapeId <$> toIndices bs) + in toList (incrementalAnimation <$> nonEmpty indices) + -------------------------------------------------------------------- -- Notes: @@ -2080,9 +2234,10 @@ presentationToPresentationElement presentationUpdateRIdData pres = do updateRIdAttribute :: XML.Attr -> XML.Attr updateRIdAttribute attr = fromMaybe attr $ do - (oldValue, _) <- case attrKey attr of + oldValue <- case attrKey attr of QName "id" _ (Just "r") -> - T.stripPrefix "rId" (attrVal attr) >>= (hush . decimal) + T.stripPrefix "rId" (attrVal attr) + >>= fmap fromIntegral . readTextAsInteger _ -> Nothing let newValue = updatePresentationRId presentationUpdateRIdData oldValue pure attr {attrVal = "rId" <> T.pack (show newValue)} @@ -2316,3 +2471,102 @@ autoNumAttrs (startNum, numStyle, numDelim) = OneParen -> "ParenR" TwoParens -> "ParenBoth" _ -> "Period" + +-- | The XML required to insert an "appear" animation for each of the given +-- groups of paragraphs, identified by index. +incrementalAnimation :: + -- | (ShapeId, [(startParagraphIndex, endParagraphIndex)]) + NonEmpty (ShapeId, NonEmpty (Integer, Integer)) -> + Element +incrementalAnimation indices = mknode "p:timing" [] [tnLst, bldLst] + where + triples :: NonEmpty (ShapeId, Integer, Integer) + triples = do + (shapeId, paragraphIds) <- indices + (start, end) <- paragraphIds + pure (shapeId, start, end) + + tnLst = mknode "p:tnLst" [] + $ mknode "p:par" [] + $ mknode "p:cTn" [ ("id", "1") + , ("dur", "indefinite") + , ("restart", "never") + , ("nodeType", "tmRoot") + ] + $ mknode "p:childTnLst" [] + $ mknode "p:seq" [ ("concurrent", "1") + , ("nextAc", "seek") + ] + [ mknode "p:cTn" [ ("id", "2") + , ("dur", "indefinite") + , ("nodeType", "mainSeq") + ] + $ mknode "p:childTnLst" [] + $ zipWith makePar [3, 7 ..] (toList triples) + , mknode "p:prevCondLst" [] + $ mknode "p:cond" ([("evt", "onPrev"), ("delay", "0")]) + $ mknode "p:tgtEl" [] + $ mknode "p:sldTgt" [] () + , mknode "p:nextCondLst" [] + $ mknode "p:cond" ([("evt", "onNext"), ("delay", "0")]) + $ mknode "p:tgtEl" [] + $ mknode "p:sldTgt" [] () + ] + bldLst = mknode "p:bldLst" [] + [ mknode "p:bldP" [ ("spid", T.pack (show shapeId)) + , ("grpId", "0") + , ("uiExpand", "1") + , ("build", "p") + ] + () | (shapeId, _) <- toList indices + ] + + makePar :: Integer -> (ShapeId, Integer, Integer) -> Element + makePar nextId (shapeId, start, end) = + mknode "p:par" [] + $ mknode "p:cTn" [("id", T.pack (show nextId)), ("fill", "hold")] + [ mknode "p:stCondLst" [] + $ mknode "p:cond" [("delay", "indefinite")] () + , mknode "p:childTnLst" [] + $ mknode "p:par" [] + $ mknode "p:cTn" [ ("id", T.pack (show (nextId + 1))) + , ("fill", "hold") + ] + [ mknode "p:stCondLst" [] + $ mknode "p:cond" [("delay", "0")] () + , mknode "p:childTnLst" [] + $ mknode "p:par" [] + $ mknode "p:cTn" [ ("id", T.pack (show (nextId + 2))) + , ("presetID", "1") + , ("presetClass", "entr") + , ("presetSubtype", "0") + , ("fill", "hold") + , ("grpId", "0") + , ("nodeType", "clickEffect") + ] + [ mknode "p:stCondLst" [] + $ mknode "p:cond" [("delay", "0")] () + , mknode "p:childTnLst" [] + $ mknode "p:set" [] + [ mknode "p:cBhvr" [] + [ mknode "p:cTn" [ ("id", T.pack (show (nextId + 3))) + , ("dur", "1") + , ("fill", "hold") + ] + $ mknode "p:stCondLst" [] + $ mknode "p:cond" [("delay", "0")] () + , mknode "p:tgtEl" [] + $ mknode "p:spTgt" [("spid", T.pack (show shapeId))] + $ mknode "p:txEl" [] + $ mknode "p:pRg" [ ("st", T.pack (show start)) + , ("end", T.pack (show end))] + () + , mknode "p:attrNameLst" [] + $ mknode "p:attrName" [] ("style.visibility" :: Text) + ] + , mknode "p:to" [] + $ mknode "p:strVal" [("val", "visible")] () + ] + ] + ] + ] diff --git a/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs b/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs index 015e2cbdd..a7660fc5e 100644 --- a/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs +++ b/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs @@ -1,8 +1,9 @@ +{-# LANGUAGE GeneralizedNewtypeDeriving #-} +{-# LANGUAGE LambdaCase #-} +{-# LANGUAGE MultiWayIf #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE PatternGuards #-} {-# LANGUAGE ViewPatterns #-} -{-# LANGUAGE GeneralizedNewtypeDeriving #-} -{-# LANGUAGE LambdaCase #-} {- | Module : Text.Pandoc.Writers.Powerpoint.Presentation Copyright : Copyright (C) 2017-2020 Jesse Rosenthal @@ -80,6 +81,8 @@ data WriterEnv = WriterEnv { envMetadata :: Meta , envInNoteSlide :: Bool , envCurSlideId :: SlideId , envInSpeakerNotes :: Bool + , envInIncrementalDiv :: Maybe InIncrementalDiv + , envInListInBlockQuote :: Bool } deriving (Show) @@ -94,6 +97,8 @@ instance Default WriterEnv where , envInNoteSlide = False , envCurSlideId = SlideId "Default" , envInSpeakerNotes = False + , envInIncrementalDiv = Nothing + , envInListInBlockQuote = False } @@ -114,6 +119,23 @@ instance Default WriterState where , stSpeakerNotes = mempty } +data InIncrementalDiv + = InIncremental + -- ^ The current content is contained within an "incremental" div. + | InNonIncremental + -- ^ The current content is contained within a "nonincremental" div. + deriving (Show) + +listShouldBeIncremental :: Pres Bool +listShouldBeIncremental = do + incrementalOption <- asks (writerIncremental . envOpts) + inIncrementalDiv <- asks envInIncrementalDiv + inBlockQuote <- asks envInListInBlockQuote + let toBoolean = (\case InIncremental -> True + InNonIncremental -> False) + maybeInvert = if inBlockQuote then not else id + pure (maybeInvert (maybe incrementalOption toBoolean inIncrementalDiv)) + metadataSlideId :: SlideId metadataSlideId = SlideId "Metadata" @@ -227,7 +249,7 @@ data Graphic = Tbl TableProps [TableCell] [[TableCell]] data Paragraph = Paragraph { paraProps :: ParaProps - , paraElems :: [ParaElem] + , paraElems :: [ParaElem] } deriving (Show, Eq) data BulletType = Bullet @@ -244,6 +266,7 @@ data ParaProps = ParaProps { pPropMarginLeft :: Maybe Pixels , pPropAlign :: Maybe Algnment , pPropSpaceBefore :: Maybe Pixels , pPropIndent :: Maybe Pixels + , pPropIncremental :: Bool } deriving (Show, Eq) instance Default ParaProps where @@ -254,6 +277,7 @@ instance Default ParaProps where , pPropAlign = Nothing , pPropSpaceBefore = Nothing , pPropIndent = Just 0 + , pPropIncremental = False } newtype TeXString = TeXString {unTeXString :: T.Text} @@ -449,7 +473,8 @@ blockToParagraphs (CodeBlock attr str) = do -- (BlockQuote List) as a list to maintain compatibility with other -- formats. blockToParagraphs (BlockQuote (blk : blks)) | isListType blk = do - ps <- blockToParagraphs blk + ps <- local (\env -> env { envInListInBlockQuote = True }) + (blockToParagraphs blk) ps' <- blockToParagraphs $ BlockQuote blks return $ ps ++ ps' blockToParagraphs (BlockQuote blks) = @@ -474,25 +499,30 @@ blockToParagraphs (Header _ (ident, _, _) ils) = do return [Paragraph def{pPropSpaceBefore = Just 30} parElems] blockToParagraphs (BulletList blksLst) = do pProps <- asks envParaProps + incremental <- listShouldBeIncremental let lvl = pPropLevel pProps local (\env -> env{ envInList = True , envParaProps = pProps{ pPropLevel = lvl + 1 , pPropBullet = Just Bullet , pPropMarginLeft = Nothing , pPropIndent = Nothing + , pPropIncremental = incremental }}) $ concatMapM multiParBullet blksLst blockToParagraphs (OrderedList listAttr blksLst) = do pProps <- asks envParaProps + incremental <- listShouldBeIncremental let lvl = pPropLevel pProps local (\env -> env{ envInList = True , envParaProps = pProps{ pPropLevel = lvl + 1 , pPropBullet = Just (AutoNumbering listAttr) , pPropMarginLeft = Nothing , pPropIndent = Nothing + , pPropIncremental = incremental }}) $ concatMapM multiParBullet blksLst blockToParagraphs (DefinitionList entries) = do + incremental <- listShouldBeIncremental let go :: ([Inline], [[Block]]) -> Pres [Paragraph] go (ils, blksLst) = do term <-blockToParagraphs $ Para [Strong ils] @@ -500,8 +530,17 @@ blockToParagraphs (DefinitionList entries) = do -- blockquote. We can extend this further later. definition <- concatMapM (blockToParagraphs . BlockQuote) blksLst return $ term ++ definition - concatMapM go entries -blockToParagraphs (Div _ blks) = concatMapM blockToParagraphs blks + local (\env -> env {envParaProps = + (envParaProps env) {pPropIncremental = incremental}}) + $ concatMapM go entries +blockToParagraphs (Div (_, classes, _) blks) = let + hasIncremental = "incremental" `elem` classes + hasNonIncremental = "nonincremental" `elem` classes + incremental = if | hasIncremental -> Just InIncremental + | hasNonIncremental -> Just InNonIncremental + | otherwise -> Nothing + addIncremental env = env { envInIncrementalDiv = incremental } + in local addIncremental (concatMapM blockToParagraphs blks) blockToParagraphs blk = do addLogMessage $ BlockNotRendered blk return [] diff --git a/test/Tests/Writers/Powerpoint.hs b/test/Tests/Writers/Powerpoint.hs index dd3846fef..6eb8c7f67 100644 --- a/test/Tests/Writers/Powerpoint.hs +++ b/test/Tests/Writers/Powerpoint.hs @@ -232,4 +232,12 @@ tests = groupPptxTests [ pptxTests "Inline formatting" def "pptx/blanks/nbsp-in-heading/input.native" "pptx/blanks/nbsp-in-heading/output.pptx" + , pptxTests ("Incremental lists are supported") + def { writerIncremental = True } + "pptx/incremental-lists/with-flag/input.native" + "pptx/incremental-lists/with-flag/output.pptx" + , pptxTests ("One-off incremental lists are supported") + def + "pptx/incremental-lists/without-flag/input.native" + "pptx/incremental-lists/without-flag/output.pptx" ] diff --git a/test/pptx/incremental-lists/with-flag/deleted-layouts.pptx b/test/pptx/incremental-lists/with-flag/deleted-layouts.pptx new file mode 100644 index 000000000..5a74826a4 Binary files /dev/null and b/test/pptx/incremental-lists/with-flag/deleted-layouts.pptx differ diff --git a/test/pptx/incremental-lists/with-flag/input.native b/test/pptx/incremental-lists/with-flag/input.native new file mode 100644 index 000000000..b690794dc --- /dev/null +++ b/test/pptx/incremental-lists/with-flag/input.native @@ -0,0 +1,139 @@ +[Header 1 ("slide-1-content",[],[]) [Str "Slide",Space,Str "1",Space,Str "(Content)"] +,BulletList + [[Plain [Str "These"]] + ,[Plain [Str "bullets"]] + ,[Plain [Str "should"]] + ,[Plain [Str "be"]] + ,[Plain [Str "incremental"]]] +,Header 1 ("slide-2-content",[],[]) [Str "Slide",Space,Str "2",Space,Str "(Content)"] +,BulletList + [[Para [Str "as"]] + ,[Para [Str "should"]] + ,[Para [Str "these"]]] +,Header 1 ("slide-3-content",[],[]) [Str "Slide",Space,Str "3",Space,Str "(Content)"] +,Para [Str "Even",Space,Str "with",Space,Str "some",Space,Str "text",Space,Str "first,",Space,Str "these",Space,Str "should:"] +,BulletList + [[Plain [Str "also"]] + ,[Plain [Str "be"]] + ,[Plain [Str "incremental"]]] +,Header 1 ("slide-4-content",[],[]) [Str "Slide",Space,Str "4",Space,Str "(Content)"] +,OrderedList (1,Decimal,Period) + [[Plain [Str "These"]] + ,[Plain [Str "are"]] + ,[Plain [Str "incremental"]]] +,Para [Str "But",Space,Str "this",Space,Str "text",Space,Str "isn\8217t"] +,BulletList + [[Plain [Str "But"]] + ,[Plain [Str "these"]] + ,[Plain [Str "are"]]] +,Header 1 ("slide-5-two-content",[],[]) [Str "Slide",Space,Str "5",Space,Str "(Two",Space,Str "Content)"] +,Div ("",["columns"],[]) + [Div ("",["column"],[]) + [Para [Str "Incremental",Space,Str "on",Space,Str "the",Space,Str "left:"] + ,BulletList + [[Plain [Str "one"]] + ,[Plain [Str "by"]] + ,[Plain [Str "one"]]] + ,Para [Str "With",Space,Str "something",Space,Str "below"]] + ,Div ("",["column"],[]) + [Para [Str "Incremental",Space,Str "on",Space,Str "the",Space,Str "right:"] + ,BulletList + [[Plain [Str "one"]] + ,[Plain [Str "by"]] + ,[Plain [Str "one"]]] + ,Para [Str "With",Space,Str "something",Space,Str "else",Space,Str "below"]]] +,Header 1 ("slide-6-two-content-right",[],[]) [Str "Slide",Space,Str "6",Space,Str "(Two",Space,Str "Content",Space,Str "Right)"] +,Div ("",["columns"],[]) + [Div ("",["column"],[]) + [Para [Image ("",[],[]) [Str "an",Space,Str "image"] ("lalune.jpg","fig:")]] + ,Div ("",["column"],[]) + [BulletList + [[Plain [Str "An"]] + ,[Plain [Str "Incremental"]] + ,[Plain [Str "List"]]]]] +,Header 1 ("slide-7-content-with-caption",[],[]) [Str "Slide",Space,Str "7",Space,Str "(Content",Space,Str "with",Space,Str "Caption)"] +,Para [Str "First,",Space,Str "we",Space,Str "have",Space,Str "some",Space,Str "incremental",Space,Str "bullets:"] +,BulletList + [[Plain [Str "one"]] + ,[Plain [Str "two"]] + ,[Plain [Str "three"]]] +,Para [Str "Then,",Space,Str "a",Space,Str "picture:"] +,Para [Image ("",[],[]) [Str "An",Space,Str "image"] ("./lalune.jpg","fig:")] +,Header 1 ("slide-8-comparison",[],[]) [Str "Slide",Space,Str "8",Space,Str "(Comparison)"] +,Div ("",["columns"],[]) + [Div ("",["column"],[]) + [BulletList + [[Plain [Str "one"]] + ,[Plain [Str "two"]] + ,[Plain [Str "three"]]] + ,Para [Image ("",[],[]) [Str "An",Space,Str "image"] ("./lalune.jpg","fig:")]] + ,Div ("",["column"],[]) + [OrderedList (1,Decimal,Period) + [[Plain [Str "one"]] + ,[Plain [Str "two"]] + ,[Plain [Str "three"]]] + ,Table ("",[],[]) (Caption Nothing + []) + [(AlignDefault,ColWidth 5.555555555555555e-2)] + (TableHead ("",[],[]) + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "1"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns 0) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "2"]]]])] + (TableFoot ("",[],[]) + [])]] +,Header 1 ("slide-9-content",[],[]) [Str "Slide",Space,Str "9",Space,Str "(Content)"] +,Div ("",["nonincremental"],[]) + [BulletList + [[Plain [Str "these"]] + ,[Plain [Str "are"]] + ,[Plain [Str "not"]] + ,[Plain [Str "incremental"]]]] +,BulletList + [[Plain [Str "these"]] + ,[Plain [Str "are"]]] +,Header 1 ("slide-10-content",[],[]) [Str "Slide",Space,Str "10",Space,Str "(Content)"] +,Div ("",["incremental","nonincremental"],[]) + [BulletList + [[Plain [Str "these"]] + ,[Plain [Str "are"]] + ,[Plain [Str "incremental"]] + ,[Plain [Str "(the",Space,Str "incremental",Space,Str "class",Space,Str "wins)"]]]] +,Header 1 ("slide-11-content",[],[]) [Str "Slide",Space,Str "11",Space,Str "(Content)"] +,Para [Str "These",Space,Str "bullets",Space,Str "are",Space,Str "not",Space,Str "incremental:"] +,BlockQuote + [BulletList + [[Plain [Str "one"]] + ,[Plain [Str "two"]] + ,[Plain [Str "three"]]]] +,Para [Str "These",Space,Str "are:"] +,Div ("",["nonincremental"],[]) + [BlockQuote + [BulletList + [[Plain [Str "one"]] + ,[Plain [Str "two"]] + ,[Plain [Str "three"]]]]] +,Para [Str "These",Space,Str "are",Space,Str "not:"] +,BlockQuote + [Div ("",["nonincremental"],[]) + [BulletList + [[Plain [Str "one"]] + ,[Plain [Str "two"]] + ,[Plain [Str "three"]]]]] +,Header 1 ("slide-12-content",[],[]) [Str "Slide",Space,Str "12",Space,Str "(Content)"] +,Div ("",["nonincremental"],[]) + [Div ("",["incremental"],[]) + [BulletList + [[Plain [Str "these"]] + ,[Plain [Str "are"]] + ,[Plain [Str "incremental"]]]]] +,Div ("",["incremental"],[]) + [Div ("",["nonincremental"],[]) + [BulletList + [[Plain [Str "these"]] + ,[Plain [Str "are"]] + ,[Plain [Str "not"]]]]]] diff --git a/test/pptx/incremental-lists/with-flag/moved-layouts.pptx b/test/pptx/incremental-lists/with-flag/moved-layouts.pptx new file mode 100644 index 000000000..f20dd2906 Binary files /dev/null and b/test/pptx/incremental-lists/with-flag/moved-layouts.pptx differ diff --git a/test/pptx/incremental-lists/with-flag/output.pptx b/test/pptx/incremental-lists/with-flag/output.pptx new file mode 100644 index 000000000..d4f76f1e7 Binary files /dev/null and b/test/pptx/incremental-lists/with-flag/output.pptx differ diff --git a/test/pptx/incremental-lists/with-flag/templated.pptx b/test/pptx/incremental-lists/with-flag/templated.pptx new file mode 100644 index 000000000..f5ee2ff5f Binary files /dev/null and b/test/pptx/incremental-lists/with-flag/templated.pptx differ diff --git a/test/pptx/incremental-lists/without-flag/deleted-layouts.pptx b/test/pptx/incremental-lists/without-flag/deleted-layouts.pptx new file mode 100644 index 000000000..16bd85ffd Binary files /dev/null and b/test/pptx/incremental-lists/without-flag/deleted-layouts.pptx differ diff --git a/test/pptx/incremental-lists/without-flag/input.native b/test/pptx/incremental-lists/without-flag/input.native new file mode 100644 index 000000000..87a4aea7e --- /dev/null +++ b/test/pptx/incremental-lists/without-flag/input.native @@ -0,0 +1,137 @@ +[Header 1 ("slide-1-content",[],[]) [Str "Slide",Space,Str "1",Space,Str "(Content)"] +,Div ("",["incremental"],[]) + [BulletList + [[Plain [Str "These"]] + ,[Plain [Str "bullets"]] + ,[Plain [Str "should"]] + ,[Plain [Str "be"]] + ,[Plain [Str "incremental"]]]] +,Header 1 ("slide-2-content",[],[]) [Str "Slide",Space,Str "2",Space,Str "(Content)"] +,BulletList + [[Plain [Str "These"]] + ,[Plain [Str "are"]] + ,[Plain [Str "not"]]] +,Header 1 ("slide-3-content",[],[]) [Str "Slide",Space,Str "3",Space,Str "(Content)"] +,Para [Str "Even",Space,Str "with",Space,Str "some",Space,Str "text",Space,Str "first,",Space,Str "these",Space,Str "should:"] +,Div ("",["incremental"],[]) + [BulletList + [[Plain [Str "also"]] + ,[Plain [Str "be"]] + ,[Plain [Str "incremental"]]]] +,Header 1 ("slide-4-content",[],[]) [Str "Slide",Space,Str "4",Space,Str "(Content)"] +,Div ("",["incremental"],[]) + [OrderedList (1,Decimal,Period) + [[Plain [Str "These"]] + ,[Plain [Str "are"]] + ,[Plain [Str "incremental"]]]] +,Para [Str "But",Space,Str "this",Space,Str "text",Space,Str "isn\8217t"] +,Header 1 ("slide-5-two-content",[],[]) [Str "Slide",Space,Str "5",Space,Str "(Two",Space,Str "Content)"] +,Div ("",["columns"],[]) + [Div ("",["column"],[]) + [Para [Str "Incremental",Space,Str "on",Space,Str "the",Space,Str "left:"] + ,Div ("",["incremental"],[]) + [BulletList + [[Plain [Str "one"]] + ,[Plain [Str "by"]] + ,[Plain [Str "one"]]]] + ,Para [Str "With",Space,Str "something",Space,Str "below"]] + ,Div ("",["column"],[]) + [Para [Str "Incremental",Space,Str "on",Space,Str "the",Space,Str "right:"] + ,Div ("",["incremental"],[]) + [BulletList + [[Plain [Str "one"]] + ,[Plain [Str "by"]] + ,[Plain [Str "one"]]]] + ,BulletList + [[Plain [Str "already"]] + ,[Plain [Str "here"]] + ,[Plain [Str "though"]]]]] +,Header 1 ("slide-6-two-content-right",[],[]) [Str "Slide",Space,Str "6",Space,Str "(Two",Space,Str "Content",Space,Str "Right)"] +,Div ("",["columns"],[]) + [Div ("",["column"],[]) + [Para [Image ("",[],[]) [Str "an",Space,Str "image"] ("lalune.jpg","fig:")]] + ,Div ("",["column"],[]) + [Div ("",["incremental"],[]) + [BulletList + [[Plain [Str "An"]] + ,[Plain [Str "Incremental"]] + ,[Plain [Str "List"]]]]]] +,Header 1 ("slide-7-content-with-caption",[],[]) [Str "Slide",Space,Str "7",Space,Str "(Content",Space,Str "with",Space,Str "Caption)"] +,Para [Str "First,",Space,Str "we",Space,Str "have",Space,Str "some",Space,Str "incremental",Space,Str "bullets:"] +,Div ("",["incremental"],[]) + [BulletList + [[Plain [Str "one"]] + ,[Plain [Str "two"]] + ,[Plain [Str "three"]]]] +,Para [Str "Then,",Space,Str "a",Space,Str "picture:"] +,Para [Image ("",[],[]) [Str "An",Space,Str "image"] ("./lalune.jpg","fig:")] +,Header 1 ("slide-8-comparison",[],[]) [Str "Slide",Space,Str "8",Space,Str "(Comparison)"] +,Div ("",["columns"],[]) + [Div ("",["column"],[]) + [Div ("",["incremental"],[]) + [BulletList + [[Plain [Str "one"]] + ,[Plain [Str "two"]] + ,[Plain [Str "three"]]]] + ,Para [Image ("",[],[]) [Str "An",Space,Str "image"] ("./lalune.jpg","fig:")]] + ,Div ("",["column"],[]) + [Div ("",["incremental"],[]) + [OrderedList (1,Decimal,Period) + [[Plain [Str "one"]] + ,[Plain [Str "two"]] + ,[Plain [Str "three"]]]] + ,Table ("",[],[]) (Caption Nothing + []) + [(AlignDefault,ColWidth 5.555555555555555e-2)] + (TableHead ("",[],[]) + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "1"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns 0) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) + [Plain [Str "2"]]]])] + (TableFoot ("",[],[]) + [])]] +,Header 1 ("slide-10-content",[],[]) [Str "Slide",Space,Str "10",Space,Str "(Content)"] +,Div ("",["incremental","nonincremental"],[]) + [BulletList + [[Plain [Str "these"]] + ,[Plain [Str "are"]] + ,[Plain [Str "incremental"]] + ,[Plain [Str "(the",Space,Str "incremental",Space,Str "class",Space,Str "wins)"]]]] +,Header 1 ("slide-11-content",[],[]) [Str "Slide",Space,Str "11",Space,Str "(Content)"] +,Para [Str "These",Space,Str "bullets",Space,Str "are",Space,Str "incremental:"] +,BlockQuote + [BulletList + [[Plain [Str "one"]] + ,[Plain [Str "two"]] + ,[Plain [Str "three"]]]] +,Para [Str "These",Space,Str "are",Space,Str "not:"] +,Div ("",["incremental"],[]) + [BlockQuote + [BulletList + [[Plain [Str "one"]] + ,[Plain [Str "two"]] + ,[Plain [Str "three"]]]]] +,Para [Str "These",Space,Str "are:"] +,BlockQuote + [Div ("",["incremental"],[]) + [BulletList + [[Plain [Str "one"]] + ,[Plain [Str "two"]] + ,[Plain [Str "three"]]]]] +,Header 1 ("slide-12-content",[],[]) [Str "Slide",Space,Str "12",Space,Str "(Content)"] +,Div ("",["nonincremental"],[]) + [Div ("",["incremental"],[]) + [BulletList + [[Plain [Str "these"]] + ,[Plain [Str "are"]] + ,[Plain [Str "incremental"]]]]] +,Div ("",["incremental"],[]) + [Div ("",["nonincremental"],[]) + [BulletList + [[Plain [Str "these"]] + ,[Plain [Str "are"]] + ,[Plain [Str "not"]]]]]] diff --git a/test/pptx/incremental-lists/without-flag/moved-layouts.pptx b/test/pptx/incremental-lists/without-flag/moved-layouts.pptx new file mode 100644 index 000000000..054fe918e Binary files /dev/null and b/test/pptx/incremental-lists/without-flag/moved-layouts.pptx differ diff --git a/test/pptx/incremental-lists/without-flag/output.pptx b/test/pptx/incremental-lists/without-flag/output.pptx new file mode 100644 index 000000000..1b326461d Binary files /dev/null and b/test/pptx/incremental-lists/without-flag/output.pptx differ diff --git a/test/pptx/incremental-lists/without-flag/templated.pptx b/test/pptx/incremental-lists/without-flag/templated.pptx new file mode 100644 index 000000000..dee6e9b06 Binary files /dev/null and b/test/pptx/incremental-lists/without-flag/templated.pptx differ -- cgit v1.2.3 From 71b82396a276899e0fc28bb26f213a038050fb9a Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Thu, 16 Sep 2021 19:19:38 -0700 Subject: Fix quick-cabal target --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 58dc8c9c6..2560994e4 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ quick: quick-cabal: cabal v2-build -j8 --ghc-options '$(GHCOPTS)' --disable-optimization --enable-tests - cabal v2-test --hide-successes --ansi-tricks=false $(TESTARGS) + cabal v2-test --test-option=--hide-successes --test-option=--ansi-tricks=false $(TESTARGS) full-cabal: cabal v2-configure . --ghc-options '$(GHCOPTS)' --flags '+embed_data_files +trypandoc' --enable-tests --enable-benchmarks -- cgit v1.2.3 From d2449ad92642a5ba380979192029600a4f3e4424 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Thu, 16 Sep 2021 19:27:34 -0700 Subject: HTML writer: set "hash" to True by default (for reveal.js). Closes #7574. See #6968 where the motivation for setting "hash" to True is explained. --- src/Text/Pandoc/Writers/HTML.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Text/Pandoc/Writers/HTML.hs b/src/Text/Pandoc/Writers/HTML.hs index c96d4622a..3592bd2d4 100644 --- a/src/Text/Pandoc/Writers/HTML.hs +++ b/src/Text/Pandoc/Writers/HTML.hs @@ -367,7 +367,7 @@ pandocToHtml opts (Pandoc meta blocks) = do defField "slideNumber" False . defField "showSlideNumber" ("all" :: Text) . defField "hashOneBasedIndex" False . - defField "hash" False . + defField "hash" True . defField "respondToHashChanges" True . defField "history" False . defField "keyboard" True . -- cgit v1.2.3 From c6cd92a0a34603c949b115f041fb30b1806b200e Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Thu, 16 Sep 2021 19:28:38 -0700 Subject: stack.yaml: use lts-18.10 resolver. --- stack.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/stack.yaml b/stack.yaml index 90735215e..75e01ee8b 100644 --- a/stack.yaml +++ b/stack.yaml @@ -7,8 +7,6 @@ flags: packages: - '.' extra-deps: -- commonmark-0.2.1 -- commonmark-pandoc-0.2.1.1 - skylighting-core-0.11 - skylighting-0.11 - doctemplates-0.10 @@ -18,7 +16,7 @@ extra-deps: commit: b27201c3ac48ffd2853f77152df19b6e2cf36987 ghc-options: "$locals": -fhide-source-paths -Wno-missing-home-modules -resolver: lts-18.0 +resolver: lts-18.10 nix: packages: [zlib] -- cgit v1.2.3 From 7c22c0202e8ed706d33f301e65f0aa1a847b4ec4 Mon Sep 17 00:00:00 2001 From: Emily Bourke Date: Mon, 13 Sep 2021 18:16:19 +0100 Subject: pptx: Support specifying slide background images MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In the reveal-js output, it’s possible to use reveal’s `data-background-image` class on a slide’s title to specify a background image for the slide. With this commit, it’s possible to use `background-image` in the same way for pptx output. Only the “stretch” mode is supported, and the background image is centred around the slide in the image’s larger axis, matching the observed default behaviour of PowerPoint. - Support `background-image` per slide. - Add tests. - Update manual. --- MANUAL.txt | 69 +++++++----- pandoc.cabal | 2 + src/Text/Pandoc/Writers/Powerpoint/Output.hs | 117 ++++++++++++++++----- src/Text/Pandoc/Writers/Powerpoint/Presentation.hs | 29 +++-- test/Tests/Writers/Powerpoint.hs | 4 + test/pptx/background-image/deleted-layouts.pptx | Bin 0 -> 56282 bytes test/pptx/background-image/input.native | 17 +++ test/pptx/background-image/moved-layouts.pptx | Bin 0 -> 66987 bytes test/pptx/background-image/output.pptx | Bin 0 -> 53408 bytes test/pptx/background-image/templated.pptx | Bin 0 -> 66487 bytes 10 files changed, 178 insertions(+), 60 deletions(-) create mode 100644 test/pptx/background-image/deleted-layouts.pptx create mode 100644 test/pptx/background-image/input.native create mode 100644 test/pptx/background-image/moved-layouts.pptx create mode 100644 test/pptx/background-image/output.pptx create mode 100644 test/pptx/background-image/templated.pptx diff --git a/MANUAL.txt b/MANUAL.txt index 82fc21684..98a2f4299 100644 --- a/MANUAL.txt +++ b/MANUAL.txt @@ -6054,40 +6054,61 @@ the [Beamer User's Guide] may also be used: `allowdisplaybreaks`, `allowframebreaks`, `b`, `c`, `t`, `environment`, `label`, `plain`, `shrink`, `standout`, `noframenumbering`. -## Background in reveal.js and beamer +## Background in reveal.js, beamer, and pptx -Background images can be added to self-contained reveal.js slide shows and -to beamer slide shows. +Background images can be added to self-contained reveal.js slide shows, +beamer slide shows, and pptx slide shows. -For the same image on every slide, use the configuration -option `background-image` either in the YAML metadata block -or as a command-line variable. (There are no other options in -beamer and the rest of this section concerns reveal.js slide shows.) +### On all slides (beamer, reveal.js, pptx) -For reveal.js, you can instead use the reveal.js-native option -`parallaxBackgroundImage`. You can also set `parallaxBackgroundHorizontal` -and `parallaxBackgroundVertical` the same way and must also set -`parallaxBackgroundSize` to have your values take effect. +With beamer and reveal.js, the configuration option `background-image` can be +used either in the YAML metadata block or as a command-line variable to get the +same image on every slide. -To set an image for a particular reveal.js slide, add -`{data-background-image="/path/to/image"}` -to the first slide-level heading on the slide (which may even be empty). +For pptx, you can use a [reference doc](#option--reference-doc) in which +background images have been set on the [relevant +layouts](#powerpoint-layout-choice). + +#### `parallaxBackgroundImage` (reveal.js) + +For reveal.js, there is also the reveal.js-native option +`parallaxBackgroundImage`, which can be used instead of `background-image` to +produce a parallax scrolling background. You must also set +`parallaxBackgroundSize`, and can optionally set `parallaxBackgroundHorizontal` +and `parallaxBackgroundVertical` to configure the scrolling behaviour. See the +[reveal.js documentation](https://revealjs.com/backgrounds/#parallax-background) +for more details about the meaning of these options. In reveal.js's overview mode, the parallaxBackgroundImage will show up only on the first slide. -Other reveal.js background settings also work on individual slides, including -`data-background-size`, `data-background-repeat`, `data-background-color`, -`data-transition`, and `data-transition-speed`. +### On individual slides (reveal.js, pptx) + +To set an image for a particular reveal.js or pptx slide, add +`{background-image="/path/to/image"}` to the first slide-level heading on the +slide (which may even be empty). + +As the [HTML writers pass unknown attributes +through](#extension-link_attributes), other reveal.js background settings also +work on individual slides, including `background-size`, `background-repeat`, +`background-color`, `transition`, and `transition-speed`. (The `data-` prefix +will automatically be added.) + +Note: `data-background-image` is also supported in pptx for consistency with +reveal.js – if `background-image` isn’t found, `data-background-image` will be +checked. + +### On the title slide (reveal.js, pptx) -To add a background image to the automatically generated title slide, use the -`title-slide-attributes` variable in the YAML metadata block. It must contain -a map of attribute names and values. +To add a background image to the automatically generated title slide for +reveal.js, use the `title-slide-attributes` variable in the YAML metadata block. +It must contain a map of attribute names and values. (Note that the `data-` +prefix is required here, as it isn’t added automatically.) -See the [reveal.js documentation](https://revealjs.com/backgrounds/) for more -details. +For pptx, pass a [reference doc](#option--reference-doc) with the background +image set on the “Title Slide” layout. -For example in reveal.js: +### Example (reveal.js) ``` --- @@ -6102,7 +6123,7 @@ title-slide-attributes: Slide 1 has background_image.png as its background. -## {data-background-image="/path/to/special_image.jpg"} +## {background-image="/path/to/special_image.jpg"} Slide 2 has a special image for its background, even though the heading has no content. ``` diff --git a/pandoc.cabal b/pandoc.cabal index 6fcc384f9..0c8cf0d61 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -380,6 +380,8 @@ extra-source-files: test/rtf/*.native test/rtf/*.rtf test/pptx/*.pptx + test/pptx/background-image/input.native + test/pptx/background-image/*.pptx test/pptx/blanks/just-speaker-notes/input.native test/pptx/blanks/just-speaker-notes/*.pptx test/pptx/blanks/nbsp-in-body/input.native diff --git a/src/Text/Pandoc/Writers/Powerpoint/Output.hs b/src/Text/Pandoc/Writers/Powerpoint/Output.hs index 5eadf1312..1431469d3 100644 --- a/src/Text/Pandoc/Writers/Powerpoint/Output.hs +++ b/src/Text/Pandoc/Writers/Powerpoint/Output.hs @@ -31,6 +31,7 @@ import qualified Data.CaseInsensitive as CI import Data.Default import Data.Foldable (toList) import Data.List.NonEmpty (nonEmpty, NonEmpty ((:|))) +import Data.Ratio ((%), Ratio) import Data.Text (Text) import qualified Data.Text as T import Data.Text.Read (decimal) @@ -439,9 +440,9 @@ makeSpeakerNotesMap :: Presentation -> M.Map Int Int makeSpeakerNotesMap (Presentation _ slides) = M.fromList $ mapMaybe f (slides `zip` [1..]) `zip` [1..] - where f (Slide _ _ notes, n) = if notes == mempty - then Nothing - else Just n + where f (Slide _ _ notes _, n) = if notes == mempty + then Nothing + else Just n presentationToArchive :: PandocMonad m => WriterOptions -> Meta -> Presentation -> m Archive @@ -1570,8 +1571,9 @@ metadataToElement layout titleElems subtitleElems authorsElems dateElems metadataToElement _ _ _ _ _ = return (Nothing, mknode "p:sp" [] ()) slideToElement :: PandocMonad m => Slide -> P m Element -slideToElement (Slide _ l@(ContentSlide hdrElems shapes) _ )= do +slideToElement (Slide _ l@(ContentSlide hdrElems shapes) _ backgroundImage) = do layout <- getLayout l + backgroundImageElement <- traverse backgroundImageToElement backgroundImage (shapeIds, spTree) <- local (\env -> if null hdrElems then env @@ -1585,9 +1587,10 @@ slideToElement (Slide _ l@(ContentSlide hdrElems shapes) _ )= do [ ("xmlns:a", "http://schemas.openxmlformats.org/drawingml/2006/main"), ("xmlns:r", "http://schemas.openxmlformats.org/officeDocument/2006/relationships"), ("xmlns:p", "http://schemas.openxmlformats.org/presentationml/2006/main") - ] (mknode "p:cSld" [] [spTree] : animations) -slideToElement (Slide _ l@(TwoColumnSlide hdrElems shapesL shapesR) _) = do + ] (mknode "p:cSld" [] (toList backgroundImageElement <> [spTree]) : animations) +slideToElement (Slide _ l@(TwoColumnSlide hdrElems shapesL shapesR) _ backgroundImage) = do layout <- getLayout l + backgroundImageElement <- traverse backgroundImageToElement backgroundImage (shapeIds, spTree) <- local (\env -> if null hdrElems then env else env{envSlideHasHeader=True}) $ @@ -1601,9 +1604,10 @@ slideToElement (Slide _ l@(TwoColumnSlide hdrElems shapesL shapesR) _) = do [ ("xmlns:a", "http://schemas.openxmlformats.org/drawingml/2006/main"), ("xmlns:r", "http://schemas.openxmlformats.org/officeDocument/2006/relationships"), ("xmlns:p", "http://schemas.openxmlformats.org/presentationml/2006/main") - ] (mknode "p:cSld" [] [spTree] : animations) -slideToElement (Slide _ l@(ComparisonSlide hdrElems shapesL shapesR) _) = do + ] (mknode "p:cSld" [] (toList backgroundImageElement <> [spTree]) : animations) +slideToElement (Slide _ l@(ComparisonSlide hdrElems shapesL shapesR) _ backgroundImage) = do layout <- getLayout l + backgroundImageElement <- traverse backgroundImageToElement backgroundImage (shapeIds, spTree) <- local (\env -> if null hdrElems then env else env{envSlideHasHeader=True}) $ @@ -1620,25 +1624,36 @@ slideToElement (Slide _ l@(ComparisonSlide hdrElems shapesL shapesR) _) = do [ ("xmlns:a", "http://schemas.openxmlformats.org/drawingml/2006/main"), ("xmlns:r", "http://schemas.openxmlformats.org/officeDocument/2006/relationships"), ("xmlns:p", "http://schemas.openxmlformats.org/presentationml/2006/main") - ] (mknode "p:cSld" [] [spTree] : animations) -slideToElement (Slide _ l@(TitleSlide hdrElems) _) = do + ] (mknode "p:cSld" [] (toList backgroundImageElement <> [spTree]) : animations) +slideToElement (Slide _ l@(TitleSlide hdrElems) _ backgroundImage) = do layout <- getLayout l + backgroundImageElement <- traverse backgroundImageToElement backgroundImage (_, spTree) <- titleToElement layout hdrElems return $ mknode "p:sld" [ ("xmlns:a", "http://schemas.openxmlformats.org/drawingml/2006/main"), ("xmlns:r", "http://schemas.openxmlformats.org/officeDocument/2006/relationships"), ("xmlns:p", "http://schemas.openxmlformats.org/presentationml/2006/main") - ] [mknode "p:cSld" [] [spTree]] -slideToElement (Slide _ l@(MetadataSlide titleElems subtitleElems authorElems dateElems) _) = do + ] [mknode "p:cSld" [] (toList backgroundImageElement <> [spTree])] +slideToElement (Slide + _ + l@(MetadataSlide titleElems subtitleElems authorElems dateElems) + _ + backgroundImage) = do layout <- getLayout l + backgroundImageElement <- traverse backgroundImageToElement backgroundImage (_, spTree) <- metadataToElement layout titleElems subtitleElems authorElems dateElems return $ mknode "p:sld" [ ("xmlns:a", "http://schemas.openxmlformats.org/drawingml/2006/main"), ("xmlns:r", "http://schemas.openxmlformats.org/officeDocument/2006/relationships"), ("xmlns:p", "http://schemas.openxmlformats.org/presentationml/2006/main") - ] [mknode "p:cSld" [] [spTree]] -slideToElement (Slide _ l@(ContentWithCaptionSlide hdrElems captionShapes contentShapes) _) = do + ] [mknode "p:cSld" [] (toList backgroundImageElement <> [spTree])] +slideToElement (Slide + _ + l@(ContentWithCaptionSlide hdrElems captionShapes contentShapes) + _ + backgroundImage) = do layout <- getLayout l + backgroundImageElement <- traverse backgroundImageToElement backgroundImage (shapeIds, spTree) <- contentWithCaptionToElement layout hdrElems captionShapes contentShapes let animations = case shapeIds of Nothing -> [] @@ -1650,15 +1665,63 @@ slideToElement (Slide _ l@(ContentWithCaptionSlide hdrElems captionShapes conten [ ("xmlns:a", "http://schemas.openxmlformats.org/drawingml/2006/main"), ("xmlns:r", "http://schemas.openxmlformats.org/officeDocument/2006/relationships"), ("xmlns:p", "http://schemas.openxmlformats.org/presentationml/2006/main") - ] (mknode "p:cSld" [] [spTree] : animations) -slideToElement (Slide _ BlankSlide _) = do + ] (mknode "p:cSld" [] (toList backgroundImageElement <> [spTree]) : animations) +slideToElement (Slide _ BlankSlide _ backgroundImage) = do layout <- getLayout BlankSlide + backgroundImageElement <- traverse backgroundImageToElement backgroundImage spTree <- blankToElement layout return $ mknode "p:sld" [ ("xmlns:a", "http://schemas.openxmlformats.org/drawingml/2006/main"), ("xmlns:r", "http://schemas.openxmlformats.org/officeDocument/2006/relationships"), ("xmlns:p", "http://schemas.openxmlformats.org/presentationml/2006/main") - ] [mknode "p:cSld" [] [spTree]] + ] [mknode "p:cSld" [] (toList backgroundImageElement <> [spTree])] + +backgroundImageToElement :: PandocMonad m => FilePath -> P m Element +backgroundImageToElement path = do + MediaInfo{mInfoLocalId, mInfoFilePath} <- registerMedia path [] + (imgBytes, _) <- P.fetchItem (T.pack mInfoFilePath) + opts <- asks envOpts + let imageDimensions = either (const Nothing) + (Just . sizeInPixels) + (imageSize opts imgBytes) + pageSize <- asks envPresentationSize + let fillRectAttributes = maybe [] (offsetAttributes pageSize) imageDimensions + let rId = "rId" <> T.pack (show mInfoLocalId) + return + $ mknode "p:bg" [] + $ mknode "p:bgPr" [] + [ mknode "a:blipFill" [("dpi", "0"), ("rotWithShape", "1")] + [ mknode "a:blip" [("r:embed", rId)] + $ mknode "a:lum" [] () + , mknode "a:srcRect" [] () + , mknode "a:stretch" [] + $ mknode "a:fillRect" fillRectAttributes () + ] + , mknode "a:effectsLst" [] () + ] + where + offsetAttributes :: (Integer, Integer) -> (Integer, Integer) -> [(Text, Text)] + offsetAttributes (pageWidth, pageHeight) (pictureWidth, pictureHeight) = let + widthRatio = pictureWidth % pageWidth + heightRatio = pictureHeight % pageHeight + getOffset :: Ratio Integer -> Text + getOffset proportion = let + percentageOffset = (proportion - 1) * (-100 % 2) + integerOffset = round percentageOffset * 1000 :: Integer + in T.pack (show integerOffset) + in case compare widthRatio heightRatio of + EQ -> [] + LT -> let + offset = getOffset ((pictureHeight % pageHeight) / widthRatio) + in [ ("t", offset) + , ("b", offset) + ] + GT -> let + offset = getOffset ((pictureWidth % pageWidth) / heightRatio) + in [ ("l", offset) + , ("r", offset) + ] + slideToIncrementalAnimations :: [(ShapeId, Shape)] -> @@ -1790,8 +1853,8 @@ speakerNotesSlideNumber pgNum fieldId = ] slideToSpeakerNotesElement :: PandocMonad m => Slide -> P m (Maybe Element) -slideToSpeakerNotesElement (Slide _ _ (SpeakerNotes [])) = return Nothing -slideToSpeakerNotesElement slide@(Slide _ _ (SpeakerNotes paras)) = do +slideToSpeakerNotesElement (Slide _ _ (SpeakerNotes []) _) = return Nothing +slideToSpeakerNotesElement slide@(Slide _ _ (SpeakerNotes paras) _) = do master <- getNotesMaster fieldId <- getSlideNumberFieldId master num <- slideNum slide @@ -2037,7 +2100,7 @@ slideToSpeakerNotesEntry slide = do _ -> return Nothing slideToSpeakerNotesRelElement :: PandocMonad m => Slide -> P m (Maybe Element) -slideToSpeakerNotesRelElement (Slide _ _ (SpeakerNotes [])) = return Nothing +slideToSpeakerNotesRelElement (Slide _ _ (SpeakerNotes []) _) = return Nothing slideToSpeakerNotesRelElement slide@Slide{} = do idNum <- slideNum slide return $ Just $ @@ -2124,13 +2187,13 @@ slideToSlideRelElement slide = do target <- flip fmap getSlideLayouts $ T.pack . ("../slideLayouts/" <>) . takeFileName . slPath . case slide of - (Slide _ MetadataSlide{} _) -> metadata - (Slide _ TitleSlide{} _) -> title - (Slide _ ContentSlide{} _) -> content - (Slide _ TwoColumnSlide{} _) -> twoColumn - (Slide _ ComparisonSlide{} _) -> comparison - (Slide _ ContentWithCaptionSlide{} _) -> contentWithCaption - (Slide _ BlankSlide _) -> blank + (Slide _ MetadataSlide{} _ _) -> metadata + (Slide _ TitleSlide{} _ _) -> title + (Slide _ ContentSlide{} _ _) -> content + (Slide _ TwoColumnSlide{} _ _) -> twoColumn + (Slide _ ComparisonSlide{} _ _) -> comparison + (Slide _ ContentWithCaptionSlide{} _ _) -> contentWithCaption + (Slide _ BlankSlide _ _) -> blank speakerNotesRels <- maybeToList <$> speakerNotesSlideRelElement slide diff --git a/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs b/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs index a7660fc5e..fb4518bd7 100644 --- a/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs +++ b/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs @@ -63,7 +63,7 @@ import Text.Pandoc.Writers.Shared (lookupMetaInlines, lookupMetaBlocks , toLegacyTable) import qualified Data.Map as M import qualified Data.Set as S -import Data.Maybe (maybeToList, fromMaybe, listToMaybe) +import Data.Maybe (maybeToList, fromMaybe, listToMaybe, isNothing) import Text.Pandoc.Highlighting import qualified Data.Text as T import Control.Applicative ((<|>)) @@ -201,6 +201,7 @@ data DocProps = DocProps { dcTitle :: Maybe T.Text data Slide = Slide { slideId :: SlideId , slideLayout :: Layout , slideSpeakerNotes :: SpeakerNotes + , slideBackgroundImage :: Maybe FilePath } deriving (Show, Eq) newtype SlideId = SlideId T.Text @@ -223,7 +224,7 @@ data Layout = MetadataSlide [ParaElem] [ParaElem] [[ParaElem]] [ParaElem] | ComparisonSlide [ParaElem] ([Shape], [Shape]) ([Shape], [Shape]) -- heading left@(text, content) right@(text, content) | ContentWithCaptionSlide [ParaElem] [Shape] [Shape] - -- heading text content + -- heading text content | BlankSlide deriving (Show, Eq) @@ -725,6 +726,7 @@ bodyBlocksToSlide _ (blk : blks) spkNotes sldId (TwoColumnSlide [] shapesL shapesR) spkNotes + Nothing let mkComparison blksL1 blksL2 blksR1 blksR2 = do shapesL1 <- blocksToShapes blksL1 shapesL2 <- blocksToShapes blksL2 @@ -735,6 +737,7 @@ bodyBlocksToSlide _ (blk : blks) spkNotes sldId (ComparisonSlide [] (shapesL1, shapesL2) (shapesR1, shapesR2)) spkNotes + Nothing let (blksL1, blksL2) = break notText blksL (blksR1, blksR2) = break notText blksR if (any null [blksL1, blksL2]) && (any null [blksR1, blksR2]) @@ -744,7 +747,7 @@ bodyBlocksToSlide _ (blk : blks) spkNotes = do sldId <- asks envCurSlideId inNoteSlide <- asks envInNoteSlide let mkSlide s = - Slide sldId s spkNotes + Slide sldId s spkNotes Nothing if inNoteSlide then mkSlide . ContentSlide [] <$> forceFontSize noteSize (blocksToShapes (blk : blks)) @@ -767,14 +770,15 @@ bodyBlocksToSlide _ [] spkNotes = do sldId BlankSlide spkNotes + Nothing blocksToSlide' :: Int -> [Block] -> SpeakerNotes -> Pres Slide -blocksToSlide' lvl (Header n (ident, _, _) ils : blks) spkNotes +blocksToSlide' lvl (Header n (ident, _, attributes) ils : blks) spkNotes | n < lvl = do registerAnchorId ident sldId <- asks envCurSlideId hdr <- inlinesToParElems ils - return $ Slide sldId (TitleSlide hdr) spkNotes + return $ Slide sldId (TitleSlide hdr) spkNotes backgroundImage | n == lvl || lvl == 0 = do registerAnchorId ident hdr <- inlinesToParElems ils @@ -788,7 +792,10 @@ blocksToSlide' lvl (Header n (ident, _, _) ils : blks) spkNotes ContentWithCaptionSlide _ text content -> ContentWithCaptionSlide hdr text content BlankSlide -> if all inlineIsBlank ils then BlankSlide else ContentSlide hdr [] layout' -> layout' - return $ slide{slideLayout = layout} + return $ slide{slideLayout = layout, slideBackgroundImage = backgroundImage} + where + backgroundImage = T.unpack <$> (lookup "background-image" attributes + <|> lookup "data-background-image" attributes) blocksToSlide' lvl blks spkNotes = bodyBlocksToSlide lvl blks spkNotes blockToSpeakerNotes :: Block -> Pres SpeakerNotes @@ -869,12 +876,13 @@ getMetaSlide = do metadataSlideId (MetadataSlide title subtitle authors date) mempty + Nothing addSpeakerNotesToMetaSlide :: Slide -> [Block] -> Pres (Slide, [Block]) -addSpeakerNotesToMetaSlide (Slide sldId layout@MetadataSlide{} spkNotes) blks = +addSpeakerNotesToMetaSlide (Slide sldId layout@MetadataSlide{} spkNotes backgroundImage) blks = do let (ntsBlks, blks') = span isNotesDiv blks spkNotes' <- mconcat <$> mapM blockToSpeakerNotes ntsBlks - return (Slide sldId layout (spkNotes <> spkNotes'), blks') + return (Slide sldId layout (spkNotes <> spkNotes') backgroundImage, blks') addSpeakerNotesToMetaSlide sld blks = return (sld, blks) makeTOCSlide :: [Block] -> Pres Slide @@ -1010,7 +1018,10 @@ emptyLayout layout = case layout of emptySlide :: Slide -> Bool -emptySlide (Slide _ layout notes) = (notes == mempty) && emptyLayout layout +emptySlide (Slide _ layout notes backgroundImage) + = (notes == mempty) + && emptyLayout layout + && isNothing backgroundImage makesBlankSlide :: [Block] -> Bool makesBlankSlide = all blockIsBlank diff --git a/test/Tests/Writers/Powerpoint.hs b/test/Tests/Writers/Powerpoint.hs index 6eb8c7f67..6e676dc37 100644 --- a/test/Tests/Writers/Powerpoint.hs +++ b/test/Tests/Writers/Powerpoint.hs @@ -240,4 +240,8 @@ tests = groupPptxTests [ pptxTests "Inline formatting" def "pptx/incremental-lists/without-flag/input.native" "pptx/incremental-lists/without-flag/output.pptx" + , pptxTests "Background images" + def + "pptx/background-image/input.native" + "pptx/background-image/output.pptx" ] diff --git a/test/pptx/background-image/deleted-layouts.pptx b/test/pptx/background-image/deleted-layouts.pptx new file mode 100644 index 000000000..05d4104b7 Binary files /dev/null and b/test/pptx/background-image/deleted-layouts.pptx differ diff --git a/test/pptx/background-image/input.native b/test/pptx/background-image/input.native new file mode 100644 index 000000000..22b089a95 --- /dev/null +++ b/test/pptx/background-image/input.native @@ -0,0 +1,17 @@ +[Header 1 ("section-header-with-background-image",[],[("background-image","movie.jpg")]) [Str "Section",Space,Str "Header",Space,Str "(with",Space,Str "background",Space,Str "image)"] +,Header 2 ("slide-1",[],[("background-image","lalune.jpg")]) [Str "Slide",Space,Str "1"] +,Para [Str "This",Space,Str "slide",Space,Str "has",Space,Str "a",Space,Str "moon",Space,Str "background."] +,Header 2 ("slide-2",[],[("background-image","movie.jpg")]) [Str "Slide",Space,Str "2"] +,Para [Str "This",Space,Str "slide",Space,Str "has",Space,Str "a",Space,Str "movie",Space,Str "background."] +,Header 2 ("slide-3",[],[("background-image","movie.jpg")]) [Str "Slide",Space,Str "3"] +,Div ("",["columns"],[]) + [Div ("",["column"],[]) + [Para [Str "Background",Space,Str "images",Space,Str "work",Space,Str "in",Space,Str "two-column",Space,Str "layout."]] + ,Div ("",["column"],[]) + [Para [Str "hello"]]] +,Header 2 ("slide-4",[],[("background-image","movie.jpg")]) [Str "Slide",Space,Str "4"] +,Para [Str "You",Space,Str "can",Space,Str "have",Space,Str "images",Space,Str "on",Space,Str "slides",Space,Str "that",Space,Str "have",Space,Str "background",Space,Str "images:"] +,Para [Image ("",[],[]) [Str "An",Space,Str "image"] ("lalune.jpg","fig:")] +,Header 2 ("section",[],[("background-image","lalune.jpg")]) [] +,Div ("",["notes"],[]) + [Para [Str "Blank",Space,Str "slides",Space,Str "can",Space,Str "have",Space,Str "background",Space,Str "images."]]] diff --git a/test/pptx/background-image/moved-layouts.pptx b/test/pptx/background-image/moved-layouts.pptx new file mode 100644 index 000000000..73b69e1d6 Binary files /dev/null and b/test/pptx/background-image/moved-layouts.pptx differ diff --git a/test/pptx/background-image/output.pptx b/test/pptx/background-image/output.pptx new file mode 100644 index 000000000..9738eefb8 Binary files /dev/null and b/test/pptx/background-image/output.pptx differ diff --git a/test/pptx/background-image/templated.pptx b/test/pptx/background-image/templated.pptx new file mode 100644 index 000000000..52d304957 Binary files /dev/null and b/test/pptx/background-image/templated.pptx differ -- cgit v1.2.3 From a07d955d6f96e78ade3e09c150ce580fb6e6f3a7 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Thu, 16 Sep 2021 20:42:18 -0700 Subject: Fix code blocks using `--preserve-tabs`. Previously they did not behave as the equivalent input with spaces would. Closes #7573. --- src/Text/Pandoc/Readers/Markdown.hs | 8 +++++++- test/command/7573.md | 11 +++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 test/command/7573.md diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs index 45594e0fa..917eef287 100644 --- a/src/Text/Pandoc/Readers/Markdown.hs +++ b/src/Text/Pandoc/Readers/Markdown.hs @@ -1124,7 +1124,13 @@ rawHtmlBlocks = do let selfClosing = "/>" `T.isSuffixOf` raw -- we don't want '

diff --git a/test/command/4019.md b/test/command/4019.md index ab13f0233..641905b54 100644 --- a/test/command/4019.md +++ b/test/command/4019.md @@ -1,5 +1,5 @@ ``` -pandoc --wrap=preserve +% pandoc --wrap=preserve This works! This fails? ^D diff --git a/test/command/4068.md b/test/command/4068.md index 7b43a7084..ddd1aaee4 100644 --- a/test/command/4068.md +++ b/test/command/4068.md @@ -1,5 +1,5 @@ ``` -pandoc -f mediawiki -t native +% pandoc -f mediawiki -t native [https://domain.com/script.php?a=1&b=2&c=&d=4 open productname bugs] [http://domain.com?a=. open productname bugs] diff --git a/test/command/4119.md b/test/command/4119.md index c4efac30f..0f7da5fe0 100644 --- a/test/command/4119.md +++ b/test/command/4119.md @@ -1,5 +1,5 @@ ``` -pandoc -t native +% pandoc -t native | col1 | col2 | | ---- | ---- | | 1 | 2 | diff --git a/test/command/4306.md b/test/command/4306.md index f1267eb9b..82abd8005 100644 --- a/test/command/4306.md +++ b/test/command/4306.md @@ -1,5 +1,5 @@ ``` -pandoc -f latex -t native +% pandoc -f latex -t native \documentclass{article} \usepackage{hyperref} \begin{document} diff --git a/test/command/4528.md b/test/command/4528.md index a34af33c5..9b917f808 100644 --- a/test/command/4528.md +++ b/test/command/4528.md @@ -15,7 +15,6 @@ This has \textsc{small caps} in it. ^D This has small caps in it. ``` -``` ``` % pandoc --wrap=none -f latex -t markdown_strict+raw_html diff --git a/test/command/4553.md b/test/command/4553.md index e5122d4d9..c179a3567 100644 --- a/test/command/4553.md +++ b/test/command/4553.md @@ -1,5 +1,5 @@ ``` -pandoc -f latex -t native +% pandoc -f latex -t native foo \include{command/bar} ^D [Para [Str "foo"] @@ -7,7 +7,7 @@ foo \include{command/bar} ``` ``` -pandoc -f latex -t native +% pandoc -f latex -t native foo \input{command/bar} ^D [Para [Str "foo",Space,Emph [Str "hi",Space,Str "there"]]] diff --git a/test/command/4667.md b/test/command/4667.md index 1fff3708d..a4ea0a5f4 100644 --- a/test/command/4667.md +++ b/test/command/4667.md @@ -1,5 +1,5 @@ ``` -pandoc -t latex +% pandoc -t latex --- header-includes: - \newcommand{\blandscape}{\begin{landscape}} diff --git a/test/command/4805-beamer-columns-alignment.md b/test/command/4805-beamer-columns-alignment.md index bd1be0f20..d890730a8 100644 --- a/test/command/4805-beamer-columns-alignment.md +++ b/test/command/4805-beamer-columns-alignment.md @@ -1,5 +1,5 @@ ``` -pandoc -t beamer +% pandoc -t beamer :::: { .columns } ::: { .column align=center } ::: diff --git a/test/command/4833.md b/test/command/4833.md index 42001ec74..838fe1463 100644 --- a/test/command/4833.md +++ b/test/command/4833.md @@ -1,5 +1,5 @@ ``` -pandoc -f native -t rst +% pandoc -f native -t rst [Div ("",["warning"],[]) [Div ("",["title"],[]) [Para [Str "Warning"]] @@ -10,7 +10,7 @@ pandoc -f native -t rst Hi ``` ``` -pandoc -f native -t rst +% pandoc -f native -t rst [Div ("",["unknown"],[]) [Para [Str "Hi"]]] ^D diff --git a/test/command/4842.md b/test/command/4842.md index a311739b7..0403c4d11 100644 --- a/test/command/4842.md +++ b/test/command/4842.md @@ -1,5 +1,5 @@ ``` -pandoc -f latex -t native +% pandoc -f latex -t native \l ^D [Para [Str "\322"]] diff --git a/test/command/5050.md b/test/command/5050.md index 9c8fa1655..735156105 100644 --- a/test/command/5050.md +++ b/test/command/5050.md @@ -1,5 +1,5 @@ ``` -pandoc -t rst +% pandoc -t rst x ^D diff --git a/test/command/5080.md b/test/command/5080.md index c9e9a2971..2dfd0683a 100644 --- a/test/command/5080.md +++ b/test/command/5080.md @@ -1,12 +1,12 @@ ``` -pandoc -t asciidoc +% pandoc -t asciidoc [foo *bar*]{.small .red key=val} ^D [.small .red]#foo _bar_# ``` ``` -pandoc -f html -t asciidoc +% pandoc -f html -t asciidoc SMALL ^D [.small]#SMALL# diff --git a/test/command/5128.md b/test/command/5128.md index 35866547e..261cea507 100644 --- a/test/command/5128.md +++ b/test/command/5128.md @@ -1,5 +1,5 @@ ``` -pandoc -f org -t rst --columns=78 +% pandoc -f org -t rst --columns=78 | Option | Meaning | |--------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | =<= | Left alignment, additional characters are added to the right (default for string). | diff --git a/test/command/5182.md b/test/command/5182.md index dc30a12ce..e11dd29f0 100644 --- a/test/command/5182.md +++ b/test/command/5182.md @@ -1,5 +1,5 @@ ``` -pandoc -f rst -t native +% pandoc -f rst -t native .. include:: command/5182.txt ^D [CodeBlock ("",["python","numberLines"],[]) "def func(x):\n return y"] diff --git a/test/command/6658.md b/test/command/6658.md index 96700c8fe..c4e5dbf3a 100644 --- a/test/command/6658.md +++ b/test/command/6658.md @@ -1,5 +1,5 @@ ``` -pandoc -f latex -t html +% pandoc -f latex -t html \num{12345,67890} \num{1+-2i} diff --git a/test/command/6836.md b/test/command/6836.md index c35048045..733318b69 100644 --- a/test/command/6836.md +++ b/test/command/6836.md @@ -1,5 +1,5 @@ ``` -pandoc -t native +% pandoc -t native [@buchanan] (@foo) diff --git a/test/command/7216.md b/test/command/7216.md index cab3b9689..2fb99c7b5 100644 --- a/test/command/7216.md +++ b/test/command/7216.md @@ -1,5 +1,5 @@ ``` -pandoc -t latex +% pandoc -t latex "This is some text in quotes. Another paragraph by the same speaker follows. The first paragraph should have no close quote. "The second paragraph should have open and close quotes." diff --git a/test/command/7529.md b/test/command/7529.md index f0c443d73..9515258e9 100644 --- a/test/command/7529.md +++ b/test/command/7529.md @@ -1,5 +1,5 @@ ``` -pandoc -f html -t asciidoc +% pandoc -f html -t asciidoc https://example.com/show.cgi?id=hi--there--everyone ^D link:++https://example.com/show.cgi?id=hi--there--everyone++[] diff --git a/test/command/987.md b/test/command/987.md index f632231ef..fc75d2c56 100644 --- a/test/command/987.md +++ b/test/command/987.md @@ -1,5 +1,5 @@ ``` -pandoc -f latex -t markdown +% pandoc -f latex -t markdown \documentclass{article} \newenvironment{flubble}{FOO}{BAR} \begin{document} diff --git a/test/command/ascii.md b/test/command/ascii.md index 0826d7414..a328ed863 100644 --- a/test/command/ascii.md +++ b/test/command/ascii.md @@ -1,19 +1,19 @@ ``` -pandoc -t html --ascii +% pandoc -t html --ascii äéıå ^D

äéıå

``` ``` -pandoc -t latex --ascii +% pandoc -t latex --ascii äéıå ^D \"{a}\'{e}\i\r{a} ``` ``` -pandoc -t man --ascii +% pandoc -t man --ascii äéıå ^D .PP @@ -21,7 +21,7 @@ pandoc -t man --ascii ``` ``` -pandoc -t ms --ascii +% pandoc -t ms --ascii äéıå ^D .LP @@ -29,7 +29,7 @@ pandoc -t ms --ascii ``` ``` -pandoc -t docbook --ascii +% pandoc -t docbook --ascii äéıå ^D @@ -38,14 +38,14 @@ pandoc -t docbook --ascii ``` ``` -pandoc -t jats --ascii +% pandoc -t jats --ascii äéıå ^D

äéıå

``` ``` -pandoc -t markdown-smart --ascii +% pandoc -t markdown-smart --ascii "äéıå" ^D “äéıå” diff --git a/test/command/latex-command-comment.md b/test/command/latex-command-comment.md index 640277f15..af679afba 100644 --- a/test/command/latex-command-comment.md +++ b/test/command/latex-command-comment.md @@ -1,5 +1,5 @@ ``` -pandoc -f latex -t native +% pandoc -f latex -t native \emph% {hi} ^D -- cgit v1.2.3 From c266734448544a118ed80e47deaa2590131c7f84 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sun, 19 Sep 2021 12:09:51 -0700 Subject: Use pretty-simple to format native output. Previously we used our own homespun formatting. But this produces over-long lines that aren't ideal for diffs in tests. Easier to use something off-the-shelf and standard. Closes #7580. Performance is slower by about a factor of 10, but this isn't really a problem because native isn't suitable as a serialization format. (For serialization you should use json, because the reader is so much faster than native.) --- pandoc.cabal | 3 +- src/Text/Pandoc/Writers/Native.hs | 88 +- test/Tests/Old.hs | 6 +- test/command/1390.md | 4 +- test/command/1592.md | 44 +- test/command/1608.md | 189 +- test/command/168.md | 46 +- test/command/1718.md | 8 +- test/command/1773.md | 2 +- test/command/1881.md | 175 +- test/command/2118.md | 8 +- test/command/2549.md | 13 +- test/command/256.md | 34 +- test/command/3113.md | 4 +- test/command/3123.md | 6 +- test/command/3236.md | 14 +- test/command/3257.md | 4 +- test/command/3348.md | 77 +- test/command/3401.md | 4 +- test/command/3407.md | 4 +- test/command/3510.md | 23 +- test/command/3511.md | 47 +- test/command/3516.md | 60 +- test/command/3530.md | 58 +- test/command/3533-rst-csv-tables.md | 282 +- test/command/3534.md | 42 +- test/command/3537.md | 6 +- test/command/3539.md | 248 +- test/command/3558.md | 10 +- test/command/3585.md | 28 +- test/command/3587.md | 108 +- test/command/3681.md | 48 +- test/command/3706.md | 104 +- test/command/3708.md | 58 +- test/command/3733.md | 9 +- test/command/3755.md | 36 +- test/command/3779.md | 41 +- test/command/3794.md | 3 +- test/command/3804.md | 4 +- test/command/3853.md | 10 +- test/command/3880.md | 2 +- test/command/3916.md | 16 +- test/command/3947.md | 7 +- test/command/3958.md | 6 +- test/command/3971.md | 2 +- test/command/3983.md | 16 +- test/command/3989.md | 19 +- test/command/4007.md | 6 +- test/command/4054.md | 12 +- test/command/4056.md | 58 +- test/command/4063.md | 40 +- test/command/4068.md | 23 +- test/command/4119.md | 69 +- test/command/4134.md | 7 +- test/command/4159.md | 7 +- test/command/4162.md | 5 +- test/command/4183.md | 8 +- test/command/4186.md | 7 +- test/command/4193.md | 4 +- test/command/4199.md | 2 +- test/command/4240.md | 28 +- test/command/4253.md | 2 +- test/command/4280.md | 2 +- test/command/4281.md | 20 +- test/command/4284.md | 80 +- test/command/4306.md | 15 +- test/command/4374.md | 15 +- test/command/4382.md | 4 +- test/command/4424.md | 2 +- test/command/4454.md | 4 +- test/command/4499.md | 4 +- test/command/4513.md | 43 +- test/command/4528.md | 1 + test/command/4553.md | 5 +- test/command/4576.md | 2 +- test/command/4579.md | 64 +- test/command/4624.md | 16 +- test/command/4635.md | 8 +- test/command/4669.md | 26 +- test/command/4715.md | 24 +- test/command/4722.md | 57 +- test/command/4742.md | 36 +- test/command/4743.md | 24 +- test/command/4781.md | 22 +- test/command/4811.md | 24 +- test/command/4817.md | 15 +- test/command/4819.md | 24 +- test/command/4832.md | 24 +- test/command/4842.md | 2 +- test/command/4845.md | 12 +- test/command/4848.md | 67 +- test/command/4860.md | 13 +- test/command/4877.md | 4 +- test/command/4919.md | 7 +- test/command/4928.md | 192 +- test/command/4933.md | 2 +- test/command/5014.md | 45 +- test/command/5079.md | 32 +- test/command/5099.md | 18 +- test/command/5178.md | 17 +- test/command/5182.md | 4 +- test/command/5271.md | 33 +- test/command/5285.md | 27 +- test/command/5321.md | 12 +- test/command/5360.md | 26 +- test/command/5368.md | 32 +- test/command/5410.md | 2 +- test/command/5416.md | 4 +- test/command/5540.md | 8 +- test/command/5549.md | 3 +- test/command/5619.md | 29 +- test/command/5682.md | 2 +- test/command/5686.md | 26 +- test/command/5700.md | 38 +- test/command/5708.md | 44 +- test/command/5711.md | 32 +- test/command/5714.md | 15 +- test/command/5753.md | 7 +- test/command/5795.md | 7 +- test/command/5797.md | 2 +- test/command/5805.md | 2 +- test/command/5845.md | 20 +- test/command/5878.md | 12 +- test/command/6009.md | 19 +- test/command/6026.md | 30 +- test/command/6034.md | 4 +- test/command/6114.md | 8 +- test/command/6137.md | 162 +- test/command/6288.md | 2 +- test/command/6324.md | 12 +- test/command/6699.md | 8 +- test/command/6709.md | 2 +- test/command/6719.md | 4 +- test/command/6791.md | 40 +- test/command/6802.md | 4 +- test/command/6836.md | 36 +- test/command/6844.md | 6 +- test/command/6869.md | 16 +- test/command/6873.md | 35 +- test/command/6890.md | 113 +- test/command/6993.md | 6 +- test/command/7003.md | 21 +- test/command/7080.md | 7 +- test/command/7092.md | 2 +- test/command/7129.md | 60 +- test/command/7134.md | 45 +- test/command/7145.md | 65 +- test/command/7155.md | 22 +- test/command/7339.md | 7 +- test/command/7340.md | 2 +- test/command/7400.md | 4 +- test/command/7434.md | 14 +- test/command/7436.md | 25 +- test/command/7557.md | 18 +- test/command/934.md | 35 +- test/command/982.md | 2 +- test/command/adjacent_latex_blocks.md | 7 +- test/command/cite-in-inline-note.md | 22 +- test/command/citeproc-author-in-text-suffix.md | 24 +- test/command/csv.md | 129 +- test/command/docbook-bibliography.md | 35 +- test/command/dots.md | 4 +- test/command/empty_paragraphs.md | 22 +- test/command/gfm.md | 131 +- test/command/hspace.md | 22 +- test/command/html-read-figure.md | 22 +- test/command/html-trim-definition-list-terms.md | 12 +- test/command/hyphenat.md | 22 +- test/command/ifstrequal.md | 4 +- test/command/indented-fences.md | 4 +- test/command/input-with-endinput.md | 10 +- test/command/latex-center.md | 3 +- test/command/latex-color.md | 136 +- test/command/latex-command-comment.md | 2 +- test/command/latex-fontawesome.md | 4 +- test/command/latex-tabular-column-specs.md | 106 +- test/command/lettrine.md | 21 +- test/command/lstlisting.md | 30 +- test/command/macro-defs-in-preamble.md | 13 +- test/command/md-abbrevs.md | 4 +- test/command/multiple-metadata-blocks.md | 6 +- test/command/refs.md | 220 +- test/command/setext-fenced-div.md | 3 +- test/command/shift-heading-level-by.md | 31 +- test/command/sloppypar.md | 214 +- test/command/table-with-cell-align.md | 64 +- test/command/table-with-column-span.md | 224 +- test/command/tabularx.md | 393 +- test/command/translations.md | 8 +- test/command/write18.md | 4 +- test/command/yaml-metadata-blocks.md | 96 +- test/command/yaml-with-chomp.md | 13 +- test/creole-reader.native | 1124 +- test/docbook-chapter.native | 184 +- test/docbook-reader.native | 3639 ++++++- test/docbook-xref.native | 213 +- test/epub/features.native | 1837 +++- test/epub/formatting.native | 6791 +++++++++++- test/epub/wasteland.native | 12347 ++++++++++++++++++++-- test/fb2/reader/emphasis.native | 44 +- test/fb2/reader/epigraph.native | 27 +- test/fb2/reader/meta.native | 45 +- test/fb2/reader/notes.native | 28 +- test/fb2/reader/poem.native | 40 +- test/fb2/reader/titles.native | 41 +- test/haddock-reader.native | 463 +- test/html-reader.native | 4202 ++++++-- test/ipynb/simple.out.native | 121 +- test/jats-reader.native | 3564 +++++-- test/jira-reader.native | 1209 ++- test/latex-reader.native | 2935 ++++- test/lhs-test-markdown.native | 138 +- test/lhs-test.native | 138 +- test/man-reader.native | 1286 ++- test/markdown-citations.native | 556 +- test/markdown-reader-more.native | 1538 ++- test/mediawiki-reader.native | 1862 +++- test/opml-reader.native | 298 +- test/org-select-tags.native | 106 +- test/pipe-tables.native | 1176 ++- test/rst-reader.native | 2317 +++- test/rtf/accent.native | 20 +- test/rtf/bookmark.native | 14 +- test/rtf/footnote.native | 132 +- test/rtf/formatting.native | 61 +- test/rtf/heading.native | 19 +- test/rtf/image.native | 11 +- test/rtf/link.native | 7 +- test/rtf/list_complex.native | 108 +- test/rtf/list_simple.native | 19 +- test/rtf/table_error_codes.native | 515 +- test/rtf/table_simple.native | 99 +- test/rtf/unicode.native | 5 +- test/tables-rstsubset.native | 1214 ++- test/tables.haddock | 60 +- test/tables.markdown | 28 +- test/tables.muse | 48 +- test/tables.native | 1184 ++- test/tables.opendocument | 4 +- test/tables.plain | 28 +- test/tables.rst | 60 +- test/tables/planets.latex | 8 +- test/testsuite.native | 2900 ++++- test/textile-reader.native | 1560 ++- test/tikiwiki-reader.native | 973 +- test/twiki-reader.native | 1125 +- test/txt2tags.native | 6168 +++++++++-- test/vimwiki-reader.native | 2868 ++++- test/writer.asciidoc | 12 +- test/writer.asciidoctor | 16 +- test/writer.context | 12 +- test/writer.docbook4 | 32 +- test/writer.docbook5 | 35 +- test/writer.haddock | 43 +- test/writer.jats_archiving | 28 +- test/writer.jats_articleauthoring | 20 +- test/writer.jats_publishing | 28 +- test/writer.latex | 17 +- test/writer.man | 18 +- test/writer.markdown | 45 +- test/writer.ms | 12 +- test/writer.muse | 16 +- test/writer.native | 2794 ++++- test/writer.opendocument | 77 +- test/writer.org | 15 +- test/writer.plain | 38 +- test/writer.rst | 4 +- test/writer.tei | 22 +- test/writer.texinfo | 26 +- 269 files changed, 65524 insertions(+), 11857 deletions(-) diff --git a/pandoc.cabal b/pandoc.cabal index 333d9afdc..7003abe2c 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -583,7 +583,8 @@ library xml-conduit >= 1.9.1.1 && < 1.10, unicode-collation >= 0.1.1 && < 0.2, zip-archive >= 0.2.3.4 && < 0.5, - zlib >= 0.5 && < 0.7 + zlib >= 0.5 && < 0.7, + pretty-simple >= 4.0 && < 4.1 if os(windows) && arch(i386) build-depends: basement >= 0.0.10, foundation >= 0.0.23 diff --git a/src/Text/Pandoc/Writers/Native.hs b/src/Text/Pandoc/Writers/Native.hs index 9c2ce805d..67af39a31 100644 --- a/src/Text/Pandoc/Writers/Native.hs +++ b/src/Text/Pandoc/Writers/Native.hs @@ -12,82 +12,24 @@ Conversion of a 'Pandoc' document to a string representation. -} module Text.Pandoc.Writers.Native ( writeNative ) where -import Data.List (intersperse) import Data.Text (Text) +import qualified Data.Text.Lazy as TL import Text.Pandoc.Class.PandocMonad (PandocMonad) import Text.Pandoc.Definition -import Text.Pandoc.Options (WrapOption (..), WriterOptions (..)) -import Text.DocLayout - -prettyList :: [Doc Text] -> Doc Text -prettyList ds = - "[" <> - mconcat (intersperse (cr <> ",") $ map (nest 1) ds) <> "]" - --- | Prettyprint Pandoc block element. -prettyBlock :: Block -> Doc Text -prettyBlock (LineBlock lines') = - "LineBlock" $$ prettyList (map (text . show) lines') -prettyBlock (BlockQuote blocks) = - "BlockQuote" $$ prettyList (map prettyBlock blocks) -prettyBlock (OrderedList attribs blockLists) = - "OrderedList" <> space <> text (show attribs) $$ - prettyList (map (prettyList . map prettyBlock) blockLists) -prettyBlock (BulletList blockLists) = - "BulletList" $$ - prettyList (map (prettyList . map prettyBlock) blockLists) -prettyBlock (DefinitionList items) = "DefinitionList" $$ - prettyList (map deflistitem items) - where deflistitem (term, defs) = "(" <> text (show term) <> "," <> cr <> - nest 1 (prettyList $ map (prettyList . map prettyBlock) defs) <> ")" -prettyBlock (Table attr blkCapt specs thead tbody tfoot) = - mconcat [ "Table " - , text (show attr) - , " " - , prettyCaption blkCapt ] $$ - prettyList (map (text . show) specs) $$ - prettyHead thead $$ - prettyBodies tbody $$ - prettyFoot tfoot - where prettyRows = prettyList . map prettyRow - prettyRow (Row a body) = - text ("Row " <> show a) $$ prettyList (map prettyCell body) - prettyCell (Cell a ma h w b) = - mconcat [ "Cell " - , text (show a) - , " " - , text (show ma) - , " (" - , text (show h) - , ") (" - , text (show w) - , ")" ] $$ - prettyList (map prettyBlock b) - prettyCaption (Caption mshort body) = - "(Caption " <> text (showsPrec 11 mshort "") $$ prettyList (map prettyBlock body) <> ")" - prettyHead (TableHead thattr body) - = "(TableHead " <> text (show thattr) $$ prettyRows body <> ")" - prettyBody (TableBody tbattr rhc hd bd) - = mconcat [ "(TableBody " - , text (show tbattr) - , " (" - , text (show rhc) - , ")" ] $$ prettyRows hd $$ prettyRows bd <> ")" - prettyBodies = prettyList . map prettyBody - prettyFoot (TableFoot tfattr body) - = "(TableFoot " <> text (show tfattr) $$ prettyRows body <> ")" -prettyBlock (Div attr blocks) = - text ("Div " <> show attr) $$ prettyList (map prettyBlock blocks) -prettyBlock block = text $ show block +import Text.Pandoc.Options (WriterOptions (..)) +import Text.Pretty.Simple (pShowOpt, defaultOutputOptionsNoColor, + OutputOptions(..), StringOutputStyle(..)) -- | Prettyprint Pandoc document. writeNative :: PandocMonad m => WriterOptions -> Pandoc -> m Text -writeNative opts (Pandoc meta blocks) = return $ - let colwidth = if writerWrapText opts == WrapAuto - then Just $ writerColumns opts - else Nothing - withHead = case writerTemplate opts of - Just _ -> \bs -> text ("Pandoc (" ++ show meta ++ ")") $$ - bs $$ cr - Nothing -> id - in render colwidth $ withHead $ prettyList $ map prettyBlock blocks +writeNative opts (Pandoc meta blocks) = do + let popts = defaultOutputOptionsNoColor{ + outputOptionsIndentAmount = 2, + outputOptionsPageWidth = writerColumns opts, + outputOptionsCompact = True, + outputOptionsCompactParens = False, + outputOptionsStringStyle = Literal } + return $ + case writerTemplate opts of + Just _ -> TL.toStrict $ pShowOpt popts (Pandoc meta blocks) <> "\n" + Nothing -> TL.toStrict $ pShowOpt popts blocks diff --git a/test/Tests/Old.hs b/test/Tests/Old.hs index 4baa16d45..d080f68f1 100644 --- a/test/Tests/Old.hs +++ b/test/Tests/Old.hs @@ -146,7 +146,7 @@ tests pandocPath = "dokuwiki_external_images.native" "dokuwiki_external_images.dokuwiki" ] , testGroup "opml" - [ test' "basic" ["-r", "native", "-w", "opml", "--columns=78", "-s"] + [ test' "basic" ["-r", "native", "-w", "opml", "--columns=80", "-s"] "testsuite.native" "writer.opml" , test' "reader" ["-r", "opml", "-w", "native", "-s"] "opml-reader.opml" "opml-reader.native" @@ -262,7 +262,7 @@ writerTests pandocPath format "tables" opts "tables.native" ("tables" <.> format) ] where - opts = ["-r", "native", "-w", format, "--columns=78", + opts = ["-r", "native", "-w", format, "--columns=80", "--variable", "pandoc-version="] extendedWriterTests :: FilePath -> String -> [TestTree] @@ -276,7 +276,7 @@ extendedWriterTests pandocPath format ("tables" name <.> format) in map testForTable ["planets", "nordics", "students"] where - opts = ["-r", "native", "-w", format, "--columns=78", + opts = ["-r", "native", "-w", format, "--columns=80", "--variable", "pandoc-version="] s5WriterTest :: FilePath -> String -> [String] -> String -> TestTree diff --git a/test/command/1390.md b/test/command/1390.md index ffd2cef8d..1d479dc94 100644 --- a/test/command/1390.md +++ b/test/command/1390.md @@ -3,7 +3,9 @@ \newcommand\foo{+} Testing: $\mu\foo\eta$. ^D -[Para [Str "Testing:",Space,Math InlineMath "\\mu+\\eta",Str "."]] +[ Para + [ Str "Testing:", Space, Math InlineMath "\\mu+\\eta", Str "." ] +] ``` " -,Para [Str "Just",Space,Str "plain",Space,Str "comment,",Space,Str "with",Space,Str "trailing",Space,Str "spaces",Space,Str "on",Space,Str "the",Space,Str "line:"] -,Para [Str "Code:"] -,CodeBlock ("",[],[]) "

" -,Para [Str "Hr\8217s:"] -,Div ("",["center"],[]) - [HorizontalRule] -,Header 1 ("inline-markup",[],[]) [Str "Inline",Space,Str "Markup"] -,Para [Str "This",Space,Str "is",Space,Emph [Str "emphasized"],Str ",",Space,Str "and",Space,Str "so",Space,Emph [Str "is",Space,Str "this"],Str "."] -,Para [Str "This",Space,Str "is",Space,Strong [Str "strong"],Str ",",Space,Str "and",Space,Str "so",Space,Strong [Str "is",Space,Str "this"],Str "."] -,Para [Str "An",Space,Emph [Link ("",[],[]) [Str "emphasized",Space,Str "link"] ("/url","")],Str "."] -,Para [Strong [Emph [Str "This",Space,Str "is",Space,Str "strong",Space,Str "and",Space,Str "em."]]] -,Para [Str "So",Space,Str "is",Space,Strong [Emph [Str "this"]],Space,Str "word."] -,Para [Strong [Emph [Str "This",Space,Str "is",Space,Str "strong",Space,Str "and",Space,Str "em."]]] -,Para [Str "So",Space,Str "is",Space,Strong [Emph [Str "this"]],Space,Str "word."] -,Para [Str "This",Space,Str "is",Space,Str "code:",Space,Code ("",[],[]) ">",Str ",",Space,Code ("",[],[]) "$",Str ",",Space,Code ("",[],[]) "\\",Str ",",Space,Code ("",[],[]) "\\$",Str ",",SoftBreak,Code ("",[],[]) "",Str "."] -,Para [Strikeout [Str "This",Space,Str "is",Space,Emph [Str "strikeout"],Str "."]] -,Para [Str "Superscripts:",Space,Str "a",Superscript [Str "bc"],Str "d",SoftBreak,Str "a",Superscript [Emph [Str "hello"]],Space,Str "a",Superscript [Str "hello",Space,Str "there"],Str "."] -,Para [Str "Subscripts:",Space,Str "H",Subscript [Str "2"],Str "O,",Space,Str "H",Subscript [Str "23"],Str "O,",SoftBreak,Str "H",Subscript [Str "many",Space,Str "of",Space,Str "them"],Str "O."] -,Para [Str "These",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "superscripts",Space,Str "or",Space,Str "subscripts,",Space,Str "because",Space,Str "of",Space,Str "the",SoftBreak,Str "unescaped",Space,Str "spaces:",Space,Str "a^b",Space,Str "c^d,",Space,Str "a",Math InlineMath "\\sim",Str "b",SoftBreak,Str "c",Math InlineMath "\\sim",Str "d."] -,Div ("",["center"],[]) - [HorizontalRule] -,Header 1 ("smart-quotes-ellipses-dashes",[],[]) [Str "Smart",Space,Str "quotes,",Space,Str "ellipses,",Space,Str "dashes"] -,Para [Quoted DoubleQuote [Str "Hello,"],Space,Str "said",Space,Str "the",Space,Str "spider.",Space,Quoted DoubleQuote [Str "\8198",Quoted SingleQuote [Str "Shelob"],Space,Str "is",Space,Str "my",Space,Str "name."]] -,Para [Quoted SingleQuote [Str "A"],Str ",",Space,Quoted SingleQuote [Str "B"],Str ",",Space,Str "and",Space,Quoted SingleQuote [Str "C"],Space,Str "are",Space,Str "letters."] -,Para [Quoted SingleQuote [Str "Oak,"],Space,Quoted SingleQuote [Str "elm,"],Space,Str "and",Space,Quoted SingleQuote [Str "beech"],Space,Str "are",Space,Str "names",Space,Str "of",Space,Str "trees.",Space,Str "So",Space,Str "is",Space,Quoted SingleQuote [Str "pine."]] -,Para [Quoted SingleQuote [Str "He",Space,Str "said,",Space,Quoted DoubleQuote [Str "I",Space,Str "want",Space,Str "to",Space,Str "go."],Str "\8198"],Space,Str "Were",Space,Str "you",Space,Str "alive",Space,Str "in",Space,Str "the",Space,Str "70\8217s?"] -,Para [Str "Here",Space,Str "is",Space,Str "some",Space,Str "quoted",Space,Quoted SingleQuote [Code ("",[],[]) "code"],Space,Str "and",Space,Str "a",SoftBreak,Quoted DoubleQuote [Link ("",[],[]) [Str "quoted",Space,Str "link"] ("http://example.com/?foo=1&bar=2","")],Str "."] -,Para [Str "Some",Space,Str "dashes:",Space,Str "one\8212two\8212three\8212four\8212five."] -,Para [Str "Dashes",Space,Str "between",Space,Str "numbers:",Space,Str "5\8211\&7,",Space,Str "255\8211\&66,",Space,Str "1987\8211\&1999."] -,Para [Str "Ellipses\8230and\8230and\8230."] -,Div ("",["center"],[]) - [HorizontalRule] -,Header 1 ("latex",[],[]) [Str "LaTeX"] -,BulletList - [[Para [Cite [Citation {citationId = "smith.1899", citationPrefix = [], citationSuffix = [Str "22-23"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [RawInline (Format "latex") "\\cite[22-23]{smith.1899}"]]] - ,[RawBlock (Format "latex") "\\doublespacing"] - ,[Para [Math InlineMath "2+2=4"]] - ,[Para [Math InlineMath "x \\in y"]] - ,[Para [Math InlineMath "\\alpha \\wedge \\omega"]] - ,[Para [Math InlineMath "223"]] - ,[Para [Math InlineMath "p",Str "-Tree"]] - ,[Para [Math InlineMath "\\frac{d}{dx}f(x)=\\lim_{h\\to 0}\\frac{f(x+h)-f(x)}{h}"]] - ,[Para [Str "Here\8217s",Space,Str "one",Space,Str "that",Space,Str "has",Space,Str "a",Space,Str "line",Space,Str "break",Space,Str "in",Space,Str "it:",SoftBreak,Math InlineMath "\\alpha + \\omega \\times x^2",Str "."]]] -,Para [Str "These",Space,Str "shouldn\8217t",Space,Str "be",Space,Str "math:"] -,BulletList - [[Para [Str "To",Space,Str "get",Space,Str "the",Space,Str "famous",Space,Str "equation,",Space,Str "write",Space,Code ("",[],[]) "$e = mc^2$",Str "."]] - ,[Para [Str "$22,000",Space,Str "is",Space,Str "a",Space,Emph [Str "lot"],Space,Str "of",Space,Str "money.",Space,Str "So",Space,Str "is",Space,Str "$34,000.",Space,Str "(It",Space,Str "worked",Space,Str "if",SoftBreak,Quoted DoubleQuote [Str "lot"],Space,Str "is",Space,Str "emphasized.)"]] - ,[Para [Str "Escaped",Space,Code ("",[],[]) "$",Str ":",Space,Str "$73",Space,Emph [Str "this",Space,Str "should",Space,Str "be",Space,Str "emphasized"],Space,Str "23$."]]] -,Para [Str "Here\8217s",Space,Str "a",Space,Str "LaTeX",Space,Str "table:"] -,Table ("",[],[]) (Caption Nothing - []) - [(AlignLeft,ColWidthDefault) - ,(AlignLeft,ColWidthDefault)] - (TableHead ("",[],[]) - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Animal"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Number"]]]]) - [(TableBody ("",[],[]) (RowHeadColumns 0) - [] - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Dog"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "2"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Cat"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "1"]]]])] - (TableFoot ("",[],[]) - []) -,Para [Str "A",Space,Str "table",Space,Str "with",Space,Str "one",Space,Str "column:"] -,Table ("",[],[]) (Caption Nothing - []) - [(AlignCenter,ColWidthDefault)] - (TableHead ("",[],[]) - []) - [(TableBody ("",[],[]) (RowHeadColumns 0) - [] - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Animal"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Vegetable"]]]])] - (TableFoot ("",[],[]) - []) -,Div ("",["center"],[]) - [HorizontalRule] -,Header 1 ("special-characters",[],[]) [Str "Special",Space,Str "Characters"] -,Para [Str "Here",Space,Str "is",Space,Str "some",Space,Str "unicode:"] -,BulletList - [[Para [Str "I",Space,Str "hat:",Space,Str "\206"]] - ,[Para [Str "o",Space,Str "umlaut:",Space,Str "\246"]] - ,[Para [Str "section:",Space,Str "\167"]] - ,[Para [Str "set",Space,Str "membership:",Space,Str "\8712"]] - ,[Para [Str "copyright:",Space,Str "\169"]]] -,Para [Str "AT&T",Space,Str "has",Space,Str "an",Space,Str "ampersand",Space,Str "in",Space,Str "their",Space,Str "name."] -,Para [Str "AT&T",Space,Str "is",Space,Str "another",Space,Str "way",Space,Str "to",Space,Str "write",Space,Str "it."] -,Para [Str "This",Space,Str "&",Space,Str "that."] -,Para [Str "4",Space,Str "<",Space,Str "5."] -,Para [Str "6",Space,Str ">",Space,Str "5."] -,Para [Str "Backslash:",Space,Str "\\"] -,Para [Str "Backtick:",Space,Str "\8216"] -,Para [Str "Asterisk:",Space,Str "*"] -,Para [Str "Underscore:",Space,Str "_"] -,Para [Str "Left",Space,Str "brace:",Space,Str "{"] -,Para [Str "Right",Space,Str "brace:",Space,Str "}"] -,Para [Str "Left",Space,Str "bracket:",Space,Str "["] -,Para [Str "Right",Space,Str "bracket:",Space,Str "]"] -,Para [Str "Left",Space,Str "paren:",Space,Str "("] -,Para [Str "Right",Space,Str "paren:",Space,Str ")"] -,Para [Str "Greater-than:",Space,Str ">"] -,Para [Str "Hash:",Space,Str "#"] -,Para [Str "Period:",Space,Str "."] -,Para [Str "Bang:",Space,Str "!"] -,Para [Str "Plus:",Space,Str "+"] -,Para [Str "Minus:",Space,Str "-"] -,Div ("",["center"],[]) - [HorizontalRule] -,Header 1 ("links",[],[]) [Str "Links"] -,Header 2 ("explicit",[],[]) [Str "Explicit"] -,Para [Str "Just",Space,Str "a",Space,Link ("",[],[]) [Str "URL"] ("/url/",""),Str "."] -,Para [Link ("",[],[]) [Str "URL",Space,Str "and",Space,Str "title"] ("/url/",""),Str "."] -,Para [Link ("",[],[]) [Str "URL",Space,Str "and",Space,Str "title"] ("/url/",""),Str "."] -,Para [Link ("",[],[]) [Str "URL",Space,Str "and",Space,Str "title"] ("/url/",""),Str "."] -,Para [Link ("",[],[]) [Str "URL",Space,Str "and",Space,Str "title"] ("/url/","")] -,Para [Link ("",[],[]) [Str "URL",Space,Str "and",Space,Str "title"] ("/url/","")] -,Para [Link ("",[],[]) [Str "with_underscore"] ("/url/with_underscore","")] -,Para [Link ("",[],[]) [Str "Email",Space,Str "link"] ("mailto:nobody@nowhere.net","")] -,Para [Link ("",[],[]) [Str "Empty"] ("",""),Str "."] -,Header 2 ("reference",[],[]) [Str "Reference"] -,Para [Str "Foo",Space,Link ("",[],[]) [Str "bar"] ("/url/",""),Str "."] -,Para [Str "Foo",Space,Link ("",[],[]) [Str "bar"] ("/url/",""),Str "."] -,Para [Str "Foo",Space,Link ("",[],[]) [Str "bar"] ("/url/",""),Str "."] -,Para [Str "With",Space,Link ("",[],[]) [Str "embedded",Space,Str "[brackets]"] ("/url/",""),Str "."] -,Para [Link ("",[],[]) [Str "b"] ("/url/",""),Space,Str "by",Space,Str "itself",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "link."] -,Para [Str "Indented",Space,Link ("",[],[]) [Str "once"] ("/url",""),Str "."] -,Para [Str "Indented",Space,Link ("",[],[]) [Str "twice"] ("/url",""),Str "."] -,Para [Str "Indented",Space,Link ("",[],[]) [Str "thrice"] ("/url",""),Str "."] -,Para [Str "This",Space,Str "should",Space,Str "[not][]",Space,Str "be",Space,Str "a",Space,Str "link."] -,CodeBlock ("",[],[]) "[not]: /url" -,Para [Str "Foo",Space,Link ("",[],[]) [Str "bar"] ("/url/",""),Str "."] -,Para [Str "Foo",Space,Link ("",[],[]) [Str "biz"] ("/url/",""),Str "."] -,Header 2 ("with-ampersands",[],[]) [Str "With",Space,Str "ampersands"] -,Para [Str "Here\8217s",Space,Str "a",SoftBreak,Link ("",[],[]) [Str "link",Space,Str "with",Space,Str "an",Space,Str "ampersand",Space,Str "in",Space,Str "the",Space,Str "URL"] ("http://example.com/?foo=1&bar=2",""),Str "."] -,Para [Str "Here\8217s",Space,Str "a",Space,Str "link",Space,Str "with",Space,Str "an",Space,Str "amersand",Space,Str "in",Space,Str "the",Space,Str "link",Space,Str "text:",SoftBreak,Link ("",[],[]) [Str "AT&T"] ("http://att.com/",""),Str "."] -,Para [Str "Here\8217s",Space,Str "an",Space,Link ("",[],[]) [Str "inline",Space,Str "link"] ("/script?foo=1&bar=2",""),Str "."] -,Para [Str "Here\8217s",Space,Str "an",SoftBreak,Link ("",[],[]) [Str "inline",Space,Str "link",Space,Str "in",Space,Str "pointy",Space,Str "braces"] ("/script?foo=1&bar=2",""),Str "."] -,Header 2 ("autolinks",[],[]) [Str "Autolinks"] -,Para [Str "With",Space,Str "an",Space,Str "ampersand:",Space,Link ("",[],[]) [Str "http://example.com/?foo=1&bar=2"] ("http://example.com/?foo=1&bar=2","")] -,BulletList - [[Para [Str "In",Space,Str "a",Space,Str "list?"]] - ,[Para [Link ("",[],[]) [Str "http://example.com/"] ("http://example.com/","")]] - ,[Para [Str "It",Space,Str "should."]]] -,Para [Str "An",Space,Str "e-mail",Space,Str "address:",SoftBreak,Link ("",[],[]) [Str "nobody@nowhere.net"] ("mailto:nobody@nowhere.net","")] -,BlockQuote - [Para [Str "Blockquoted:",Space,Link ("",[],[]) [Str "http://example.com/"] ("http://example.com/","")]] -,Para [Str "Auto-links",Space,Str "should",Space,Str "not",Space,Str "occur",Space,Str "here:",Space,Code ("",[],[]) ""] -,CodeBlock ("",[],[]) "or here: " -,Div ("",["center"],[]) - [HorizontalRule] -,Header 1 ("images",[],[]) [Str "Images"] -,Para [Str "From",Space,Quoted DoubleQuote [Str "Voyage",Space,Str "dans",Space,Str "la",Space,Str "Lune"],Space,Str "by",Space,Str "Georges",Space,Str "Melies",Space,Str "(1902):"] -,Para [Image ("",[],[]) [Str "image"] ("lalune.jpg","")] -,Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "movie",Space,Image ("",[],[]) [Str "image"] ("movie.jpg",""),Space,Str "icon."] -,Div ("",["center"],[]) - [HorizontalRule] -,Header 1 ("footnotes",[],[]) [Str "Footnotes"] -,Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "footnote",SoftBreak,Str "reference,",Note [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",SoftBreak,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."]],SoftBreak,Str "and",SoftBreak,Str "another.",Note [Para [Str "Here\8217s",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",SoftBreak,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",SoftBreak,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."]],SoftBreak,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",SoftBreak,Str "a",Space,Str "space.[^my",Space,Str "note]",Space,Str "Here",Space,Str "is",Space,Str "an",Space,Str "inline",SoftBreak,Str "note.",Note [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",SoftBreak,Link ("",[],[]) [Str "links"] ("http://google.com",""),Space,Str "and",Space,Code ("",[],[]) "]",Space,Str "verbatim",Space,Str "characters,",SoftBreak,Str "as",Space,Str "well",Space,Str "as",Space,Str "[bracketed",Space,Str "text]."]]]
-,BlockQuote
- [Para [Str "Notes",Space,Str "can",Space,Str "go",Space,Str "in",Space,Str "quotes.",Note [Para [Str "In",Space,Str "quote."]]]]
-,OrderedList (1,Decimal,Period)
- [[Para [Str "And",Space,Str "in",Space,Str "list",Space,Str "items.",Note [Para [Str "In",Space,Str "list."]]]]]
-,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",SoftBreak,Str "indented."]
-,Header 1 ("escaped-characters",[],[]) [Str "Escaped",Space,Str "characters"]
-,Para [Str "$",Space,Str "%",Space,Str "&",Space,Str "#",Space,Str "_",Space,Str "{",Space,Str "}"]]
+Pandoc
+  ( Meta
+    { unMeta = fromList
+      [
+        ( "author"
+        , MetaList
+          [ MetaInlines
+            [ Str "John", Space, Str "MacFarlane" ]
+          , MetaInlines
+            [ Str "Anonymous" ]
+          ]
+        )
+      ,
+        ( "date"
+        , MetaInlines
+          [ Str "July", Space, Str "17,", Space, Str "2006" ]
+        )
+      ,
+        ( "title"
+        , MetaInlines
+          [ Str "Pandoc", Space, Str "Test", Space, Str "Suite" ]
+        )
+      ]
+    }
+  )
+  [ RawBlock
+    ( Format "latex" ) "\\maketitle"
+  , Para
+    [ Str "This"
+    , Space
+    , Str "is"
+    , Space
+    , Str "a"
+    , Space
+    , Str "set"
+    , Space
+    , Str "of"
+    , Space
+    , Str "tests"
+    , Space
+    , Str "for"
+    , Space
+    , Str "pandoc."
+    , Space
+    , Str "Most"
+    , Space
+    , Str "of"
+    , Space
+    , Str "them"
+    , Space
+    , Str "are"
+    , Space
+    , Str "adapted"
+    , Space
+    , Str "from"
+    , SoftBreak
+    , Str "John"
+    , Space
+    , Str "Gruber\8217s"
+    , Space
+    , Str "markdown"
+    , Space
+    , Str "test"
+    , Space
+    , Str "suite."
+    ]
+  , Div
+    ( "", [ "center" ], [] ) [ HorizontalRule ]
+  , Header 1
+    ( "headers", [], [] )
+    [ Str "Headers" ]
+  , Header 2
+    ( "level-2-with-an-embedded-link", [], [] )
+    [ Str "Level"
+    , Space
+    , Str "2"
+    , Space
+    , Str "with"
+    , Space
+    , Str "an"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "embedded", Space, Str "link" ]
+      ( "/url", "" )
+    ]
+  , Header 3
+    ( "level-3-with-emphasis", [], [] )
+    [ Str "Level"
+    , Space
+    , Str "3"
+    , Space
+    , Str "with"
+    , Space
+    , Emph
+      [ Str "emphasis" ]
+    ]
+  , Para
+    [ Str "Level", Space, Str "4" ]
+  , Para
+    [ Str "Level", Space, Str "5" ]
+  , Header 1
+    ( "level-1", [], [] )
+    [ Str "Level", Space, Str "1" ]
+  , Header 2
+    ( "level-2-with-emphasis", [], [] )
+    [ Str "Level"
+    , Space
+    , Str "2"
+    , Space
+    , Str "with"
+    , Space
+    , Emph
+      [ Str "emphasis" ]
+    ]
+  , Header 3
+    ( "level-3", [], [] )
+    [ Str "Level", Space, Str "3" ]
+  , Para
+    [ Str "with"
+    , Space
+    , Str "no"
+    , Space
+    , Str "blank"
+    , Space
+    , Str "line"
+    ]
+  , Header 2
+    ( "level-2", [], [] )
+    [ Str "Level", Space, Str "2" ]
+  , Para
+    [ Str "with"
+    , Space
+    , Str "no"
+    , Space
+    , Str "blank"
+    , Space
+    , Str "line"
+    ]
+  , Div
+    ( "", [ "center" ], [] ) [ HorizontalRule ]
+  , Header 1
+    ( "paragraphs", [], [] )
+    [ Str "Paragraphs" ]
+  , Para
+    [ Str "Here\8217s"
+    , Space
+    , Str "a"
+    , Space
+    , Str "regular"
+    , Space
+    , Str "paragraph."
+    ]
+  , Para
+    [ Str "In"
+    , Space
+    , Str "Markdown"
+    , Space
+    , Str "1.0.0"
+    , Space
+    , Str "and"
+    , Space
+    , Str "earlier."
+    , Space
+    , Str "Version"
+    , Space
+    , Str "8."
+    , Space
+    , Str "This"
+    , Space
+    , Str "line"
+    , Space
+    , Str "turns"
+    , Space
+    , Str "into"
+    , Space
+    , Str "a"
+    , SoftBreak
+    , Str "list"
+    , Space
+    , Str "item."
+    , Space
+    , Str "Because"
+    , Space
+    , Str "a"
+    , Space
+    , Str "hard-wrapped"
+    , Space
+    , Str "line"
+    , Space
+    , Str "in"
+    , Space
+    , Str "the"
+    , Space
+    , Str "middle"
+    , Space
+    , Str "of"
+    , Space
+    , Str "a"
+    , Space
+    , Str "paragraph"
+    , SoftBreak
+    , Str "looked"
+    , Space
+    , Str "like"
+    , Space
+    , Str "a"
+    , Space
+    , Str "list"
+    , Space
+    , Str "item."
+    ]
+  , Para
+    [ Str "Here\8217s"
+    , Space
+    , Str "one"
+    , Space
+    , Str "with"
+    , Space
+    , Str "a"
+    , Space
+    , Str "bullet."
+    , Space
+    , Str "*"
+    , Space
+    , Str "criminey."
+    ]
+  , Para
+    [ Str "There"
+    , Space
+    , Str "should"
+    , Space
+    , Str "be"
+    , Space
+    , Str "a"
+    , Space
+    , Str "hard"
+    , Space
+    , Str "line"
+    , Space
+    , Str "break"
+    , LineBreak
+    , Str "here."
+    ]
+  , Div
+    ( "", [ "center" ], [] ) [ HorizontalRule ]
+  , Header 1
+    ( "block-quotes", [], [] )
+    [ Str "Block", Space, Str "Quotes" ]
+  , Para
+    [ Str "E-mail", Space, Str "style:" ]
+  , BlockQuote
+    [ Para
+      [ Str "This"
+      , Space
+      , Str "is"
+      , Space
+      , Str "a"
+      , Space
+      , Str "block"
+      , Space
+      , Str "quote."
+      , Space
+      , Str "It"
+      , Space
+      , Str "is"
+      , Space
+      , Str "pretty"
+      , Space
+      , Str "short."
+      ]
+    ]
+  , BlockQuote
+    [ Para
+      [ Str "Code"
+      , Space
+      , Str "in"
+      , Space
+      , Str "a"
+      , Space
+      , Str "block"
+      , Space
+      , Str "quote:"
+      ]
+    , CodeBlock
+      ( "", [], [] ) "sub status {\n    print \"working\";\n}"
+    , Para
+      [ Str "A", Space, Str "list:" ]
+    , OrderedList
+      ( 1, Decimal, Period )
+      [
+        [ Para [ Str "item", Space, Str "one" ] ]
+      ,
+        [ Para [ Str "item", Space, Str "two" ] ]
+      ]
+    , Para
+      [ Str "Nested", Space, Str "block", Space, Str "quotes:" ]
+    , BlockQuote
+      [ Para [ Str "nested" ] ]
+    , BlockQuote
+      [ Para [ Str "nested" ] ]
+    ]
+  , Para
+    [ Str "This"
+    , Space
+    , Str "should"
+    , Space
+    , Str "not"
+    , Space
+    , Str "be"
+    , Space
+    , Str "a"
+    , Space
+    , Str "block"
+    , Space
+    , Str "quote:"
+    , Space
+    , Str "2"
+    , Space
+    , Str ">"
+    , Space
+    , Str "1."
+    ]
+  , Para
+    [ Str "Box-style:" ]
+  , BlockQuote
+    [ Para
+      [ Str "Example:" ]
+    , CodeBlock
+      ( "", [], [] ) "sub status {\n    print \"working\";\n}"
+    ]
+  , BlockQuote
+    [ OrderedList
+      ( 1, Decimal, Period )
+      [
+        [ Para [ Str "do", Space, Str "laundry" ] ]
+      ,
+        [ Para
+          [ Str "take"
+          , Space
+          , Str "out"
+          , Space
+          , Str "the"
+          , Space
+          , Str "trash"
+          ]
+        ]
+      ]
+    ]
+  , Para
+    [ Str "Here\8217s"
+    , Space
+    , Str "a"
+    , Space
+    , Str "nested"
+    , Space
+    , Str "one:"
+    ]
+  , BlockQuote
+    [ Para
+      [ Str "Joe", Space, Str "said:" ]
+    , BlockQuote
+      [ Para [ Str "Don\8217t", Space, Str "quote", Space, Str "me." ] ]
+    ]
+  , Para
+    [ Str "And"
+    , Space
+    , Str "a"
+    , Space
+    , Str "following"
+    , Space
+    , Str "paragraph."
+    ]
+  , Div
+    ( "", [ "center" ], [] ) [ HorizontalRule ]
+  , Header 1
+    ( "code-blocks", [], [] )
+    [ Str "Code", Space, Str "Blocks" ]
+  , Para
+    [ Str "Code:" ]
+  , CodeBlock
+    ( ""
+    , []
+    , []
+    ) "---- (should be four hyphens)\n\nsub status {\n    print \"working\";\n}\n\nthis code block is indented by one tab"
+  , Para
+    [ Str "And:" ]
+  , CodeBlock
+    ( ""
+    , []
+    , []
+    ) "    this code block is indented by two tabs\n\nThese should not be escaped:  \\$ \\\\ \\> \\[ \\{"
+  , Para
+    [ Str "this"
+    , Space
+    , Str "has"
+    , Space
+    , Emph
+      [ Str "two", LineBreak, Str "lines" ]
+    ]
+  , Div
+    ( "", [ "center" ], [] ) [ HorizontalRule ]
+  , Header 1
+    ( "lists", [], [] )
+    [ Str "Lists" ]
+  , Header 2
+    ( "unordered", [], [] )
+    [ Str "Unordered" ]
+  , Para
+    [ Str "Asterisks", Space, Str "tight:" ]
+  , BulletList
+    [
+      [ Para [ Str "asterisk", Space, Str "1" ] ]
+    ,
+      [ Para [ Str "asterisk", Space, Str "2" ] ]
+    ,
+      [ Para [ Str "asterisk", Space, Str "3" ] ]
+    ]
+  , Para
+    [ Str "Asterisks", Space, Str "loose:" ]
+  , BulletList
+    [
+      [ Para [ Str "asterisk", Space, Str "1" ] ]
+    ,
+      [ Para [ Str "asterisk", Space, Str "2" ] ]
+    ,
+      [ Para [ Str "asterisk", Space, Str "3" ] ]
+    ]
+  , Para
+    [ Str "Pluses", Space, Str "tight:" ]
+  , BulletList
+    [
+      [ Para [ Str "Plus", Space, Str "1" ] ]
+    ,
+      [ Para [ Str "Plus", Space, Str "2" ] ]
+    ,
+      [ Para [ Str "Plus", Space, Str "3" ] ]
+    ]
+  , Para
+    [ Str "Pluses", Space, Str "loose:" ]
+  , BulletList
+    [
+      [ Para [ Str "Plus", Space, Str "1" ] ]
+    ,
+      [ Para [ Str "Plus", Space, Str "2" ] ]
+    ,
+      [ Para [ Str "Plus", Space, Str "3" ] ]
+    ]
+  , Para
+    [ Str "Minuses", Space, Str "tight:" ]
+  , BulletList
+    [
+      [ Para [ Str "Minus", Space, Str "1" ] ]
+    ,
+      [ Para [ Str "Minus", Space, Str "2" ] ]
+    ,
+      [ Para [ Str "Minus", Space, Str "3" ] ]
+    ]
+  , Para
+    [ Str "Minuses", Space, Str "loose:" ]
+  , BulletList
+    [
+      [ Para [ Str "Minus", Space, Str "1" ] ]
+    ,
+      [ Para [ Str "Minus", Space, Str "2" ] ]
+    ,
+      [ Para [ Str "Minus", Space, Str "3" ] ]
+    ]
+  , Header 2
+    ( "ordered", [], [] )
+    [ Str "Ordered" ]
+  , Para
+    [ Str "Tight:" ]
+  , OrderedList
+    ( 1, Decimal, Period )
+    [
+      [ Para [ Str "First" ] ]
+    ,
+      [ Para [ Str "Second" ] ]
+    ,
+      [ Para [ Str "Third" ] ]
+    ]
+  , Para
+    [ Str "and:" ]
+  , OrderedList
+    ( 1, Decimal, Period )
+    [
+      [ Para [ Str "One" ] ]
+    ,
+      [ Para [ Str "Two" ] ]
+    ,
+      [ Para [ Str "Three" ] ]
+    ]
+  , Para
+    [ Str "Loose", Space, Str "using", Space, Str "tabs:" ]
+  , OrderedList
+    ( 1, Decimal, Period )
+    [
+      [ Para [ Str "First" ] ]
+    ,
+      [ Para [ Str "Second" ] ]
+    ,
+      [ Para [ Str "Third" ] ]
+    ]
+  , Para
+    [ Str "and", Space, Str "using", Space, Str "spaces:" ]
+  , OrderedList
+    ( 1, Decimal, Period )
+    [
+      [ Para [ Str "One" ] ]
+    ,
+      [ Para [ Str "Two" ] ]
+    ,
+      [ Para [ Str "Three" ] ]
+    ]
+  , Para
+    [ Str "Multiple", Space, Str "paragraphs:" ]
+  , OrderedList
+    ( 1, Decimal, Period )
+    [
+      [ Para
+        [ Str "Item"
+        , Space
+        , Str "1,"
+        , Space
+        , Str "graf"
+        , Space
+        , Str "one."
+        ]
+      , Para
+        [ Str "Item"
+        , Space
+        , Str "1."
+        , Space
+        , Str "graf"
+        , Space
+        , Str "two."
+        , Space
+        , Str "The"
+        , Space
+        , Str "quick"
+        , Space
+        , Str "brown"
+        , Space
+        , Str "fox"
+        , Space
+        , Str "jumped"
+        , Space
+        , Str "over"
+        , Space
+        , Str "the"
+        , Space
+        , Str "lazy"
+        , Space
+        , Str "dog\8217s"
+        , SoftBreak
+        , Str "back."
+        ]
+      ]
+    ,
+      [ Para [ Str "Item", Space, Str "2." ] ]
+    ,
+      [ Para [ Str "Item", Space, Str "3." ] ]
+    ]
+  , Header 2
+    ( "nested", [], [] )
+    [ Str "Nested" ]
+  , BulletList
+    [
+      [ Para
+        [ Str "Tab" ]
+      , BulletList
+        [
+          [ Para [ Str "Tab" ], BulletList [ [ Para [ Str "Tab" ] ] ] ]
+        ]
+      ]
+    ]
+  , Para
+    [ Str "Here\8217s", Space, Str "another:" ]
+  , OrderedList
+    ( 1, Decimal, Period )
+    [
+      [ Para [ Str "First" ] ]
+    ,
+      [ Para
+        [ Str "Second:" ]
+      , BulletList
+        [
+          [ Para [ Str "Fee" ] ]
+        ,
+          [ Para [ Str "Fie" ] ]
+        ,
+          [ Para [ Str "Foe" ] ]
+        ]
+      ]
+    ,
+      [ Para [ Str "Third" ] ]
+    ]
+  , Para
+    [ Str "Same"
+    , Space
+    , Str "thing"
+    , Space
+    , Str "but"
+    , Space
+    , Str "with"
+    , Space
+    , Str "paragraphs:"
+    ]
+  , OrderedList
+    ( 1, Decimal, Period )
+    [
+      [ Para [ Str "First" ] ]
+    ,
+      [ Para
+        [ Str "Second:" ]
+      , BulletList
+        [
+          [ Para [ Str "Fee" ] ]
+        ,
+          [ Para [ Str "Fie" ] ]
+        ,
+          [ Para [ Str "Foe" ] ]
+        ]
+      ]
+    ,
+      [ Para [ Str "Third" ] ]
+    ]
+  , Header 2
+    ( "tabs-and-spaces", [], [] )
+    [ Str "Tabs", Space, Str "and", Space, Str "spaces" ]
+  , BulletList
+    [
+      [ Para
+        [ Str "this"
+        , Space
+        , Str "is"
+        , Space
+        , Str "a"
+        , Space
+        , Str "list"
+        , Space
+        , Str "item"
+        , Space
+        , Str "indented"
+        , Space
+        , Str "with"
+        , Space
+        , Str "tabs"
+        ]
+      ]
+    ,
+      [ Para
+        [ Str "this"
+        , Space
+        , Str "is"
+        , Space
+        , Str "a"
+        , Space
+        , Str "list"
+        , Space
+        , Str "item"
+        , Space
+        , Str "indented"
+        , Space
+        , Str "with"
+        , Space
+        , Str "spaces"
+        ]
+      , BulletList
+        [
+          [ Para
+            [ Str "this"
+            , Space
+            , Str "is"
+            , Space
+            , Str "an"
+            , Space
+            , Str "example"
+            , Space
+            , Str "list"
+            , Space
+            , Str "item"
+            , Space
+            , Str "indented"
+            , Space
+            , Str "with"
+            , Space
+            , Str "tabs"
+            ]
+          ]
+        ,
+          [ Para
+            [ Str "this"
+            , Space
+            , Str "is"
+            , Space
+            , Str "an"
+            , Space
+            , Str "example"
+            , Space
+            , Str "list"
+            , Space
+            , Str "item"
+            , Space
+            , Str "indented"
+            , Space
+            , Str "with"
+            , Space
+            , Str "spaces"
+            ]
+          ]
+        ]
+      ]
+    ]
+  , Header 2
+    ( "fancy-list-markers", [], [] )
+    [ Str "Fancy", Space, Str "list", Space, Str "markers" ]
+  , OrderedList
+    ( 2, Decimal, TwoParens )
+    [
+      [ Para [ Str "begins", Space, Str "with", Space, Str "2" ] ]
+    ,
+      [ Para
+        [ Str "and", Space, Str "now", Space, Str "3" ]
+      , Para
+        [ Str "with", Space, Str "a", Space, Str "continuation" ]
+      , OrderedList
+        ( 4, LowerRoman, Period )
+        [
+          [ Para
+            [ Str "sublist"
+            , Space
+            , Str "with"
+            , Space
+            , Str "roman"
+            , Space
+            , Str "numerals,"
+            , Space
+            , Str "starting"
+            , Space
+            , Str "with"
+            , Space
+            , Str "4"
+            ]
+          ]
+        ,
+          [ Para
+            [ Str "more", Space, Str "items" ]
+          , OrderedList
+            ( 1, UpperAlpha, TwoParens )
+            [
+              [ Para [ Str "a", Space, Str "subsublist" ] ]
+            ,
+              [ Para [ Str "a", Space, Str "subsublist" ] ]
+            ]
+          ]
+        ]
+      ]
+    ]
+  , Para
+    [ Str "Nesting:" ]
+  , OrderedList
+    ( 1, UpperAlpha, Period )
+    [
+      [ Para
+        [ Str "Upper", Space, Str "Alpha" ]
+      , OrderedList
+        ( 1, UpperRoman, Period )
+        [
+          [ Para
+            [ Str "Upper", Space, Str "Roman." ]
+          , OrderedList
+            ( 6, Decimal, TwoParens )
+            [
+              [ Para
+                [ Str "Decimal"
+                , Space
+                , Str "start"
+                , Space
+                , Str "with"
+                , Space
+                , Str "6"
+                ]
+              , OrderedList
+                ( 3, LowerAlpha, OneParen )
+                [
+                  [ Para
+                    [ Str "Lower"
+                    , Space
+                    , Str "alpha"
+                    , Space
+                    , Str "with"
+                    , Space
+                    , Str "paren"
+                    ]
+                  ]
+                ]
+              ]
+            ]
+          ]
+        ]
+      ]
+    ]
+  , Para
+    [ Str "Autonumbering:" ]
+  , OrderedList
+    ( 1, DefaultStyle, DefaultDelim )
+    [
+      [ Para [ Str "Autonumber." ] ]
+    ,
+      [ Para
+        [ Str "More." ]
+      , OrderedList
+        ( 1, DefaultStyle, DefaultDelim )
+        [ [ Para [ Str "Nested." ] ] ]
+      ]
+    ]
+  , Para
+    [ Str "Should"
+    , Space
+    , Str "not"
+    , Space
+    , Str "be"
+    , Space
+    , Str "a"
+    , Space
+    , Str "list"
+    , Space
+    , Str "item:"
+    ]
+  , Para
+    [ Str "M.A.", Space, Str "2007" ]
+  , Para
+    [ Str "B.", Space, Str "Williams" ]
+  , Div
+    ( "", [ "center" ], [] ) [ HorizontalRule ]
+  , Header 1
+    ( "definition-lists", [], [] )
+    [ Str "Definition", Space, Str "Lists" ]
+  , Para
+    [ Str "Tight", Space, Str "using", Space, Str "spaces:" ]
+  , DefinitionList
+    [
+      (
+        [ Str "apple" ]
+      ,
+        [ [ Para [ Str "red", Space, Str "fruit" ] ] ]
+      )
+    ,
+      (
+        [ Str "orange" ]
+      ,
+        [ [ Para [ Str "orange", Space, Str "fruit" ] ] ]
+      )
+    ,
+      (
+        [ Str "banana" ]
+      ,
+        [ [ Para [ Str "yellow", Space, Str "fruit" ] ] ]
+      )
+    ]
+  , Para
+    [ Str "Tight", Space, Str "using", Space, Str "tabs:" ]
+  , DefinitionList
+    [
+      (
+        [ Str "apple" ]
+      ,
+        [ [ Para [ Str "red", Space, Str "fruit" ] ] ]
+      )
+    ,
+      (
+        [ Str "orange" ]
+      ,
+        [ [ Para [ Str "orange", Space, Str "fruit" ] ] ]
+      )
+    ,
+      (
+        [ Str "banana" ]
+      ,
+        [ [ Para [ Str "yellow", Space, Str "fruit" ] ] ]
+      )
+    ]
+  , Para
+    [ Str "Loose:" ]
+  , DefinitionList
+    [
+      (
+        [ Str "apple" ]
+      ,
+        [ [ Para [ Str "red", Space, Str "fruit" ] ] ]
+      )
+    ,
+      (
+        [ Str "orange" ]
+      ,
+        [ [ Para [ Str "orange", Space, Str "fruit" ] ] ]
+      )
+    ,
+      (
+        [ Str "banana" ]
+      ,
+        [ [ Para [ Str "yellow", Space, Str "fruit" ] ] ]
+      )
+    ]
+  , Para
+    [ Str "Multiple"
+    , Space
+    , Str "blocks"
+    , Space
+    , Str "with"
+    , Space
+    , Str "italics:"
+    ]
+  , DefinitionList
+    [
+      (
+        [ Emph [ Str "apple" ] ]
+      ,
+        [
+          [ Para
+            [ Str "red", Space, Str "fruit" ]
+          , Para
+            [ Str "contains"
+            , Space
+            , Str "seeds,"
+            , Space
+            , Str "crisp,"
+            , Space
+            , Str "pleasant"
+            , Space
+            , Str "to"
+            , Space
+            , Str "taste"
+            ]
+          ]
+        ]
+      )
+    ,
+      (
+        [ Emph [ Str "orange" ] ]
+      ,
+        [
+          [ Para
+            [ Str "orange", Space, Str "fruit" ]
+          , CodeBlock
+            ( "", [], [] ) "{ orange code block }"
+          , BlockQuote
+            [ Para
+              [ Str "orange", Space, Str "block", Space, Str "quote" ]
+            ]
+          ]
+        ]
+      )
+    ]
+  , Header 1
+    ( "html-blocks", [], [] )
+    [ Str "HTML", Space, Str "Blocks" ]
+  , Para
+    [ Str "Simple"
+    , Space
+    , Str "block"
+    , Space
+    , Str "on"
+    , Space
+    , Str "one"
+    , Space
+    , Str "line:"
+    ]
+  , Para
+    [ Str "foo"
+    , SoftBreak
+    , Str "And"
+    , Space
+    , Str "nested"
+    , Space
+    , Str "without"
+    , Space
+    , Str "indentation:"
+    ]
+  , Para
+    [ Str "foo"
+    , SoftBreak
+    , Str "bar"
+    , SoftBreak
+    , Str "Interpreted"
+    , Space
+    , Str "markdown"
+    , Space
+    , Str "in"
+    , Space
+    , Str "a"
+    , Space
+    , Str "table:"
+    ]
+  , Para
+    [ Str "This"
+    , Space
+    , Str "is"
+    , Space
+    , Emph
+      [ Str "emphasized" ]
+    , SoftBreak
+    , Str "And"
+    , Space
+    , Str "this"
+    , Space
+    , Str "is"
+    , Space
+    , Strong
+      [ Str "strong" ]
+    , SoftBreak
+    , Str "Here\8217s"
+    , Space
+    , Str "a"
+    , Space
+    , Str "simple"
+    , Space
+    , Str "block:"
+    ]
+  , Para
+    [ Str "foo"
+    , SoftBreak
+    , Str "This"
+    , Space
+    , Str "should"
+    , Space
+    , Str "be"
+    , Space
+    , Str "a"
+    , Space
+    , Str "code"
+    , Space
+    , Str "block,"
+    , Space
+    , Str "though:"
+    ]
+  , CodeBlock
+    ( "", [], [] ) "\n    foo\n"
+  , Para
+    [ Str "As", Space, Str "should", Space, Str "this:" ]
+  , CodeBlock
+    ( "", [], [] ) "foo"
+  , Para
+    [ Str "Now,", Space, Str "nested:" ]
+  , Para
+    [ Str "foo"
+    , SoftBreak
+    , Str "This"
+    , Space
+    , Str "should"
+    , Space
+    , Str "just"
+    , Space
+    , Str "be"
+    , Space
+    , Str "an"
+    , Space
+    , Str "HTML"
+    , Space
+    , Str "comment:"
+    ]
+  , Para
+    [ Str "Multiline:" ]
+  , Para
+    [ Str "Code", Space, Str "block:" ]
+  , CodeBlock
+    ( "", [], [] ) ""
+  , Para
+    [ Str "Just"
+    , Space
+    , Str "plain"
+    , Space
+    , Str "comment,"
+    , Space
+    , Str "with"
+    , Space
+    , Str "trailing"
+    , Space
+    , Str "spaces"
+    , Space
+    , Str "on"
+    , Space
+    , Str "the"
+    , Space
+    , Str "line:"
+    ]
+  , Para
+    [ Str "Code:" ]
+  , CodeBlock
+    ( "", [], [] ) ""
+  , Para
+    [ Str "Hr\8217s:" ]
+  , Div
+    ( "", [ "center" ], [] ) [ HorizontalRule ]
+  , Header 1
+    ( "inline-markup", [], [] )
+    [ Str "Inline", Space, Str "Markup" ]
+  , Para
+    [ Str "This"
+    , Space
+    , Str "is"
+    , Space
+    , Emph
+      [ Str "emphasized" ]
+    , Str ","
+    , Space
+    , Str "and"
+    , Space
+    , Str "so"
+    , Space
+    , Emph
+      [ Str "is", Space, Str "this" ]
+    , Str "."
+    ]
+  , Para
+    [ Str "This"
+    , Space
+    , Str "is"
+    , Space
+    , Strong
+      [ Str "strong" ]
+    , Str ","
+    , Space
+    , Str "and"
+    , Space
+    , Str "so"
+    , Space
+    , Strong
+      [ Str "is", Space, Str "this" ]
+    , Str "."
+    ]
+  , Para
+    [ Str "An"
+    , Space
+    , Emph
+      [ Link
+        ( "", [], [] )
+        [ Str "emphasized", Space, Str "link" ]
+        ( "/url", "" )
+      ]
+    , Str "."
+    ]
+  , Para
+    [ Strong
+      [ Emph
+        [ Str "This"
+        , Space
+        , Str "is"
+        , Space
+        , Str "strong"
+        , Space
+        , Str "and"
+        , Space
+        , Str "em."
+        ]
+      ]
+    ]
+  , Para
+    [ Str "So"
+    , Space
+    , Str "is"
+    , Space
+    , Strong
+      [ Emph [ Str "this" ] ]
+    , Space
+    , Str "word."
+    ]
+  , Para
+    [ Strong
+      [ Emph
+        [ Str "This"
+        , Space
+        , Str "is"
+        , Space
+        , Str "strong"
+        , Space
+        , Str "and"
+        , Space
+        , Str "em."
+        ]
+      ]
+    ]
+  , Para
+    [ Str "So"
+    , Space
+    , Str "is"
+    , Space
+    , Strong
+      [ Emph [ Str "this" ] ]
+    , Space
+    , Str "word."
+    ]
+  , Para
+    [ Str "This"
+    , Space
+    , Str "is"
+    , Space
+    , Str "code:"
+    , Space
+    , Code
+      ( "", [], [] ) ">"
+    , Str ","
+    , Space
+    , Code
+      ( "", [], [] ) "$"
+    , Str ","
+    , Space
+    , Code
+      ( "", [], [] ) "\\"
+    , Str ","
+    , Space
+    , Code
+      ( "", [], [] ) "\\$"
+    , Str ","
+    , SoftBreak
+    , Code
+      ( "", [], [] ) ""
+    , Str "."
+    ]
+  , Para
+    [ Strikeout
+      [ Str "This"
+      , Space
+      , Str "is"
+      , Space
+      , Emph
+        [ Str "strikeout" ]
+      , Str "."
+      ]
+    ]
+  , Para
+    [ Str "Superscripts:"
+    , Space
+    , Str "a"
+    , Superscript
+      [ Str "bc" ]
+    , Str "d"
+    , SoftBreak
+    , Str "a"
+    , Superscript
+      [ Emph [ Str "hello" ] ]
+    , Space
+    , Str "a"
+    , Superscript
+      [ Str "hello", Space, Str "there" ]
+    , Str "."
+    ]
+  , Para
+    [ Str "Subscripts:"
+    , Space
+    , Str "H"
+    , Subscript
+      [ Str "2" ]
+    , Str "O,"
+    , Space
+    , Str "H"
+    , Subscript
+      [ Str "23" ]
+    , Str "O,"
+    , SoftBreak
+    , Str "H"
+    , Subscript
+      [ Str "many", Space, Str "of", Space, Str "them" ]
+    , Str "O."
+    ]
+  , Para
+    [ Str "These"
+    , Space
+    , Str "should"
+    , Space
+    , Str "not"
+    , Space
+    , Str "be"
+    , Space
+    , Str "superscripts"
+    , Space
+    , Str "or"
+    , Space
+    , Str "subscripts,"
+    , Space
+    , Str "because"
+    , Space
+    , Str "of"
+    , Space
+    , Str "the"
+    , SoftBreak
+    , Str "unescaped"
+    , Space
+    , Str "spaces:"
+    , Space
+    , Str "a^b"
+    , Space
+    , Str "c^d,"
+    , Space
+    , Str "a"
+    , Math InlineMath "\\sim"
+    , Str "b"
+    , SoftBreak
+    , Str "c"
+    , Math InlineMath "\\sim"
+    , Str "d."
+    ]
+  , Div
+    ( "", [ "center" ], [] ) [ HorizontalRule ]
+  , Header 1
+    ( "smart-quotes-ellipses-dashes", [], [] )
+    [ Str "Smart"
+    , Space
+    , Str "quotes,"
+    , Space
+    , Str "ellipses,"
+    , Space
+    , Str "dashes"
+    ]
+  , Para
+    [ Quoted DoubleQuote
+      [ Str "Hello," ]
+    , Space
+    , Str "said"
+    , Space
+    , Str "the"
+    , Space
+    , Str "spider."
+    , Space
+    , Quoted DoubleQuote
+      [ Str "\8198"
+      , Quoted SingleQuote
+        [ Str "Shelob" ]
+      , Space
+      , Str "is"
+      , Space
+      , Str "my"
+      , Space
+      , Str "name."
+      ]
+    ]
+  , Para
+    [ Quoted SingleQuote
+      [ Str "A" ]
+    , Str ","
+    , Space
+    , Quoted SingleQuote
+      [ Str "B" ]
+    , Str ","
+    , Space
+    , Str "and"
+    , Space
+    , Quoted SingleQuote
+      [ Str "C" ]
+    , Space
+    , Str "are"
+    , Space
+    , Str "letters."
+    ]
+  , Para
+    [ Quoted SingleQuote
+      [ Str "Oak," ]
+    , Space
+    , Quoted SingleQuote
+      [ Str "elm," ]
+    , Space
+    , Str "and"
+    , Space
+    , Quoted SingleQuote
+      [ Str "beech" ]
+    , Space
+    , Str "are"
+    , Space
+    , Str "names"
+    , Space
+    , Str "of"
+    , Space
+    , Str "trees."
+    , Space
+    , Str "So"
+    , Space
+    , Str "is"
+    , Space
+    , Quoted SingleQuote
+      [ Str "pine." ]
+    ]
+  , Para
+    [ Quoted SingleQuote
+      [ Str "He"
+      , Space
+      , Str "said,"
+      , Space
+      , Quoted DoubleQuote
+        [ Str "I"
+        , Space
+        , Str "want"
+        , Space
+        , Str "to"
+        , Space
+        , Str "go."
+        ]
+      , Str "\8198"
+      ]
+    , Space
+    , Str "Were"
+    , Space
+    , Str "you"
+    , Space
+    , Str "alive"
+    , Space
+    , Str "in"
+    , Space
+    , Str "the"
+    , Space
+    , Str "70\8217s?"
+    ]
+  , Para
+    [ Str "Here"
+    , Space
+    , Str "is"
+    , Space
+    , Str "some"
+    , Space
+    , Str "quoted"
+    , Space
+    , Quoted SingleQuote
+      [ Code ( "", [], [] ) "code" ]
+    , Space
+    , Str "and"
+    , Space
+    , Str "a"
+    , SoftBreak
+    , Quoted DoubleQuote
+      [ Link
+        ( "", [], [] )
+        [ Str "quoted", Space, Str "link" ]
+        ( "http://example.com/?foo=1&bar=2", "" )
+      ]
+    , Str "."
+    ]
+  , Para
+    [ Str "Some"
+    , Space
+    , Str "dashes:"
+    , Space
+    , Str "one\8212two\8212three\8212four\8212five."
+    ]
+  , Para
+    [ Str "Dashes"
+    , Space
+    , Str "between"
+    , Space
+    , Str "numbers:"
+    , Space
+    , Str "5\8211\&7,"
+    , Space
+    , Str "255\8211\&66,"
+    , Space
+    , Str "1987\8211\&1999."
+    ]
+  , Para
+    [ Str "Ellipses\8230and\8230and\8230." ]
+  , Div
+    ( "", [ "center" ], [] ) [ HorizontalRule ]
+  , Header 1
+    ( "latex", [], [] )
+    [ Str "LaTeX" ]
+  , BulletList
+    [
+      [ Para
+        [ Cite
+          [ Citation
+            { citationId = "smith.1899"
+            , citationPrefix = []
+            , citationSuffix =
+              [ Str "22-23" ]
+            , citationMode = NormalCitation
+            , citationNoteNum = 0
+            , citationHash = 0
+            }
+          ]
+          [ RawInline ( Format "latex" ) "\\cite[22-23]{smith.1899}" ]
+        ]
+      ]
+    ,
+      [ RawBlock ( Format "latex" ) "\\doublespacing" ]
+    ,
+      [ Para [ Math InlineMath "2+2=4" ] ]
+    ,
+      [ Para [ Math InlineMath "x \\in y" ] ]
+    ,
+      [ Para [ Math InlineMath "\\alpha \\wedge \\omega" ] ]
+    ,
+      [ Para [ Math InlineMath "223" ] ]
+    ,
+      [ Para [ Math InlineMath "p", Str "-Tree" ] ]
+    ,
+      [ Para
+        [ Math InlineMath "\\frac{d}{dx}f(x)=\\lim_{h\\to 0}\\frac{f(x+h)-f(x)}{h}" ]
+      ]
+    ,
+      [ Para
+        [ Str "Here\8217s"
+        , Space
+        , Str "one"
+        , Space
+        , Str "that"
+        , Space
+        , Str "has"
+        , Space
+        , Str "a"
+        , Space
+        , Str "line"
+        , Space
+        , Str "break"
+        , Space
+        , Str "in"
+        , Space
+        , Str "it:"
+        , SoftBreak
+        , Math InlineMath "\\alpha + \\omega \\times x^2"
+        , Str "."
+        ]
+      ]
+    ]
+  , Para
+    [ Str "These"
+    , Space
+    , Str "shouldn\8217t"
+    , Space
+    , Str "be"
+    , Space
+    , Str "math:"
+    ]
+  , BulletList
+    [
+      [ Para
+        [ Str "To"
+        , Space
+        , Str "get"
+        , Space
+        , Str "the"
+        , Space
+        , Str "famous"
+        , Space
+        , Str "equation,"
+        , Space
+        , Str "write"
+        , Space
+        , Code
+          ( "", [], [] ) "$e = mc^2$"
+        , Str "."
+        ]
+      ]
+    ,
+      [ Para
+        [ Str "$22,000"
+        , Space
+        , Str "is"
+        , Space
+        , Str "a"
+        , Space
+        , Emph
+          [ Str "lot" ]
+        , Space
+        , Str "of"
+        , Space
+        , Str "money."
+        , Space
+        , Str "So"
+        , Space
+        , Str "is"
+        , Space
+        , Str "$34,000."
+        , Space
+        , Str "(It"
+        , Space
+        , Str "worked"
+        , Space
+        , Str "if"
+        , SoftBreak
+        , Quoted DoubleQuote
+          [ Str "lot" ]
+        , Space
+        , Str "is"
+        , Space
+        , Str "emphasized.)"
+        ]
+      ]
+    ,
+      [ Para
+        [ Str "Escaped"
+        , Space
+        , Code
+          ( "", [], [] ) "$"
+        , Str ":"
+        , Space
+        , Str "$73"
+        , Space
+        , Emph
+          [ Str "this"
+          , Space
+          , Str "should"
+          , Space
+          , Str "be"
+          , Space
+          , Str "emphasized"
+          ]
+        , Space
+        , Str "23$."
+        ]
+      ]
+    ]
+  , Para
+    [ Str "Here\8217s"
+    , Space
+    , Str "a"
+    , Space
+    , Str "LaTeX"
+    , Space
+    , Str "table:"
+    ]
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [ ( AlignLeft, ColWidthDefault ), ( AlignLeft, ColWidthDefault ) ]
+    ( TableHead
+      ( "", [], [] )
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Animal" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Number" ] ]
+        ]
+      ]
+    )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Dog" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "2" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Cat" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "1" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Para
+    [ Str "A"
+    , Space
+    , Str "table"
+    , Space
+    , Str "with"
+    , Space
+    , Str "one"
+    , Space
+    , Str "column:"
+    ]
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [ ( AlignCenter, ColWidthDefault ) ]
+    ( TableHead ( "", [], [] ) [] )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Animal" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Vegetable" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Div
+    ( "", [ "center" ], [] ) [ HorizontalRule ]
+  , Header 1
+    ( "special-characters", [], [] )
+    [ Str "Special", Space, Str "Characters" ]
+  , Para
+    [ Str "Here"
+    , Space
+    , Str "is"
+    , Space
+    , Str "some"
+    , Space
+    , Str "unicode:"
+    ]
+  , BulletList
+    [
+      [ Para [ Str "I", Space, Str "hat:", Space, Str "\206" ] ]
+    ,
+      [ Para [ Str "o", Space, Str "umlaut:", Space, Str "\246" ] ]
+    ,
+      [ Para [ Str "section:", Space, Str "\167" ] ]
+    ,
+      [ Para
+        [ Str "set", Space, Str "membership:", Space, Str "\8712" ]
+      ]
+    ,
+      [ Para [ Str "copyright:", Space, Str "\169" ] ]
+    ]
+  , Para
+    [ Str "AT&T"
+    , Space
+    , Str "has"
+    , Space
+    , Str "an"
+    , Space
+    , Str "ampersand"
+    , Space
+    , Str "in"
+    , Space
+    , Str "their"
+    , Space
+    , Str "name."
+    ]
+  , Para
+    [ Str "AT&T"
+    , Space
+    , Str "is"
+    , Space
+    , Str "another"
+    , Space
+    , Str "way"
+    , Space
+    , Str "to"
+    , Space
+    , Str "write"
+    , Space
+    , Str "it."
+    ]
+  , Para
+    [ Str "This", Space, Str "&", Space, Str "that." ]
+  , Para
+    [ Str "4", Space, Str "<", Space, Str "5." ]
+  , Para
+    [ Str "6", Space, Str ">", Space, Str "5." ]
+  , Para
+    [ Str "Backslash:", Space, Str "\\" ]
+  , Para
+    [ Str "Backtick:", Space, Str "\8216" ]
+  , Para
+    [ Str "Asterisk:", Space, Str "*" ]
+  , Para
+    [ Str "Underscore:", Space, Str "_" ]
+  , Para
+    [ Str "Left", Space, Str "brace:", Space, Str "{" ]
+  , Para
+    [ Str "Right", Space, Str "brace:", Space, Str "}" ]
+  , Para
+    [ Str "Left", Space, Str "bracket:", Space, Str "[" ]
+  , Para
+    [ Str "Right", Space, Str "bracket:", Space, Str "]" ]
+  , Para
+    [ Str "Left", Space, Str "paren:", Space, Str "(" ]
+  , Para
+    [ Str "Right", Space, Str "paren:", Space, Str ")" ]
+  , Para
+    [ Str "Greater-than:", Space, Str ">" ]
+  , Para
+    [ Str "Hash:", Space, Str "#" ]
+  , Para
+    [ Str "Period:", Space, Str "." ]
+  , Para
+    [ Str "Bang:", Space, Str "!" ]
+  , Para
+    [ Str "Plus:", Space, Str "+" ]
+  , Para
+    [ Str "Minus:", Space, Str "-" ]
+  , Div
+    ( "", [ "center" ], [] ) [ HorizontalRule ]
+  , Header 1
+    ( "links", [], [] )
+    [ Str "Links" ]
+  , Header 2
+    ( "explicit", [], [] )
+    [ Str "Explicit" ]
+  , Para
+    [ Str "Just"
+    , Space
+    , Str "a"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "URL" ]
+      ( "/url/", "" )
+    , Str "."
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "URL", Space, Str "and", Space, Str "title" ]
+      ( "/url/", "" )
+    , Str "."
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "URL", Space, Str "and", Space, Str "title" ]
+      ( "/url/", "" )
+    , Str "."
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "URL", Space, Str "and", Space, Str "title" ]
+      ( "/url/", "" )
+    , Str "."
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "URL", Space, Str "and", Space, Str "title" ]
+      ( "/url/", "" )
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "URL", Space, Str "and", Space, Str "title" ]
+      ( "/url/", "" )
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "with_underscore" ]
+      ( "/url/with_underscore", "" )
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "Email", Space, Str "link" ]
+      ( "mailto:nobody@nowhere.net", "" )
+    ]
+  , Para
+    [ Link ( "", [], [] ) [ Str "Empty" ] ( "", "" ), Str "." ]
+  , Header 2
+    ( "reference", [], [] )
+    [ Str "Reference" ]
+  , Para
+    [ Str "Foo"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "bar" ]
+      ( "/url/", "" )
+    , Str "."
+    ]
+  , Para
+    [ Str "Foo"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "bar" ]
+      ( "/url/", "" )
+    , Str "."
+    ]
+  , Para
+    [ Str "Foo"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "bar" ]
+      ( "/url/", "" )
+    , Str "."
+    ]
+  , Para
+    [ Str "With"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "embedded", Space, Str "[brackets]" ]
+      ( "/url/", "" )
+    , Str "."
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "b" ]
+      ( "/url/", "" )
+    , Space
+    , Str "by"
+    , Space
+    , Str "itself"
+    , Space
+    , Str "should"
+    , Space
+    , Str "be"
+    , Space
+    , Str "a"
+    , Space
+    , Str "link."
+    ]
+  , Para
+    [ Str "Indented"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "once" ]
+      ( "/url", "" )
+    , Str "."
+    ]
+  , Para
+    [ Str "Indented"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "twice" ]
+      ( "/url", "" )
+    , Str "."
+    ]
+  , Para
+    [ Str "Indented"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "thrice" ]
+      ( "/url", "" )
+    , Str "."
+    ]
+  , Para
+    [ Str "This"
+    , Space
+    , Str "should"
+    , Space
+    , Str "[not][]"
+    , Space
+    , Str "be"
+    , Space
+    , Str "a"
+    , Space
+    , Str "link."
+    ]
+  , CodeBlock
+    ( "", [], [] ) "[not]: /url"
+  , Para
+    [ Str "Foo"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "bar" ]
+      ( "/url/", "" )
+    , Str "."
+    ]
+  , Para
+    [ Str "Foo"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "biz" ]
+      ( "/url/", "" )
+    , Str "."
+    ]
+  , Header 2
+    ( "with-ampersands", [], [] )
+    [ Str "With", Space, Str "ampersands" ]
+  , Para
+    [ Str "Here\8217s"
+    , Space
+    , Str "a"
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "link"
+      , Space
+      , Str "with"
+      , Space
+      , Str "an"
+      , Space
+      , Str "ampersand"
+      , Space
+      , Str "in"
+      , Space
+      , Str "the"
+      , Space
+      , Str "URL"
+      ]
+      ( "http://example.com/?foo=1&bar=2", "" )
+    , Str "."
+    ]
+  , Para
+    [ Str "Here\8217s"
+    , Space
+    , Str "a"
+    , Space
+    , Str "link"
+    , Space
+    , Str "with"
+    , Space
+    , Str "an"
+    , Space
+    , Str "amersand"
+    , Space
+    , Str "in"
+    , Space
+    , Str "the"
+    , Space
+    , Str "link"
+    , Space
+    , Str "text:"
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "AT&T" ]
+      ( "http://att.com/", "" )
+    , Str "."
+    ]
+  , Para
+    [ Str "Here\8217s"
+    , Space
+    , Str "an"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "inline", Space, Str "link" ]
+      ( "/script?foo=1&bar=2", "" )
+    , Str "."
+    ]
+  , Para
+    [ Str "Here\8217s"
+    , Space
+    , Str "an"
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "inline"
+      , Space
+      , Str "link"
+      , Space
+      , Str "in"
+      , Space
+      , Str "pointy"
+      , Space
+      , Str "braces"
+      ]
+      ( "/script?foo=1&bar=2", "" )
+    , Str "."
+    ]
+  , Header 2
+    ( "autolinks", [], [] )
+    [ Str "Autolinks" ]
+  , Para
+    [ Str "With"
+    , Space
+    , Str "an"
+    , Space
+    , Str "ampersand:"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "http://example.com/?foo=1&bar=2" ]
+      ( "http://example.com/?foo=1&bar=2", "" )
+    ]
+  , BulletList
+    [
+      [ Para [ Str "In", Space, Str "a", Space, Str "list?" ] ]
+    ,
+      [ Para
+        [ Link
+          ( "", [], [] )
+          [ Str "http://example.com/" ]
+          ( "http://example.com/", "" )
+        ]
+      ]
+    ,
+      [ Para [ Str "It", Space, Str "should." ] ]
+    ]
+  , Para
+    [ Str "An"
+    , Space
+    , Str "e-mail"
+    , Space
+    , Str "address:"
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "nobody@nowhere.net" ]
+      ( "mailto:nobody@nowhere.net", "" )
+    ]
+  , BlockQuote
+    [ Para
+      [ Str "Blockquoted:"
+      , Space
+      , Link
+        ( "", [], [] )
+        [ Str "http://example.com/" ]
+        ( "http://example.com/", "" )
+      ]
+    ]
+  , Para
+    [ Str "Auto-links"
+    , Space
+    , Str "should"
+    , Space
+    , Str "not"
+    , Space
+    , Str "occur"
+    , Space
+    , Str "here:"
+    , Space
+    , Code
+      ( "", [], [] ) ""
+    ]
+  , CodeBlock
+    ( "", [], [] ) "or here: "
+  , Div
+    ( "", [ "center" ], [] ) [ HorizontalRule ]
+  , Header 1
+    ( "images", [], [] )
+    [ Str "Images" ]
+  , Para
+    [ Str "From"
+    , Space
+    , Quoted DoubleQuote
+      [ Str "Voyage"
+      , Space
+      , Str "dans"
+      , Space
+      , Str "la"
+      , Space
+      , Str "Lune"
+      ]
+    , Space
+    , Str "by"
+    , Space
+    , Str "Georges"
+    , Space
+    , Str "Melies"
+    , Space
+    , Str "(1902):"
+    ]
+  , Para
+    [ Image ( "", [], [] ) [ Str "image" ] ( "lalune.jpg", "" ) ]
+  , Para
+    [ Str "Here"
+    , Space
+    , Str "is"
+    , Space
+    , Str "a"
+    , Space
+    , Str "movie"
+    , Space
+    , Image
+      ( "", [], [] )
+      [ Str "image" ]
+      ( "movie.jpg", "" )
+    , Space
+    , Str "icon."
+    ]
+  , Div
+    ( "", [ "center" ], [] ) [ HorizontalRule ]
+  , Header 1
+    ( "footnotes", [], [] )
+    [ Str "Footnotes" ]
+  , Para
+    [ Str "Here"
+    , Space
+    , Str "is"
+    , Space
+    , Str "a"
+    , Space
+    , Str "footnote"
+    , SoftBreak
+    , Str "reference,"
+    , Note
+      [ 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"
+        , SoftBreak
+        , 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."
+        ]
+      ]
+    , SoftBreak
+    , Str "and"
+    , SoftBreak
+    , Str "another."
+    , Note
+      [ Para
+        [ Str "Here\8217s"
+        , 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"
+        , SoftBreak
+        , 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"
+        , SoftBreak
+        , 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."
+        ]
+      ]
+    , SoftBreak
+    , 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"
+    , SoftBreak
+    , Str "a"
+    , Space
+    , Str "space.[^my"
+    , Space
+    , Str "note]"
+    , Space
+    , Str "Here"
+    , Space
+    , Str "is"
+    , Space
+    , Str "an"
+    , Space
+    , Str "inline"
+    , SoftBreak
+    , Str "note."
+    , Note
+      [ 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"
+        , SoftBreak
+        , Link
+          ( "", [], [] )
+          [ Str "links" ]
+          ( "http://google.com", "" )
+        , Space
+        , Str "and"
+        , Space
+        , Code
+          ( "", [], [] ) "]"
+        , Space
+        , Str "verbatim"
+        , Space
+        , Str "characters,"
+        , SoftBreak
+        , Str "as"
+        , Space
+        , Str "well"
+        , Space
+        , Str "as"
+        , Space
+        , Str "[bracketed"
+        , Space
+        , Str "text]."
+        ]
+      ]
+    ]
+  , BlockQuote
+    [ Para
+      [ Str "Notes"
+      , Space
+      , Str "can"
+      , Space
+      , Str "go"
+      , Space
+      , Str "in"
+      , Space
+      , Str "quotes."
+      , Note
+        [ Para [ Str "In", Space, Str "quote." ] ]
+      ]
+    ]
+  , OrderedList
+    ( 1, Decimal, Period )
+    [
+      [ Para
+        [ Str "And"
+        , Space
+        , Str "in"
+        , Space
+        , Str "list"
+        , Space
+        , Str "items."
+        , Note
+          [ Para [ Str "In", Space, Str "list." ] ]
+        ]
+      ]
+    ]
+  , 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"
+    , SoftBreak
+    , Str "indented."
+    ]
+  , Header 1
+    ( "escaped-characters", [], [] )
+    [ Str "Escaped", Space, Str "characters" ]
+  , Para
+    [ Str "$"
+    , Space
+    , Str "%"
+    , Space
+    , Str "&"
+    , Space
+    , Str "#"
+    , Space
+    , Str "_"
+    , Space
+    , Str "{"
+    , Space
+    , Str "}"
+    ]
+  ]
diff --git a/test/lhs-test-markdown.native b/test/lhs-test-markdown.native
index 7a423b1ab..db2acd318 100644
--- a/test/lhs-test-markdown.native
+++ b/test/lhs-test-markdown.native
@@ -1,8 +1,130 @@
-[Header 1 ("lhs-test",[],[]) [Str "lhs",Space,Str "test"]
-,Para [Code ("",[],[]) "unsplit",Space,Str "is",Space,Str "an",Space,Str "arrow",Space,Str "that",Space,Str "takes",Space,Str "a",Space,Str "pair",Space,Str "of",Space,Str "values",Space,Str "and",Space,Str "combines",Space,Str "them",Space,Str "to",SoftBreak,Str "return",Space,Str "a",Space,Str "single",Space,Str "value:"]
-,CodeBlock ("",["haskell","literate"],[]) "unsplit :: (Arrow a) => (b -> c -> d) -> a (b, c) d\nunsplit = arr . uncurry\n          -- arr (\\op (x,y) -> x `op` y)"
-,Para [Code ("",[],[]) "(***)",Space,Str "combines",Space,Str "two",Space,Str "arrows",Space,Str "into",Space,Str "a",Space,Str "new",Space,Str "arrow",Space,Str "by",Space,Str "running",Space,Str "the",Space,Str "two",Space,Str "arrows",Space,Str "on",Space,Str "a",SoftBreak,Str "pair",Space,Str "of",Space,Str "values",Space,Str "(one",Space,Str "arrow",Space,Str "on",Space,Str "the",Space,Str "first",Space,Str "item",Space,Str "of",Space,Str "the",Space,Str "pair",Space,Str "and",Space,Str "one",Space,Str "arrow",Space,Str "on",Space,Str "the",SoftBreak,Str "second",Space,Str "item",Space,Str "of",Space,Str "the",Space,Str "pair)."]
-,CodeBlock ("",[],[]) "f *** g = first f >>> second g"
-,Para [Str "Block",Space,Str "quote:"]
-,BlockQuote
- [Para [Str "foo",Space,Str "bar"]]]
+[ Header 1
+  ( "lhs-test", [], [] )
+  [ Str "lhs", Space, Str "test" ]
+, Para
+  [ Code
+    ( "", [], [] ) "unsplit"
+  , Space
+  , Str "is"
+  , Space
+  , Str "an"
+  , Space
+  , Str "arrow"
+  , Space
+  , Str "that"
+  , Space
+  , Str "takes"
+  , Space
+  , Str "a"
+  , Space
+  , Str "pair"
+  , Space
+  , Str "of"
+  , Space
+  , Str "values"
+  , Space
+  , Str "and"
+  , Space
+  , Str "combines"
+  , Space
+  , Str "them"
+  , Space
+  , Str "to"
+  , SoftBreak
+  , Str "return"
+  , Space
+  , Str "a"
+  , Space
+  , Str "single"
+  , Space
+  , Str "value:"
+  ]
+, CodeBlock
+  ( ""
+  ,
+    [ "haskell", "literate" ]
+  , []
+  ) "unsplit :: (Arrow a) => (b -> c -> d) -> a (b, c) d\nunsplit = arr . uncurry\n          -- arr (\\op (x,y) -> x `op` y)"
+, Para
+  [ Code
+    ( "", [], [] ) "(***)"
+  , Space
+  , Str "combines"
+  , Space
+  , Str "two"
+  , Space
+  , Str "arrows"
+  , Space
+  , Str "into"
+  , Space
+  , Str "a"
+  , Space
+  , Str "new"
+  , Space
+  , Str "arrow"
+  , Space
+  , Str "by"
+  , Space
+  , Str "running"
+  , Space
+  , Str "the"
+  , Space
+  , Str "two"
+  , Space
+  , Str "arrows"
+  , Space
+  , Str "on"
+  , Space
+  , Str "a"
+  , SoftBreak
+  , Str "pair"
+  , Space
+  , Str "of"
+  , Space
+  , Str "values"
+  , Space
+  , Str "(one"
+  , Space
+  , Str "arrow"
+  , Space
+  , Str "on"
+  , Space
+  , Str "the"
+  , Space
+  , Str "first"
+  , Space
+  , Str "item"
+  , Space
+  , Str "of"
+  , Space
+  , Str "the"
+  , Space
+  , Str "pair"
+  , Space
+  , Str "and"
+  , Space
+  , Str "one"
+  , Space
+  , Str "arrow"
+  , Space
+  , Str "on"
+  , Space
+  , Str "the"
+  , SoftBreak
+  , Str "second"
+  , Space
+  , Str "item"
+  , Space
+  , Str "of"
+  , Space
+  , Str "the"
+  , Space
+  , Str "pair)."
+  ]
+, CodeBlock
+  ( "", [], [] ) "f *** g = first f >>> second g"
+, Para
+  [ Str "Block", Space, Str "quote:" ]
+, BlockQuote
+  [ Para [ Str "foo", Space, Str "bar" ] ]
+]
diff --git a/test/lhs-test.native b/test/lhs-test.native
index 7a423b1ab..db2acd318 100644
--- a/test/lhs-test.native
+++ b/test/lhs-test.native
@@ -1,8 +1,130 @@
-[Header 1 ("lhs-test",[],[]) [Str "lhs",Space,Str "test"]
-,Para [Code ("",[],[]) "unsplit",Space,Str "is",Space,Str "an",Space,Str "arrow",Space,Str "that",Space,Str "takes",Space,Str "a",Space,Str "pair",Space,Str "of",Space,Str "values",Space,Str "and",Space,Str "combines",Space,Str "them",Space,Str "to",SoftBreak,Str "return",Space,Str "a",Space,Str "single",Space,Str "value:"]
-,CodeBlock ("",["haskell","literate"],[]) "unsplit :: (Arrow a) => (b -> c -> d) -> a (b, c) d\nunsplit = arr . uncurry\n          -- arr (\\op (x,y) -> x `op` y)"
-,Para [Code ("",[],[]) "(***)",Space,Str "combines",Space,Str "two",Space,Str "arrows",Space,Str "into",Space,Str "a",Space,Str "new",Space,Str "arrow",Space,Str "by",Space,Str "running",Space,Str "the",Space,Str "two",Space,Str "arrows",Space,Str "on",Space,Str "a",SoftBreak,Str "pair",Space,Str "of",Space,Str "values",Space,Str "(one",Space,Str "arrow",Space,Str "on",Space,Str "the",Space,Str "first",Space,Str "item",Space,Str "of",Space,Str "the",Space,Str "pair",Space,Str "and",Space,Str "one",Space,Str "arrow",Space,Str "on",Space,Str "the",SoftBreak,Str "second",Space,Str "item",Space,Str "of",Space,Str "the",Space,Str "pair)."]
-,CodeBlock ("",[],[]) "f *** g = first f >>> second g"
-,Para [Str "Block",Space,Str "quote:"]
-,BlockQuote
- [Para [Str "foo",Space,Str "bar"]]]
+[ Header 1
+  ( "lhs-test", [], [] )
+  [ Str "lhs", Space, Str "test" ]
+, Para
+  [ Code
+    ( "", [], [] ) "unsplit"
+  , Space
+  , Str "is"
+  , Space
+  , Str "an"
+  , Space
+  , Str "arrow"
+  , Space
+  , Str "that"
+  , Space
+  , Str "takes"
+  , Space
+  , Str "a"
+  , Space
+  , Str "pair"
+  , Space
+  , Str "of"
+  , Space
+  , Str "values"
+  , Space
+  , Str "and"
+  , Space
+  , Str "combines"
+  , Space
+  , Str "them"
+  , Space
+  , Str "to"
+  , SoftBreak
+  , Str "return"
+  , Space
+  , Str "a"
+  , Space
+  , Str "single"
+  , Space
+  , Str "value:"
+  ]
+, CodeBlock
+  ( ""
+  ,
+    [ "haskell", "literate" ]
+  , []
+  ) "unsplit :: (Arrow a) => (b -> c -> d) -> a (b, c) d\nunsplit = arr . uncurry\n          -- arr (\\op (x,y) -> x `op` y)"
+, Para
+  [ Code
+    ( "", [], [] ) "(***)"
+  , Space
+  , Str "combines"
+  , Space
+  , Str "two"
+  , Space
+  , Str "arrows"
+  , Space
+  , Str "into"
+  , Space
+  , Str "a"
+  , Space
+  , Str "new"
+  , Space
+  , Str "arrow"
+  , Space
+  , Str "by"
+  , Space
+  , Str "running"
+  , Space
+  , Str "the"
+  , Space
+  , Str "two"
+  , Space
+  , Str "arrows"
+  , Space
+  , Str "on"
+  , Space
+  , Str "a"
+  , SoftBreak
+  , Str "pair"
+  , Space
+  , Str "of"
+  , Space
+  , Str "values"
+  , Space
+  , Str "(one"
+  , Space
+  , Str "arrow"
+  , Space
+  , Str "on"
+  , Space
+  , Str "the"
+  , Space
+  , Str "first"
+  , Space
+  , Str "item"
+  , Space
+  , Str "of"
+  , Space
+  , Str "the"
+  , Space
+  , Str "pair"
+  , Space
+  , Str "and"
+  , Space
+  , Str "one"
+  , Space
+  , Str "arrow"
+  , Space
+  , Str "on"
+  , Space
+  , Str "the"
+  , SoftBreak
+  , Str "second"
+  , Space
+  , Str "item"
+  , Space
+  , Str "of"
+  , Space
+  , Str "the"
+  , Space
+  , Str "pair)."
+  ]
+, CodeBlock
+  ( "", [], [] ) "f *** g = first f >>> second g"
+, Para
+  [ Str "Block", Space, Str "quote:" ]
+, BlockQuote
+  [ Para [ Str "foo", Space, Str "bar" ] ]
+]
diff --git a/test/man-reader.native b/test/man-reader.native
index 2ab088ff1..f8341fb84 100644
--- a/test/man-reader.native
+++ b/test/man-reader.native
@@ -1,300 +1,986 @@
-Pandoc (Meta {unMeta = fromList [("date",MetaInlines [Str "Oct",Space,Str "17,",Space,Str "2018"]),("section",MetaInlines []),("title",MetaInlines [Str "Pandoc",Space,Str "Man",Space,Str "tests"])]})
-[Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "set",Space,Str "of",Space,Str "tests",Space,Str "for",Space,Str "pandoc."]
-,Para [Str "*",Space,Str "*",Space,Str "*",Space,Str "*",Space,Str "*"]
-,Header 1 ("",[],[]) [Str "Headers"]
-,Header 1 ("",[],[]) [Str "Level",Space,Str "1"]
-,Header 2 ("",[],[]) [Str "Level",Space,Str "2"]
-,Para [Str "*",Space,Str "*",Space,Str "*",Space,Str "*",Space,Str "*"]
-,Header 1 ("",[],[]) [Str "Paragraphs"]
-,Para [Str "Here's",Space,Str "a",Space,Str "regular",Space,Str "paragraph."]
-,Para [Str "Another",Space,Str "paragraph",Space,Str "In",Space,Str "Markdown",Space,Str "1.0.0",Space,Str "and",Space,Str "earlier.",Space,Str "Version",Space,Str "8.",Space,Str "This",Space,Str "line",Space,Str "turns",Space,Str "into",Space,Str "a",Space,Str "list",Space,Str "item.",Space,Str "Because",Space,Str "a",Space,Str "hard-wrapped",Space,Str "line",Space,Str "in",Space,Str "the",Space,Str "middle",Space,Str "of",Space,Str "a",Space,Str "paragraph",Space,Str "looked",Space,Str "like",Space,Str "a",Space,Str "list",Space,Str "item."]
-,Para [Str "There",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "hard",Space,Str "line",Space,Str "break"]
-,Para [Str "here."]
-,Para [Str "*",Space,Str "*",Space,Str "*",Space,Str "*",Space,Str "*"]
-,Header 1 ("",[],[]) [Str "Block",Space,Str "Quotes"]
-,Para [Str "Code",Space,Str "in",Space,Str "a",Space,Str "block",Space,Str "quote:"]
-,BlockQuote
- [CodeBlock ("",[],[]) "sub status {\n    print \"working\";\n}"]
-,Para [Str "A",Space,Str "list:"]
-,OrderedList (1,Decimal,Period)
- [[Para [Str "item",Space,Str "one"]]
- ,[Para [Str "item",Space,Str "two"]]]
-,Header 1 ("",[],[]) [Str "Code",Space,Str "Blocks"]
-,Para [Str "Code:"]
-,CodeBlock ("",[],[]) "---- (should be four hyphens)\n\nsub status {\n    print \"working\";\n}\n"
-,Para [Str "And:"]
-,CodeBlock ("",[],[]) "\tthis code line is indented by one tab"
-,Para [Str "*",Space,Str "*",Space,Str "*",Space,Str "*",Space,Str "*"]
-,Header 1 ("",[],[]) [Str "Lists"]
-,Header 2 ("",[],[]) [Str "Unordered"]
-,Para [Str "Asterisks:"]
-,BulletList
- [[Para [Str "asterisk",Space,Str "1"]]
- ,[Para [Str "asterisk",Space,Str "2"]]
- ,[Para [Str "asterisk",Space,Str "3"]]]
-,Header 2 ("",[],[]) [Str "Ordered"]
-,OrderedList (1,Decimal,Period)
- [[Para [Str "First"]]
- ,[Para [Str "Second"]]
- ,[Para [Str "Third"]]]
-,Header 2 ("",[],[]) [Str "Nested"]
-,BulletList
- [[Para [Str "Tab"]
-  ,BulletList
-   [[Para [Str "Tab"]
-    ,BulletList
-     [[Para [Str "Tab"]]]]]]]
-,Para [Str "Here's",Space,Str "another:"]
-,OrderedList (1,Decimal,Period)
- [[Para [Str "First"]]
- ,[Para [Str "Second:"]
-  ,BulletList
-   [[Para [Str "Fee"]]
-   ,[Para [Str "Fie"]]
-   ,[Para [Str "Foe"]]]]
- ,[Para [Str "Third"]]]
-,Para [Str "Same",Space,Str "thing:"]
-,OrderedList (1,Decimal,Period)
- [[Para [Str "First"]]
- ,[Para [Str "Second:"]
-  ,BulletList
-   [[Para [Str "Fee"]]
-   ,[Para [Str "Fie"]]
-   ,[Para [Str "Foe"]]]]
- ,[Para [Str "Third"]]]
-,Header 2 ("",[],[]) [Str "different",Space,Str "styles:"]
-,OrderedList (1,UpperAlpha,Period)
- [[Para [Str "Upper",Space,Str "Alpha"]
-  ,OrderedList (1,UpperRoman,Period)
-   [[Para [Str "Upper",Space,Str "Roman."]
-    ,OrderedList (6,Decimal,TwoParens)
-     [[Para [Str "Decimal",Space,Str "start",Space,Str "with",Space,Str "6"]
-      ,OrderedList (3,LowerAlpha,OneParen)
-       [[Para [Str "Lower",Space,Str "alpha",Space,Str "with",Space,Str "paren"]]]]]]]]]
-,Header 2 ("",[],[]) [Str "Ordered"]
-,Para [Str "Definition",Space,Str "lists"]
-,DefinitionList
- [([Strong [Str "term1"]],
-   [[Para [Str "definition",Space,Str "1"]
-    ,Para [Str "continued"]]])
- ,([Strong [Str "term2"]],
-   [[Para [Str "definition",Space,Str "2",Space,Str "*",Space,Str "*",Space,Str "*",Space,Str "*",Space,Str "*"]]])]
-,Header 1 ("",[],[]) [Str "Special",Space,Str "Characters"]
-,Para [Str "AT&T",Space,Str "has",Space,Str "an",Space,Str "ampersand",Space,Str "in",Space,Str "their",Space,Str "name."]
-,Para [Str "4",Space,Str "<",Space,Str "5."]
-,Para [Str "6",Space,Str ">",Space,Str "5."]
-,Para [Str "Backslash:",Space,Str "\\"]
-,Para [Str "Backtick:",Space,Str "`"]
-,Para [Str "Asterisk:",Space,Str "*"]
-,Para [Str "Underscore:",Space,Str "_"]
-,Para [Str "Left",Space,Str "brace:",Space,Str "{"]
-,Para [Str "Right",Space,Str "brace:",Space,Str "}"]
-,Para [Str "Left",Space,Str "bracket:",Space,Str "["]
-,Para [Str "Right",Space,Str "bracket:",Space,Str "]"]
-,Para [Str "Left",Space,Str "paren:",Space,Str "("]
-,Para [Str "Right",Space,Str "paren:",Space,Str ")"]
-,Para [Str "Greater-than:",Space,Str ">"]
-,Para [Str "Hash:",Space,Str "#"]
-,Para [Str "Period:",Space,Str "."]
-,Para [Str "Bang:",Space,Str "!"]
-,Para [Str "Plus:",Space,Str "+"]
-,Para [Str "Minus:",Space,Str "-"]
-,Header 1 ("",[],[]) [Str "Links"]
-,Para [Link ("",[],[]) [Str "some",Space,Str "randomsite"] ("http://example.com",""),Str "."]
-,Para [Link ("",[],[]) [Str "my",Space,Str "email",Space,Str "address"] ("mailto:me@example.com",""),Str "."]
-,Header 1 ("",[],[]) [Str "Macros"]
-,Para [Strong [Str "Me",Space,Str "Myself"],Space,Str "and",Space,Str "I.",Space,Emph [Str "The",Space,Str "author",Space,Str "is",Space,Str "John",Space,Str "Jones."],Space,Str "It's",Space,Str "The",Space,Strong [Str "Author"],Str "."]
-,Header 1 ("",[],[]) [Str "Tables"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignRight,ColWidthDefault)
- ,(AlignLeft,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignLeft,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Right"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Left"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Center"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Default"]]]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]]])]
- (TableFoot ("",[],[])
- [])
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignRight,ColWidthDefault)
- ,(AlignLeft,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignLeft,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Right"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Left"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Center"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Left",Space,Emph [Str "more"]]]]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]]])]
- (TableFoot ("",[],[])
- [])
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignCenter,ColWidthDefault)
- ,(AlignLeft,ColWidthDefault)
- ,(AlignRight,ColWidthDefault)
- ,(AlignLeft,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Centered",Space,Str "Header"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Left",Space,Str "Aligned"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Right",Space,Str "Aligned"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Default",Space,Str "aligned"]]]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "First"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "row"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12.0"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",Space,Str "multiple",Space,Str "lines."]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Second"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "row"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "5.0"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",Space,Str "Note",Space,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",Space,Str "rows."]]]])]
- (TableFoot ("",[],[])
- [])
-,Para [Str "Table",Space,Str "without",Space,Str "column",Space,Str "headers:"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignRight,ColWidthDefault)
- ,(AlignLeft,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignRight,ColWidthDefault)]
- (TableHead ("",[],[])
- [])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]]])]
- (TableFoot ("",[],[])
- [])
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignRight,ColWidth 0.5)
- ,(AlignLeft,ColWidth 0.5)]
- (TableHead ("",[],[])
- [])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "a"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "b"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "one"]
-    ,Para [Str "two"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [CodeBlock ("",[],[]) "some\n   code"]]])]
- (TableFoot ("",[],[])
- [])]
+Pandoc
+  ( Meta
+    { unMeta = fromList
+      [
+        ( "date"
+        , MetaInlines
+          [ Str "Oct", Space, Str "17,", Space, Str "2018" ]
+        )
+      ,
+        ( "section", MetaInlines [] )
+      ,
+        ( "title"
+        , MetaInlines
+          [ Str "Pandoc", Space, Str "Man", Space, Str "tests" ]
+        )
+      ]
+    }
+  )
+  [ Para
+    [ Str "This"
+    , Space
+    , Str "is"
+    , Space
+    , Str "a"
+    , Space
+    , Str "set"
+    , Space
+    , Str "of"
+    , Space
+    , Str "tests"
+    , Space
+    , Str "for"
+    , Space
+    , Str "pandoc."
+    ]
+  , Para
+    [ Str "*"
+    , Space
+    , Str "*"
+    , Space
+    , Str "*"
+    , Space
+    , Str "*"
+    , Space
+    , Str "*"
+    ]
+  , Header 1
+    ( "", [], [] )
+    [ Str "Headers" ]
+  , Header 1
+    ( "", [], [] )
+    [ Str "Level", Space, Str "1" ]
+  , Header 2
+    ( "", [], [] )
+    [ Str "Level", Space, Str "2" ]
+  , Para
+    [ Str "*"
+    , Space
+    , Str "*"
+    , Space
+    , Str "*"
+    , Space
+    , Str "*"
+    , Space
+    , Str "*"
+    ]
+  , Header 1
+    ( "", [], [] )
+    [ Str "Paragraphs" ]
+  , Para
+    [ Str "Here's"
+    , Space
+    , Str "a"
+    , Space
+    , Str "regular"
+    , Space
+    , Str "paragraph."
+    ]
+  , Para
+    [ Str "Another"
+    , Space
+    , Str "paragraph"
+    , Space
+    , Str "In"
+    , Space
+    , Str "Markdown"
+    , Space
+    , Str "1.0.0"
+    , Space
+    , Str "and"
+    , Space
+    , Str "earlier."
+    , Space
+    , Str "Version"
+    , Space
+    , Str "8."
+    , Space
+    , Str "This"
+    , Space
+    , Str "line"
+    , Space
+    , Str "turns"
+    , Space
+    , Str "into"
+    , Space
+    , Str "a"
+    , Space
+    , Str "list"
+    , Space
+    , Str "item."
+    , Space
+    , Str "Because"
+    , Space
+    , Str "a"
+    , Space
+    , Str "hard-wrapped"
+    , Space
+    , Str "line"
+    , Space
+    , Str "in"
+    , Space
+    , Str "the"
+    , Space
+    , Str "middle"
+    , Space
+    , Str "of"
+    , Space
+    , Str "a"
+    , Space
+    , Str "paragraph"
+    , Space
+    , Str "looked"
+    , Space
+    , Str "like"
+    , Space
+    , Str "a"
+    , Space
+    , Str "list"
+    , Space
+    , Str "item."
+    ]
+  , Para
+    [ Str "There"
+    , Space
+    , Str "should"
+    , Space
+    , Str "be"
+    , Space
+    , Str "a"
+    , Space
+    , Str "hard"
+    , Space
+    , Str "line"
+    , Space
+    , Str "break"
+    ]
+  , Para
+    [ Str "here." ]
+  , Para
+    [ Str "*"
+    , Space
+    , Str "*"
+    , Space
+    , Str "*"
+    , Space
+    , Str "*"
+    , Space
+    , Str "*"
+    ]
+  , Header 1
+    ( "", [], [] )
+    [ Str "Block", Space, Str "Quotes" ]
+  , Para
+    [ Str "Code"
+    , Space
+    , Str "in"
+    , Space
+    , Str "a"
+    , Space
+    , Str "block"
+    , Space
+    , Str "quote:"
+    ]
+  , BlockQuote
+    [ CodeBlock
+      ( "", [], [] ) "sub status {\n    print \"working\";\n}"
+    ]
+  , Para
+    [ Str "A", Space, Str "list:" ]
+  , OrderedList
+    ( 1, Decimal, Period )
+    [
+      [ Para [ Str "item", Space, Str "one" ] ]
+    ,
+      [ Para [ Str "item", Space, Str "two" ] ]
+    ]
+  , Header 1
+    ( "", [], [] )
+    [ Str "Code", Space, Str "Blocks" ]
+  , Para
+    [ Str "Code:" ]
+  , CodeBlock
+    ( ""
+    , []
+    , []
+    ) "---- (should be four hyphens)\n\nsub status {\n    print \"working\";\n}\n"
+  , Para
+    [ Str "And:" ]
+  , CodeBlock
+    ( "", [], [] ) "\tthis code line is indented by one tab"
+  , Para
+    [ Str "*"
+    , Space
+    , Str "*"
+    , Space
+    , Str "*"
+    , Space
+    , Str "*"
+    , Space
+    , Str "*"
+    ]
+  , Header 1
+    ( "", [], [] )
+    [ Str "Lists" ]
+  , Header 2
+    ( "", [], [] )
+    [ Str "Unordered" ]
+  , Para
+    [ Str "Asterisks:" ]
+  , BulletList
+    [
+      [ Para [ Str "asterisk", Space, Str "1" ] ]
+    ,
+      [ Para [ Str "asterisk", Space, Str "2" ] ]
+    ,
+      [ Para [ Str "asterisk", Space, Str "3" ] ]
+    ]
+  , Header 2
+    ( "", [], [] )
+    [ Str "Ordered" ]
+  , OrderedList
+    ( 1, Decimal, Period )
+    [
+      [ Para [ Str "First" ] ]
+    ,
+      [ Para [ Str "Second" ] ]
+    ,
+      [ Para [ Str "Third" ] ]
+    ]
+  , Header 2
+    ( "", [], [] )
+    [ Str "Nested" ]
+  , BulletList
+    [
+      [ Para
+        [ Str "Tab" ]
+      , BulletList
+        [
+          [ Para [ Str "Tab" ], BulletList [ [ Para [ Str "Tab" ] ] ] ]
+        ]
+      ]
+    ]
+  , Para
+    [ Str "Here's", Space, Str "another:" ]
+  , OrderedList
+    ( 1, Decimal, Period )
+    [
+      [ Para [ Str "First" ] ]
+    ,
+      [ Para
+        [ Str "Second:" ]
+      , BulletList
+        [
+          [ Para [ Str "Fee" ] ]
+        ,
+          [ Para [ Str "Fie" ] ]
+        ,
+          [ Para [ Str "Foe" ] ]
+        ]
+      ]
+    ,
+      [ Para [ Str "Third" ] ]
+    ]
+  , Para
+    [ Str "Same", Space, Str "thing:" ]
+  , OrderedList
+    ( 1, Decimal, Period )
+    [
+      [ Para [ Str "First" ] ]
+    ,
+      [ Para
+        [ Str "Second:" ]
+      , BulletList
+        [
+          [ Para [ Str "Fee" ] ]
+        ,
+          [ Para [ Str "Fie" ] ]
+        ,
+          [ Para [ Str "Foe" ] ]
+        ]
+      ]
+    ,
+      [ Para [ Str "Third" ] ]
+    ]
+  , Header 2
+    ( "", [], [] )
+    [ Str "different", Space, Str "styles:" ]
+  , OrderedList
+    ( 1, UpperAlpha, Period )
+    [
+      [ Para
+        [ Str "Upper", Space, Str "Alpha" ]
+      , OrderedList
+        ( 1, UpperRoman, Period )
+        [
+          [ Para
+            [ Str "Upper", Space, Str "Roman." ]
+          , OrderedList
+            ( 6, Decimal, TwoParens )
+            [
+              [ Para
+                [ Str "Decimal"
+                , Space
+                , Str "start"
+                , Space
+                , Str "with"
+                , Space
+                , Str "6"
+                ]
+              , OrderedList
+                ( 3, LowerAlpha, OneParen )
+                [
+                  [ Para
+                    [ Str "Lower"
+                    , Space
+                    , Str "alpha"
+                    , Space
+                    , Str "with"
+                    , Space
+                    , Str "paren"
+                    ]
+                  ]
+                ]
+              ]
+            ]
+          ]
+        ]
+      ]
+    ]
+  , Header 2
+    ( "", [], [] )
+    [ Str "Ordered" ]
+  , Para
+    [ Str "Definition", Space, Str "lists" ]
+  , DefinitionList
+    [
+      (
+        [ Strong [ Str "term1" ] ]
+      ,
+        [
+          [ Para
+            [ Str "definition", Space, Str "1" ]
+          , Para
+            [ Str "continued" ]
+          ]
+        ]
+      )
+    ,
+      (
+        [ Strong [ Str "term2" ] ]
+      ,
+        [
+          [ Para
+            [ Str "definition"
+            , Space
+            , Str "2"
+            , Space
+            , Str "*"
+            , Space
+            , Str "*"
+            , Space
+            , Str "*"
+            , Space
+            , Str "*"
+            , Space
+            , Str "*"
+            ]
+          ]
+        ]
+      )
+    ]
+  , Header 1
+    ( "", [], [] )
+    [ Str "Special", Space, Str "Characters" ]
+  , Para
+    [ Str "AT&T"
+    , Space
+    , Str "has"
+    , Space
+    , Str "an"
+    , Space
+    , Str "ampersand"
+    , Space
+    , Str "in"
+    , Space
+    , Str "their"
+    , Space
+    , Str "name."
+    ]
+  , Para
+    [ Str "4", Space, Str "<", Space, Str "5." ]
+  , Para
+    [ Str "6", Space, Str ">", Space, Str "5." ]
+  , Para
+    [ Str "Backslash:", Space, Str "\\" ]
+  , Para
+    [ Str "Backtick:", Space, Str "`" ]
+  , Para
+    [ Str "Asterisk:", Space, Str "*" ]
+  , Para
+    [ Str "Underscore:", Space, Str "_" ]
+  , Para
+    [ Str "Left", Space, Str "brace:", Space, Str "{" ]
+  , Para
+    [ Str "Right", Space, Str "brace:", Space, Str "}" ]
+  , Para
+    [ Str "Left", Space, Str "bracket:", Space, Str "[" ]
+  , Para
+    [ Str "Right", Space, Str "bracket:", Space, Str "]" ]
+  , Para
+    [ Str "Left", Space, Str "paren:", Space, Str "(" ]
+  , Para
+    [ Str "Right", Space, Str "paren:", Space, Str ")" ]
+  , Para
+    [ Str "Greater-than:", Space, Str ">" ]
+  , Para
+    [ Str "Hash:", Space, Str "#" ]
+  , Para
+    [ Str "Period:", Space, Str "." ]
+  , Para
+    [ Str "Bang:", Space, Str "!" ]
+  , Para
+    [ Str "Plus:", Space, Str "+" ]
+  , Para
+    [ Str "Minus:", Space, Str "-" ]
+  , Header 1
+    ( "", [], [] )
+    [ Str "Links" ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "some", Space, Str "randomsite" ]
+      ( "http://example.com", "" )
+    , Str "."
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "my", Space, Str "email", Space, Str "address" ]
+      ( "mailto:me@example.com", "" )
+    , Str "."
+    ]
+  , Header 1
+    ( "", [], [] )
+    [ Str "Macros" ]
+  , Para
+    [ Strong
+      [ Str "Me", Space, Str "Myself" ]
+    , Space
+    , Str "and"
+    , Space
+    , Str "I."
+    , Space
+    , Emph
+      [ Str "The"
+      , Space
+      , Str "author"
+      , Space
+      , Str "is"
+      , Space
+      , Str "John"
+      , Space
+      , Str "Jones."
+      ]
+    , Space
+    , Str "It's"
+    , Space
+    , Str "The"
+    , Space
+    , Strong
+      [ Str "Author" ]
+    , Str "."
+    ]
+  , Header 1
+    ( "", [], [] )
+    [ Str "Tables" ]
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignRight, ColWidthDefault )
+    ,
+      ( AlignLeft, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignLeft, ColWidthDefault )
+    ]
+    ( TableHead
+      ( "", [], [] )
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Right" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Left" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Center" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Default" ] ]
+        ]
+      ]
+    )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "12" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "12" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "12" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "12" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "123" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "123" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "123" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "123" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "1" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "1" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "1" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "1" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignRight, ColWidthDefault )
+    ,
+      ( AlignLeft, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignLeft, ColWidthDefault )
+    ]
+    ( TableHead
+      ( "", [], [] )
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Right" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Left" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Center" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Left", Space, Emph [ Str "more" ] ] ]
+        ]
+      ]
+    )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "12" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "12" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "12" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "12" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "123" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "123" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "123" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "123" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "1" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "1" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "1" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "1" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignLeft, ColWidthDefault )
+    ,
+      ( AlignRight, ColWidthDefault )
+    ,
+      ( AlignLeft, ColWidthDefault )
+    ]
+    ( TableHead
+      ( "", [], [] )
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Centered", Space, Str "Header" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Left", Space, Str "Aligned" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Right", Space, Str "Aligned" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Default", Space, Str "aligned" ] ]
+        ]
+      ]
+    )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "First" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "row" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "12.0" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain
+            [ Str "Example"
+            , Space
+            , Str "of"
+            , Space
+            , Str "a"
+            , Space
+            , Str "row"
+            , Space
+            , Str "that"
+            , Space
+            , Str "spans"
+            , Space
+            , Str "multiple"
+            , Space
+            , Str "lines."
+            ]
+          ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Second" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "row" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "5.0" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain
+            [ Str "Here\8217s"
+            , Space
+            , Str "another"
+            , Space
+            , Str "one."
+            , Space
+            , Str "Note"
+            , Space
+            , Str "the"
+            , Space
+            , Str "blank"
+            , Space
+            , Str "line"
+            , Space
+            , Str "between"
+            , Space
+            , Str "rows."
+            ]
+          ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Para
+    [ Str "Table"
+    , Space
+    , Str "without"
+    , Space
+    , Str "column"
+    , Space
+    , Str "headers:"
+    ]
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignRight, ColWidthDefault )
+    ,
+      ( AlignLeft, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignRight, ColWidthDefault )
+    ]
+    ( TableHead ( "", [], [] ) [] )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "12" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "12" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "12" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "12" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "123" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "123" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "123" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "123" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "1" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "1" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "1" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "1" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [ ( AlignRight, ColWidth 0.5 ), ( AlignLeft, ColWidth 0.5 ) ]
+    ( TableHead ( "", [], [] ) [] )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "a" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "b" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "one" ], Para [ Str "two" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ CodeBlock ( "", [], [] ) "some\n   code" ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  ]
diff --git a/test/markdown-citations.native b/test/markdown-citations.native
index 1d4b1a8b2..bafdb0bbf 100644
--- a/test/markdown-citations.native
+++ b/test/markdown-citations.native
@@ -1,17 +1,539 @@
-[Header 1 ("pandoc-with-citeproc-hs",[],[]) [Str "Pandoc",Space,Str "with",Space,Str "citeproc-hs"]
-,BulletList
- [[Para [Cite [Citation {citationId = "nonexistent", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 1, citationHash = 0}] [Str "[@nonexistent]"]]]
- ,[Para [Cite [Citation {citationId = "nonexistent", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 2, citationHash = 0}] [Str "@nonexistent"]]]
- ,[Para [Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 3, citationHash = 0}] [Str "@item1"],Space,Str "says",Space,Str "blah."]]
- ,[Para [Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [Str "p.\160\&30"], citationMode = AuthorInText, citationNoteNum = 4, citationHash = 0}] [Str "@item1",Space,Str "[p.",Space,Str "30]"],Space,Str "says",Space,Str "blah."]]
- ,[Para [Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [Str "p.\160\&30,",Space,Str "with",Space,Str "suffix"], citationMode = AuthorInText, citationNoteNum = 5, citationHash = 0}] [Str "@item1",Space,Str "[p.",Space,Str "30,",Space,Str "with",Space,Str "suffix]"],Space,Str "says",Space,Str "blah."]]
- ,[Para [Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 6, citationHash = 0},Citation {citationId = "item2", citationPrefix = [], citationSuffix = [Space,Str "p.\160\&30"], citationMode = SuppressAuthor, citationNoteNum = 6, citationHash = 0},Citation {citationId = "\1087\1091\1085\1082\1090\&3", citationPrefix = [Str "see",Space,Str "also"], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 6, citationHash = 0}] [Str "@item1",Space,Str "[-@item2",Space,Str "p.",Space,Str "30;",Space,Str "see",Space,Str "also",Space,Str "@\1087\1091\1085\1082\1090\&3]"],Space,Str "says",Space,Str "blah."]]
- ,[Para [Str "In",Space,Str "a",Space,Str "note.",Note [Para [Cite [Citation {citationId = "\1087\1091\1085\1082\1090\&3", citationPrefix = [], citationSuffix = [Str "p.\160\&12"], citationMode = AuthorInText, citationNoteNum = 7, citationHash = 0}] [Str "@\1087\1091\1085\1082\1090\&3",Space,Str "[p.",Space,Str "12]"],Space,Str "and",Space,Str "a",Space,Str "citation",Space,Str "without",Space,Str "locators",Space,Cite [Citation {citationId = "\1087\1091\1085\1082\1090\&3", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 7, citationHash = 0}] [Str "[@\1087\1091\1085\1082\1090\&3]"],Str "."]]]]
- ,[Para [Str "A",Space,Str "citation",Space,Str "group",Space,Cite [Citation {citationId = "item1", citationPrefix = [Str "see"], citationSuffix = [Space,Str "chap.\160\&3"], citationMode = NormalCitation, citationNoteNum = 8, citationHash = 0},Citation {citationId = "\1087\1091\1085\1082\1090\&3", citationPrefix = [Str "also"], citationSuffix = [Space,Str "p.\160\&34-35"], citationMode = NormalCitation, citationNoteNum = 8, citationHash = 0}] [Str "[see",Space,Str "@item1",Space,Str "chap.",Space,Str "3;",Space,Str "also",Space,Str "@\1087\1091\1085\1082\1090\&3",Space,Str "p.",Space,Str "34-35]"],Str "."]]
- ,[Para [Str "Another",Space,Str "one",Space,Cite [Citation {citationId = "item1", citationPrefix = [Str "see"], citationSuffix = [Space,Str "p.\160\&34-35"], citationMode = NormalCitation, citationNoteNum = 9, citationHash = 0}] [Str "[see",Space,Str "@item1",Space,Str "p.",Space,Str "34-35]"],Str "."]]
- ,[Para [Str "And",Space,Str "another",Space,Str "one",Space,Str "in",Space,Str "a",Space,Str "note.",Note [Para [Str "Some",Space,Str "citations",Space,Cite [Citation {citationId = "item1", citationPrefix = [Str "see"], citationSuffix = [Space,Str "chap.\160\&3"], citationMode = NormalCitation, citationNoteNum = 10, citationHash = 0},Citation {citationId = "\1087\1091\1085\1082\1090\&3", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 10, citationHash = 0},Citation {citationId = "item2", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 10, citationHash = 0}] [Str "[see",Space,Str "@item1",Space,Str "chap.",Space,Str "3;",Space,Str "@\1087\1091\1085\1082\1090\&3;",Space,Str "@item2]"],Str "."]]]]
- ,[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 = 11, 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 = 12, 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 = 13, 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 = 13, 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.\160",Strong [Str "32"]], citationMode = NormalCitation, citationNoteNum = 14, citationHash = 0}] [Str "[*see*",Space,Str "@item1",Space,Str "p.",Space,Str "**32**]"],Str "."]]]
-,Header 1 ("references",[],[]) [Str "References"]]
+[ Header 1
+  ( "pandoc-with-citeproc-hs", [], [] )
+  [ Str "Pandoc", Space, Str "with", Space, Str "citeproc-hs" ]
+, BulletList
+  [
+    [ Para
+      [ Cite
+        [ Citation
+          { citationId = "nonexistent"
+          , citationPrefix = []
+          , citationSuffix = []
+          , citationMode = NormalCitation
+          , citationNoteNum = 1
+          , citationHash = 0
+          }
+        ]
+        [ Str "[@nonexistent]" ]
+      ]
+    ]
+  ,
+    [ Para
+      [ Cite
+        [ Citation
+          { citationId = "nonexistent"
+          , citationPrefix = []
+          , citationSuffix = []
+          , citationMode = AuthorInText
+          , citationNoteNum = 2
+          , citationHash = 0
+          }
+        ]
+        [ Str "@nonexistent" ]
+      ]
+    ]
+  ,
+    [ Para
+      [ Cite
+        [ Citation
+          { citationId = "item1"
+          , citationPrefix = []
+          , citationSuffix = []
+          , citationMode = AuthorInText
+          , citationNoteNum = 3
+          , citationHash = 0
+          }
+        ]
+        [ Str "@item1" ]
+      , Space
+      , Str "says"
+      , Space
+      , Str "blah."
+      ]
+    ]
+  ,
+    [ Para
+      [ Cite
+        [ Citation
+          { citationId = "item1"
+          , citationPrefix = []
+          , citationSuffix =
+            [ Str "p.\160\&30" ]
+          , citationMode = AuthorInText
+          , citationNoteNum = 4
+          , citationHash = 0
+          }
+        ]
+        [ Str "@item1", Space, Str "[p.", Space, Str "30]" ]
+      , Space
+      , Str "says"
+      , Space
+      , Str "blah."
+      ]
+    ]
+  ,
+    [ Para
+      [ Cite
+        [ Citation
+          { citationId = "item1"
+          , citationPrefix = []
+          , citationSuffix =
+            [ Str "p.\160\&30,"
+            , Space
+            , Str "with"
+            , Space
+            , Str "suffix"
+            ]
+          , citationMode = AuthorInText
+          , citationNoteNum = 5
+          , citationHash = 0
+          }
+        ]
+        [ Str "@item1"
+        , Space
+        , Str "[p."
+        , Space
+        , Str "30,"
+        , Space
+        , Str "with"
+        , Space
+        , Str "suffix]"
+        ]
+      , Space
+      , Str "says"
+      , Space
+      , Str "blah."
+      ]
+    ]
+  ,
+    [ Para
+      [ Cite
+        [ Citation
+          { citationId = "item1"
+          , citationPrefix = []
+          , citationSuffix = []
+          , citationMode = AuthorInText
+          , citationNoteNum = 6
+          , citationHash = 0
+          }
+        , Citation
+          { citationId = "item2"
+          , citationPrefix = []
+          , citationSuffix =
+            [ Space, Str "p.\160\&30" ]
+          , citationMode = SuppressAuthor
+          , citationNoteNum = 6
+          , citationHash = 0
+          }
+        , Citation
+          { citationId = "\1087\1091\1085\1082\1090\&3"
+          , citationPrefix =
+            [ Str "see", Space, Str "also" ]
+          , citationSuffix = []
+          , citationMode = NormalCitation
+          , citationNoteNum = 6
+          , citationHash = 0
+          }
+        ]
+        [ Str "@item1"
+        , Space
+        , Str "[-@item2"
+        , Space
+        , Str "p."
+        , Space
+        , Str "30;"
+        , Space
+        , Str "see"
+        , Space
+        , Str "also"
+        , Space
+        , Str "@\1087\1091\1085\1082\1090\&3]"
+        ]
+      , Space
+      , Str "says"
+      , Space
+      , Str "blah."
+      ]
+    ]
+  ,
+    [ Para
+      [ Str "In"
+      , Space
+      , Str "a"
+      , Space
+      , Str "note."
+      , Note
+        [ Para
+          [ Cite
+            [ Citation
+              { citationId = "\1087\1091\1085\1082\1090\&3"
+              , citationPrefix = []
+              , citationSuffix =
+                [ Str "p.\160\&12" ]
+              , citationMode = AuthorInText
+              , citationNoteNum = 7
+              , citationHash = 0
+              }
+            ]
+            [ Str "@\1087\1091\1085\1082\1090\&3"
+            , Space
+            , Str "[p."
+            , Space
+            , Str "12]"
+            ]
+          , Space
+          , Str "and"
+          , Space
+          , Str "a"
+          , Space
+          , Str "citation"
+          , Space
+          , Str "without"
+          , Space
+          , Str "locators"
+          , Space
+          , Cite
+            [ Citation
+              { citationId = "\1087\1091\1085\1082\1090\&3"
+              , citationPrefix = []
+              , citationSuffix = []
+              , citationMode = NormalCitation
+              , citationNoteNum = 7
+              , citationHash = 0
+              }
+            ]
+            [ Str "[@\1087\1091\1085\1082\1090\&3]" ]
+          , Str "."
+          ]
+        ]
+      ]
+    ]
+  ,
+    [ Para
+      [ Str "A"
+      , Space
+      , Str "citation"
+      , Space
+      , Str "group"
+      , Space
+      , Cite
+        [ Citation
+          { citationId = "item1"
+          , citationPrefix =
+            [ Str "see" ]
+          , citationSuffix =
+            [ Space, Str "chap.\160\&3" ]
+          , citationMode = NormalCitation
+          , citationNoteNum = 8
+          , citationHash = 0
+          }
+        , Citation
+          { citationId = "\1087\1091\1085\1082\1090\&3"
+          , citationPrefix =
+            [ Str "also" ]
+          , citationSuffix =
+            [ Space, Str "p.\160\&34-35" ]
+          , citationMode = NormalCitation
+          , citationNoteNum = 8
+          , citationHash = 0
+          }
+        ]
+        [ Str "[see"
+        , Space
+        , Str "@item1"
+        , Space
+        , Str "chap."
+        , Space
+        , Str "3;"
+        , Space
+        , Str "also"
+        , Space
+        , Str "@\1087\1091\1085\1082\1090\&3"
+        , Space
+        , Str "p."
+        , Space
+        , Str "34-35]"
+        ]
+      , Str "."
+      ]
+    ]
+  ,
+    [ Para
+      [ Str "Another"
+      , Space
+      , Str "one"
+      , Space
+      , Cite
+        [ Citation
+          { citationId = "item1"
+          , citationPrefix =
+            [ Str "see" ]
+          , citationSuffix =
+            [ Space, Str "p.\160\&34-35" ]
+          , citationMode = NormalCitation
+          , citationNoteNum = 9
+          , citationHash = 0
+          }
+        ]
+        [ Str "[see"
+        , Space
+        , Str "@item1"
+        , Space
+        , Str "p."
+        , Space
+        , Str "34-35]"
+        ]
+      , Str "."
+      ]
+    ]
+  ,
+    [ Para
+      [ Str "And"
+      , Space
+      , Str "another"
+      , Space
+      , Str "one"
+      , Space
+      , Str "in"
+      , Space
+      , Str "a"
+      , Space
+      , Str "note."
+      , Note
+        [ Para
+          [ Str "Some"
+          , Space
+          , Str "citations"
+          , Space
+          , Cite
+            [ Citation
+              { citationId = "item1"
+              , citationPrefix =
+                [ Str "see" ]
+              , citationSuffix =
+                [ Space, Str "chap.\160\&3" ]
+              , citationMode = NormalCitation
+              , citationNoteNum = 10
+              , citationHash = 0
+              }
+            , Citation
+              { citationId = "\1087\1091\1085\1082\1090\&3"
+              , citationPrefix = []
+              , citationSuffix = []
+              , citationMode = NormalCitation
+              , citationNoteNum = 10
+              , citationHash = 0
+              }
+            , Citation
+              { citationId = "item2"
+              , citationPrefix = []
+              , citationSuffix = []
+              , citationMode = NormalCitation
+              , citationNoteNum = 10
+              , citationHash = 0
+              }
+            ]
+            [ Str "[see"
+            , Space
+            , Str "@item1"
+            , Space
+            , Str "chap."
+            , Space
+            , Str "3;"
+            , Space
+            , Str "@\1087\1091\1085\1082\1090\&3;"
+            , Space
+            , Str "@item2]"
+            ]
+          , Str "."
+          ]
+        ]
+      ]
+    ]
+  ,
+    [ 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 = 11
+          , 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 = 12
+          , 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 = 13
+              , 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 = 13
+              , 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.\160", Strong [ Str "32" ] ]
+          , citationMode = NormalCitation
+          , citationNoteNum = 14
+          , citationHash = 0
+          }
+        ]
+        [ Str "[*see*"
+        , Space
+        , Str "@item1"
+        , Space
+        , Str "p."
+        , Space
+        , Str "**32**]"
+        ]
+      , Str "."
+      ]
+    ]
+  ]
+, Header 1
+  ( "references", [], [] )
+  [ Str "References" ]
+]
diff --git a/test/markdown-reader-more.native b/test/markdown-reader-more.native
index b4a16f7cf..99ab260ba 100644
--- a/test/markdown-reader-more.native
+++ b/test/markdown-reader-more.native
@@ -1,311 +1,1227 @@
-Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "Author",Space,Str "One"],MetaInlines [Str "Author",Space,Str "Two"],MetaInlines [Str "Author",Space,Str "Three"],MetaInlines [Str "Author",Space,Str "Four"]]),("title",MetaInlines [Str "Title",SoftBreak,Str "spanning",Space,Str "multiple",Space,Str "lines"])]})
-[Header 1 ("additional-markdown-reader-tests",[],[]) [Str "Additional",Space,Str "markdown",Space,Str "reader",Space,Str "tests"]
-,Header 2 ("blank-line-before-url-in-link-reference",[],[]) [Str "Blank",Space,Str "line",Space,Str "before",Space,Str "URL",Space,Str "in",Space,Str "link",Space,Str "reference"]
-,Para [Link ("",[],[]) [Str "foo"] ("/url",""),Space,Str "and",Space,Link ("",[],[]) [Str "bar"] ("/url","title")]
-,Header 2 ("raw-context-environments",[],[]) [Str "Raw",Space,Str "ConTeXt",Space,Str "environments"]
-,RawBlock (Format "tex") "\\placeformula \\startformula"
-,Para [Str "L_{1}",Space,Str "=",Space,Str "L_{2}",SoftBreak,RawInline (Format "tex") "\\stopformula"]
-,RawBlock (Format "tex") "\\start[a2]\n\\start[a2]\n\\stop[a2]\n\\stop[a2]"
-,Header 2 ("raw-latex-environments",[],[]) [Str "Raw",Space,Str "LaTeX",Space,Str "environments"]
-,RawBlock (Format "tex") "\\begin{center}\n\\begin{tikzpicture}[baseline={([yshift=+-.5ex]current bounding box.center)}, level distance=24pt]\n\\Tree [.{S} [.NP John\\index{i} ] [.VP [.V likes ] [.NP himself\\index{i,*j} ]]]\n\\end{tikzpicture}\n\\end{center}"
-,Header 2 ("urls-with-spaces-and-punctuation",[],[]) [Str "URLs",Space,Str "with",Space,Str "spaces",Space,Str "and",Space,Str "punctuation"]
-,Para [Link ("",[],[]) [Str "foo"] ("/bar%20and%20baz",""),SoftBreak,Link ("",[],[]) [Str "foo"] ("/bar%20and%20baz",""),SoftBreak,Link ("",[],[]) [Str "foo"] ("/bar%20and%20baz",""),SoftBreak,Link ("",[],[]) [Str "foo"] ("bar%20baz","title")]
-,Para [Link ("",[],[]) [Str "baz"] ("/foo%20foo",""),Space,Link ("",[],[]) [Str "bam"] ("/foo%20fee",""),Space,Link ("",[],[]) [Str "bork"] ("/foo/zee%20zob","title")]
-,Para [Link ("",[],[]) [Str "Ward\8217s",Space,Str "method."] ("http://en.wikipedia.org/wiki/Ward's_method","")]
-,Header 2 ("horizontal-rules-with-spaces-at-end",[],[]) [Str "Horizontal",Space,Str "rules",Space,Str "with",Space,Str "spaces",Space,Str "at",Space,Str "end"]
-,HorizontalRule
-,HorizontalRule
-,Header 2 ("raw-html-before-header",[],[]) [Str "Raw",Space,Str "HTML",Space,Str "before",Space,Str "header"]
-,Para [RawInline (Format "html") "",RawInline (Format "html") ""]
-,Header 3 ("my-header",[],[]) [Str "my",Space,Str "header"]
-,Header 2 ("in-math",[],[]) [Str "$",Space,Str "in",Space,Str "math"]
-,Para [Math InlineMath "\\$2 + \\$3"]
-,Para [Math InlineMath "x = \\text{the $n$th root of $y$}"]
-,Para [Str "This",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "math:"]
-,Para [Str "$PATH",Space,Str "90",Space,Str "$PATH"]
-,Header 2 ("commented-out-list-item",[],[]) [Str "Commented-out",Space,Str "list",Space,Str "item"]
-,BulletList
- [[Plain [Str "one",SoftBreak,RawInline (Format "html") ""]]
- ,[Plain [Str "three"]]]
-,Header 2 ("indented-code-at-beginning-of-list",[],[]) [Str "Indented",Space,Str "code",Space,Str "at",Space,Str "beginning",Space,Str "of",Space,Str "list"]
-,BulletList
- [[CodeBlock ("",[],[]) "code\ncode"
-  ,OrderedList (1,Decimal,Period)
-   [[CodeBlock ("",[],[]) "code\ncode"]
-   ,[CodeBlock ("",[],[]) "code\ncode"]]
-  ,BulletList
-   [[CodeBlock ("",[],[]) "code\ncode"]
-   ,[Plain [Str "no",Space,Str "code"]]]]]
-,Header 2 ("backslash-newline",[],[]) [Str "Backslash",Space,Str "newline"]
-,Para [Str "hi",LineBreak,Str "there"]
-,Header 2 ("code-spans",[],[]) [Str "Code",Space,Str "spans"]
-,Para [Code ("",[],[]) "hi\\"]
-,Para [Code ("",[],[]) "hi there"]
-,Para [Code ("",[],[]) "hi````there"]
-,Para [Str "`hi"]
-,Para [Str "there`"]
-,Header 2 ("multilingual-urls",[],[]) [Str "Multilingual",Space,Str "URLs"]
-,Para [Link ("",["uri"],[]) [Str "http://\27979.com?\27979=\27979"] ("http://\27979.com?\27979=\27979","")]
-,Para [Link ("",[],[]) [Str "foo"] ("/bar/\27979?x=\27979","title")]
-,Para [Link ("",["email"],[]) [Str "\27979@foo.\27979.baz"] ("mailto:\27979@foo.\27979.baz","")]
-,Header 2 ("numbered-examples",[],[]) [Str "Numbered",Space,Str "examples"]
-,OrderedList (1,Example,TwoParens)
- [[Plain [Str "First",Space,Str "example."]]
- ,[Plain [Str "Second",Space,Str "example."]]]
-,Para [Str "Explanation",Space,Str "of",Space,Str "examples",Space,Str "(2)",Space,Str "and",Space,Str "(3)."]
-,OrderedList (3,Example,TwoParens)
- [[Plain [Str "Third",Space,Str "example."]]]
-,Header 2 ("macros",[],[]) [Str "Macros"]
-,RawBlock (Format "tex") "\\newcommand{\\tuple}[1]{\\langle #1 \\rangle}"
-,Para [Math InlineMath "\\langle x,y \\rangle"]
-,Header 2 ("case-insensitive-references",[],[]) [Str "Case-insensitive",Space,Str "references"]
-,Para [Link ("",[],[]) [Str "Fum"] ("/fum","")]
-,Para [Link ("",[],[]) [Str "FUM"] ("/fum","")]
-,Para [Link ("",[],[]) [Str "bat"] ("/bat","")]
-,Header 2 ("curly-smart-quotes",[],[]) [Str "Curly",Space,Str "smart",Space,Str "quotes"]
-,Para [Quoted DoubleQuote [Str "Hi"]]
-,Para [Quoted SingleQuote [Str "Hi"]]
-,Header 2 ("consecutive-lists",[],[]) [Str "Consecutive",Space,Str "lists"]
-,BulletList
- [[Plain [Str "one"]]
- ,[Plain [Str "two"]]]
-,OrderedList (1,Decimal,Period)
- [[Plain [Str "one"]]
- ,[Plain [Str "two"]]]
-,OrderedList (1,LowerAlpha,Period)
- [[Plain [Str "one"]]
- ,[Plain [Str "two"]]]
-,Header 2 ("implicit-header-references",[],[]) [Str "Implicit",Space,Str "header",Space,Str "references"]
-,Header 3 ("my-header-1",[],[]) [Str "My",Space,Str "header"]
-,Header 3 ("my-other-header",[],[]) [Str "My",Space,Str "other",Space,Str "header"]
-,Para [Str "A",Space,Str "link",Space,Str "to",Space,Link ("",[],[]) [Str "My",Space,Str "header"] ("#my-header-1",""),Str "."]
-,Para [Str "Another",Space,Str "link",Space,Str "to",Space,Link ("",[],[]) [Str "it"] ("#my-header-1",""),Str "."]
-,Para [Str "Should",Space,Str "be",Space,Link ("",[],[]) [Str "case",Space,Str "insensitive"] ("#my-header-1",""),Str "."]
-,Para [Str "Link",Space,Str "to",Space,Link ("",[],[]) [Str "Explicit",Space,Str "header",Space,Str "attributes"] ("#foobar",""),Str "."]
-,Para [Str "But",Space,Str "this",Space,Str "is",Space,Str "not",Space,Str "a",Space,Str "link",Space,Str "to",Space,Link ("",[],[]) [Str "My",Space,Str "other",Space,Str "header"] ("/foo",""),Str ",",Space,Str "since",Space,Str "the",Space,Str "reference",Space,Str "is",Space,Str "defined."]
-,Header 2 ("foobar",["baz"],[("key","val")]) [Str "Explicit",Space,Str "header",Space,Str "attributes"]
-,BlockQuote
- [Header 2 ("foobar",["baz"],[("key","val")]) [Str "Header",Space,Str "attributes",Space,Str "inside",Space,Str "block",Space,Str "quote"]]
-,Header 2 ("line-blocks",[],[]) [Str "Line",Space,Str "blocks"]
-,LineBlock
- [[Str "But",Space,Str "can",Space,Str "a",Space,Str "bee",Space,Str "be",Space,Str "said",Space,Str "to",Space,Str "be"]
- ,[Str "\160\160\160\160or",Space,Str "not",Space,Str "to",Space,Str "be",Space,Str "an",Space,Str "entire",Space,Str "bee,"]
- ,[Str "\160\160\160\160\160\160\160\160when",Space,Str "half",Space,Str "the",Space,Str "bee",Space,Str "is",Space,Str "not",Space,Str "a",Space,Str "bee,"]
- ,[Str "\160\160\160\160\160\160\160\160\160\160\160\160due",Space,Str "to",Space,Str "some",Space,Str "ancient",Space,Str "injury?"]
- ,[]
- ,[Str "Continuation",Space,Str "line"]
- ,[Str "\160\160and",Space,Str "another"]]
-,Header 2 ("grid-tables",[],[]) [Str "Grid",Space,Str "Tables"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidth 0.2638888888888889)
- ,(AlignDefault,ColWidth 0.16666666666666666)
- ,(AlignDefault,ColWidth 0.18055555555555555)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "col",Space,Str "1"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "col",Space,Str "2"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "col",Space,Str "3"]]]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "r2",Space,Str "d"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "e"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "f"]]]])]
- (TableFoot ("",[],[])
- [])
-,Para [Str "Headless"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidth 0.2638888888888889)
- ,(AlignDefault,ColWidth 0.16666666666666666)
- ,(AlignDefault,ColWidth 0.18055555555555555)]
- (TableHead ("",[],[])
- [])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "r2",Space,Str "d"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "e"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "f"]]]])]
- (TableFoot ("",[],[])
- [])
-,Para [Str "With",Space,Str "alignments"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignRight,ColWidth 0.2638888888888889)
- ,(AlignLeft,ColWidth 0.16666666666666666)
- ,(AlignCenter,ColWidth 0.18055555555555555)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "col",Space,Str "1"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "col",Space,Str "2"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "col",Space,Str "3"]]]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "r2",Space,Str "d"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "e"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "f"]]]])]
- (TableFoot ("",[],[])
- [])
-,Para [Str "Headless",Space,Str "with",Space,Str "alignments"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignRight,ColWidth 0.2638888888888889)
- ,(AlignLeft,ColWidth 0.16666666666666666)
- ,(AlignCenter,ColWidth 0.18055555555555555)]
- (TableHead ("",[],[])
- [])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "r2",Space,Str "d"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "e"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "f"]]]])]
- (TableFoot ("",[],[])
- [])
-,Para [Str "Spaces",Space,Str "at",Space,Str "ends",Space,Str "of",Space,Str "lines"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidth 0.2638888888888889)
- ,(AlignDefault,ColWidth 0.16666666666666666)
- ,(AlignDefault,ColWidth 0.18055555555555555)]
- (TableHead ("",[],[])
- [])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "r2",Space,Str "d"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "e"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "f"]]]])]
- (TableFoot ("",[],[])
- [])
-,Para [Str "Multiple",Space,Str "blocks",Space,Str "in",Space,Str "a",Space,Str "cell"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidth 0.2638888888888889)
- ,(AlignDefault,ColWidth 0.16666666666666666)
- ,(AlignDefault,ColWidth 0.18055555555555555)]
- (TableHead ("",[],[])
- [])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Header 1 ("col-1",[],[]) [Str "col",Space,Str "1"]
-    ,Plain [Str "col",Space,Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Header 1 ("col-2",[],[]) [Str "col",Space,Str "2"]
-    ,Plain [Str "col",Space,Str "2"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Header 1 ("col-3",[],[]) [Str "col",Space,Str "3"]
-    ,Plain [Str "col",Space,Str "3"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "r1",Space,Str "a"]
-    ,Para [Str "r1",Space,Str "bis"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [BulletList
-     [[Plain [Str "b"]]
-     ,[Plain [Str "b",Space,Str "2"]]
-     ,[Plain [Str "b",Space,Str "2"]]]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "c",SoftBreak,Str "c",Space,Str "2",SoftBreak,Str "c",Space,Str "2"]]]])]
- (TableFoot ("",[],[])
- [])
-,Para [Str "Empty",Space,Str "cells"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidth 5.555555555555555e-2)
- ,(AlignDefault,ColWidth 5.555555555555555e-2)]
- (TableHead ("",[],[])
- [])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []]])]
- (TableFoot ("",[],[])
- [])
-,Header 2 ("entities-in-links-and-titles",[],[]) [Str "Entities",Space,Str "in",Space,Str "links",Space,Str "and",Space,Str "titles"]
-,Para [Link ("",[],[]) [Str "link"] ("/\252rl","\246\246!")]
-,Para [Link ("",["uri"],[]) [Str "http://g\246\246gle.com"] ("http://g\246\246gle.com","")]
-,Para [Link ("",["email"],[]) [Str "me@ex\228mple.com"] ("mailto:me@ex\228mple.com","")]
-,Para [Link ("",[],[]) [Str "foobar"] ("/\252rl","\246\246!")]
-,Header 2 ("parentheses-in-urls",[],[]) [Str "Parentheses",Space,Str "in",Space,Str "URLs"]
-,Para [Link ("",[],[]) [Str "link"] ("/hi(there)","")]
-,Para [Link ("",[],[]) [Str "link"] ("/hithere)","")]
-,Para [Link ("",[],[]) [Str "linky"] ("hi_(there_(nested))","")]
-,Header 2 ("backslashes-in-link-references",[],[]) [Str "Backslashes",Space,Str "in",Space,Str "link",Space,Str "references"]
-,Para [Link ("",[],[]) [Str "*",RawInline (Format "tex") "\\a"] ("b","")]
-,Header 2 ("reference-link-fallbacks",[],[]) [Str "Reference",Space,Str "link",Space,Str "fallbacks"]
-,Para [Str "[",Emph [Str "not",Space,Str "a",Space,Str "link"],Str "]",Space,Str "[",Emph [Str "nope"],Str "]\8230"]
-,Header 2 ("reference-link-followed-by-a-citation",[],[]) [Str "Reference",Space,Str "link",Space,Str "followed",Space,Str "by",Space,Str "a",Space,Str "citation"]
-,Para [Str "MapReduce",Space,Str "is",Space,Str "a",Space,Str "paradigm",Space,Str "popularized",Space,Str "by",Space,Link ("",[],[]) [Str "Google"] ("http://google.com",""),Space,Cite [Citation {citationId = "mapreduce", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 2, citationHash = 0}] [Str "[@mapreduce]"],Space,Str "as",Space,Str "its",SoftBreak,Str "most",Space,Str "vocal",Space,Str "proponent."]
-,Header 2 ("empty-reference-links",[],[]) [Str "Empty",Space,Str "reference",Space,Str "links"]
-,Para [Str "bar"]
-,Para [Link ("",[],[]) [Str "foo2"] ("","")]
-,Header 2 ("wrapping-shouldnt-introduce-new-list-items",[],[]) [Str "Wrapping",Space,Str "shouldn\8217t",Space,Str "introduce",Space,Str "new",Space,Str "list",Space,Str "items"]
-,BulletList
- [[Plain [Str "blah",Space,Str "blah",Space,Str "blah",Space,Str "blah",Space,Str "blah",Space,Str "blah",Space,Str "blah",Space,Str "blah",Space,Str "blah",Space,Str "blah",Space,Str "blah",Space,Str "blah",Space,Str "blah",Space,Str "blah",Space,Str "2015."]]]
-,Header 2 ("bracketed-spans",[],[]) [Str "Bracketed",Space,Str "spans"]
-,Para [Span ("id",["class"],[("key","val")]) [Emph [Str "foo"],Space,Str "bar",Space,Str "baz",Space,Link ("",[],[]) [Str "link"] ("url","")]]]
+Pandoc
+  ( Meta
+    { unMeta = fromList
+      [
+        ( "author"
+        , MetaList
+          [ MetaInlines
+            [ Str "Author", Space, Str "One" ]
+          , MetaInlines
+            [ Str "Author", Space, Str "Two" ]
+          , MetaInlines
+            [ Str "Author", Space, Str "Three" ]
+          , MetaInlines
+            [ Str "Author", Space, Str "Four" ]
+          ]
+        )
+      ,
+        ( "title"
+        , MetaInlines
+          [ Str "Title"
+          , SoftBreak
+          , Str "spanning"
+          , Space
+          , Str "multiple"
+          , Space
+          , Str "lines"
+          ]
+        )
+      ]
+    }
+  )
+  [ Header 1
+    ( "additional-markdown-reader-tests", [], [] )
+    [ Str "Additional"
+    , Space
+    , Str "markdown"
+    , Space
+    , Str "reader"
+    , Space
+    , Str "tests"
+    ]
+  , Header 2
+    ( "blank-line-before-url-in-link-reference", [], [] )
+    [ Str "Blank"
+    , Space
+    , Str "line"
+    , Space
+    , Str "before"
+    , Space
+    , Str "URL"
+    , Space
+    , Str "in"
+    , Space
+    , Str "link"
+    , Space
+    , Str "reference"
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "foo" ]
+      ( "/url", "" )
+    , Space
+    , Str "and"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "bar" ]
+      ( "/url", "title" )
+    ]
+  , Header 2
+    ( "raw-context-environments", [], [] )
+    [ Str "Raw", Space, Str "ConTeXt", Space, Str "environments" ]
+  , RawBlock
+    ( Format "tex" ) "\\placeformula \\startformula"
+  , Para
+    [ Str "L_{1}"
+    , Space
+    , Str "="
+    , Space
+    , Str "L_{2}"
+    , SoftBreak
+    , RawInline
+      ( Format "tex" ) "\\stopformula"
+    ]
+  , RawBlock
+    ( Format "tex" ) "\\start[a2]\n\\start[a2]\n\\stop[a2]\n\\stop[a2]"
+  , Header 2
+    ( "raw-latex-environments", [], [] )
+    [ Str "Raw", Space, Str "LaTeX", Space, Str "environments" ]
+  , RawBlock
+    ( Format "tex" ) "\\begin{center}\n\\begin{tikzpicture}[baseline={([yshift=+-.5ex]current bounding box.center)}, level distance=24pt]\n\\Tree [.{S} [.NP John\\index{i} ] [.VP [.V likes ] [.NP himself\\index{i,*j} ]]]\n\\end{tikzpicture}\n\\end{center}"
+  , Header 2
+    ( "urls-with-spaces-and-punctuation", [], [] )
+    [ Str "URLs"
+    , Space
+    , Str "with"
+    , Space
+    , Str "spaces"
+    , Space
+    , Str "and"
+    , Space
+    , Str "punctuation"
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "foo" ]
+      ( "/bar%20and%20baz", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "foo" ]
+      ( "/bar%20and%20baz", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "foo" ]
+      ( "/bar%20and%20baz", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "foo" ]
+      ( "bar%20baz", "title" )
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "baz" ]
+      ( "/foo%20foo", "" )
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "bam" ]
+      ( "/foo%20fee", "" )
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "bork" ]
+      ( "/foo/zee%20zob", "title" )
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "Ward\8217s", Space, Str "method." ]
+      ( "http://en.wikipedia.org/wiki/Ward's_method", "" )
+    ]
+  , Header 2
+    ( "horizontal-rules-with-spaces-at-end", [], [] )
+    [ Str "Horizontal"
+    , Space
+    , Str "rules"
+    , Space
+    , Str "with"
+    , Space
+    , Str "spaces"
+    , Space
+    , Str "at"
+    , Space
+    , Str "end"
+    ]
+  , HorizontalRule
+  , HorizontalRule
+  , Header 2
+    ( "raw-html-before-header", [], [] )
+    [ Str "Raw"
+    , Space
+    , Str "HTML"
+    , Space
+    , Str "before"
+    , Space
+    , Str "header"
+    ]
+  , Para
+    [ RawInline
+      ( Format "html" ) ""
+    , RawInline
+      ( Format "html" ) ""
+    ]
+  , Header 3
+    ( "my-header", [], [] )
+    [ Str "my", Space, Str "header" ]
+  , Header 2
+    ( "in-math", [], [] )
+    [ Str "$", Space, Str "in", Space, Str "math" ]
+  , Para
+    [ Math InlineMath "\\$2 + \\$3" ]
+  , Para
+    [ Math InlineMath "x = \\text{the $n$th root of $y$}" ]
+  , Para
+    [ Str "This"
+    , Space
+    , Str "should"
+    , Space
+    , Str "not"
+    , Space
+    , Str "be"
+    , Space
+    , Str "math:"
+    ]
+  , Para
+    [ Str "$PATH", Space, Str "90", Space, Str "$PATH" ]
+  , Header 2
+    ( "commented-out-list-item", [], [] )
+    [ Str "Commented-out", Space, Str "list", Space, Str "item" ]
+  , BulletList
+    [
+      [ Plain
+        [ Str "one"
+        , SoftBreak
+        , RawInline
+          ( Format "html" ) ""
+        ]
+      ]
+    ,
+      [ Plain [ Str "three" ] ]
+    ]
+  , Header 2
+    ( "indented-code-at-beginning-of-list", [], [] )
+    [ Str "Indented"
+    , Space
+    , Str "code"
+    , Space
+    , Str "at"
+    , Space
+    , Str "beginning"
+    , Space
+    , Str "of"
+    , Space
+    , Str "list"
+    ]
+  , BulletList
+    [
+      [ CodeBlock
+        ( "", [], [] ) "code\ncode"
+      , OrderedList
+        ( 1, Decimal, Period )
+        [
+          [ CodeBlock ( "", [], [] ) "code\ncode" ]
+        ,
+          [ CodeBlock ( "", [], [] ) "code\ncode" ]
+        ]
+      , BulletList
+        [
+          [ CodeBlock ( "", [], [] ) "code\ncode" ]
+        ,
+          [ Plain [ Str "no", Space, Str "code" ] ]
+        ]
+      ]
+    ]
+  , Header 2
+    ( "backslash-newline", [], [] )
+    [ Str "Backslash", Space, Str "newline" ]
+  , Para
+    [ Str "hi", LineBreak, Str "there" ]
+  , Header 2
+    ( "code-spans", [], [] )
+    [ Str "Code", Space, Str "spans" ]
+  , Para
+    [ Code ( "", [], [] ) "hi\\" ]
+  , Para
+    [ Code ( "", [], [] ) "hi there" ]
+  , Para
+    [ Code ( "", [], [] ) "hi````there" ]
+  , Para
+    [ Str "`hi" ]
+  , Para
+    [ Str "there`" ]
+  , Header 2
+    ( "multilingual-urls", [], [] )
+    [ Str "Multilingual", Space, Str "URLs" ]
+  , Para
+    [ Link
+      ( "", [ "uri" ], [] )
+      [ Str "http://\27979.com?\27979=\27979" ]
+      ( "http://\27979.com?\27979=\27979", "" )
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "foo" ]
+      ( "/bar/\27979?x=\27979", "title" )
+    ]
+  , Para
+    [ Link
+      ( "", [ "email" ], [] )
+      [ Str "\27979@foo.\27979.baz" ]
+      ( "mailto:\27979@foo.\27979.baz", "" )
+    ]
+  , Header 2
+    ( "numbered-examples", [], [] )
+    [ Str "Numbered", Space, Str "examples" ]
+  , OrderedList
+    ( 1, Example, TwoParens )
+    [
+      [ Plain [ Str "First", Space, Str "example." ] ]
+    ,
+      [ Plain [ Str "Second", Space, Str "example." ] ]
+    ]
+  , Para
+    [ Str "Explanation"
+    , Space
+    , Str "of"
+    , Space
+    , Str "examples"
+    , Space
+    , Str "(2)"
+    , Space
+    , Str "and"
+    , Space
+    , Str "(3)."
+    ]
+  , OrderedList
+    ( 3, Example, TwoParens )
+    [ [ Plain [ Str "Third", Space, Str "example." ] ] ]
+  , Header 2
+    ( "macros", [], [] )
+    [ Str "Macros" ]
+  , RawBlock
+    ( Format "tex" ) "\\newcommand{\\tuple}[1]{\\langle #1 \\rangle}"
+  , Para
+    [ Math InlineMath "\\langle x,y \\rangle" ]
+  , Header 2
+    ( "case-insensitive-references", [], [] )
+    [ Str "Case-insensitive", Space, Str "references" ]
+  , Para
+    [ Link ( "", [], [] ) [ Str "Fum" ] ( "/fum", "" ) ]
+  , Para
+    [ Link ( "", [], [] ) [ Str "FUM" ] ( "/fum", "" ) ]
+  , Para
+    [ Link ( "", [], [] ) [ Str "bat" ] ( "/bat", "" ) ]
+  , Header 2
+    ( "curly-smart-quotes", [], [] )
+    [ Str "Curly", Space, Str "smart", Space, Str "quotes" ]
+  , Para
+    [ Quoted DoubleQuote [ Str "Hi" ] ]
+  , Para
+    [ Quoted SingleQuote [ Str "Hi" ] ]
+  , Header 2
+    ( "consecutive-lists", [], [] )
+    [ Str "Consecutive", Space, Str "lists" ]
+  , BulletList
+    [ [ Plain [ Str "one" ] ], [ Plain [ Str "two" ] ] ]
+  , OrderedList
+    ( 1, Decimal, Period )
+    [ [ Plain [ Str "one" ] ], [ Plain [ Str "two" ] ] ]
+  , OrderedList
+    ( 1, LowerAlpha, Period )
+    [ [ Plain [ Str "one" ] ], [ Plain [ Str "two" ] ] ]
+  , Header 2
+    ( "implicit-header-references", [], [] )
+    [ Str "Implicit", Space, Str "header", Space, Str "references" ]
+  , Header 3
+    ( "my-header-1", [], [] )
+    [ Str "My", Space, Str "header" ]
+  , Header 3
+    ( "my-other-header", [], [] )
+    [ Str "My", Space, Str "other", Space, Str "header" ]
+  , Para
+    [ Str "A"
+    , Space
+    , Str "link"
+    , Space
+    , Str "to"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "My", Space, Str "header" ]
+      ( "#my-header-1", "" )
+    , Str "."
+    ]
+  , Para
+    [ Str "Another"
+    , Space
+    , Str "link"
+    , Space
+    , Str "to"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "it" ]
+      ( "#my-header-1", "" )
+    , Str "."
+    ]
+  , Para
+    [ Str "Should"
+    , Space
+    , Str "be"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "case", Space, Str "insensitive" ]
+      ( "#my-header-1", "" )
+    , Str "."
+    ]
+  , Para
+    [ Str "Link"
+    , Space
+    , Str "to"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "Explicit", Space, Str "header", Space, Str "attributes" ]
+      ( "#foobar", "" )
+    , Str "."
+    ]
+  , Para
+    [ Str "But"
+    , Space
+    , Str "this"
+    , Space
+    , Str "is"
+    , Space
+    , Str "not"
+    , Space
+    , Str "a"
+    , Space
+    , Str "link"
+    , Space
+    , Str "to"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "My", Space, Str "other", Space, Str "header" ]
+      ( "/foo", "" )
+    , Str ","
+    , Space
+    , Str "since"
+    , Space
+    , Str "the"
+    , Space
+    , Str "reference"
+    , Space
+    , Str "is"
+    , Space
+    , Str "defined."
+    ]
+  , Header 2
+    ( "foobar", [ "baz" ], [ ( "key", "val" ) ] )
+    [ Str "Explicit", Space, Str "header", Space, Str "attributes" ]
+  , BlockQuote
+    [ Header 2
+      ( "foobar", [ "baz" ], [ ( "key", "val" ) ] )
+      [ Str "Header"
+      , Space
+      , Str "attributes"
+      , Space
+      , Str "inside"
+      , Space
+      , Str "block"
+      , Space
+      , Str "quote"
+      ]
+    ]
+  , Header 2
+    ( "line-blocks", [], [] )
+    [ Str "Line", Space, Str "blocks" ]
+  , LineBlock
+    [
+      [ Str "But"
+      , Space
+      , Str "can"
+      , Space
+      , Str "a"
+      , Space
+      , Str "bee"
+      , Space
+      , Str "be"
+      , Space
+      , Str "said"
+      , Space
+      , Str "to"
+      , Space
+      , Str "be"
+      ]
+    ,
+      [ Str "\160\160\160\160or"
+      , Space
+      , Str "not"
+      , Space
+      , Str "to"
+      , Space
+      , Str "be"
+      , Space
+      , Str "an"
+      , Space
+      , Str "entire"
+      , Space
+      , Str "bee,"
+      ]
+    ,
+      [ Str "\160\160\160\160\160\160\160\160when"
+      , Space
+      , Str "half"
+      , Space
+      , Str "the"
+      , Space
+      , Str "bee"
+      , Space
+      , Str "is"
+      , Space
+      , Str "not"
+      , Space
+      , Str "a"
+      , Space
+      , Str "bee,"
+      ]
+    ,
+      [ Str "\160\160\160\160\160\160\160\160\160\160\160\160due"
+      , Space
+      , Str "to"
+      , Space
+      , Str "some"
+      , Space
+      , Str "ancient"
+      , Space
+      , Str "injury?"
+      ]
+    , []
+    ,
+      [ Str "Continuation", Space, Str "line" ]
+    ,
+      [ Str "\160\160and", Space, Str "another" ]
+    ]
+  , Header 2
+    ( "grid-tables", [], [] )
+    [ Str "Grid", Space, Str "Tables" ]
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignDefault, ColWidth 0.2638888888888889 )
+    ,
+      ( AlignDefault, ColWidth 0.16666666666666666 )
+    ,
+      ( AlignDefault, ColWidth 0.18055555555555555 )
+    ]
+    ( TableHead
+      ( "", [], [] )
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "col", Space, Str "1" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "col", Space, Str "2" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "col", Space, Str "3" ] ]
+        ]
+      ]
+    )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain
+            [ Str "r1"
+            , Space
+            , Str "a"
+            , SoftBreak
+            , Str "r1"
+            , Space
+            , Str "bis"
+            ]
+          ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "b", SoftBreak, Str "b", Space, Str "2" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "c", SoftBreak, Str "c", Space, Str "2" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "r2", Space, Str "d" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "e" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "f" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Para
+    [ Str "Headless" ]
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignDefault, ColWidth 0.2638888888888889 )
+    ,
+      ( AlignDefault, ColWidth 0.16666666666666666 )
+    ,
+      ( AlignDefault, ColWidth 0.18055555555555555 )
+    ]
+    ( TableHead ( "", [], [] ) [] )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain
+            [ Str "r1"
+            , Space
+            , Str "a"
+            , SoftBreak
+            , Str "r1"
+            , Space
+            , Str "bis"
+            ]
+          ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "b", SoftBreak, Str "b", Space, Str "2" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "c", SoftBreak, Str "c", Space, Str "2" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "r2", Space, Str "d" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "e" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "f" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Para
+    [ Str "With", Space, Str "alignments" ]
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignRight, ColWidth 0.2638888888888889 )
+    ,
+      ( AlignLeft, ColWidth 0.16666666666666666 )
+    ,
+      ( AlignCenter, ColWidth 0.18055555555555555 )
+    ]
+    ( TableHead
+      ( "", [], [] )
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "col", Space, Str "1" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "col", Space, Str "2" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "col", Space, Str "3" ] ]
+        ]
+      ]
+    )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain
+            [ Str "r1"
+            , Space
+            , Str "a"
+            , SoftBreak
+            , Str "r1"
+            , Space
+            , Str "bis"
+            ]
+          ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "b", SoftBreak, Str "b", Space, Str "2" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "c", SoftBreak, Str "c", Space, Str "2" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "r2", Space, Str "d" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "e" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "f" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Para
+    [ Str "Headless", Space, Str "with", Space, Str "alignments" ]
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignRight, ColWidth 0.2638888888888889 )
+    ,
+      ( AlignLeft, ColWidth 0.16666666666666666 )
+    ,
+      ( AlignCenter, ColWidth 0.18055555555555555 )
+    ]
+    ( TableHead ( "", [], [] ) [] )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain
+            [ Str "r1"
+            , Space
+            , Str "a"
+            , SoftBreak
+            , Str "r1"
+            , Space
+            , Str "bis"
+            ]
+          ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "b", SoftBreak, Str "b", Space, Str "2" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "c", SoftBreak, Str "c", Space, Str "2" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "r2", Space, Str "d" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "e" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "f" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Para
+    [ Str "Spaces"
+    , Space
+    , Str "at"
+    , Space
+    , Str "ends"
+    , Space
+    , Str "of"
+    , Space
+    , Str "lines"
+    ]
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignDefault, ColWidth 0.2638888888888889 )
+    ,
+      ( AlignDefault, ColWidth 0.16666666666666666 )
+    ,
+      ( AlignDefault, ColWidth 0.18055555555555555 )
+    ]
+    ( TableHead ( "", [], [] ) [] )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain
+            [ Str "r1"
+            , Space
+            , Str "a"
+            , SoftBreak
+            , Str "r1"
+            , Space
+            , Str "bis"
+            ]
+          ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "b", SoftBreak, Str "b", Space, Str "2" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "c", SoftBreak, Str "c", Space, Str "2" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "r2", Space, Str "d" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "e" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "f" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Para
+    [ Str "Multiple"
+    , Space
+    , Str "blocks"
+    , Space
+    , Str "in"
+    , Space
+    , Str "a"
+    , Space
+    , Str "cell"
+    ]
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignDefault, ColWidth 0.2638888888888889 )
+    ,
+      ( AlignDefault, ColWidth 0.16666666666666666 )
+    ,
+      ( AlignDefault, ColWidth 0.18055555555555555 )
+    ]
+    ( TableHead ( "", [], [] ) [] )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Header 1
+            ( "col-1", [], [] )
+            [ Str "col", Space, Str "1" ]
+          , Plain
+            [ Str "col", Space, Str "1" ]
+          ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Header 1
+            ( "col-2", [], [] )
+            [ Str "col", Space, Str "2" ]
+          , Plain
+            [ Str "col", Space, Str "2" ]
+          ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Header 1
+            ( "col-3", [], [] )
+            [ Str "col", Space, Str "3" ]
+          , Plain
+            [ Str "col", Space, Str "3" ]
+          ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para
+            [ Str "r1", Space, Str "a" ]
+          , Para
+            [ Str "r1", Space, Str "bis" ]
+          ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ BulletList
+            [
+              [ Plain [ Str "b" ] ]
+            ,
+              [ Plain [ Str "b", Space, Str "2" ] ]
+            ,
+              [ Plain [ Str "b", Space, Str "2" ] ]
+            ]
+          ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain
+            [ Str "c"
+            , SoftBreak
+            , Str "c"
+            , Space
+            , Str "2"
+            , SoftBreak
+            , Str "c"
+            , Space
+            , Str "2"
+            ]
+          ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Para
+    [ Str "Empty", Space, Str "cells" ]
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignDefault, ColWidth 5.555555555555555 e- 2 )
+    ,
+      ( AlignDefault, ColWidth 5.555555555555555 e- 2 )
+    ]
+    ( TableHead ( "", [], [] ) [] )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Header 2
+    ( "entities-in-links-and-titles", [], [] )
+    [ Str "Entities"
+    , Space
+    , Str "in"
+    , Space
+    , Str "links"
+    , Space
+    , Str "and"
+    , Space
+    , Str "titles"
+    ]
+  , Para
+    [ Link ( "", [], [] ) [ Str "link" ] ( "/\252rl", "\246\246!" ) ]
+  , Para
+    [ Link
+      ( "", [ "uri" ], [] )
+      [ Str "http://g\246\246gle.com" ]
+      ( "http://g\246\246gle.com", "" )
+    ]
+  , Para
+    [ Link
+      ( "", [ "email" ], [] )
+      [ Str "me@ex\228mple.com" ]
+      ( "mailto:me@ex\228mple.com", "" )
+    ]
+  , Para
+    [ Link ( "", [], [] ) [ Str "foobar" ] ( "/\252rl", "\246\246!" ) ]
+  , Header 2
+    ( "parentheses-in-urls", [], [] )
+    [ Str "Parentheses", Space, Str "in", Space, Str "URLs" ]
+  , Para
+    [ Link ( "", [], [] ) [ Str "link" ] ( "/hi(there)", "" ) ]
+  , Para
+    [ Link ( "", [], [] ) [ Str "link" ] ( "/hithere)", "" ) ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "linky" ]
+      ( "hi_(there_(nested))", "" )
+    ]
+  , Header 2
+    ( "backslashes-in-link-references", [], [] )
+    [ Str "Backslashes"
+    , Space
+    , Str "in"
+    , Space
+    , Str "link"
+    , Space
+    , Str "references"
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "*", RawInline ( Format "tex" ) "\\a" ]
+      ( "b", "" )
+    ]
+  , Header 2
+    ( "reference-link-fallbacks", [], [] )
+    [ Str "Reference", Space, Str "link", Space, Str "fallbacks" ]
+  , Para
+    [ Str "["
+    , Emph
+      [ Str "not", Space, Str "a", Space, Str "link" ]
+    , Str "]"
+    , Space
+    , Str "["
+    , Emph
+      [ Str "nope" ]
+    , Str "]\8230"
+    ]
+  , Header 2
+    ( "reference-link-followed-by-a-citation", [], [] )
+    [ Str "Reference"
+    , Space
+    , Str "link"
+    , Space
+    , Str "followed"
+    , Space
+    , Str "by"
+    , Space
+    , Str "a"
+    , Space
+    , Str "citation"
+    ]
+  , Para
+    [ Str "MapReduce"
+    , Space
+    , Str "is"
+    , Space
+    , Str "a"
+    , Space
+    , Str "paradigm"
+    , Space
+    , Str "popularized"
+    , Space
+    , Str "by"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "Google" ]
+      ( "http://google.com", "" )
+    , Space
+    , Cite
+      [ Citation
+        { citationId = "mapreduce"
+        , citationPrefix = []
+        , citationSuffix = []
+        , citationMode = NormalCitation
+        , citationNoteNum = 2
+        , citationHash = 0
+        }
+      ]
+      [ Str "[@mapreduce]" ]
+    , Space
+    , Str "as"
+    , Space
+    , Str "its"
+    , SoftBreak
+    , Str "most"
+    , Space
+    , Str "vocal"
+    , Space
+    , Str "proponent."
+    ]
+  , Header 2
+    ( "empty-reference-links", [], [] )
+    [ Str "Empty", Space, Str "reference", Space, Str "links" ]
+  , Para
+    [ Str "bar" ]
+  , Para
+    [ Link ( "", [], [] ) [ Str "foo2" ] ( "", "" ) ]
+  , Header 2
+    ( "wrapping-shouldnt-introduce-new-list-items", [], [] )
+    [ Str "Wrapping"
+    , Space
+    , Str "shouldn\8217t"
+    , Space
+    , Str "introduce"
+    , Space
+    , Str "new"
+    , Space
+    , Str "list"
+    , Space
+    , Str "items"
+    ]
+  , BulletList
+    [
+      [ Plain
+        [ Str "blah"
+        , Space
+        , Str "blah"
+        , Space
+        , Str "blah"
+        , Space
+        , Str "blah"
+        , Space
+        , Str "blah"
+        , Space
+        , Str "blah"
+        , Space
+        , Str "blah"
+        , Space
+        , Str "blah"
+        , Space
+        , Str "blah"
+        , Space
+        , Str "blah"
+        , Space
+        , Str "blah"
+        , Space
+        , Str "blah"
+        , Space
+        , Str "blah"
+        , Space
+        , Str "blah"
+        , Space
+        , Str "2015."
+        ]
+      ]
+    ]
+  , Header 2
+    ( "bracketed-spans", [], [] )
+    [ Str "Bracketed", Space, Str "spans" ]
+  , Para
+    [ Span
+      ( "id", [ "class" ], [ ( "key", "val" ) ] )
+      [ Emph
+        [ Str "foo" ]
+      , Space
+      , Str "bar"
+      , Space
+      , Str "baz"
+      , Space
+      , Link
+        ( "", [], [] )
+        [ Str "link" ]
+        ( "url", "" )
+      ]
+    ]
+  ]
diff --git a/test/mediawiki-reader.native b/test/mediawiki-reader.native
index d7ac63215..0a1e1c29d 100644
--- a/test/mediawiki-reader.native
+++ b/test/mediawiki-reader.native
@@ -1,418 +1,1444 @@
-Pandoc (Meta {unMeta = fromList []})
-[Header 1 ("header",[],[]) [Str "header"]
-,Header 2 ("header_level_two",[],[]) [Str "header",Space,Str "level",Space,Str "two"]
-,Header 3 ("header_level_3",[],[]) [Str "header",Space,Str "level",Space,Str "3"]
-,Header 4 ("header_level_four",[],[]) [Str "header",Space,Emph [Str "level"],Space,Str "four"]
-,Header 5 ("header_level_5",[],[]) [Str "header",Space,Str "level",Space,Str "5"]
-,Header 6 ("header_level_6",[],[]) [Str "header",Space,Str "level",Space,Str "6"]
-,Para [Str "=======",Space,Str "not",Space,Str "a",Space,Str "header",Space,Str "========"]
-,Para [Code ("",[],[]) "==\160not\160a\160header\160=="]
-,Header 2 ("emph_and_strong",[],[]) [Str "emph",Space,Str "and",Space,Str "strong"]
-,Para [Emph [Str "emph"],Space,Strong [Str "strong"]]
-,Para [Strong [Emph [Str "strong",Space,Str "and",Space,Str "emph"]]]
-,Para [Strong [Emph [Str "emph",Space,Str "inside"],Space,Str "strong"]]
-,Para [Strong [Str "strong",Space,Str "with",Space,Emph [Str "emph"]]]
-,Para [Emph [Strong [Str "strong",Space,Str "inside"],Space,Str "emph"]]
-,Header 2 ("horizontal_rule",[],[]) [Str "horizontal",Space,Str "rule"]
-,Para [Str "top"]
-,HorizontalRule
-,Para [Str "bottom"]
-,HorizontalRule
-,Header 2 ("nowiki",[],[]) [Str "nowiki"]
-,Para [Str "''not",Space,Str "emph''"]
-,Header 2 ("strikeout",[],[]) [Str "strikeout"]
-,Para [Strikeout [Str "This",Space,Str "is",Space,Emph [Str "struck",Space,Str "out"]]]
-,Header 2 ("entities",[],[]) [Str "entities"]
-,Para [Str "hi",Space,Str "&",Space,Str "low"]
-,Para [Str "hi",Space,Str "&",Space,Str "low"]
-,Para [Str "G\246del"]
-,Para [Str "\777\2730"]
-,Header 2 ("comments",[],[]) [Str "comments"]
-,Para [Str "inline",Space,Str "comment"]
-,Para [Str "between",Space,Str "blocks"]
-,Header 2 ("linebreaks",[],[]) [Str "linebreaks"]
-,Para [Str "hi",LineBreak,Str "there"]
-,Para [Str "hi",LineBreak,Str "there"]
-,Header 2 ("indents",[],[]) [Str ":",Space,Str "indents"]
-,Para [Str "hi"]
-,DefinitionList
- [([],
-   [[Plain [Str "there"]]])]
-,Para [Str "bud"]
-,Para [Str "hi"]
-,DefinitionList
- [([],
-   [[DefinitionList
-     [([],
-       [[Plain [Str "there"]]])]]])]
-,Para [Str "bud"]
-,Header 2 ("p_tags",[],[]) [Str "p",Space,Str "tags"]
-,Para [Str "hi",Space,Str "there"]
-,Para [Str "bud"]
-,Para [Str "another"]
-,Header 2 ("raw_html",[],[]) [Str "raw",Space,Str "html"]
-,Para [Str "hi",Space,RawInline (Format "html") "",Emph [Str "there"],RawInline (Format "html") "",Str "."]
-,Para [RawInline (Format "html") "",Str "inserted",RawInline (Format "html") ""]
-,RawBlock (Format "html") ""
-,Para [Str "hi",Space,Emph [Str "there"]]
-,RawBlock (Format "html") ""
-,Header 2 ("sup_sub_del",[],[]) [Str "sup,",Space,Str "sub,",Space,Str "del"]
-,Para [Str "H",Subscript [Str "2"],Str "O",Space,Str "base",Superscript [Emph [Str "exponent"]],SoftBreak,Strikeout [Str "hello"]]
-,Header 2 ("inline_code",[],[]) [Str "inline",Space,Str "code"]
-,Para [Code ("",[],[]) "*\8594*",Space,Code ("",[],[]) "typed",Space,Code ("",["haskell"],[]) ">>="]
-,Header 2 ("code_blocks",[],[]) [Str "code",Space,Str "blocks"]
-,CodeBlock ("",[],[]) "case xs of\n     (_:_) -> reverse xs\n     []    -> ['*']"
-,CodeBlock ("",["haskell"],[]) "case xs of\n     (_:_) -> reverse xs\n     []    -> ['*']"
-,CodeBlock ("",["ruby","numberLines"],[("startFrom","100")]) "widgets.each do |w|\n  print w.price\nend"
-,Header 2 ("block_quotes",[],[]) [Str "block",Space,Str "quotes"]
-,Para [Str "Regular",Space,Str "paragraph"]
-,BlockQuote
- [Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "block",Space,Str "quote."]
- ,Para [Str "With",Space,Str "two",Space,Str "paragraphs."]]
-,Para [Str "Nother",Space,Str "paragraph."]
-,Header 2 ("external_links",[],[]) [Str "external",Space,Str "links"]
-,Para [Link ("",[],[]) [Emph [Str "Google"],Space,Str "search",Space,Str "engine"] ("http://google.com","")]
-,Para [Link ("",[],[]) [Str "http://pandoc.org"] ("http://pandoc.org","")]
-,Para [Link ("",[],[]) [Str "1"] ("http://google.com",""),Space,Link ("",[],[]) [Str "2"] ("http://yahoo.com","")]
-,Para [Link ("",[],[]) [Str "email",Space,Str "me"] ("mailto:info@example.org","")]
-,Header 2 ("internal_links",[],[]) [Str "internal",Space,Str "links"]
-,Para [Link ("",[],[]) [Str "Help"] ("Help","wikilink")]
-,Para [Link ("",[],[]) [Str "the",Space,Str "help",Space,Str "page"] ("Help","wikilink")]
-,Para [Link ("",[],[]) [Str "Helpers"] ("Help","wikilink")]
-,Para [Link ("",[],[]) [Str "Help"] ("Help","wikilink"),Str "ers"]
-,Para [Link ("",[],[]) [Str "Contents"] ("Help:Contents","wikilink")]
-,Para [Link ("",[],[]) [Str "#My",Space,Str "anchor"] ("#My_anchor","wikilink")]
-,Para [Link ("",[],[]) [Str "and",Space,Str "text"] ("Page#with_anchor","wikilink")]
-,Header 2 ("images",[],[]) [Str "images"]
-,Para [Image ("",[],[]) [Str "caption"] ("example.jpg","fig:caption")]
-,Para [Image ("",[],[]) [Str "the",Space,Emph [Str "caption"],Space,Str "with",Space,Link ("",[],[]) [Str "external",Space,Str "link"] ("http://google.com","")] ("example.jpg","fig:the caption with external link")]
-,Para [Image ("",[],[("width","30"),("height","40")]) [Str "caption"] ("example.jpg","fig:caption")]
-,Para [Image ("",[],[("width","30")]) [Str "caption"] ("example.jpg","fig:caption")]
-,Para [Image ("",[],[("width","30")]) [Str "caption"] ("example.jpg","fig:caption")]
-,Para [Image ("",[],[]) [Str "example.jpg"] ("example.jpg","fig:example.jpg")]
-,Para [Image ("",[],[]) [Str "example_es.jpg"] ("example_es.jpg","fig:example_es.jpg")]
-,Header 2 ("lists",[],[]) [Str "lists"]
-,BulletList
- [[Plain [Str "Start",Space,Str "each",Space,Str "line"]]
- ,[Plain [Str "with",Space,Str "an",Space,Str "asterisk",Space,Str "(*)."]
-  ,BulletList
-   [[Plain [Str "More",Space,Str "asterisks",Space,Str "gives",Space,Str "deeper"]
-    ,BulletList
-     [[Plain [Str "and",Space,Str "deeper",Space,Str "levels."]]]]]]
- ,[Plain [Str "Line",Space,Str "breaks",LineBreak,Str "don't",Space,Str "break",Space,Str "levels."]
-  ,BulletList
-   [[BulletList
-     [[Plain [Str "But",Space,Str "jumping",Space,Str "levels",Space,Str "creates",Space,Str "empty",Space,Str "space."]]]]]]]
-,Para [Str "Any",Space,Str "other",Space,Str "start",Space,Str "ends",Space,Str "the",Space,Str "list."]
-,BulletList
- [[BulletList
-   [[Plain [Str "two"]]]]
- ,[Plain [Str "one"]]]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Plain [Str "Start",Space,Str "each",Space,Str "line"]]
- ,[Plain [Str "with",Space,Str "a",Space,Str "number",Space,Str "sign",Space,Str "(#)."]
-  ,OrderedList (1,DefaultStyle,DefaultDelim)
-   [[Plain [Str "More",Space,Str "number",Space,Str "signs",Space,Str "gives",Space,Str "deeper"]
-    ,OrderedList (1,DefaultStyle,DefaultDelim)
-     [[Plain [Str "and",Space,Str "deeper"]]
-     ,[Plain [Str "levels."]]]]]]
- ,[Plain [Str "Line",Space,Str "breaks",LineBreak,Str "don't",Space,Str "break",Space,Str "levels."]
-  ,OrderedList (1,DefaultStyle,DefaultDelim)
-   [[OrderedList (1,DefaultStyle,DefaultDelim)
-     [[Plain [Str "But",Space,Str "jumping",Space,Str "levels",Space,Str "creates",Space,Str "empty",Space,Str "space."]]]]]]
- ,[Plain [Str "Blank",Space,Str "lines"]]]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Plain [Str "end",Space,Str "the",Space,Str "list",Space,Str "and",Space,Str "start",Space,Str "another."]]]
-,Para [Str "Any",Space,Str "other",Space,Str "start",Space,Str "also",SoftBreak,Str "ends",Space,Str "the",Space,Str "list."]
-,DefinitionList
- [([Str "item",Space,Str "1"],
-   [[Plain [Str "definition",Space,Str "1"]]])
- ,([Str "item",Space,Str "2"],
-   [[Plain [Str "definition",Space,Str "2-1"]]
-   ,[Plain [Str "definition",Space,Str "2-2"]]])]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Plain [Str "one"]]
- ,[Plain [Str "two"]
-  ,BulletList
-   [[Plain [Str "two",Space,Str "point",Space,Str "one"]]
-   ,[Plain [Str "two",Space,Str "point",Space,Str "two"]]]]
- ,[Plain [Str "three"]
-  ,DefinitionList
-   [([Str "three",Space,Str "item",Space,Str "one"],
-     [[Plain [Str "three",Space,Str "def",Space,Str "one"]]])]]
- ,[Plain [Str "four"]
-  ,DefinitionList
-   [([],
-     [[Plain [Str "four",Space,Str "def",Space,Str "one"]]
-     ,[Plain [Str "this",Space,Str "looks",Space,Str "like",Space,Str "a",Space,Str "continuation"]]
-     ,[Plain [Str "and",Space,Str "is",Space,Str "often",Space,Str "used"]]
-     ,[Plain [Str "instead",LineBreak,Str "of",Space,Str "
"]]])]]
- ,[Plain [RawInline (Format "mediawiki") "{{{template\n|author=John\n|title=My Book\n}}}"]
-  ,OrderedList (1,DefaultStyle,DefaultDelim)
-   [[Plain [Str "five",Space,Str "sub",Space,Str "1"]
-    ,OrderedList (1,DefaultStyle,DefaultDelim)
-     [[Plain [Str "five",Space,Str "sub",Space,Str "1",Space,Str "sub",Space,Str "1"]]]]
-   ,[Plain [Str "five",Space,Str "sub",Space,Str "2"]]]]]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Plain [Str "list",Space,Str "item",Space,Emph [Str "emph"]]
-  ,OrderedList (1,DefaultStyle,DefaultDelim)
-   [[Plain [Str "list",Space,Str "item",Space,Str "B1"]]
-   ,[Plain [Str "list",Space,Str "item",Space,Str "B2"]]]
-  ,Para [Str "continuing",Space,Str "list",Space,Str "item",Space,Str "A1"]]
- ,[Plain [Str "list",Space,Str "item",Space,Str "A2"]]]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Plain [Str "abc"]]
- ,[Plain [Str "def"]]
- ,[Plain [Str "ghi"]]]
-,OrderedList (9,DefaultStyle,DefaultDelim)
- [[Plain [Str "Amsterdam"]]
- ,[Plain [Str "Rotterdam"]]
- ,[Plain [Str "The",Space,Str "Hague"]]]
-,Header 2 ("math",[],[]) [Str "math"]
-,Para [Str "Here",Space,Str "is",Space,Str "some",Space,Math InlineMath "x=\\frac{y^\\pi}{z}",Str "."]
-,Para [Str "With",Space,Str "spaces:",Space,Math InlineMath "x=\\frac{y^\\pi}{z}",Str "."]
-,Header 2 ("preformatted_blocks",[],[]) [Str "preformatted",Space,Str "blocks"]
-,Para [Code ("",[],[]) "Start\160each\160line\160with\160a\160space.",LineBreak,Code ("",[],[]) "Text\160is\160",Strong [Code ("",[],[]) "preformatted"],Code ("",[],[]) "\160and",LineBreak,Emph [Code ("",[],[]) "markups"],Code ("",[],[]) "\160",Strong [Emph [Code ("",[],[]) "can"]],Code ("",[],[]) "\160be\160done."]
-,Para [Code ("",[],[]) "\160hell\160\160\160\160\160\160yeah"]
-,Para [Code ("",[],[]) "Start\160with\160a\160space\160in\160the\160first\160column,",LineBreak,Code ("",[],[]) "(before\160the\160).",LineBreak,Code ("",[],[]) "",LineBreak,Code ("",[],[]) "Then\160your\160block\160format\160will\160be",LineBreak,Code ("",[],[]) "\160\160\160\160maintained.",LineBreak,Code ("",[],[]) "",LineBreak,Code ("",[],[]) "This\160is\160good\160for\160copying\160in\160code\160blocks:",LineBreak,Code ("",[],[]) "",LineBreak,Code ("",[],[]) "def\160function():",LineBreak,Code ("",[],[]) "\160\160\160\160\"\"\"documentation\160string\"\"\"",LineBreak,Code ("",[],[]) "",LineBreak,Code ("",[],[]) "\160\160\160\160if\160True:",LineBreak,Code ("",[],[]) "\160\160\160\160\160\160\160\160print\160True",LineBreak,Code ("",[],[]) "\160\160\160\160else:",LineBreak,Code ("",[],[]) "\160\160\160\160\160\160\160\160print\160False"]
-,Para [Str "Not"]
-,RawBlock (Format "html") ""
-,Para [Str "preformatted"]
-,Para [Str "Don't",Space,Str "need"]
-,Para [Code ("",[],[]) "a\160blank\160line"]
-,Para [Str "around",Space,Str "a",Space,Str "preformatted",Space,Str "block."]
-,Header 2 ("templates",[],[]) [Str "templates"]
-,RawBlock (Format "mediawiki") "{{Welcome}}"
-,RawBlock (Format "mediawiki") "{{Foo:Bar}}"
-,RawBlock (Format "mediawiki") "{{Thankyou|all your effort|Me}}"
-,Para [Str "Written",Space,RawInline (Format "mediawiki") "{{{date}}}",Space,Str "by",Space,RawInline (Format "mediawiki") "{{{name}}}",Str "."]
-,Header 2 ("tables",[],[]) [Str "tables"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   []
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   []]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "Orange"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "Apple"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "Bread"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "Pie"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "Butter"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "Ice",Space,Str "cream"]]]])]
- (TableFoot ("",[],[])
- [])
-,Table ("",[],[]) (Caption Nothing
- [Plain [Str "Food",Space,Str "complements"]])
- [(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Para [Str "Orange"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Para [Str "Apple"]]]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "Bread"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "Pie"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "Butter"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "Ice",Space,Str "cream"]]]])]
- (TableFoot ("",[],[])
- [])
-,Table ("",[],[]) (Caption Nothing
- [Plain [Str "Food",Space,Str "complements"]])
- [(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Para [Str "Orange"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Para [Str "Apple"]]]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "Bread"]
-    ,Para [Str "and",Space,Str "cheese"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "Pie"]
-    ,OrderedList (1,DefaultStyle,DefaultDelim)
-     [[Plain [Str "apple"]]
-     ,[Plain [Str "carrot"]]]]]])]
- (TableFoot ("",[],[])
- [])
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   []
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   []
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   []]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "Orange"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "Apple"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "more"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "Bread"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "Pie"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "more"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "Butter"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "Ice",Space,Str "cream"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "and",Space,Str "more"]]]])]
- (TableFoot ("",[],[])
- [])
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignLeft,ColWidth 0.25)
- ,(AlignRight,ColWidth 0.125)
- ,(AlignCenter,ColWidth 0.125)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Para [Str "Left"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Para [Str "Right"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Para [Str "Center"]]]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "left"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "15.00"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "centered"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "more"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "2.0"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "more"]]]])]
- (TableFoot ("",[],[])
- [])
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   []
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   []]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "Orange"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "Apple"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "Bread"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Table ("",[],[]) (Caption Nothing
-     [])
-     [(AlignDefault,ColWidthDefault)
-     ,(AlignDefault,ColWidthDefault)]
-     (TableHead ("",[],[])
-     [Row ("",[],[])
-      [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-       [Para [Str "fruit"]]
-      ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-       [Para [Str "topping"]]]])
-     [(TableBody ("",[],[]) (RowHeadColumns 0)
-      []
-      [Row ("",[],[])
-       [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-        [Para [Str "apple"]]
-       ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-        [Para [Str "ice",Space,Str "cream"]]]])]
-     (TableFoot ("",[],[])
-     [])]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "Butter"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "Ice",Space,Str "cream"]]]])]
- (TableFoot ("",[],[])
- [])
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   []]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "Orange"]]]])]
- (TableFoot ("",[],[])
- [])
-,Para [Str "Paragraph",Space,Str "after",Space,Str "the",Space,Str "table."]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Para [Str "fruit"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Para [Str "topping"]]]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "apple"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "ice",Space,Str "cream"]]]])]
- (TableFoot ("",[],[])
- [])
-,Header 2 ("notes",[],[]) [Str "notes"]
-,Para [Str "My",Space,Str "note!",Note [Plain [Str "This."]]]
-,Para [Str "URL",Space,Str "note.",Note [Plain [Link ("",[],[]) [Str "http://docs.python.org/library/functions.html#range"] ("http://docs.python.org/library/functions.html#range","")]]]]
+Pandoc
+  ( Meta { unMeta = fromList [] } )
+  [ Header 1
+    ( "header", [], [] )
+    [ Str "header" ]
+  , Header 2
+    ( "header_level_two", [], [] )
+    [ Str "header", Space, Str "level", Space, Str "two" ]
+  , Header 3
+    ( "header_level_3", [], [] )
+    [ Str "header", Space, Str "level", Space, Str "3" ]
+  , Header 4
+    ( "header_level_four", [], [] )
+    [ Str "header", Space, Emph [ Str "level" ], Space, Str "four" ]
+  , Header 5
+    ( "header_level_5", [], [] )
+    [ Str "header", Space, Str "level", Space, Str "5" ]
+  , Header 6
+    ( "header_level_6", [], [] )
+    [ Str "header", Space, Str "level", Space, Str "6" ]
+  , Para
+    [ Str "======="
+    , Space
+    , Str "not"
+    , Space
+    , Str "a"
+    , Space
+    , Str "header"
+    , Space
+    , Str "========"
+    ]
+  , Para
+    [ Code ( "", [], [] ) "==\160not\160a\160header\160==" ]
+  , Header 2
+    ( "emph_and_strong", [], [] )
+    [ Str "emph", Space, Str "and", Space, Str "strong" ]
+  , Para
+    [ Emph [ Str "emph" ], Space, Strong [ Str "strong" ] ]
+  , Para
+    [ Strong
+      [ Emph [ Str "strong", Space, Str "and", Space, Str "emph" ] ]
+    ]
+  , Para
+    [ Strong
+      [ Emph [ Str "emph", Space, Str "inside" ], Space, Str "strong" ]
+    ]
+  , Para
+    [ Strong
+      [ Str "strong", Space, Str "with", Space, Emph [ Str "emph" ] ]
+    ]
+  , Para
+    [ Emph
+      [ Strong
+        [ Str "strong", Space, Str "inside" ]
+      , Space
+      , Str "emph"
+      ]
+    ]
+  , Header 2
+    ( "horizontal_rule", [], [] )
+    [ Str "horizontal", Space, Str "rule" ]
+  , Para
+    [ Str "top" ]
+  , HorizontalRule
+  , Para
+    [ Str "bottom" ]
+  , HorizontalRule
+  , Header 2
+    ( "nowiki", [], [] )
+    [ Str "nowiki" ]
+  , Para
+    [ Str "''not", Space, Str "emph''" ]
+  , Header 2
+    ( "strikeout", [], [] )
+    [ Str "strikeout" ]
+  , Para
+    [ Strikeout
+      [ Str "This"
+      , Space
+      , Str "is"
+      , Space
+      , Emph
+        [ Str "struck", Space, Str "out" ]
+      ]
+    ]
+  , Header 2
+    ( "entities", [], [] )
+    [ Str "entities" ]
+  , Para
+    [ Str "hi", Space, Str "&", Space, Str "low" ]
+  , Para
+    [ Str "hi", Space, Str "&", Space, Str "low" ]
+  , Para
+    [ Str "G\246del" ]
+  , Para
+    [ Str "\777\2730" ]
+  , Header 2
+    ( "comments", [], [] )
+    [ Str "comments" ]
+  , Para
+    [ Str "inline", Space, Str "comment" ]
+  , Para
+    [ Str "between", Space, Str "blocks" ]
+  , Header 2
+    ( "linebreaks", [], [] )
+    [ Str "linebreaks" ]
+  , Para
+    [ Str "hi", LineBreak, Str "there" ]
+  , Para
+    [ Str "hi", LineBreak, Str "there" ]
+  , Header 2
+    ( "indents", [], [] )
+    [ Str ":", Space, Str "indents" ]
+  , Para
+    [ Str "hi" ]
+  , DefinitionList
+    [ ( [], [ [ Plain [ Str "there" ] ] ] ) ]
+  , Para
+    [ Str "bud" ]
+  , Para
+    [ Str "hi" ]
+  , DefinitionList
+    [
+      ( []
+      ,
+        [ [ DefinitionList [ ( [], [ [ Plain [ Str "there" ] ] ] ) ] ] ]
+      )
+    ]
+  , Para
+    [ Str "bud" ]
+  , Header 2
+    ( "p_tags", [], [] )
+    [ Str "p", Space, Str "tags" ]
+  , Para
+    [ Str "hi", Space, Str "there" ]
+  , Para
+    [ Str "bud" ]
+  , Para
+    [ Str "another" ]
+  , Header 2
+    ( "raw_html", [], [] )
+    [ Str "raw", Space, Str "html" ]
+  , Para
+    [ Str "hi"
+    , Space
+    , RawInline
+      ( Format "html" ) ""
+    , Emph
+      [ Str "there" ]
+    , RawInline
+      ( Format "html" ) ""
+    , Str "."
+    ]
+  , Para
+    [ RawInline
+      ( Format "html" ) ""
+    , Str "inserted"
+    , RawInline
+      ( Format "html" ) ""
+    ]
+  , RawBlock
+    ( Format "html" ) ""
+  , Para
+    [ Str "hi", Space, Emph [ Str "there" ] ]
+  , RawBlock
+    ( Format "html" ) ""
+  , Header 2
+    ( "sup_sub_del", [], [] )
+    [ Str "sup,", Space, Str "sub,", Space, Str "del" ]
+  , Para
+    [ Str "H"
+    , Subscript
+      [ Str "2" ]
+    , Str "O"
+    , Space
+    , Str "base"
+    , Superscript
+      [ Emph [ Str "exponent" ] ]
+    , SoftBreak
+    , Strikeout
+      [ Str "hello" ]
+    ]
+  , Header 2
+    ( "inline_code", [], [] )
+    [ Str "inline", Space, Str "code" ]
+  , Para
+    [ Code
+      ( "", [], [] ) "*\8594*"
+    , Space
+    , Code
+      ( "", [], [] ) "typed"
+    , Space
+    , Code
+      ( "", [ "haskell" ], [] ) ">>="
+    ]
+  , Header 2
+    ( "code_blocks", [], [] )
+    [ Str "code", Space, Str "blocks" ]
+  , CodeBlock
+    ( ""
+    , []
+    , []
+    ) "case xs of\n     (_:_) -> reverse xs\n     []    -> ['*']"
+  , CodeBlock
+    ( ""
+    , [ "haskell" ]
+    , []
+    ) "case xs of\n     (_:_) -> reverse xs\n     []    -> ['*']"
+  , CodeBlock
+    ( ""
+    ,
+      [ "ruby", "numberLines" ]
+    ,
+      [ ( "startFrom", "100" ) ]
+    ) "widgets.each do |w|\n  print w.price\nend"
+  , Header 2
+    ( "block_quotes", [], [] )
+    [ Str "block", Space, Str "quotes" ]
+  , Para
+    [ Str "Regular", Space, Str "paragraph" ]
+  , BlockQuote
+    [ Para
+      [ Str "This"
+      , Space
+      , Str "is"
+      , Space
+      , Str "a"
+      , Space
+      , Str "block"
+      , Space
+      , Str "quote."
+      ]
+    , Para
+      [ Str "With", Space, Str "two", Space, Str "paragraphs." ]
+    ]
+  , Para
+    [ Str "Nother", Space, Str "paragraph." ]
+  , Header 2
+    ( "external_links", [], [] )
+    [ Str "external", Space, Str "links" ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Emph
+        [ Str "Google" ]
+      , Space
+      , Str "search"
+      , Space
+      , Str "engine"
+      ]
+      ( "http://google.com", "" )
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "http://pandoc.org" ]
+      ( "http://pandoc.org", "" )
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "1" ]
+      ( "http://google.com", "" )
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "2" ]
+      ( "http://yahoo.com", "" )
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "email", Space, Str "me" ]
+      ( "mailto:info@example.org", "" )
+    ]
+  , Header 2
+    ( "internal_links", [], [] )
+    [ Str "internal", Space, Str "links" ]
+  , Para
+    [ Link ( "", [], [] ) [ Str "Help" ] ( "Help", "wikilink" ) ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "the", Space, Str "help", Space, Str "page" ]
+      ( "Help", "wikilink" )
+    ]
+  , Para
+    [ Link ( "", [], [] ) [ Str "Helpers" ] ( "Help", "wikilink" ) ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "Help" ]
+      ( "Help", "wikilink" )
+    , Str "ers"
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "Contents" ]
+      ( "Help:Contents", "wikilink" )
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "#My", Space, Str "anchor" ]
+      ( "#My_anchor", "wikilink" )
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "and", Space, Str "text" ]
+      ( "Page#with_anchor", "wikilink" )
+    ]
+  , Header 2
+    ( "images", [], [] )
+    [ Str "images" ]
+  , Para
+    [ Image
+      ( "", [], [] )
+      [ Str "caption" ]
+      ( "example.jpg", "fig:caption" )
+    ]
+  , Para
+    [ Image
+      ( "", [], [] )
+      [ Str "the"
+      , Space
+      , Emph
+        [ Str "caption" ]
+      , Space
+      , Str "with"
+      , Space
+      , Link
+        ( "", [], [] )
+        [ Str "external", Space, Str "link" ]
+        ( "http://google.com", "" )
+      ]
+      ( "example.jpg", "fig:the caption with external link" )
+    ]
+  , Para
+    [ Image
+      ( "", [], [ ( "width", "30" ), ( "height", "40" ) ] )
+      [ Str "caption" ]
+      ( "example.jpg", "fig:caption" )
+    ]
+  , Para
+    [ Image
+      ( "", [], [ ( "width", "30" ) ] )
+      [ Str "caption" ]
+      ( "example.jpg", "fig:caption" )
+    ]
+  , Para
+    [ Image
+      ( "", [], [ ( "width", "30" ) ] )
+      [ Str "caption" ]
+      ( "example.jpg", "fig:caption" )
+    ]
+  , Para
+    [ Image
+      ( "", [], [] )
+      [ Str "example.jpg" ]
+      ( "example.jpg", "fig:example.jpg" )
+    ]
+  , Para
+    [ Image
+      ( "", [], [] )
+      [ Str "example_es.jpg" ]
+      ( "example_es.jpg", "fig:example_es.jpg" )
+    ]
+  , Header 2
+    ( "lists", [], [] )
+    [ Str "lists" ]
+  , BulletList
+    [
+      [ Plain [ Str "Start", Space, Str "each", Space, Str "line" ] ]
+    ,
+      [ Plain
+        [ Str "with"
+        , Space
+        , Str "an"
+        , Space
+        , Str "asterisk"
+        , Space
+        , Str "(*)."
+        ]
+      , BulletList
+        [
+          [ Plain
+            [ Str "More"
+            , Space
+            , Str "asterisks"
+            , Space
+            , Str "gives"
+            , Space
+            , Str "deeper"
+            ]
+          , BulletList
+            [
+              [ Plain
+                [ Str "and", Space, Str "deeper", Space, Str "levels." ]
+              ]
+            ]
+          ]
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "Line"
+        , Space
+        , Str "breaks"
+        , LineBreak
+        , Str "don't"
+        , Space
+        , Str "break"
+        , Space
+        , Str "levels."
+        ]
+      , BulletList
+        [
+          [ BulletList
+            [
+              [ Plain
+                [ Str "But"
+                , Space
+                , Str "jumping"
+                , Space
+                , Str "levels"
+                , Space
+                , Str "creates"
+                , Space
+                , Str "empty"
+                , Space
+                , Str "space."
+                ]
+              ]
+            ]
+          ]
+        ]
+      ]
+    ]
+  , Para
+    [ Str "Any"
+    , Space
+    , Str "other"
+    , Space
+    , Str "start"
+    , Space
+    , Str "ends"
+    , Space
+    , Str "the"
+    , Space
+    , Str "list."
+    ]
+  , BulletList
+    [
+      [ BulletList [ [ Plain [ Str "two" ] ] ] ]
+    ,
+      [ Plain [ Str "one" ] ]
+    ]
+  , OrderedList
+    ( 1, DefaultStyle, DefaultDelim )
+    [
+      [ Plain [ Str "Start", Space, Str "each", Space, Str "line" ] ]
+    ,
+      [ Plain
+        [ Str "with"
+        , Space
+        , Str "a"
+        , Space
+        , Str "number"
+        , Space
+        , Str "sign"
+        , Space
+        , Str "(#)."
+        ]
+      , OrderedList
+        ( 1, DefaultStyle, DefaultDelim )
+        [
+          [ Plain
+            [ Str "More"
+            , Space
+            , Str "number"
+            , Space
+            , Str "signs"
+            , Space
+            , Str "gives"
+            , Space
+            , Str "deeper"
+            ]
+          , OrderedList
+            ( 1, DefaultStyle, DefaultDelim )
+            [
+              [ Plain [ Str "and", Space, Str "deeper" ] ]
+            ,
+              [ Plain [ Str "levels." ] ]
+            ]
+          ]
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "Line"
+        , Space
+        , Str "breaks"
+        , LineBreak
+        , Str "don't"
+        , Space
+        , Str "break"
+        , Space
+        , Str "levels."
+        ]
+      , OrderedList
+        ( 1, DefaultStyle, DefaultDelim )
+        [
+          [ OrderedList
+            ( 1, DefaultStyle, DefaultDelim )
+            [
+              [ Plain
+                [ Str "But"
+                , Space
+                , Str "jumping"
+                , Space
+                , Str "levels"
+                , Space
+                , Str "creates"
+                , Space
+                , Str "empty"
+                , Space
+                , Str "space."
+                ]
+              ]
+            ]
+          ]
+        ]
+      ]
+    ,
+      [ Plain [ Str "Blank", Space, Str "lines" ] ]
+    ]
+  , OrderedList
+    ( 1, DefaultStyle, DefaultDelim )
+    [
+      [ Plain
+        [ Str "end"
+        , Space
+        , Str "the"
+        , Space
+        , Str "list"
+        , Space
+        , Str "and"
+        , Space
+        , Str "start"
+        , Space
+        , Str "another."
+        ]
+      ]
+    ]
+  , Para
+    [ Str "Any"
+    , Space
+    , Str "other"
+    , Space
+    , Str "start"
+    , Space
+    , Str "also"
+    , SoftBreak
+    , Str "ends"
+    , Space
+    , Str "the"
+    , Space
+    , Str "list."
+    ]
+  , DefinitionList
+    [
+      (
+        [ Str "item", Space, Str "1" ]
+      ,
+        [ [ Plain [ Str "definition", Space, Str "1" ] ] ]
+      )
+    ,
+      (
+        [ Str "item", Space, Str "2" ]
+      ,
+        [
+          [ Plain [ Str "definition", Space, Str "2-1" ] ]
+        ,
+          [ Plain [ Str "definition", Space, Str "2-2" ] ]
+        ]
+      )
+    ]
+  , OrderedList
+    ( 1, DefaultStyle, DefaultDelim )
+    [
+      [ Plain [ Str "one" ] ]
+    ,
+      [ Plain
+        [ Str "two" ]
+      , BulletList
+        [
+          [ Plain [ Str "two", Space, Str "point", Space, Str "one" ] ]
+        ,
+          [ Plain [ Str "two", Space, Str "point", Space, Str "two" ] ]
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "three" ]
+      , DefinitionList
+        [
+          (
+            [ Str "three", Space, Str "item", Space, Str "one" ]
+          ,
+            [
+              [ Plain
+                [ Str "three", Space, Str "def", Space, Str "one" ]
+              ]
+            ]
+          )
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "four" ]
+      , DefinitionList
+        [
+          ( []
+          ,
+            [
+              [ Plain
+                [ Str "four", Space, Str "def", Space, Str "one" ]
+              ]
+            ,
+              [ Plain
+                [ Str "this"
+                , Space
+                , Str "looks"
+                , Space
+                , Str "like"
+                , Space
+                , Str "a"
+                , Space
+                , Str "continuation"
+                ]
+              ]
+            ,
+              [ Plain
+                [ Str "and"
+                , Space
+                , Str "is"
+                , Space
+                , Str "often"
+                , Space
+                , Str "used"
+                ]
+              ]
+            ,
+              [ Plain
+                [ Str "instead"
+                , LineBreak
+                , Str "of"
+                , Space
+                , Str "
"
+                ]
+              ]
+            ]
+          )
+        ]
+      ]
+    ,
+      [ Plain
+        [ RawInline
+          ( Format "mediawiki" ) "{{{template\n|author=John\n|title=My Book\n}}}"
+        ]
+      , OrderedList
+        ( 1, DefaultStyle, DefaultDelim )
+        [
+          [ Plain
+            [ Str "five", Space, Str "sub", Space, Str "1" ]
+          , OrderedList
+            ( 1, DefaultStyle, DefaultDelim )
+            [
+              [ Plain
+                [ Str "five"
+                , Space
+                , Str "sub"
+                , Space
+                , Str "1"
+                , Space
+                , Str "sub"
+                , Space
+                , Str "1"
+                ]
+              ]
+            ]
+          ]
+        ,
+          [ Plain [ Str "five", Space, Str "sub", Space, Str "2" ] ]
+        ]
+      ]
+    ]
+  , OrderedList
+    ( 1, DefaultStyle, DefaultDelim )
+    [
+      [ Plain
+        [ Str "list", Space, Str "item", Space, Emph [ Str "emph" ] ]
+      , OrderedList
+        ( 1, DefaultStyle, DefaultDelim )
+        [
+          [ Plain [ Str "list", Space, Str "item", Space, Str "B1" ] ]
+        ,
+          [ Plain [ Str "list", Space, Str "item", Space, Str "B2" ] ]
+        ]
+      , Para
+        [ Str "continuing"
+        , Space
+        , Str "list"
+        , Space
+        , Str "item"
+        , Space
+        , Str "A1"
+        ]
+      ]
+    ,
+      [ Plain [ Str "list", Space, Str "item", Space, Str "A2" ] ]
+    ]
+  , OrderedList
+    ( 1, DefaultStyle, DefaultDelim )
+    [
+      [ Plain [ Str "abc" ] ]
+    ,
+      [ Plain [ Str "def" ] ]
+    ,
+      [ Plain [ Str "ghi" ] ]
+    ]
+  , OrderedList
+    ( 9, DefaultStyle, DefaultDelim )
+    [
+      [ Plain [ Str "Amsterdam" ] ]
+    ,
+      [ Plain [ Str "Rotterdam" ] ]
+    ,
+      [ Plain [ Str "The", Space, Str "Hague" ] ]
+    ]
+  , Header 2
+    ( "math", [], [] )
+    [ Str "math" ]
+  , Para
+    [ Str "Here"
+    , Space
+    , Str "is"
+    , Space
+    , Str "some"
+    , Space
+    , Math InlineMath "x=\\frac{y^\\pi}{z}"
+    , Str "."
+    ]
+  , Para
+    [ Str "With"
+    , Space
+    , Str "spaces:"
+    , Space
+    , Math InlineMath "x=\\frac{y^\\pi}{z}"
+    , Str "."
+    ]
+  , Header 2
+    ( "preformatted_blocks", [], [] )
+    [ Str "preformatted", Space, Str "blocks" ]
+  , Para
+    [ Code
+      ( "", [], [] ) "Start\160each\160line\160with\160a\160space."
+    , LineBreak
+    , Code
+      ( "", [], [] ) "Text\160is\160"
+    , Strong
+      [ Code ( "", [], [] ) "preformatted" ]
+    , Code
+      ( "", [], [] ) "\160and"
+    , LineBreak
+    , Emph
+      [ Code ( "", [], [] ) "markups" ]
+    , Code
+      ( "", [], [] ) "\160"
+    , Strong
+      [ Emph [ Code ( "", [], [] ) "can" ] ]
+    , Code
+      ( "", [], [] ) "\160be\160done."
+    ]
+  , Para
+    [ Code ( "", [], [] ) "\160hell\160\160\160\160\160\160yeah" ]
+  , Para
+    [ Code
+      ( ""
+      , []
+      , []
+      ) "Start\160with\160a\160space\160in\160the\160first\160column,"
+    , LineBreak
+    , Code
+      ( "", [], [] ) "(before\160the\160)."
+    , LineBreak
+    , Code
+      ( "", [], [] ) ""
+    , LineBreak
+    , Code
+      ( "", [], [] ) "Then\160your\160block\160format\160will\160be"
+    , LineBreak
+    , Code
+      ( "", [], [] ) "\160\160\160\160maintained."
+    , LineBreak
+    , Code
+      ( "", [], [] ) ""
+    , LineBreak
+    , Code
+      ( ""
+      , []
+      , []
+      ) "This\160is\160good\160for\160copying\160in\160code\160blocks:"
+    , LineBreak
+    , Code
+      ( "", [], [] ) ""
+    , LineBreak
+    , Code
+      ( "", [], [] ) "def\160function():"
+    , LineBreak
+    , Code
+      ( ""
+      , []
+      , []
+      ) "\160\160\160\160\"\"\"documentation\160string\"\"\""
+    , LineBreak
+    , Code
+      ( "", [], [] ) ""
+    , LineBreak
+    , Code
+      ( "", [], [] ) "\160\160\160\160if\160True:"
+    , LineBreak
+    , Code
+      ( "", [], [] ) "\160\160\160\160\160\160\160\160print\160True"
+    , LineBreak
+    , Code
+      ( "", [], [] ) "\160\160\160\160else:"
+    , LineBreak
+    , Code
+      ( "", [], [] ) "\160\160\160\160\160\160\160\160print\160False"
+    ]
+  , Para
+    [ Str "Not" ]
+  , RawBlock
+    ( Format "html" ) ""
+  , Para
+    [ Str "preformatted" ]
+  , Para
+    [ Str "Don't", Space, Str "need" ]
+  , Para
+    [ Code ( "", [], [] ) "a\160blank\160line" ]
+  , Para
+    [ Str "around"
+    , Space
+    , Str "a"
+    , Space
+    , Str "preformatted"
+    , Space
+    , Str "block."
+    ]
+  , Header 2
+    ( "templates", [], [] )
+    [ Str "templates" ]
+  , RawBlock
+    ( Format "mediawiki" ) "{{Welcome}}"
+  , RawBlock
+    ( Format "mediawiki" ) "{{Foo:Bar}}"
+  , RawBlock
+    ( Format "mediawiki" ) "{{Thankyou|all your effort|Me}}"
+  , Para
+    [ Str "Written"
+    , Space
+    , RawInline
+      ( Format "mediawiki" ) "{{{date}}}"
+    , Space
+    , Str "by"
+    , Space
+    , RawInline
+      ( Format "mediawiki" ) "{{{name}}}"
+    , Str "."
+    ]
+  , Header 2
+    ( "tables", [], [] )
+    [ Str "tables" ]
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignDefault, ColWidthDefault )
+    ,
+      ( AlignDefault, ColWidthDefault )
+    ]
+    ( TableHead
+      ( "", [], [] )
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        ]
+      ]
+    )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "Orange" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "Apple" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "Bread" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "Pie" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "Butter" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "Ice", Space, Str "cream" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing
+      [ Plain [ Str "Food", Space, Str "complements" ] ]
+    )
+    [
+      ( AlignDefault, ColWidthDefault )
+    ,
+      ( AlignDefault, ColWidthDefault )
+    ]
+    ( TableHead
+      ( "", [], [] )
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "Orange" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "Apple" ] ]
+        ]
+      ]
+    )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "Bread" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "Pie" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "Butter" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "Ice", Space, Str "cream" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing
+      [ Plain [ Str "Food", Space, Str "complements" ] ]
+    )
+    [
+      ( AlignDefault, ColWidthDefault )
+    ,
+      ( AlignDefault, ColWidthDefault )
+    ]
+    ( TableHead
+      ( "", [], [] )
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "Orange" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "Apple" ] ]
+        ]
+      ]
+    )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para
+            [ Str "Bread" ]
+          , Para
+            [ Str "and", Space, Str "cheese" ]
+          ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para
+            [ Str "Pie" ]
+          , OrderedList
+            ( 1, DefaultStyle, DefaultDelim )
+            [ [ Plain [ Str "apple" ] ], [ Plain [ Str "carrot" ] ] ]
+          ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignDefault, ColWidthDefault )
+    ,
+      ( AlignDefault, ColWidthDefault )
+    ,
+      ( AlignDefault, ColWidthDefault )
+    ]
+    ( TableHead
+      ( "", [], [] )
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        ]
+      ]
+    )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "Orange" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "Apple" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "more" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "Bread" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "Pie" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "more" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "Butter" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "Ice", Space, Str "cream" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "and", Space, Str "more" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignLeft, ColWidth 0.25 )
+    ,
+      ( AlignRight, ColWidth 0.125 )
+    ,
+      ( AlignCenter, ColWidth 0.125 )
+    ]
+    ( TableHead
+      ( "", [], [] )
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "Left" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "Right" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "Center" ] ]
+        ]
+      ]
+    )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "left" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "15.00" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "centered" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "more" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "2.0" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "more" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignDefault, ColWidthDefault )
+    ,
+      ( AlignDefault, ColWidthDefault )
+    ]
+    ( TableHead
+      ( "", [], [] )
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        ]
+      ]
+    )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "Orange" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "Apple" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "Bread" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Table
+            ( "", [], [] )
+            ( Caption Nothing [] )
+            [
+              ( AlignDefault, ColWidthDefault )
+            ,
+              ( AlignDefault, ColWidthDefault )
+            ]
+            ( TableHead
+              ( "", [], [] )
+              [ Row
+                ( "", [], [] )
+                [ Cell
+                  ( "", [], [] ) AlignDefault
+                  ( RowSpan 1 )
+                  ( ColSpan 1 )
+                  [ Para [ Str "fruit" ] ]
+                , Cell
+                  ( "", [], [] ) AlignDefault
+                  ( RowSpan 1 )
+                  ( ColSpan 1 )
+                  [ Para [ Str "topping" ] ]
+                ]
+              ]
+            )
+            [ TableBody
+              ( "", [], [] )
+              ( RowHeadColumns 0 ) []
+              [ Row
+                ( "", [], [] )
+                [ Cell
+                  ( "", [], [] ) AlignDefault
+                  ( RowSpan 1 )
+                  ( ColSpan 1 )
+                  [ Para [ Str "apple" ] ]
+                , Cell
+                  ( "", [], [] ) AlignDefault
+                  ( RowSpan 1 )
+                  ( ColSpan 1 )
+                  [ Para [ Str "ice", Space, Str "cream" ] ]
+                ]
+              ]
+            ]
+            ( TableFoot ( "", [], [] ) [] )
+          ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "Butter" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "Ice", Space, Str "cream" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [ ( AlignDefault, ColWidthDefault ) ]
+    ( TableHead
+      ( "", [], [] )
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        ]
+      ]
+    )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "Orange" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Para
+    [ Str "Paragraph"
+    , Space
+    , Str "after"
+    , Space
+    , Str "the"
+    , Space
+    , Str "table."
+    ]
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignDefault, ColWidthDefault )
+    ,
+      ( AlignDefault, ColWidthDefault )
+    ]
+    ( TableHead
+      ( "", [], [] )
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "fruit" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "topping" ] ]
+        ]
+      ]
+    )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "apple" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "ice", Space, Str "cream" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Header 2
+    ( "notes", [], [] )
+    [ Str "notes" ]
+  , Para
+    [ Str "My", Space, Str "note!", Note [ Plain [ Str "This." ] ] ]
+  , Para
+    [ Str "URL"
+    , Space
+    , Str "note."
+    , Note
+      [ Plain
+        [ Link
+          ( "", [], [] )
+          [ Str "http://docs.python.org/library/functions.html#range" ]
+          ( "http://docs.python.org/library/functions.html#range", "" )
+        ]
+      ]
+    ]
+  ]
diff --git a/test/opml-reader.native b/test/opml-reader.native
index 0819116ab..bbb54e068 100644
--- a/test/opml-reader.native
+++ b/test/opml-reader.native
@@ -1,66 +1,232 @@
-Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "Dave",Space,Str "Winer"]]),("date",MetaInlines [Str "Thu,",Space,Str "14",Space,Str "Jul",Space,Str "2005",Space,Str "23:41:05",Space,Str "GMT"]),("title",MetaInlines [Str "States"])]})
-[Header 1 ("",[],[]) [Str "United",Space,Str "States"]
-,Header 2 ("",[],[]) [Str "Far",Space,Str "West"]
-,Header 3 ("",[],[]) [Str "Alaska"]
-,Header 3 ("",[],[]) [Str "California"]
-,Header 3 ("",[],[]) [Str "Hawaii"]
-,Header 3 ("",[],[]) [Strong [Str "Nevada"]]
-,Para [Str "I",Space,Str "lived",Space,Str "here",Space,Emph [Str "once"],Str "."]
-,Para [Str "Loved",Space,Str "it."]
-,Header 4 ("",[],[]) [Link ("",[],[]) [Str "Reno"] ("http://www.reno.gov","")]
-,Header 4 ("",[],[]) [Str "Las",Space,Str "Vegas"]
-,Header 4 ("",[],[]) [Str "Ely"]
-,Header 4 ("",[],[]) [Str "Gerlach"]
-,Header 3 ("",[],[]) [Str "Oregon"]
-,Header 3 ("",[],[]) [Str "Washington"]
-,Header 2 ("",[],[]) [Str "Great",Space,Str "Plains"]
-,Header 3 ("",[],[]) [Str "Kansas"]
-,Header 3 ("",[],[]) [Str "Nebraska"]
-,Header 3 ("",[],[]) [Str "North",Space,Str "Dakota"]
-,Header 3 ("",[],[]) [Str "Oklahoma"]
-,Header 3 ("",[],[]) [Str "South",Space,Str "Dakota"]
-,Header 2 ("",[],[]) [Str "Mid-Atlantic"]
-,Header 3 ("",[],[]) [Str "Delaware"]
-,Header 3 ("",[],[]) [Str "Maryland"]
-,Header 3 ("",[],[]) [Str "New",Space,Str "Jersey"]
-,Header 3 ("",[],[]) [Str "New",Space,Str "York"]
-,Header 3 ("",[],[]) [Str "Pennsylvania"]
-,Header 2 ("",[],[]) [Str "Midwest"]
-,Header 3 ("",[],[]) [Str "Illinois"]
-,Header 3 ("",[],[]) [Str "Indiana"]
-,Header 3 ("",[],[]) [Str "Iowa"]
-,Header 3 ("",[],[]) [Str "Kentucky"]
-,Header 3 ("",[],[]) [Str "Michigan"]
-,Header 3 ("",[],[]) [Str "Minnesota"]
-,Header 3 ("",[],[]) [Str "Missouri"]
-,Header 3 ("",[],[]) [Str "Ohio"]
-,Header 3 ("",[],[]) [Str "West",Space,Str "Virginia"]
-,Header 3 ("",[],[]) [Str "Wisconsin"]
-,Header 2 ("",[],[]) [Str "Mountains"]
-,Header 3 ("",[],[]) [Str "Colorado"]
-,Header 3 ("",[],[]) [Str "Idaho"]
-,Header 3 ("",[],[]) [Str "Montana"]
-,Header 3 ("",[],[]) [Str "Utah"]
-,Header 3 ("",[],[]) [Str "Wyoming"]
-,Header 2 ("",[],[]) [Str "New",Space,Str "England"]
-,Header 3 ("",[],[]) [Str "Connecticut"]
-,Header 3 ("",[],[]) [Str "Maine"]
-,Header 3 ("",[],[]) [Str "Massachusetts"]
-,Header 3 ("",[],[]) [Str "New",Space,Str "Hampshire"]
-,Header 3 ("",[],[]) [Str "Rhode",Space,Str "Island"]
-,Header 3 ("",[],[]) [Str "Vermont"]
-,Header 2 ("",[],[]) [Str "South"]
-,Header 3 ("",[],[]) [Str "Alabama"]
-,Header 3 ("",[],[]) [Str "Arkansas"]
-,Header 3 ("",[],[]) [Str "Florida"]
-,Header 3 ("",[],[]) [Str "Georgia"]
-,Header 3 ("",[],[]) [Str "Louisiana"]
-,Header 3 ("",[],[]) [Str "Mississippi"]
-,Header 3 ("",[],[]) [Str "North",Space,Str "Carolina"]
-,Header 3 ("",[],[]) [Str "South",Space,Str "Carolina"]
-,Header 3 ("",[],[]) [Str "Tennessee"]
-,Header 3 ("",[],[]) [Str "Virginia"]
-,Header 2 ("",[],[]) [Str "Southwest"]
-,Header 3 ("",[],[]) [Str "Arizona"]
-,Header 3 ("",[],[]) [Str "New",Space,Str "Mexico"]
-,Header 3 ("",[],[]) [Str "Texas"]]
+Pandoc
+  ( Meta
+    { unMeta = fromList
+      [
+        ( "author"
+        , MetaList
+          [ MetaInlines [ Str "Dave", Space, Str "Winer" ] ]
+        )
+      ,
+        ( "date"
+        , MetaInlines
+          [ Str "Thu,"
+          , Space
+          , Str "14"
+          , Space
+          , Str "Jul"
+          , Space
+          , Str "2005"
+          , Space
+          , Str "23:41:05"
+          , Space
+          , Str "GMT"
+          ]
+        )
+      ,
+        ( "title", MetaInlines [ Str "States" ] )
+      ]
+    }
+  )
+  [ Header 1
+    ( "", [], [] )
+    [ Str "United", Space, Str "States" ]
+  , Header 2
+    ( "", [], [] )
+    [ Str "Far", Space, Str "West" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Alaska" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "California" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Hawaii" ]
+  , Header 3
+    ( "", [], [] )
+    [ Strong [ Str "Nevada" ] ]
+  , Para
+    [ Str "I"
+    , Space
+    , Str "lived"
+    , Space
+    , Str "here"
+    , Space
+    , Emph
+      [ Str "once" ]
+    , Str "."
+    ]
+  , Para
+    [ Str "Loved", Space, Str "it." ]
+  , Header 4
+    ( "", [], [] )
+    [ Link ( "", [], [] ) [ Str "Reno" ] ( "http://www.reno.gov", "" ) ]
+  , Header 4
+    ( "", [], [] )
+    [ Str "Las", Space, Str "Vegas" ]
+  , Header 4
+    ( "", [], [] )
+    [ Str "Ely" ]
+  , Header 4
+    ( "", [], [] )
+    [ Str "Gerlach" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Oregon" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Washington" ]
+  , Header 2
+    ( "", [], [] )
+    [ Str "Great", Space, Str "Plains" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Kansas" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Nebraska" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "North", Space, Str "Dakota" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Oklahoma" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "South", Space, Str "Dakota" ]
+  , Header 2
+    ( "", [], [] )
+    [ Str "Mid-Atlantic" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Delaware" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Maryland" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "New", Space, Str "Jersey" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "New", Space, Str "York" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Pennsylvania" ]
+  , Header 2
+    ( "", [], [] )
+    [ Str "Midwest" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Illinois" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Indiana" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Iowa" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Kentucky" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Michigan" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Minnesota" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Missouri" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Ohio" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "West", Space, Str "Virginia" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Wisconsin" ]
+  , Header 2
+    ( "", [], [] )
+    [ Str "Mountains" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Colorado" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Idaho" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Montana" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Utah" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Wyoming" ]
+  , Header 2
+    ( "", [], [] )
+    [ Str "New", Space, Str "England" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Connecticut" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Maine" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Massachusetts" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "New", Space, Str "Hampshire" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Rhode", Space, Str "Island" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Vermont" ]
+  , Header 2
+    ( "", [], [] )
+    [ Str "South" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Alabama" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Arkansas" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Florida" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Georgia" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Louisiana" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Mississippi" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "North", Space, Str "Carolina" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "South", Space, Str "Carolina" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Tennessee" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Virginia" ]
+  , Header 2
+    ( "", [], [] )
+    [ Str "Southwest" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Arizona" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "New", Space, Str "Mexico" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Texas" ]
+  ]
diff --git a/test/org-select-tags.native b/test/org-select-tags.native
index 5fbfd92d1..a94c70abe 100644
--- a/test/org-select-tags.native
+++ b/test/org-select-tags.native
@@ -1,7 +1,99 @@
-Pandoc (Meta {unMeta = fromList []})
-[Header 1 ("will-appear-because-it-is-the-ancestor-of-something-tagged-yes",[],[]) [Str "Will",Space,Str "appear",Space,Str "because",Space,Str "it",Space,Str "is",Space,Str "the",Space,Str "ancestor",Space,Str "of",Space,Str "something",Space,Str "tagged",Space,Str "\"yes\""]
-,Header 2 ("will-appear",[],[]) [Str "Will",Space,Str "appear",Space,Span ("",["tag"],[("tag-name","yes")]) [SmallCaps [Str "yes"]]]
-,Header 3 ("will-appear-since-the-entire-subtree-of-something-selected-will-appear",[],[]) [Str "Will",Space,Str "appear",Space,Str "since",Space,Str "the",Space,Str "entire",Space,Str "subtree",Space,Str "of",Space,Str "something",Space,Str "selected",Space,Str "will",Space,Str "appear"]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Para [Str "Will",Space,Str "appear"]]]
-,Header 2 ("will-appear-because-it-is-the-ancestor-of-something-listed-in-select-tags",[],[]) [Str "Will",Space,Str "appear",Space,Str "because",Space,Str "it",Space,Str "is",Space,Str "the",Space,Str "ancestor",Space,Str "of",Space,Str "something",Space,Str "listed",Space,Str "in",Space,Str "SELECT-TAGS"]]
+Pandoc
+  ( Meta { unMeta = fromList [] } )
+  [ Header 1
+    ( "will-appear-because-it-is-the-ancestor-of-something-tagged-yes"
+    , []
+    , []
+    )
+    [ Str "Will"
+    , Space
+    , Str "appear"
+    , Space
+    , Str "because"
+    , Space
+    , Str "it"
+    , Space
+    , Str "is"
+    , Space
+    , Str "the"
+    , Space
+    , Str "ancestor"
+    , Space
+    , Str "of"
+    , Space
+    , Str "something"
+    , Space
+    , Str "tagged"
+    , Space
+    , Str "\"yes\""
+    ]
+  , Header 2
+    ( "will-appear", [], [] )
+    [ Str "Will"
+    , Space
+    , Str "appear"
+    , Space
+    , Span
+      ( "", [ "tag" ], [ ( "tag-name", "yes" ) ] )
+      [ SmallCaps [ Str "yes" ] ]
+    ]
+  , Header 3
+    ( "will-appear-since-the-entire-subtree-of-something-selected-will-appear"
+    , []
+    , []
+    )
+    [ Str "Will"
+    , Space
+    , Str "appear"
+    , Space
+    , Str "since"
+    , Space
+    , Str "the"
+    , Space
+    , Str "entire"
+    , Space
+    , Str "subtree"
+    , Space
+    , Str "of"
+    , Space
+    , Str "something"
+    , Space
+    , Str "selected"
+    , Space
+    , Str "will"
+    , Space
+    , Str "appear"
+    ]
+  , OrderedList
+    ( 1, DefaultStyle, DefaultDelim )
+    [ [ Para [ Str "Will", Space, Str "appear" ] ] ]
+  , Header 2
+    ( "will-appear-because-it-is-the-ancestor-of-something-listed-in-select-tags"
+    , []
+    , []
+    )
+    [ Str "Will"
+    , Space
+    , Str "appear"
+    , Space
+    , Str "because"
+    , Space
+    , Str "it"
+    , Space
+    , Str "is"
+    , Space
+    , Str "the"
+    , Space
+    , Str "ancestor"
+    , Space
+    , Str "of"
+    , Space
+    , Str "something"
+    , Space
+    , Str "listed"
+    , Space
+    , Str "in"
+    , Space
+    , Str "SELECT-TAGS"
+    ]
+  ]
diff --git a/test/pipe-tables.native b/test/pipe-tables.native
index 249eec17e..e678053d2 100644
--- a/test/pipe-tables.native
+++ b/test/pipe-tables.native
@@ -1,326 +1,850 @@
-[Para [Str "Simplest",Space,Str "table",Space,Str "without",Space,Str "caption:"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Default1"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Default2"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Default3"]]]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]]])]
- (TableFoot ("",[],[])
- [])
-,Para [Str "Simple",Space,Str "table",Space,Str "with",Space,Str "caption:"]
-,Table ("",[],[]) (Caption Nothing
- [Plain [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."]])
- [(AlignRight,ColWidthDefault)
- ,(AlignLeft,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Right"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Left"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Default"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Center"]]]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]]])]
- (TableFoot ("",[],[])
- [])
-,Para [Str "Simple",Space,Str "table",Space,Str "without",Space,Str "caption:"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignRight,ColWidthDefault)
- ,(AlignLeft,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Right"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Left"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Center"]]]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]]])]
- (TableFoot ("",[],[])
- [])
-,Para [Str "Headerless",Space,Str "table",Space,Str "without",Space,Str "caption:"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignRight,ColWidthDefault)
- ,(AlignLeft,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)]
- (TableHead ("",[],[])
- [])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]]])]
- (TableFoot ("",[],[])
- [])
-,Para [Str "Table",Space,Str "without",Space,Str "sides:"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidthDefault)
- ,(AlignRight,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Fruit"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Quantity"]]]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "apple"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "5"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "orange"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "17"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "pear"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "302"]]]])]
- (TableFoot ("",[],[])
- [])
-,Para [Str "One-column:"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "hi"]]]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "lo"]]]])]
- (TableFoot ("",[],[])
- [])
-,Para [Str "Header-less",Space,Str "one-column:"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignCenter,ColWidthDefault)]
- (TableHead ("",[],[])
- [])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "hi"]]]])]
- (TableFoot ("",[],[])
- [])
-,Para [Str "Indented",Space,Str "left",Space,Str "column:"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignRight,ColWidthDefault)
- ,(AlignLeft,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Number",Space,Str "of",Space,Str "siblings"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Salary"]]]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "3"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "33"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "4"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "44"]]]])]
- (TableFoot ("",[],[])
- [])
-,Para [Str "Long",Space,Str "pipe",Space,Str "table",Space,Str "with",Space,Str "relative",Space,Str "widths:"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidth 0.15517241379310345)
- ,(AlignDefault,ColWidth 0.1724137931034483)
- ,(AlignDefault,ColWidth 0.6724137931034483)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Default1"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Default2"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Default3"]]]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "this",Space,Str "is",Space,Str "a",Space,Str "table",Space,Str "cell"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "and",Space,Str "this",Space,Str "is",Space,Str "a",Space,Str "really",Space,Str "long",Space,Str "table",Space,Str "cell",Space,Str "that",Space,Str "will",Space,Str "probably",Space,Str "need",Space,Str "wrapping"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]]])]
- (TableFoot ("",[],[])
- [])
-,Para [Str "Pipe",Space,Str "table",Space,Str "with",Space,Str "no",Space,Str "body:"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Header"]]]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [])]
- (TableFoot ("",[],[])
- [])
-,Para [Str "Pipe",Space,Str "table",Space,Str "with",Space,Str "tricky",Space,Str "cell",Space,Str "contents",Space,Str "(see",Space,Str "#2765):"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignLeft,ColWidthDefault)
- ,(AlignRight,ColWidthDefault)
- ,(AlignRight,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   []
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "IP_gene8-_1st"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "IP_gene8+_1st"]]]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "IP_gene8-_1st"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1.0000000"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "0.4357325"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "IP_gene8+_1st"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "0.4357325"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1.0000000"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "foo",Code ("",[],[]) "bar|baz"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "and|escaped"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "3.0000000"]]]])]
- (TableFoot ("",[],[])
- [])]
+[ Para
+  [ Str "Simplest"
+  , Space
+  , Str "table"
+  , Space
+  , Str "without"
+  , Space
+  , Str "caption:"
+  ]
+, Table
+  ( "", [], [] )
+  ( Caption Nothing [] )
+  [
+    ( AlignDefault, ColWidthDefault )
+  ,
+    ( AlignDefault, ColWidthDefault )
+  ,
+    ( AlignDefault, ColWidthDefault )
+  ]
+  ( TableHead
+    ( "", [], [] )
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Default1" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Default2" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Default3" ] ]
+      ]
+    ]
+  )
+  [ TableBody
+    ( "", [], [] )
+    ( RowHeadColumns 0 ) []
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      ]
+    , Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      ]
+    , Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      ]
+    ]
+  ]
+  ( TableFoot ( "", [], [] ) [] )
+, Para
+  [ Str "Simple", Space, Str "table", Space, Str "with", Space, Str "caption:" ]
+, Table
+  ( "", [], [] )
+  ( Caption Nothing
+    [ Plain
+      [ Str "Demonstration"
+      , Space
+      , Str "of"
+      , Space
+      , Str "simple"
+      , Space
+      , Str "table"
+      , Space
+      , Str "syntax."
+      ]
+    ]
+  )
+  [
+    ( AlignRight, ColWidthDefault )
+  ,
+    ( AlignLeft, ColWidthDefault )
+  ,
+    ( AlignDefault, ColWidthDefault )
+  ,
+    ( AlignCenter, ColWidthDefault )
+  ]
+  ( TableHead
+    ( "", [], [] )
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Right" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Left" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Default" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Center" ] ]
+      ]
+    ]
+  )
+  [ TableBody
+    ( "", [], [] )
+    ( RowHeadColumns 0 ) []
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      ]
+    , Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      ]
+    , Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      ]
+    ]
+  ]
+  ( TableFoot ( "", [], [] ) [] )
+, Para
+  [ Str "Simple"
+  , Space
+  , Str "table"
+  , Space
+  , Str "without"
+  , Space
+  , Str "caption:"
+  ]
+, Table
+  ( "", [], [] )
+  ( Caption Nothing [] )
+  [
+    ( AlignRight, ColWidthDefault )
+  ,
+    ( AlignLeft, ColWidthDefault )
+  ,
+    ( AlignCenter, ColWidthDefault )
+  ]
+  ( TableHead
+    ( "", [], [] )
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Right" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Left" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Center" ] ]
+      ]
+    ]
+  )
+  [ TableBody
+    ( "", [], [] )
+    ( RowHeadColumns 0 ) []
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      ]
+    , Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      ]
+    , Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      ]
+    ]
+  ]
+  ( TableFoot ( "", [], [] ) [] )
+, Para
+  [ Str "Headerless"
+  , Space
+  , Str "table"
+  , Space
+  , Str "without"
+  , Space
+  , Str "caption:"
+  ]
+, Table
+  ( "", [], [] )
+  ( Caption Nothing [] )
+  [
+    ( AlignRight, ColWidthDefault )
+  ,
+    ( AlignLeft, ColWidthDefault )
+  ,
+    ( AlignCenter, ColWidthDefault )
+  ]
+  ( TableHead ( "", [], [] ) [] )
+  [ TableBody
+    ( "", [], [] )
+    ( RowHeadColumns 0 ) []
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      ]
+    , Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      ]
+    , Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      ]
+    ]
+  ]
+  ( TableFoot ( "", [], [] ) [] )
+, Para
+  [ Str "Table", Space, Str "without", Space, Str "sides:" ]
+, Table
+  ( "", [], [] )
+  ( Caption Nothing [] )
+  [ ( AlignDefault, ColWidthDefault ), ( AlignRight, ColWidthDefault ) ]
+  ( TableHead
+    ( "", [], [] )
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Fruit" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Quantity" ] ]
+      ]
+    ]
+  )
+  [ TableBody
+    ( "", [], [] )
+    ( RowHeadColumns 0 ) []
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "apple" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "5" ] ]
+      ]
+    , Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "orange" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "17" ] ]
+      ]
+    , Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "pear" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "302" ] ]
+      ]
+    ]
+  ]
+  ( TableFoot ( "", [], [] ) [] )
+, Para
+  [ Str "One-column:" ]
+, Table
+  ( "", [], [] )
+  ( Caption Nothing [] )
+  [ ( AlignDefault, ColWidthDefault ) ]
+  ( TableHead
+    ( "", [], [] )
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "hi" ] ]
+      ]
+    ]
+  )
+  [ TableBody
+    ( "", [], [] )
+    ( RowHeadColumns 0 ) []
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "lo" ] ]
+      ]
+    ]
+  ]
+  ( TableFoot ( "", [], [] ) [] )
+, Para
+  [ Str "Header-less", Space, Str "one-column:" ]
+, Table
+  ( "", [], [] )
+  ( Caption Nothing [] )
+  [ ( AlignCenter, ColWidthDefault ) ]
+  ( TableHead ( "", [], [] ) [] )
+  [ TableBody
+    ( "", [], [] )
+    ( RowHeadColumns 0 ) []
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "hi" ] ]
+      ]
+    ]
+  ]
+  ( TableFoot ( "", [], [] ) [] )
+, Para
+  [ Str "Indented", Space, Str "left", Space, Str "column:" ]
+, Table
+  ( "", [], [] )
+  ( Caption Nothing [] )
+  [ ( AlignRight, ColWidthDefault ), ( AlignLeft, ColWidthDefault ) ]
+  ( TableHead
+    ( "", [], [] )
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Number", Space, Str "of", Space, Str "siblings" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Salary" ] ]
+      ]
+    ]
+  )
+  [ TableBody
+    ( "", [], [] )
+    ( RowHeadColumns 0 ) []
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "3" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "33" ] ]
+      ]
+    , Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "4" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "44" ] ]
+      ]
+    ]
+  ]
+  ( TableFoot ( "", [], [] ) [] )
+, Para
+  [ Str "Long"
+  , Space
+  , Str "pipe"
+  , Space
+  , Str "table"
+  , Space
+  , Str "with"
+  , Space
+  , Str "relative"
+  , Space
+  , Str "widths:"
+  ]
+, Table
+  ( "", [], [] )
+  ( Caption Nothing [] )
+  [
+    ( AlignDefault, ColWidth 0.15517241379310345 )
+  ,
+    ( AlignDefault, ColWidth 0.1724137931034483 )
+  ,
+    ( AlignDefault, ColWidth 0.6724137931034483 )
+  ]
+  ( TableHead
+    ( "", [], [] )
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Default1" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Default2" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Default3" ] ]
+      ]
+    ]
+  )
+  [ TableBody
+    ( "", [], [] )
+    ( RowHeadColumns 0 ) []
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain
+          [ Str "this"
+          , Space
+          , Str "is"
+          , Space
+          , Str "a"
+          , Space
+          , Str "table"
+          , Space
+          , Str "cell"
+          ]
+        ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain
+          [ Str "and"
+          , Space
+          , Str "this"
+          , Space
+          , Str "is"
+          , Space
+          , Str "a"
+          , Space
+          , Str "really"
+          , Space
+          , Str "long"
+          , Space
+          , Str "table"
+          , Space
+          , Str "cell"
+          , Space
+          , Str "that"
+          , Space
+          , Str "will"
+          , Space
+          , Str "probably"
+          , Space
+          , Str "need"
+          , Space
+          , Str "wrapping"
+          ]
+        ]
+      ]
+    , Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      ]
+    ]
+  ]
+  ( TableFoot ( "", [], [] ) [] )
+, Para
+  [ Str "Pipe"
+  , Space
+  , Str "table"
+  , Space
+  , Str "with"
+  , Space
+  , Str "no"
+  , Space
+  , Str "body:"
+  ]
+, Table
+  ( "", [], [] )
+  ( Caption Nothing [] )
+  [ ( AlignDefault, ColWidthDefault ) ]
+  ( TableHead
+    ( "", [], [] )
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Header" ] ]
+      ]
+    ]
+  )
+  [ TableBody ( "", [], [] ) ( RowHeadColumns 0 ) [] [] ]
+  ( TableFoot ( "", [], [] ) [] )
+, Para
+  [ Str "Pipe"
+  , Space
+  , Str "table"
+  , Space
+  , Str "with"
+  , Space
+  , Str "tricky"
+  , Space
+  , Str "cell"
+  , Space
+  , Str "contents"
+  , Space
+  , Str "(see"
+  , Space
+  , Str "#2765):"
+  ]
+, Table
+  ( "", [], [] )
+  ( Caption Nothing [] )
+  [
+    ( AlignLeft, ColWidthDefault )
+  ,
+    ( AlignRight, ColWidthDefault )
+  ,
+    ( AlignRight, ColWidthDefault )
+  ]
+  ( TableHead
+    ( "", [], [] )
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 ) []
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "IP_gene8-_1st" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "IP_gene8+_1st" ] ]
+      ]
+    ]
+  )
+  [ TableBody
+    ( "", [], [] )
+    ( RowHeadColumns 0 ) []
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "IP_gene8-_1st" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1.0000000" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "0.4357325" ] ]
+      ]
+    , Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "IP_gene8+_1st" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "0.4357325" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1.0000000" ] ]
+      ]
+    , Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "foo", Code ( "", [], [] ) "bar|baz" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "and|escaped" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "3.0000000" ] ]
+      ]
+    ]
+  ]
+  ( TableFoot ( "", [], [] ) [] )
+]
diff --git a/test/rst-reader.native b/test/rst-reader.native
index 9f8d5ab3e..7a5c3d812 100644
--- a/test/rst-reader.native
+++ b/test/rst-reader.native
@@ -1,443 +1,1874 @@
-Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "John",Space,Str "MacFarlane"],MetaInlines [Str "Anonymous"]]),("date",MetaInlines [Str "July",Space,Str "17,",Space,Str "2006"]),("revision",MetaBlocks [Para [Str "3"]]),("subtitle",MetaInlines [Str "Subtitle"]),("title",MetaInlines [Str "Pandoc",Space,Str "Test",Space,Str "Suite"])]})
-[Header 1 ("level-one-header",[],[]) [Str "Level",Space,Str "one",Space,Str "header"]
-,Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "set",Space,Str "of",Space,Str "tests",Space,Str "for",Space,Str "pandoc.",Space,Str "Most",Space,Str "of",Space,Str "them",Space,Str "are",Space,Str "adapted",Space,Str "from",SoftBreak,Str "John",Space,Str "Gruber\8217s",Space,Str "markdown",Space,Str "test",Space,Str "suite."]
-,Header 2 ("level-two-header",[],[]) [Str "Level",Space,Str "two",Space,Str "header"]
-,Header 3 ("level-three",[],[]) [Str "Level",Space,Str "three"]
-,Header 4 ("level-four-with-emphasis",[],[]) [Str "Level",Space,Str "four",Space,Str "with",Space,Emph [Str "emphasis"]]
-,Header 5 ("level-five",[],[]) [Str "Level",Space,Str "five"]
-,Header 1 ("paragraphs",[],[]) [Str "Paragraphs"]
-,Para [Str "Here\8217s",Space,Str "a",Space,Str "regular",Space,Str "paragraph."]
-,Para [Str "In",Space,Str "Markdown",Space,Str "1.0.0",Space,Str "and",Space,Str "earlier.",Space,Str "Version",SoftBreak,Str "8.",Space,Str "This",Space,Str "line",Space,Str "turns",Space,Str "into",Space,Str "a",Space,Str "list",Space,Str "item.",SoftBreak,Str "Because",Space,Str "a",Space,Str "hard-wrapped",Space,Str "line",Space,Str "in",Space,Str "the",SoftBreak,Str "middle",Space,Str "of",Space,Str "a",Space,Str "paragraph",Space,Str "looked",Space,Str "like",Space,Str "a",SoftBreak,Str "list",Space,Str "item."]
-,Para [Str "Here\8217s",Space,Str "one",Space,Str "with",Space,Str "a",Space,Str "bullet.",SoftBreak,Str "*",Space,Str "criminey."]
-,Para [Str "Horizontal",Space,Str "rule:"]
-,HorizontalRule
-,Para [Str "Another:"]
-,HorizontalRule
-,Header 1 ("block-quotes",[],[]) [Str "Block",Space,Str "Quotes"]
-,Para [Str "Here\8217s",Space,Str "a",Space,Str "block",Space,Str "quote:"]
-,BlockQuote
- [Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "block",Space,Str "quote.",SoftBreak,Str "It",Space,Str "is",Space,Str "pretty",Space,Str "short."]]
-,Para [Str "Here\8217s",Space,Str "another,",Space,Str "differently",Space,Str "indented:"]
-,BlockQuote
- [Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "block",Space,Str "quote.",SoftBreak,Str "It\8217s",Space,Str "indented",Space,Str "with",Space,Str "a",Space,Str "tab."]
- ,Para [Str "Code",Space,Str "in",Space,Str "a",Space,Str "block",Space,Str "quote:"]
- ,CodeBlock ("",[],[]) "sub status {\n    print \"working\";\n}"
- ,Para [Str "List",Space,Str "in",Space,Str "a",Space,Str "block",Space,Str "quote:"]
- ,OrderedList (1,Decimal,Period)
-  [[Plain [Str "item",Space,Str "one"]]
-  ,[Plain [Str "item",Space,Str "two"]]]
- ,Para [Str "Nested",Space,Str "block",Space,Str "quotes:"]
- ,BlockQuote
-  [Para [Str "nested"]
-  ,BlockQuote
-   [Para [Str "nested"]]]]
-,Header 1 ("code-blocks",[],[]) [Str "Code",Space,Str "Blocks"]
-,Para [Str "Code:"]
-,CodeBlock ("",[],[]) "---- (should be four hyphens)\n\nsub status {\n    print \"working\";\n}"
-,CodeBlock ("",[],[]) "this code block is indented by one tab"
-,Para [Str "And:"]
-,CodeBlock ("",[],[]) "this block is indented by two tabs\n\nThese should not be escaped:  \\$ \\\\ \\> \\[ \\{"
-,Para [Str "And:"]
-,CodeBlock ("",["python"],[]) "def my_function(x):\n    return x + 1"
-,Para [Str "If",Space,Str "we",Space,Str "use",Space,Str "the",Space,Str "highlight",Space,Str "directive,",Space,Str "we",Space,Str "can",Space,Str "specify",Space,Str "a",Space,Str "default",Space,Str "language",SoftBreak,Str "for",Space,Str "literate",Space,Str "blocks."]
-,CodeBlock ("",["haskell"],[]) "-- this code is in haskell\ndata Tree = Leaf | Node Tree Tree"
-,CodeBlock ("",["haskell"],[]) "-- this code is in haskell too\ndata Nat = Zero | Succ Nat"
-,CodeBlock ("",["javascript"],[]) "-- this code is in javascript\nlet f = (x, y) => x + y"
-,Header 1 ("lists",[],[]) [Str "Lists"]
-,Header 2 ("unordered",[],[]) [Str "Unordered"]
-,Para [Str "Asterisks",Space,Str "tight:"]
-,BulletList
- [[Plain [Str "asterisk",Space,Str "1"]]
- ,[Plain [Str "asterisk",Space,Str "2"]]
- ,[Plain [Str "asterisk",Space,Str "3"]]]
-,Para [Str "Asterisks",Space,Str "loose:"]
-,BulletList
- [[Plain [Str "asterisk",Space,Str "1"]]
- ,[Plain [Str "asterisk",Space,Str "2"]]
- ,[Plain [Str "asterisk",Space,Str "3"]]]
-,Para [Str "Pluses",Space,Str "tight:"]
-,BulletList
- [[Plain [Str "Plus",Space,Str "1"]]
- ,[Plain [Str "Plus",Space,Str "2"]]
- ,[Plain [Str "Plus",Space,Str "3"]]]
-,Para [Str "Pluses",Space,Str "loose:"]
-,BulletList
- [[Plain [Str "Plus",Space,Str "1"]]
- ,[Plain [Str "Plus",Space,Str "2"]]
- ,[Plain [Str "Plus",Space,Str "3"]]]
-,Para [Str "Minuses",Space,Str "tight:"]
-,BulletList
- [[Plain [Str "Minus",Space,Str "1"]]
- ,[Plain [Str "Minus",Space,Str "2"]]
- ,[Plain [Str "Minus",Space,Str "3"]]]
-,Para [Str "Minuses",Space,Str "loose:"]
-,BulletList
- [[Plain [Str "Minus",Space,Str "1"]]
- ,[Plain [Str "Minus",Space,Str "2"]]
- ,[Plain [Str "Minus",Space,Str "3"]]]
-,Header 2 ("ordered",[],[]) [Str "Ordered"]
-,Para [Str "Tight:"]
-,OrderedList (1,Decimal,Period)
- [[Plain [Str "First"]]
- ,[Plain [Str "Second"]]
- ,[Plain [Str "Third"]]]
-,Para [Str "and:"]
-,OrderedList (1,Decimal,Period)
- [[Plain [Str "One"]]
- ,[Plain [Str "Two"]]
- ,[Plain [Str "Three"]]]
-,Para [Str "Loose",Space,Str "using",Space,Str "tabs:"]
-,OrderedList (1,Decimal,Period)
- [[Plain [Str "First"]]
- ,[Plain [Str "Second"]]
- ,[Plain [Str "Third"]]]
-,Para [Str "and",Space,Str "using",Space,Str "spaces:"]
-,OrderedList (1,Decimal,Period)
- [[Plain [Str "One"]]
- ,[Plain [Str "Two"]]
- ,[Plain [Str "Three"]]]
-,Para [Str "Multiple",Space,Str "paragraphs:"]
-,OrderedList (1,Decimal,Period)
- [[Para [Str "Item",Space,Str "1,",Space,Str "graf",Space,Str "one."]
-  ,Para [Str "Item",Space,Str "1.",Space,Str "graf",Space,Str "two.",Space,Str "The",Space,Str "quick",Space,Str "brown",Space,Str "fox",Space,Str "jumped",Space,Str "over",Space,Str "the",Space,Str "lazy",Space,Str "dog\8217s",SoftBreak,Str "back."]]
- ,[Para [Str "Item",Space,Str "2."]]
- ,[Para [Str "Item",Space,Str "3."]]]
-,Para [Str "Nested:"]
-,BulletList
- [[Plain [Str "Tab"]
-  ,BulletList
-   [[Plain [Str "Tab"]
-    ,BulletList
-     [[Plain [Str "Tab"]]]]]]]
-,Para [Str "Here\8217s",Space,Str "another:"]
-,OrderedList (1,Decimal,Period)
- [[Para [Str "First"]]
- ,[Para [Str "Second:"]
-  ,BlockQuote
-   [BulletList
-    [[Plain [Str "Fee"]]
-    ,[Plain [Str "Fie"]]
-    ,[Plain [Str "Foe"]]]]]
- ,[Para [Str "Third"]]]
-,Header 2 ("fancy-list-markers",[],[]) [Str "Fancy",Space,Str "list",Space,Str "markers"]
-,OrderedList (2,Decimal,TwoParens)
- [[Para [Str "begins",Space,Str "with",Space,Str "2"]]
- ,[Para [Str "and",Space,Str "now",Space,Str "3"]
-  ,Para [Str "with",Space,Str "a",Space,Str "continuation"]
-  ,OrderedList (4,LowerRoman,Period)
-   [[Plain [Str "sublist",Space,Str "with",Space,Str "roman",Space,Str "numerals,",Space,Str "starting",Space,Str "with",Space,Str "4"]]
-   ,[Plain [Str "more",Space,Str "items"]
-    ,OrderedList (1,UpperAlpha,TwoParens)
-     [[Plain [Str "a",Space,Str "subsublist"]]
-     ,[Plain [Str "a",Space,Str "subsublist"]]]]]]]
-,Para [Str "Nesting:"]
-,OrderedList (1,UpperAlpha,Period)
- [[Plain [Str "Upper",Space,Str "Alpha"]
-  ,OrderedList (1,UpperRoman,Period)
-   [[Plain [Str "Upper",Space,Str "Roman."]
-    ,OrderedList (6,Decimal,TwoParens)
-     [[Plain [Str "Decimal",Space,Str "start",Space,Str "with",Space,Str "6"]
-      ,OrderedList (3,LowerAlpha,OneParen)
-       [[Plain [Str "Lower",Space,Str "alpha",Space,Str "with",Space,Str "paren"]]]]]]]]]
-,Para [Str "Autonumbering:"]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Plain [Str "Autonumber."]]
- ,[Plain [Str "More."]
-  ,OrderedList (1,DefaultStyle,DefaultDelim)
-   [[Plain [Str "Nested."]]]]]
-,Para [Str "Autonumbering",Space,Str "with",Space,Str "explicit",Space,Str "start:"]
-,OrderedList (4,LowerAlpha,TwoParens)
- [[Plain [Str "item",Space,Str "1"]]
- ,[Plain [Str "item",Space,Str "2"]]]
-,Header 2 ("definition",[],[]) [Str "Definition"]
-,DefinitionList
- [([Str "term",Space,Str "1"],
-   [[Para [Str "Definition",Space,Str "1."]]])
- ,([Str "term",Space,Str "2"],
-   [[Para [Str "Definition",Space,Str "2,",Space,Str "paragraph",Space,Str "1."]
-    ,Para [Str "Definition",Space,Str "2,",Space,Str "paragraph",Space,Str "2."]]])
- ,([Str "term",Space,Str "with",Space,Emph [Str "emphasis"]],
-   [[Para [Str "Definition",Space,Str "3."]]])]
-,Header 1 ("field-lists",[],[]) [Str "Field",Space,Str "Lists"]
-,BlockQuote
- [DefinitionList
-  [([Str "address"],
-    [[Para [Str "61",Space,Str "Main",Space,Str "St."]]])
-  ,([Str "city"],
-    [[Para [Emph [Str "Nowhere"],Str ",",Space,Str "MA,",SoftBreak,Str "USA"]]])
-  ,([Str "phone"],
-    [[Para [Str "123-4567"]]])]]
-,DefinitionList
- [([Str "address"],
-   [[Para [Str "61",Space,Str "Main",Space,Str "St."]]])
- ,([Str "city"],
-   [[Para [Emph [Str "Nowhere"],Str ",",Space,Str "MA,",SoftBreak,Str "USA"]]])
- ,([Str "phone"],
-   [[Para [Str "123-4567"]]])]
-,Header 1 ("html-blocks",[],[]) [Str "HTML",Space,Str "Blocks"]
-,Para [Str "Simple",Space,Str "block",Space,Str "on",Space,Str "one",Space,Str "line:"]
-,RawBlock (Format "html") "foo"
-,Para [Str "Now,",Space,Str "nested:"]
-,RawBlock (Format "html") "\n    \n        \n            foo\n        
\n    
\n"
-,Header 1 ("latex-block",[],[]) [Str "LaTeX",Space,Str "Block"]
-,RawBlock (Format "latex") "\\begin{tabular}{|l|l|}\\hline\nAnimal & Number \\\\ \\hline\nDog    & 2      \\\\\nCat    & 1      \\\\ \\hline\n\\end{tabular}"
-,Header 1 ("inline-markup",[],[]) [Str "Inline",Space,Str "Markup"]
-,Para [Str "This",Space,Str "is",Space,Emph [Str "emphasized"],Str ".",Space,Str "This",Space,Str "is",Space,Strong [Str "strong"],Str "."]
-,Para [Str "This",Space,Str "is",Space,Str "code:",Space,Code ("",[],[]) ">",Str ",",Space,Code ("",[],[]) "$",Str ",",Space,Code ("",[],[]) "\\",Str ",",Space,Code ("",[],[]) "\\$",Str ",",Space,Code ("",[],[]) "",Str "."]
-,Para [Str "This",Space,Str "is",Subscript [Str "subscripted"],Space,Str "and",Space,Str "this",Space,Str "is",Space,Superscript [Str "superscripted"],Str "."]
-,Header 1 ("special-characters",[],[]) [Str "Special",Space,Str "Characters"]
-,Para [Str "Here",Space,Str "is",Space,Str "some",Space,Str "unicode:"]
-,BulletList
- [[Plain [Str "I",Space,Str "hat:",Space,Str "\206"]]
- ,[Plain [Str "o",Space,Str "umlaut:",Space,Str "\246"]]
- ,[Plain [Str "section:",Space,Str "\167"]]
- ,[Plain [Str "set",Space,Str "membership:",Space,Str "\8712"]]
- ,[Plain [Str "copyright:",Space,Str "\169"]]]
-,Para [Str "AT&T",Space,Str "has",Space,Str "an",Space,Str "ampersand",Space,Str "in",Space,Str "their",Space,Str "name."]
-,Para [Str "This",Space,Str "&",Space,Str "that."]
-,Para [Str "4",Space,Str "<",Space,Str "5."]
-,Para [Str "6",Space,Str ">",Space,Str "5."]
-,Para [Str "Backslash:",Space,Str "\\"]
-,Para [Str "Backtick:",Space,Str "`"]
-,Para [Str "Asterisk:",Space,Str "*"]
-,Para [Str "Underscore:",Space,Str "_"]
-,Para [Str "Left",Space,Str "brace:",Space,Str "{"]
-,Para [Str "Right",Space,Str "brace:",Space,Str "}"]
-,Para [Str "Left",Space,Str "bracket:",Space,Str "["]
-,Para [Str "Right",Space,Str "bracket:",Space,Str "]"]
-,Para [Str "Left",Space,Str "paren:",Space,Str "("]
-,Para [Str "Right",Space,Str "paren:",Space,Str ")"]
-,Para [Str "Greater-than:",Space,Str ">"]
-,Para [Str "Hash:",Space,Str "#"]
-,Para [Str "Period:",Space,Str "."]
-,Para [Str "Bang:",Space,Str "!"]
-,Para [Str "Plus:",Space,Str "+"]
-,Para [Str "Minus:",Space,Str "-"]
-,Header 1 ("links",[],[]) [Str "Links"]
-,Para [Str "Explicit:",Space,Str "a",Space,Link ("",[],[]) [Str "URL"] ("/url/",""),Str "."]
-,Para [Str "Explicit",Space,Str "with",Space,Str "no",Space,Str "label:",Space,Link ("",[],[]) [Str "foo"] ("foo",""),Str "."]
-,Para [Str "Two",Space,Str "anonymous",Space,Str "links:",Space,Link ("",[],[]) [Str "the",Space,Str "first"] ("/url1/",""),Space,Str "and",Space,Link ("",[],[]) [Str "the",Space,Str "second"] ("/url2/","")]
-,Para [Str "Reference",Space,Str "links:",Space,Link ("",[],[]) [Str "link1"] ("/url1/",""),Space,Str "and",Space,Link ("",[],[]) [Str "link2"] ("/url2/",""),Space,Str "and",Space,Link ("",[],[]) [Str "link1"] ("/url1/",""),Space,Str "again."]
-,Para [Str "Another",Space,Link ("",[],[]) [Str "style",Space,Str "of",Space,Str "reference",Space,Str "link"] ("/url1/",""),Str "."]
-,Para [Str "Here\8217s",Space,Str "a",Space,Link ("",[],[]) [Str "link",Space,Str "with",Space,Str "an",Space,Str "ampersand",Space,Str "in",Space,Str "the",Space,Str "URL"] ("http://example.com/?foo=1&bar=2",""),Str "."]
-,Para [Str "Here\8217s",Space,Str "a",Space,Str "link",Space,Str "with",Space,Str "an",Space,Str "amersand",Space,Str "in",Space,Str "the",Space,Str "link",Space,Str "text:",Space,Link ("",[],[]) [Str "AT&T"] ("/url/",""),Str "."]
-,Para [Str "Autolinks:",Space,Link ("",[],[]) [Str "http://example.com/?foo=1&bar=2"] ("http://example.com/?foo=1&bar=2",""),Space,Str "and",Space,Link ("",[],[]) [Str "nobody@nowhere.net"] ("mailto:nobody@nowhere.net",""),Str "."]
-,Para [Str "But",Space,Str "not",Space,Str "here:"]
-,CodeBlock ("",[],[]) "http://example.com/"
-,Header 1 ("images",[],[]) [Str "Images"]
-,Para [Str "From",Space,Quoted DoubleQuote [Str "Voyage",Space,Str "dans",Space,Str "la",Space,Str "Lune"],Space,Str "by",Space,Str "Georges",Space,Str "Melies",Space,Str "(1902):"]
-,Para [Image ("",[],[]) [Str "image"] ("lalune.jpg","")]
-,Para [Image ("",[],[("height","2343px")]) [Str "Voyage dans la Lune"] ("lalune.jpg","")]
-,Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "movie",Space,Image ("",[],[]) [Str "movie"] ("movie.jpg",""),Space,Str "icon."]
-,Para [Str "And",Space,Str "an",Space,Link ("",[],[]) [Image ("",[],[]) [Str "A movie"] ("movie.jpg","")] ("/url",""),Str "."]
-,Header 1 ("comments",[],[]) [Str "Comments"]
-,Para [Str "First",Space,Str "paragraph"]
-,Para [Str "Another",Space,Str "paragraph"]
-,Para [Str "A",Space,Str "third",Space,Str "paragraph"]
-,Header 1 ("line-blocks",[],[]) [Str "Line",Space,Str "blocks"]
-,LineBlock
- [[Str "But",Space,Str "can",Space,Str "a",Space,Str "bee",Space,Str "be",Space,Str "said",Space,Str "to",Space,Str "be"]
- ,[Str "\160\160\160\160or",Space,Str "not",Space,Str "to",Space,Str "be",Space,Str "an",Space,Str "entire",Space,Str "bee,"]
- ,[Str "\160\160\160\160\160\160\160\160when",Space,Str "half",Space,Str "the",Space,Str "bee",Space,Str "is",Space,Str "not",Space,Str "a",Space,Str "bee,"]
- ,[Str "\160\160\160\160\160\160\160\160\160\160\160\160due",Space,Str "to",Space,Str "some",Space,Str "ancient",Space,Str "injury?"]
- ,[]
- ,[Str "Continuation",Space,Str "line"]
- ,[Str "\160\160and",Space,Str "another"]]
-,Header 1 ("simple-tables",[],[]) [Str "Simple",Space,Str "Tables"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "col",Space,Str "1"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "col",Space,Str "2"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "col",Space,Str "3"]]]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "r1",Space,Str "a"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "b"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "c"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "r2",Space,Str "d"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "e"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "f"]]]])]
- (TableFoot ("",[],[])
- [])
-,Para [Str "Headless"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   []
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   []
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   []]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "r1",Space,Str "a"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "b"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "c"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "r2",Space,Str "d"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "e"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "f"]]]])]
- (TableFoot ("",[],[])
- [])
-,Header 1 ("grid-tables",[],[]) [Str "Grid",Space,Str "Tables"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidth 0.2375)
- ,(AlignDefault,ColWidth 0.15)
- ,(AlignDefault,ColWidth 0.1625)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "col",Space,Str "1"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "col",Space,Str "2"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "col",Space,Str "3"]]]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "r2",Space,Str "d"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "e"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "f"]]]])]
- (TableFoot ("",[],[])
- [])
-,Para [Str "Headless"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidth 0.2375)
- ,(AlignDefault,ColWidth 0.15)
- ,(AlignDefault,ColWidth 0.1625)]
- (TableHead ("",[],[])
- [])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "r2",Space,Str "d"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "e"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "f"]]]])]
- (TableFoot ("",[],[])
- [])
-,Para [Str "Spaces",Space,Str "at",Space,Str "ends",Space,Str "of",Space,Str "lines"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidth 0.2375)
- ,(AlignDefault,ColWidth 0.15)
- ,(AlignDefault,ColWidth 0.1625)]
- (TableHead ("",[],[])
- [])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "r2",Space,Str "d"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "e"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "f"]]]])]
- (TableFoot ("",[],[])
- [])
-,Para [Str "Multiple",Space,Str "blocks",Space,Str "in",Space,Str "a",Space,Str "cell"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidth 0.2375)
- ,(AlignDefault,ColWidth 0.15)
- ,(AlignDefault,ColWidth 0.1625)]
- (TableHead ("",[],[])
- [])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "r1",Space,Str "a"]
-    ,Para [Str "r1",Space,Str "bis"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [BulletList
-     [[Plain [Str "b"]]
-     ,[Plain [Str "b",Space,Str "2"]]
-     ,[Plain [Str "b",Space,Str "2"]]]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "c",SoftBreak,Str "c",Space,Str "2",SoftBreak,Str "c",Space,Str "2"]]]])]
- (TableFoot ("",[],[])
- [])
-,Header 1 ("footnotes",[],[]) [Str "Footnotes"]
-,Para [Note [Para [Str "Note",Space,Str "with",Space,Str "one",Space,Str "line."]]]
-,Para [Note [Para [Str "Note",Space,Str "with",SoftBreak,Str "continuation",Space,Str "line."]]]
-,Para [Note [Para [Str "Note",Space,Str "with"],Para [Str "continuation",Space,Str "block."]]]
-,Para [Note [Para [Str "Note",Space,Str "with",SoftBreak,Str "continuation",Space,Str "line"],Para [Str "and",Space,Str "a",Space,Str "second",Space,Str "para."]]]
-,Para [Str "Not",Space,Str "in",Space,Str "note."]
-,Header 1 ("math",[],[]) [Str "Math"]
-,Para [Str "Some",Space,Str "inline",Space,Str "math",Space,Math InlineMath "E=mc^2",Str ".",Space,Str "Now",Space,Str "some",SoftBreak,Str "display",Space,Str "math:"]
-,Para [Math DisplayMath "E=mc^2"]
-,Para [Math DisplayMath "E = mc^2"]
-,Para [Math DisplayMath "E = mc^2",Math DisplayMath "\\alpha = \\beta"]
-,Para [Math DisplayMath "\\begin{aligned}\nE &= mc^2\\\\\nF &= \\pi E\n\\end{aligned}",Math DisplayMath "F &= \\gamma \\alpha^2"]
-,Para [Str "All",Space,Str "done."]
-,Header 1 ("default-role",[],[]) [Str "Default-Role"]
-,Para [Str "Try",Space,Str "changing",Space,Str "the",Space,Str "default",Space,Str "role",Space,Str "to",Space,Str "a",Space,Str "few",Space,Str "different",Space,Str "things."]
-,Header 2 ("doesnt-break-title-parsing",[],[]) [Str "Doesn\8217t",Space,Str "Break",Space,Str "Title",Space,Str "Parsing"]
-,Para [Str "Inline",Space,Str "math:",Space,Math InlineMath "E=mc^2",Space,Str "or",Space,Math InlineMath "E=mc^2",Space,Str "or",Space,Math InlineMath "E=mc^2",Str ".",SoftBreak,Str "Other",Space,Str "roles:",Space,Superscript [Str "super"],Str ",",Space,Subscript [Str "sub"],Str "."]
-,Para [Math DisplayMath "\\alpha = beta",Math DisplayMath "E = mc^2"]
-,Para [Str "Some",Space,Superscript [Str "of"],Space,Str "these",Space,Superscript [Str "words"],Space,Str "are",Space,Str "in",Space,Superscript [Str "superscript"],Str "."]
-,Para [Str "Reset",Space,Str "default-role",Space,Str "to",Space,Str "the",Space,Str "default",Space,Str "default."]
-,Para [Str "And",Space,Str "now",Space,Span ("",["title-ref"],[]) [Str "some-invalid-string-3231231"],Space,Str "is",Space,Str "nonsense."]
-,Para [Str "And",Space,Str "now",Space,Str "with",Space,RawInline (Format "html") "inline HTML",Str "."]
-,Para [Str "And",Space,Str "some",Space,Str "inline",Space,Str "haskell",Space,Code ("",["haskell"],[]) "fmap id [1,2..10]",Str "."]
-,Para [Str "Indirect",Space,Str "python",Space,Str "role",Space,Code ("",["py","python","indirect"],[]) "[x*x for x in [1,2,3,4,5]]",Str "."]
-,Para [Str "Different",Space,Str "indirect",Space,Str "C",Space,Code ("",["c","different-indirect"],[]) "int x = 15;",Str "."]
-,Header 2 ("literal-symbols",[],[]) [Str "Literal",Space,Str "symbols"]
-,Para [Str "2*2",Space,Str "=",Space,Str "4*1"]]
+Pandoc
+  ( Meta
+    { unMeta = fromList
+      [
+        ( "author"
+        , MetaList
+          [ MetaInlines
+            [ Str "John", Space, Str "MacFarlane" ]
+          , MetaInlines
+            [ Str "Anonymous" ]
+          ]
+        )
+      ,
+        ( "date"
+        , MetaInlines
+          [ Str "July", Space, Str "17,", Space, Str "2006" ]
+        )
+      ,
+        ( "revision", MetaBlocks [ Para [ Str "3" ] ] )
+      ,
+        ( "subtitle", MetaInlines [ Str "Subtitle" ] )
+      ,
+        ( "title"
+        , MetaInlines
+          [ Str "Pandoc", Space, Str "Test", Space, Str "Suite" ]
+        )
+      ]
+    }
+  )
+  [ Header 1
+    ( "level-one-header", [], [] )
+    [ Str "Level", Space, Str "one", Space, Str "header" ]
+  , Para
+    [ Str "This"
+    , Space
+    , Str "is"
+    , Space
+    , Str "a"
+    , Space
+    , Str "set"
+    , Space
+    , Str "of"
+    , Space
+    , Str "tests"
+    , Space
+    , Str "for"
+    , Space
+    , Str "pandoc."
+    , Space
+    , Str "Most"
+    , Space
+    , Str "of"
+    , Space
+    , Str "them"
+    , Space
+    , Str "are"
+    , Space
+    , Str "adapted"
+    , Space
+    , Str "from"
+    , SoftBreak
+    , Str "John"
+    , Space
+    , Str "Gruber\8217s"
+    , Space
+    , Str "markdown"
+    , Space
+    , Str "test"
+    , Space
+    , Str "suite."
+    ]
+  , Header 2
+    ( "level-two-header", [], [] )
+    [ Str "Level", Space, Str "two", Space, Str "header" ]
+  , Header 3
+    ( "level-three", [], [] )
+    [ Str "Level", Space, Str "three" ]
+  , Header 4
+    ( "level-four-with-emphasis", [], [] )
+    [ Str "Level"
+    , Space
+    , Str "four"
+    , Space
+    , Str "with"
+    , Space
+    , Emph
+      [ Str "emphasis" ]
+    ]
+  , Header 5
+    ( "level-five", [], [] )
+    [ Str "Level", Space, Str "five" ]
+  , Header 1
+    ( "paragraphs", [], [] )
+    [ Str "Paragraphs" ]
+  , Para
+    [ Str "Here\8217s"
+    , Space
+    , Str "a"
+    , Space
+    , Str "regular"
+    , Space
+    , Str "paragraph."
+    ]
+  , Para
+    [ Str "In"
+    , Space
+    , Str "Markdown"
+    , Space
+    , Str "1.0.0"
+    , Space
+    , Str "and"
+    , Space
+    , Str "earlier."
+    , Space
+    , Str "Version"
+    , SoftBreak
+    , Str "8."
+    , Space
+    , Str "This"
+    , Space
+    , Str "line"
+    , Space
+    , Str "turns"
+    , Space
+    , Str "into"
+    , Space
+    , Str "a"
+    , Space
+    , Str "list"
+    , Space
+    , Str "item."
+    , SoftBreak
+    , Str "Because"
+    , Space
+    , Str "a"
+    , Space
+    , Str "hard-wrapped"
+    , Space
+    , Str "line"
+    , Space
+    , Str "in"
+    , Space
+    , Str "the"
+    , SoftBreak
+    , Str "middle"
+    , Space
+    , Str "of"
+    , Space
+    , Str "a"
+    , Space
+    , Str "paragraph"
+    , Space
+    , Str "looked"
+    , Space
+    , Str "like"
+    , Space
+    , Str "a"
+    , SoftBreak
+    , Str "list"
+    , Space
+    , Str "item."
+    ]
+  , Para
+    [ Str "Here\8217s"
+    , Space
+    , Str "one"
+    , Space
+    , Str "with"
+    , Space
+    , Str "a"
+    , Space
+    , Str "bullet."
+    , SoftBreak
+    , Str "*"
+    , Space
+    , Str "criminey."
+    ]
+  , Para
+    [ Str "Horizontal", Space, Str "rule:" ]
+  , HorizontalRule
+  , Para
+    [ Str "Another:" ]
+  , HorizontalRule
+  , Header 1
+    ( "block-quotes", [], [] )
+    [ Str "Block", Space, Str "Quotes" ]
+  , Para
+    [ Str "Here\8217s"
+    , Space
+    , Str "a"
+    , Space
+    , Str "block"
+    , Space
+    , Str "quote:"
+    ]
+  , BlockQuote
+    [ Para
+      [ Str "This"
+      , Space
+      , Str "is"
+      , Space
+      , Str "a"
+      , Space
+      , Str "block"
+      , Space
+      , Str "quote."
+      , SoftBreak
+      , Str "It"
+      , Space
+      , Str "is"
+      , Space
+      , Str "pretty"
+      , Space
+      , Str "short."
+      ]
+    ]
+  , Para
+    [ Str "Here\8217s"
+    , Space
+    , Str "another,"
+    , Space
+    , Str "differently"
+    , Space
+    , Str "indented:"
+    ]
+  , BlockQuote
+    [ Para
+      [ Str "This"
+      , Space
+      , Str "is"
+      , Space
+      , Str "a"
+      , Space
+      , Str "block"
+      , Space
+      , Str "quote."
+      , SoftBreak
+      , Str "It\8217s"
+      , Space
+      , Str "indented"
+      , Space
+      , Str "with"
+      , Space
+      , Str "a"
+      , Space
+      , Str "tab."
+      ]
+    , Para
+      [ Str "Code"
+      , Space
+      , Str "in"
+      , Space
+      , Str "a"
+      , Space
+      , Str "block"
+      , Space
+      , Str "quote:"
+      ]
+    , CodeBlock
+      ( "", [], [] ) "sub status {\n    print \"working\";\n}"
+    , Para
+      [ Str "List"
+      , Space
+      , Str "in"
+      , Space
+      , Str "a"
+      , Space
+      , Str "block"
+      , Space
+      , Str "quote:"
+      ]
+    , OrderedList
+      ( 1, Decimal, Period )
+      [
+        [ Plain [ Str "item", Space, Str "one" ] ]
+      ,
+        [ Plain [ Str "item", Space, Str "two" ] ]
+      ]
+    , Para
+      [ Str "Nested", Space, Str "block", Space, Str "quotes:" ]
+    , BlockQuote
+      [ Para [ Str "nested" ], BlockQuote [ Para [ Str "nested" ] ] ]
+    ]
+  , Header 1
+    ( "code-blocks", [], [] )
+    [ Str "Code", Space, Str "Blocks" ]
+  , Para
+    [ Str "Code:" ]
+  , CodeBlock
+    ( ""
+    , []
+    , []
+    ) "---- (should be four hyphens)\n\nsub status {\n    print \"working\";\n}"
+  , CodeBlock
+    ( "", [], [] ) "this code block is indented by one tab"
+  , Para
+    [ Str "And:" ]
+  , CodeBlock
+    ( ""
+    , []
+    , []
+    ) "this block is indented by two tabs\n\nThese should not be escaped:  \\$ \\\\ \\> \\[ \\{"
+  , Para
+    [ Str "And:" ]
+  , CodeBlock
+    ( "", [ "python" ], [] ) "def my_function(x):\n    return x + 1"
+  , Para
+    [ Str "If"
+    , Space
+    , Str "we"
+    , Space
+    , Str "use"
+    , Space
+    , Str "the"
+    , Space
+    , Str "highlight"
+    , Space
+    , Str "directive,"
+    , Space
+    , Str "we"
+    , Space
+    , Str "can"
+    , Space
+    , Str "specify"
+    , Space
+    , Str "a"
+    , Space
+    , Str "default"
+    , Space
+    , Str "language"
+    , SoftBreak
+    , Str "for"
+    , Space
+    , Str "literate"
+    , Space
+    , Str "blocks."
+    ]
+  , CodeBlock
+    ( ""
+    , [ "haskell" ]
+    , []
+    ) "-- this code is in haskell\ndata Tree = Leaf | Node Tree Tree"
+  , CodeBlock
+    ( ""
+    , [ "haskell" ]
+    , []
+    ) "-- this code is in haskell too\ndata Nat = Zero | Succ Nat"
+  , CodeBlock
+    ( ""
+    , [ "javascript" ]
+    , []
+    ) "-- this code is in javascript\nlet f = (x, y) => x + y"
+  , Header 1
+    ( "lists", [], [] )
+    [ Str "Lists" ]
+  , Header 2
+    ( "unordered", [], [] )
+    [ Str "Unordered" ]
+  , Para
+    [ Str "Asterisks", Space, Str "tight:" ]
+  , BulletList
+    [
+      [ Plain [ Str "asterisk", Space, Str "1" ] ]
+    ,
+      [ Plain [ Str "asterisk", Space, Str "2" ] ]
+    ,
+      [ Plain [ Str "asterisk", Space, Str "3" ] ]
+    ]
+  , Para
+    [ Str "Asterisks", Space, Str "loose:" ]
+  , BulletList
+    [
+      [ Plain [ Str "asterisk", Space, Str "1" ] ]
+    ,
+      [ Plain [ Str "asterisk", Space, Str "2" ] ]
+    ,
+      [ Plain [ Str "asterisk", Space, Str "3" ] ]
+    ]
+  , Para
+    [ Str "Pluses", Space, Str "tight:" ]
+  , BulletList
+    [
+      [ Plain [ Str "Plus", Space, Str "1" ] ]
+    ,
+      [ Plain [ Str "Plus", Space, Str "2" ] ]
+    ,
+      [ Plain [ Str "Plus", Space, Str "3" ] ]
+    ]
+  , Para
+    [ Str "Pluses", Space, Str "loose:" ]
+  , BulletList
+    [
+      [ Plain [ Str "Plus", Space, Str "1" ] ]
+    ,
+      [ Plain [ Str "Plus", Space, Str "2" ] ]
+    ,
+      [ Plain [ Str "Plus", Space, Str "3" ] ]
+    ]
+  , Para
+    [ Str "Minuses", Space, Str "tight:" ]
+  , BulletList
+    [
+      [ Plain [ Str "Minus", Space, Str "1" ] ]
+    ,
+      [ Plain [ Str "Minus", Space, Str "2" ] ]
+    ,
+      [ Plain [ Str "Minus", Space, Str "3" ] ]
+    ]
+  , Para
+    [ Str "Minuses", Space, Str "loose:" ]
+  , BulletList
+    [
+      [ Plain [ Str "Minus", Space, Str "1" ] ]
+    ,
+      [ Plain [ Str "Minus", Space, Str "2" ] ]
+    ,
+      [ Plain [ Str "Minus", Space, Str "3" ] ]
+    ]
+  , Header 2
+    ( "ordered", [], [] )
+    [ Str "Ordered" ]
+  , Para
+    [ Str "Tight:" ]
+  , OrderedList
+    ( 1, Decimal, Period )
+    [
+      [ Plain [ Str "First" ] ]
+    ,
+      [ Plain [ Str "Second" ] ]
+    ,
+      [ Plain [ Str "Third" ] ]
+    ]
+  , Para
+    [ Str "and:" ]
+  , OrderedList
+    ( 1, Decimal, Period )
+    [
+      [ Plain [ Str "One" ] ]
+    ,
+      [ Plain [ Str "Two" ] ]
+    ,
+      [ Plain [ Str "Three" ] ]
+    ]
+  , Para
+    [ Str "Loose", Space, Str "using", Space, Str "tabs:" ]
+  , OrderedList
+    ( 1, Decimal, Period )
+    [
+      [ Plain [ Str "First" ] ]
+    ,
+      [ Plain [ Str "Second" ] ]
+    ,
+      [ Plain [ Str "Third" ] ]
+    ]
+  , Para
+    [ Str "and", Space, Str "using", Space, Str "spaces:" ]
+  , OrderedList
+    ( 1, Decimal, Period )
+    [
+      [ Plain [ Str "One" ] ]
+    ,
+      [ Plain [ Str "Two" ] ]
+    ,
+      [ Plain [ Str "Three" ] ]
+    ]
+  , Para
+    [ Str "Multiple", Space, Str "paragraphs:" ]
+  , OrderedList
+    ( 1, Decimal, Period )
+    [
+      [ Para
+        [ Str "Item", Space, Str "1,", Space, Str "graf", Space, Str "one." ]
+      , Para
+        [ Str "Item"
+        , Space
+        , Str "1."
+        , Space
+        , Str "graf"
+        , Space
+        , Str "two."
+        , Space
+        , Str "The"
+        , Space
+        , Str "quick"
+        , Space
+        , Str "brown"
+        , Space
+        , Str "fox"
+        , Space
+        , Str "jumped"
+        , Space
+        , Str "over"
+        , Space
+        , Str "the"
+        , Space
+        , Str "lazy"
+        , Space
+        , Str "dog\8217s"
+        , SoftBreak
+        , Str "back."
+        ]
+      ]
+    ,
+      [ Para [ Str "Item", Space, Str "2." ] ]
+    ,
+      [ Para [ Str "Item", Space, Str "3." ] ]
+    ]
+  , Para
+    [ Str "Nested:" ]
+  , BulletList
+    [
+      [ Plain
+        [ Str "Tab" ]
+      , BulletList
+        [ [ Plain [ Str "Tab" ], BulletList [ [ Plain [ Str "Tab" ] ] ] ] ]
+      ]
+    ]
+  , Para
+    [ Str "Here\8217s", Space, Str "another:" ]
+  , OrderedList
+    ( 1, Decimal, Period )
+    [
+      [ Para [ Str "First" ] ]
+    ,
+      [ Para
+        [ Str "Second:" ]
+      , BlockQuote
+        [ BulletList
+          [
+            [ Plain [ Str "Fee" ] ]
+          ,
+            [ Plain [ Str "Fie" ] ]
+          ,
+            [ Plain [ Str "Foe" ] ]
+          ]
+        ]
+      ]
+    ,
+      [ Para [ Str "Third" ] ]
+    ]
+  , Header 2
+    ( "fancy-list-markers", [], [] )
+    [ Str "Fancy", Space, Str "list", Space, Str "markers" ]
+  , OrderedList
+    ( 2, Decimal, TwoParens )
+    [
+      [ Para [ Str "begins", Space, Str "with", Space, Str "2" ] ]
+    ,
+      [ Para
+        [ Str "and", Space, Str "now", Space, Str "3" ]
+      , Para
+        [ Str "with", Space, Str "a", Space, Str "continuation" ]
+      , OrderedList
+        ( 4, LowerRoman, Period )
+        [
+          [ Plain
+            [ Str "sublist"
+            , Space
+            , Str "with"
+            , Space
+            , Str "roman"
+            , Space
+            , Str "numerals,"
+            , Space
+            , Str "starting"
+            , Space
+            , Str "with"
+            , Space
+            , Str "4"
+            ]
+          ]
+        ,
+          [ Plain
+            [ Str "more", Space, Str "items" ]
+          , OrderedList
+            ( 1, UpperAlpha, TwoParens )
+            [
+              [ Plain [ Str "a", Space, Str "subsublist" ] ]
+            ,
+              [ Plain [ Str "a", Space, Str "subsublist" ] ]
+            ]
+          ]
+        ]
+      ]
+    ]
+  , Para
+    [ Str "Nesting:" ]
+  , OrderedList
+    ( 1, UpperAlpha, Period )
+    [
+      [ Plain
+        [ Str "Upper", Space, Str "Alpha" ]
+      , OrderedList
+        ( 1, UpperRoman, Period )
+        [
+          [ Plain
+            [ Str "Upper", Space, Str "Roman." ]
+          , OrderedList
+            ( 6, Decimal, TwoParens )
+            [
+              [ Plain
+                [ Str "Decimal"
+                , Space
+                , Str "start"
+                , Space
+                , Str "with"
+                , Space
+                , Str "6"
+                ]
+              , OrderedList
+                ( 3, LowerAlpha, OneParen )
+                [
+                  [ Plain
+                    [ Str "Lower"
+                    , Space
+                    , Str "alpha"
+                    , Space
+                    , Str "with"
+                    , Space
+                    , Str "paren"
+                    ]
+                  ]
+                ]
+              ]
+            ]
+          ]
+        ]
+      ]
+    ]
+  , Para
+    [ Str "Autonumbering:" ]
+  , OrderedList
+    ( 1, DefaultStyle, DefaultDelim )
+    [
+      [ Plain [ Str "Autonumber." ] ]
+    ,
+      [ Plain
+        [ Str "More." ]
+      , OrderedList
+        ( 1, DefaultStyle, DefaultDelim )
+        [ [ Plain [ Str "Nested." ] ] ]
+      ]
+    ]
+  , Para
+    [ Str "Autonumbering"
+    , Space
+    , Str "with"
+    , Space
+    , Str "explicit"
+    , Space
+    , Str "start:"
+    ]
+  , OrderedList
+    ( 4, LowerAlpha, TwoParens )
+    [
+      [ Plain [ Str "item", Space, Str "1" ] ]
+    ,
+      [ Plain [ Str "item", Space, Str "2" ] ]
+    ]
+  , Header 2
+    ( "definition", [], [] )
+    [ Str "Definition" ]
+  , DefinitionList
+    [
+      (
+        [ Str "term", Space, Str "1" ]
+      ,
+        [ [ Para [ Str "Definition", Space, Str "1." ] ] ]
+      )
+    ,
+      (
+        [ Str "term", Space, Str "2" ]
+      ,
+        [
+          [ Para
+            [ Str "Definition"
+            , Space
+            , Str "2,"
+            , Space
+            , Str "paragraph"
+            , Space
+            , Str "1."
+            ]
+          , Para
+            [ Str "Definition"
+            , Space
+            , Str "2,"
+            , Space
+            , Str "paragraph"
+            , Space
+            , Str "2."
+            ]
+          ]
+        ]
+      )
+    ,
+      (
+        [ Str "term", Space, Str "with", Space, Emph [ Str "emphasis" ] ]
+      ,
+        [ [ Para [ Str "Definition", Space, Str "3." ] ] ]
+      )
+    ]
+  , Header 1
+    ( "field-lists", [], [] )
+    [ Str "Field", Space, Str "Lists" ]
+  , BlockQuote
+    [ DefinitionList
+      [
+        (
+          [ Str "address" ]
+        ,
+          [ [ Para [ Str "61", Space, Str "Main", Space, Str "St." ] ] ]
+        )
+      ,
+        (
+          [ Str "city" ]
+        ,
+          [
+            [ Para
+              [ Emph
+                [ Str "Nowhere" ]
+              , Str ","
+              , Space
+              , Str "MA,"
+              , SoftBreak
+              , Str "USA"
+              ]
+            ]
+          ]
+        )
+      ,
+        ( [ Str "phone" ], [ [ Para [ Str "123-4567" ] ] ] )
+      ]
+    ]
+  , DefinitionList
+    [
+      (
+        [ Str "address" ]
+      ,
+        [ [ Para [ Str "61", Space, Str "Main", Space, Str "St." ] ] ]
+      )
+    ,
+      (
+        [ Str "city" ]
+      ,
+        [
+          [ Para
+            [ Emph
+              [ Str "Nowhere" ]
+            , Str ","
+            , Space
+            , Str "MA,"
+            , SoftBreak
+            , Str "USA"
+            ]
+          ]
+        ]
+      )
+    ,
+      ( [ Str "phone" ], [ [ Para [ Str "123-4567" ] ] ] )
+    ]
+  , Header 1
+    ( "html-blocks", [], [] )
+    [ Str "HTML", Space, Str "Blocks" ]
+  , Para
+    [ Str "Simple"
+    , Space
+    , Str "block"
+    , Space
+    , Str "on"
+    , Space
+    , Str "one"
+    , Space
+    , Str "line:"
+    ]
+  , RawBlock
+    ( Format "html" ) "foo"
+  , Para
+    [ Str "Now,", Space, Str "nested:" ]
+  , RawBlock
+    ( Format "html" ) "\n    \n        \n            foo\n        
\n    
\n"
+  , Header 1
+    ( "latex-block", [], [] )
+    [ Str "LaTeX", Space, Str "Block" ]
+  , RawBlock
+    ( Format "latex" ) "\\begin{tabular}{|l|l|}\\hline\nAnimal & Number \\\\ \\hline\nDog    & 2      \\\\\nCat    & 1      \\\\ \\hline\n\\end{tabular}"
+  , Header 1
+    ( "inline-markup", [], [] )
+    [ Str "Inline", Space, Str "Markup" ]
+  , Para
+    [ Str "This"
+    , Space
+    , Str "is"
+    , Space
+    , Emph
+      [ Str "emphasized" ]
+    , Str "."
+    , Space
+    , Str "This"
+    , Space
+    , Str "is"
+    , Space
+    , Strong
+      [ Str "strong" ]
+    , Str "."
+    ]
+  , Para
+    [ Str "This"
+    , Space
+    , Str "is"
+    , Space
+    , Str "code:"
+    , Space
+    , Code
+      ( "", [], [] ) ">"
+    , Str ","
+    , Space
+    , Code
+      ( "", [], [] ) "$"
+    , Str ","
+    , Space
+    , Code
+      ( "", [], [] ) "\\"
+    , Str ","
+    , Space
+    , Code
+      ( "", [], [] ) "\\$"
+    , Str ","
+    , Space
+    , Code
+      ( "", [], [] ) ""
+    , Str "."
+    ]
+  , Para
+    [ Str "This"
+    , Space
+    , Str "is"
+    , Subscript
+      [ Str "subscripted" ]
+    , Space
+    , Str "and"
+    , Space
+    , Str "this"
+    , Space
+    , Str "is"
+    , Space
+    , Superscript
+      [ Str "superscripted" ]
+    , Str "."
+    ]
+  , Header 1
+    ( "special-characters", [], [] )
+    [ Str "Special", Space, Str "Characters" ]
+  , Para
+    [ Str "Here", Space, Str "is", Space, Str "some", Space, Str "unicode:" ]
+  , BulletList
+    [
+      [ Plain [ Str "I", Space, Str "hat:", Space, Str "\206" ] ]
+    ,
+      [ Plain [ Str "o", Space, Str "umlaut:", Space, Str "\246" ] ]
+    ,
+      [ Plain [ Str "section:", Space, Str "\167" ] ]
+    ,
+      [ Plain [ Str "set", Space, Str "membership:", Space, Str "\8712" ] ]
+    ,
+      [ Plain [ Str "copyright:", Space, Str "\169" ] ]
+    ]
+  , Para
+    [ Str "AT&T"
+    , Space
+    , Str "has"
+    , Space
+    , Str "an"
+    , Space
+    , Str "ampersand"
+    , Space
+    , Str "in"
+    , Space
+    , Str "their"
+    , Space
+    , Str "name."
+    ]
+  , Para
+    [ Str "This", Space, Str "&", Space, Str "that." ]
+  , Para
+    [ Str "4", Space, Str "<", Space, Str "5." ]
+  , Para
+    [ Str "6", Space, Str ">", Space, Str "5." ]
+  , Para
+    [ Str "Backslash:", Space, Str "\\" ]
+  , Para
+    [ Str "Backtick:", Space, Str "`" ]
+  , Para
+    [ Str "Asterisk:", Space, Str "*" ]
+  , Para
+    [ Str "Underscore:", Space, Str "_" ]
+  , Para
+    [ Str "Left", Space, Str "brace:", Space, Str "{" ]
+  , Para
+    [ Str "Right", Space, Str "brace:", Space, Str "}" ]
+  , Para
+    [ Str "Left", Space, Str "bracket:", Space, Str "[" ]
+  , Para
+    [ Str "Right", Space, Str "bracket:", Space, Str "]" ]
+  , Para
+    [ Str "Left", Space, Str "paren:", Space, Str "(" ]
+  , Para
+    [ Str "Right", Space, Str "paren:", Space, Str ")" ]
+  , Para
+    [ Str "Greater-than:", Space, Str ">" ]
+  , Para
+    [ Str "Hash:", Space, Str "#" ]
+  , Para
+    [ Str "Period:", Space, Str "." ]
+  , Para
+    [ Str "Bang:", Space, Str "!" ]
+  , Para
+    [ Str "Plus:", Space, Str "+" ]
+  , Para
+    [ Str "Minus:", Space, Str "-" ]
+  , Header 1
+    ( "links", [], [] )
+    [ Str "Links" ]
+  , Para
+    [ Str "Explicit:"
+    , Space
+    , Str "a"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "URL" ]
+      ( "/url/", "" )
+    , Str "."
+    ]
+  , Para
+    [ Str "Explicit"
+    , Space
+    , Str "with"
+    , Space
+    , Str "no"
+    , Space
+    , Str "label:"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "foo" ]
+      ( "foo", "" )
+    , Str "."
+    ]
+  , Para
+    [ Str "Two"
+    , Space
+    , Str "anonymous"
+    , Space
+    , Str "links:"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "the", Space, Str "first" ]
+      ( "/url1/", "" )
+    , Space
+    , Str "and"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "the", Space, Str "second" ]
+      ( "/url2/", "" )
+    ]
+  , Para
+    [ Str "Reference"
+    , Space
+    , Str "links:"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "link1" ]
+      ( "/url1/", "" )
+    , Space
+    , Str "and"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "link2" ]
+      ( "/url2/", "" )
+    , Space
+    , Str "and"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "link1" ]
+      ( "/url1/", "" )
+    , Space
+    , Str "again."
+    ]
+  , Para
+    [ Str "Another"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "style"
+      , Space
+      , Str "of"
+      , Space
+      , Str "reference"
+      , Space
+      , Str "link"
+      ]
+      ( "/url1/", "" )
+    , Str "."
+    ]
+  , Para
+    [ Str "Here\8217s"
+    , Space
+    , Str "a"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "link"
+      , Space
+      , Str "with"
+      , Space
+      , Str "an"
+      , Space
+      , Str "ampersand"
+      , Space
+      , Str "in"
+      , Space
+      , Str "the"
+      , Space
+      , Str "URL"
+      ]
+      ( "http://example.com/?foo=1&bar=2", "" )
+    , Str "."
+    ]
+  , Para
+    [ Str "Here\8217s"
+    , Space
+    , Str "a"
+    , Space
+    , Str "link"
+    , Space
+    , Str "with"
+    , Space
+    , Str "an"
+    , Space
+    , Str "amersand"
+    , Space
+    , Str "in"
+    , Space
+    , Str "the"
+    , Space
+    , Str "link"
+    , Space
+    , Str "text:"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "AT&T" ]
+      ( "/url/", "" )
+    , Str "."
+    ]
+  , Para
+    [ Str "Autolinks:"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "http://example.com/?foo=1&bar=2" ]
+      ( "http://example.com/?foo=1&bar=2", "" )
+    , Space
+    , Str "and"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "nobody@nowhere.net" ]
+      ( "mailto:nobody@nowhere.net", "" )
+    , Str "."
+    ]
+  , Para
+    [ Str "But", Space, Str "not", Space, Str "here:" ]
+  , CodeBlock
+    ( "", [], [] ) "http://example.com/"
+  , Header 1
+    ( "images", [], [] )
+    [ Str "Images" ]
+  , Para
+    [ Str "From"
+    , Space
+    , Quoted DoubleQuote
+      [ Str "Voyage", Space, Str "dans", Space, Str "la", Space, Str "Lune" ]
+    , Space
+    , Str "by"
+    , Space
+    , Str "Georges"
+    , Space
+    , Str "Melies"
+    , Space
+    , Str "(1902):"
+    ]
+  , Para
+    [ Image ( "", [], [] ) [ Str "image" ] ( "lalune.jpg", "" ) ]
+  , Para
+    [ Image
+      ( "", [], [ ( "height", "2343px" ) ] )
+      [ Str "Voyage dans la Lune" ]
+      ( "lalune.jpg", "" )
+    ]
+  , Para
+    [ Str "Here"
+    , Space
+    , Str "is"
+    , Space
+    , Str "a"
+    , Space
+    , Str "movie"
+    , Space
+    , Image
+      ( "", [], [] )
+      [ Str "movie" ]
+      ( "movie.jpg", "" )
+    , Space
+    , Str "icon."
+    ]
+  , Para
+    [ Str "And"
+    , Space
+    , Str "an"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Image ( "", [], [] ) [ Str "A movie" ] ( "movie.jpg", "" ) ]
+      ( "/url", "" )
+    , Str "."
+    ]
+  , Header 1
+    ( "comments", [], [] )
+    [ Str "Comments" ]
+  , Para
+    [ Str "First", Space, Str "paragraph" ]
+  , Para
+    [ Str "Another", Space, Str "paragraph" ]
+  , Para
+    [ Str "A", Space, Str "third", Space, Str "paragraph" ]
+  , Header 1
+    ( "line-blocks", [], [] )
+    [ Str "Line", Space, Str "blocks" ]
+  , LineBlock
+    [
+      [ Str "But"
+      , Space
+      , Str "can"
+      , Space
+      , Str "a"
+      , Space
+      , Str "bee"
+      , Space
+      , Str "be"
+      , Space
+      , Str "said"
+      , Space
+      , Str "to"
+      , Space
+      , Str "be"
+      ]
+    ,
+      [ Str "\160\160\160\160or"
+      , Space
+      , Str "not"
+      , Space
+      , Str "to"
+      , Space
+      , Str "be"
+      , Space
+      , Str "an"
+      , Space
+      , Str "entire"
+      , Space
+      , Str "bee,"
+      ]
+    ,
+      [ Str "\160\160\160\160\160\160\160\160when"
+      , Space
+      , Str "half"
+      , Space
+      , Str "the"
+      , Space
+      , Str "bee"
+      , Space
+      , Str "is"
+      , Space
+      , Str "not"
+      , Space
+      , Str "a"
+      , Space
+      , Str "bee,"
+      ]
+    ,
+      [ Str "\160\160\160\160\160\160\160\160\160\160\160\160due"
+      , Space
+      , Str "to"
+      , Space
+      , Str "some"
+      , Space
+      , Str "ancient"
+      , Space
+      , Str "injury?"
+      ]
+    , []
+    ,
+      [ Str "Continuation", Space, Str "line" ]
+    ,
+      [ Str "\160\160and", Space, Str "another" ]
+    ]
+  , Header 1
+    ( "simple-tables", [], [] )
+    [ Str "Simple", Space, Str "Tables" ]
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignDefault, ColWidthDefault )
+    ,
+      ( AlignDefault, ColWidthDefault )
+    ,
+      ( AlignDefault, ColWidthDefault )
+    ]
+    ( TableHead
+      ( "", [], [] )
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "col", Space, Str "1" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "col", Space, Str "2" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "col", Space, Str "3" ] ]
+        ]
+      ]
+    )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "r1", Space, Str "a" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "b" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "c" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "r2", Space, Str "d" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "e" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "f" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Para
+    [ Str "Headless" ]
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignDefault, ColWidthDefault )
+    ,
+      ( AlignDefault, ColWidthDefault )
+    ,
+      ( AlignDefault, ColWidthDefault )
+    ]
+    ( TableHead
+      ( "", [], [] )
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        ]
+      ]
+    )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "r1", Space, Str "a" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "b" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "c" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "r2", Space, Str "d" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "e" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "f" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Header 1
+    ( "grid-tables", [], [] )
+    [ Str "Grid", Space, Str "Tables" ]
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignDefault, ColWidth 0.2375 )
+    ,
+      ( AlignDefault, ColWidth 0.15 )
+    ,
+      ( AlignDefault, ColWidth 0.1625 )
+    ]
+    ( TableHead
+      ( "", [], [] )
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "col", Space, Str "1" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "col", Space, Str "2" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "col", Space, Str "3" ] ]
+        ]
+      ]
+    )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain
+            [ Str "r1", Space, Str "a", SoftBreak, Str "r1", Space, Str "bis" ]
+          ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "b", SoftBreak, Str "b", Space, Str "2" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "c", SoftBreak, Str "c", Space, Str "2" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "r2", Space, Str "d" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "e" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "f" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Para
+    [ Str "Headless" ]
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignDefault, ColWidth 0.2375 )
+    ,
+      ( AlignDefault, ColWidth 0.15 )
+    ,
+      ( AlignDefault, ColWidth 0.1625 )
+    ]
+    ( TableHead ( "", [], [] ) [] )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain
+            [ Str "r1", Space, Str "a", SoftBreak, Str "r1", Space, Str "bis" ]
+          ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "b", SoftBreak, Str "b", Space, Str "2" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "c", SoftBreak, Str "c", Space, Str "2" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "r2", Space, Str "d" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "e" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "f" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Para
+    [ Str "Spaces"
+    , Space
+    , Str "at"
+    , Space
+    , Str "ends"
+    , Space
+    , Str "of"
+    , Space
+    , Str "lines"
+    ]
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignDefault, ColWidth 0.2375 )
+    ,
+      ( AlignDefault, ColWidth 0.15 )
+    ,
+      ( AlignDefault, ColWidth 0.1625 )
+    ]
+    ( TableHead ( "", [], [] ) [] )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain
+            [ Str "r1", Space, Str "a", SoftBreak, Str "r1", Space, Str "bis" ]
+          ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "b", SoftBreak, Str "b", Space, Str "2" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "c", SoftBreak, Str "c", Space, Str "2" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "r2", Space, Str "d" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "e" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "f" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Para
+    [ Str "Multiple"
+    , Space
+    , Str "blocks"
+    , Space
+    , Str "in"
+    , Space
+    , Str "a"
+    , Space
+    , Str "cell"
+    ]
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignDefault, ColWidth 0.2375 )
+    ,
+      ( AlignDefault, ColWidth 0.15 )
+    ,
+      ( AlignDefault, ColWidth 0.1625 )
+    ]
+    ( TableHead ( "", [], [] ) [] )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para
+            [ Str "r1", Space, Str "a" ]
+          , Para
+            [ Str "r1", Space, Str "bis" ]
+          ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ BulletList
+            [
+              [ Plain [ Str "b" ] ]
+            ,
+              [ Plain [ Str "b", Space, Str "2" ] ]
+            ,
+              [ Plain [ Str "b", Space, Str "2" ] ]
+            ]
+          ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain
+            [ Str "c"
+            , SoftBreak
+            , Str "c"
+            , Space
+            , Str "2"
+            , SoftBreak
+            , Str "c"
+            , Space
+            , Str "2"
+            ]
+          ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Header 1
+    ( "footnotes", [], [] )
+    [ Str "Footnotes" ]
+  , Para
+    [ Note
+      [ Para
+        [ Str "Note", Space, Str "with", Space, Str "one", Space, Str "line." ]
+      ]
+    ]
+  , Para
+    [ Note
+      [ Para
+        [ Str "Note"
+        , Space
+        , Str "with"
+        , SoftBreak
+        , Str "continuation"
+        , Space
+        , Str "line."
+        ]
+      ]
+    ]
+  , Para
+    [ Note
+      [ Para
+        [ Str "Note", Space, Str "with" ]
+      , Para
+        [ Str "continuation", Space, Str "block." ]
+      ]
+    ]
+  , Para
+    [ Note
+      [ Para
+        [ Str "Note"
+        , Space
+        , Str "with"
+        , SoftBreak
+        , Str "continuation"
+        , Space
+        , Str "line"
+        ]
+      , Para
+        [ Str "and", Space, Str "a", Space, Str "second", Space, Str "para." ]
+      ]
+    ]
+  , Para
+    [ Str "Not", Space, Str "in", Space, Str "note." ]
+  , Header 1
+    ( "math", [], [] )
+    [ Str "Math" ]
+  , Para
+    [ Str "Some"
+    , Space
+    , Str "inline"
+    , Space
+    , Str "math"
+    , Space
+    , Math InlineMath "E=mc^2"
+    , Str "."
+    , Space
+    , Str "Now"
+    , Space
+    , Str "some"
+    , SoftBreak
+    , Str "display"
+    , Space
+    , Str "math:"
+    ]
+  , Para
+    [ Math DisplayMath "E=mc^2" ]
+  , Para
+    [ Math DisplayMath "E = mc^2" ]
+  , Para
+    [ Math DisplayMath "E = mc^2", Math DisplayMath "\\alpha = \\beta" ]
+  , Para
+    [ Math DisplayMath "\\begin{aligned}\nE &= mc^2\\\\\nF &= \\pi E\n\\end{aligned}"
+    , Math DisplayMath "F &= \\gamma \\alpha^2"
+    ]
+  , Para
+    [ Str "All", Space, Str "done." ]
+  , Header 1
+    ( "default-role", [], [] )
+    [ Str "Default-Role" ]
+  , Para
+    [ Str "Try"
+    , Space
+    , Str "changing"
+    , Space
+    , Str "the"
+    , Space
+    , Str "default"
+    , Space
+    , Str "role"
+    , Space
+    , Str "to"
+    , Space
+    , Str "a"
+    , Space
+    , Str "few"
+    , Space
+    , Str "different"
+    , Space
+    , Str "things."
+    ]
+  , Header 2
+    ( "doesnt-break-title-parsing", [], [] )
+    [ Str "Doesn\8217t"
+    , Space
+    , Str "Break"
+    , Space
+    , Str "Title"
+    , Space
+    , Str "Parsing"
+    ]
+  , Para
+    [ Str "Inline"
+    , Space
+    , Str "math:"
+    , Space
+    , Math InlineMath "E=mc^2"
+    , Space
+    , Str "or"
+    , Space
+    , Math InlineMath "E=mc^2"
+    , Space
+    , Str "or"
+    , Space
+    , Math InlineMath "E=mc^2"
+    , Str "."
+    , SoftBreak
+    , Str "Other"
+    , Space
+    , Str "roles:"
+    , Space
+    , Superscript
+      [ Str "super" ]
+    , Str ","
+    , Space
+    , Subscript
+      [ Str "sub" ]
+    , Str "."
+    ]
+  , Para
+    [ Math DisplayMath "\\alpha = beta", Math DisplayMath "E = mc^2" ]
+  , Para
+    [ Str "Some"
+    , Space
+    , Superscript
+      [ Str "of" ]
+    , Space
+    , Str "these"
+    , Space
+    , Superscript
+      [ Str "words" ]
+    , Space
+    , Str "are"
+    , Space
+    , Str "in"
+    , Space
+    , Superscript
+      [ Str "superscript" ]
+    , Str "."
+    ]
+  , Para
+    [ Str "Reset"
+    , Space
+    , Str "default-role"
+    , Space
+    , Str "to"
+    , Space
+    , Str "the"
+    , Space
+    , Str "default"
+    , Space
+    , Str "default."
+    ]
+  , Para
+    [ Str "And"
+    , Space
+    , Str "now"
+    , Space
+    , Span
+      ( "", [ "title-ref" ], [] )
+      [ Str "some-invalid-string-3231231" ]
+    , Space
+    , Str "is"
+    , Space
+    , Str "nonsense."
+    ]
+  , Para
+    [ Str "And"
+    , Space
+    , Str "now"
+    , Space
+    , Str "with"
+    , Space
+    , RawInline
+      ( Format "html" ) "inline HTML"
+    , Str "."
+    ]
+  , Para
+    [ Str "And"
+    , Space
+    , Str "some"
+    , Space
+    , Str "inline"
+    , Space
+    , Str "haskell"
+    , Space
+    , Code
+      ( "", [ "haskell" ], [] ) "fmap id [1,2..10]"
+    , Str "."
+    ]
+  , Para
+    [ Str "Indirect"
+    , Space
+    , Str "python"
+    , Space
+    , Str "role"
+    , Space
+    , Code
+      ( "", [ "py", "python", "indirect" ], [] ) "[x*x for x in [1,2,3,4,5]]"
+    , Str "."
+    ]
+  , Para
+    [ Str "Different"
+    , Space
+    , Str "indirect"
+    , Space
+    , Str "C"
+    , Space
+    , Code
+      ( "", [ "c", "different-indirect" ], [] ) "int x = 15;"
+    , Str "."
+    ]
+  , Header 2
+    ( "literal-symbols", [], [] )
+    [ Str "Literal", Space, Str "symbols" ]
+  , Para
+    [ Str "2*2", Space, Str "=", Space, Str "4*1" ]
+  ]
diff --git a/test/rtf/accent.native b/test/rtf/accent.native
index bea6364de..67eb654fe 100644
--- a/test/rtf/accent.native
+++ b/test/rtf/accent.native
@@ -1,2 +1,18 @@
-Pandoc (Meta {unMeta = fromList []})
-[Para [Str "le",Space,Str "caf\233",Space,Str "o\249",Space,Str "on",Space,Str "ne",Space,Str "fume",Space,Str "pas"]]
+Pandoc
+  ( Meta { unMeta = fromList [] } )
+  [ Para
+    [ Str "le"
+    , Space
+    , Str "caf\233"
+    , Space
+    , Str "o\249"
+    , Space
+    , Str "on"
+    , Space
+    , Str "ne"
+    , Space
+    , Str "fume"
+    , Space
+    , Str "pas"
+    ]
+  ]
diff --git a/test/rtf/bookmark.native b/test/rtf/bookmark.native
index f142f1c5c..765bf29d0 100644
--- a/test/rtf/bookmark.native
+++ b/test/rtf/bookmark.native
@@ -1,3 +1,11 @@
-Pandoc (Meta {unMeta = fromList []})
-[Para [Span ("bookmark_1",[],[]) [Str "Bookmark_1"]]
-,Para [Link ("",[],[]) [Str "click",Space,Str "me"] ("#bookmark_1","")]]
+Pandoc
+  ( Meta { unMeta = fromList [] } )
+  [ Para
+    [ Span ( "bookmark_1", [], [] ) [ Str "Bookmark_1" ] ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "click", Space, Str "me" ]
+      ( "#bookmark_1", "" )
+    ]
+  ]
diff --git a/test/rtf/footnote.native b/test/rtf/footnote.native
index f2893be7e..cfea5f4a1 100644
--- a/test/rtf/footnote.native
+++ b/test/rtf/footnote.native
@@ -1,2 +1,130 @@
-Pandoc (Meta {unMeta = fromList []})
-[Para [Str "Mead's",Space,Str "landmark",Space,Str "study",Space,Str "has",Space,Str "been",Space,Str "amply",Space,Str "annotated.",Note [Para [Str "See",Space,Str "Sahlins,",Space,Str "Bateson,",Space,Str "and",Space,Str "Geertz",Space,Str "for",Space,Str "a",Space,Str "complete",Space,Str "bibliography."]],Space,Str "It",Space,Str "was",Space,Str "her",Space,Str "work",Space,Str "in",Space,Str "America",Space,Str "during",Space,Str "the",Space,Str "Second",Space,Str "World",Space,Str "War,",Space,Str "however,",Space,Str "that",Space,Str "forms",Space,Str "the",Space,Str "basis",Space,Str "for",Space,Str "the",Space,Str "paper.",Space,Str "As",Space,Str "others",Space,Str "have",Space,Str "noted,",Note [Para [Str "A",Space,Str "complete",Space,Str "bibliography",Space,Str "will",Space,Str "be",Space,Str "found",Space,Str "at",Space,Str "the",Space,Str "end",Space,Str "of",Space,Str "this",Space,Str "chapter."]],Space,Str "this",Space,Str "period",Space,Str "was",Space,Str "a",Space,Str "turning",Space,Str "point",Space,Str "for",Space,Str "Margaret",Space,Str "Mead."]]
+Pandoc
+  ( Meta { unMeta = fromList [] } )
+  [ Para
+    [ Str "Mead's"
+    , Space
+    , Str "landmark"
+    , Space
+    , Str "study"
+    , Space
+    , Str "has"
+    , Space
+    , Str "been"
+    , Space
+    , Str "amply"
+    , Space
+    , Str "annotated."
+    , Note
+      [ Para
+        [ Str "See"
+        , Space
+        , Str "Sahlins,"
+        , Space
+        , Str "Bateson,"
+        , Space
+        , Str "and"
+        , Space
+        , Str "Geertz"
+        , Space
+        , Str "for"
+        , Space
+        , Str "a"
+        , Space
+        , Str "complete"
+        , Space
+        , Str "bibliography."
+        ]
+      ]
+    , Space
+    , Str "It"
+    , Space
+    , Str "was"
+    , Space
+    , Str "her"
+    , Space
+    , Str "work"
+    , Space
+    , Str "in"
+    , Space
+    , Str "America"
+    , Space
+    , Str "during"
+    , Space
+    , Str "the"
+    , Space
+    , Str "Second"
+    , Space
+    , Str "World"
+    , Space
+    , Str "War,"
+    , Space
+    , Str "however,"
+    , Space
+    , Str "that"
+    , Space
+    , Str "forms"
+    , Space
+    , Str "the"
+    , Space
+    , Str "basis"
+    , Space
+    , Str "for"
+    , Space
+    , Str "the"
+    , Space
+    , Str "paper."
+    , Space
+    , Str "As"
+    , Space
+    , Str "others"
+    , Space
+    , Str "have"
+    , Space
+    , Str "noted,"
+    , Note
+      [ Para
+        [ Str "A"
+        , Space
+        , Str "complete"
+        , Space
+        , Str "bibliography"
+        , Space
+        , Str "will"
+        , Space
+        , Str "be"
+        , Space
+        , Str "found"
+        , Space
+        , Str "at"
+        , Space
+        , Str "the"
+        , Space
+        , Str "end"
+        , Space
+        , Str "of"
+        , Space
+        , Str "this"
+        , Space
+        , Str "chapter."
+        ]
+      ]
+    , Space
+    , Str "this"
+    , Space
+    , Str "period"
+    , Space
+    , Str "was"
+    , Space
+    , Str "a"
+    , Space
+    , Str "turning"
+    , Space
+    , Str "point"
+    , Space
+    , Str "for"
+    , Space
+    , Str "Margaret"
+    , Space
+    , Str "Mead."
+    ]
+  ]
diff --git a/test/rtf/formatting.native b/test/rtf/formatting.native
index 54e61bf97..6e5001de3 100644
--- a/test/rtf/formatting.native
+++ b/test/rtf/formatting.native
@@ -1,10 +1,51 @@
-Pandoc (Meta {unMeta = fromList [("operator",MetaInlines [Str "John",Space,Str "MacFarlane"])]})
-[Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "test",Space,Str "of",Space,Str "FORMATTING.",Space,Str "This",Space,Str "is",Space,Str "hidden:",Space,Str "."]
-,Para [SmallCaps [Str "Small",Space,Str "Caps"]]
-,Para [Strong [Str "bold"]]
-,Para [Emph [Str "italics"]]
-,Para [Strong [Str "bold",Space,Emph [Str "and",Space,Str "italics"]]]
-,Para [Underline [Str "underlined"]]
-,Para [Strikeout [Str "strikeout"]]
-,Para [Str "x",Superscript [Str "superscript"]]
-,Para [Str "x",Subscript [Str "subscript"]]]
+Pandoc
+  ( Meta
+    { unMeta = fromList
+      [
+        ( "operator"
+        , MetaInlines
+          [ Str "John", Space, Str "MacFarlane" ]
+        )
+      ]
+    }
+  )
+  [ Para
+    [ Str "This"
+    , Space
+    , Str "is"
+    , Space
+    , Str "a"
+    , Space
+    , Str "test"
+    , Space
+    , Str "of"
+    , Space
+    , Str "FORMATTING."
+    , Space
+    , Str "This"
+    , Space
+    , Str "is"
+    , Space
+    , Str "hidden:"
+    , Space
+    , Str "."
+    ]
+  , Para
+    [ SmallCaps [ Str "Small", Space, Str "Caps" ] ]
+  , Para
+    [ Strong [ Str "bold" ] ]
+  , Para
+    [ Emph [ Str "italics" ] ]
+  , Para
+    [ Strong
+      [ Str "bold", Space, Emph [ Str "and", Space, Str "italics" ] ]
+    ]
+  , Para
+    [ Underline [ Str "underlined" ] ]
+  , Para
+    [ Strikeout [ Str "strikeout" ] ]
+  , Para
+    [ Str "x", Superscript [ Str "superscript" ] ]
+  , Para
+    [ Str "x", Subscript [ Str "subscript" ] ]
+  ]
diff --git a/test/rtf/heading.native b/test/rtf/heading.native
index fbda9ef51..27d5d455e 100644
--- a/test/rtf/heading.native
+++ b/test/rtf/heading.native
@@ -1,5 +1,14 @@
-Pandoc (Meta {unMeta = fromList []})
-[Header 1 ("",[],[]) [Str "Heading",Space,Str "1"]
-,Header 2 ("",[],[]) [Str "Heading",Space,Str "2"]
-,Header 3 ("",[],[]) [Str "Heading",Space,Str "3"]
-,Para [Str "Paragraph"]]
+Pandoc
+  ( Meta { unMeta = fromList [] } )
+  [ Header 1
+    ( "", [], [] )
+    [ Str "Heading", Space, Str "1" ]
+  , Header 2
+    ( "", [], [] )
+    [ Str "Heading", Space, Str "2" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Heading", Space, Str "3" ]
+  , Para
+    [ Str "Paragraph" ]
+  ]
diff --git a/test/rtf/image.native b/test/rtf/image.native
index e730859af..551a0f95c 100644
--- a/test/rtf/image.native
+++ b/test/rtf/image.native
@@ -1,2 +1,9 @@
-Pandoc (Meta {unMeta = fromList []})
-[Para [Image ("",[],[("width","2.0in"),("height","2.0in")]) [Str "image"] ("f9d88c3dbe18f6a7f5670e994a947d51216cdf0e.jpg","")]]
+Pandoc
+  ( Meta { unMeta = fromList [] } )
+  [ Para
+    [ Image
+      ( "", [], [ ( "width", "2.0in" ), ( "height", "2.0in" ) ] )
+      [ Str "image" ]
+      ( "f9d88c3dbe18f6a7f5670e994a947d51216cdf0e.jpg", "" )
+    ]
+  ]
diff --git a/test/rtf/link.native b/test/rtf/link.native
index e9e08dc86..9902760e1 100644
--- a/test/rtf/link.native
+++ b/test/rtf/link.native
@@ -1,2 +1,5 @@
-Pandoc (Meta {unMeta = fromList []})
-[Para [Link ("",[],[]) [Str "pandoc"] ("http://pandoc.org","")]]
+Pandoc
+  ( Meta { unMeta = fromList [] } )
+  [ Para
+    [ Link ( "", [], [] ) [ Str "pandoc" ] ( "http://pandoc.org", "" ) ]
+  ]
diff --git a/test/rtf/list_complex.native b/test/rtf/list_complex.native
index 53ffdf9bd..73e2e14f8 100644
--- a/test/rtf/list_complex.native
+++ b/test/rtf/list_complex.native
@@ -1,24 +1,84 @@
-Pandoc (Meta {unMeta = fromList [("author",MetaInlines [Str "Cynthia",Space,Str "Johnson"]),("operator",MetaInlines [Str "John",Space,Str "MacFarlane"]),("title",MetaInlines [Str "Text",Space,Str "before",Space,Str "list"])]})
-[OrderedList (1,Decimal,Period)
- [[Para [Str "One"]]
- ,[Para [Str "Two"]
-  ,OrderedList (1,LowerAlpha,Period)
-   [[Para [Str "Three"]]
-   ,[Para [Str "Four"]
-    ,OrderedList (1,LowerRoman,Period)
-     [[Para [Str "Five"]]
-     ,[Para [Str "Six"]
-      ,OrderedList (1,UpperAlpha,Period)
-       [[Para [Str "Seven"]]
-       ,[Para [Str "Eight"]
-        ,OrderedList (1,UpperRoman,Period)
-         [[Para [Str "Nine"]]
-         ,[Para [Str "Ten"]
-          ,BulletList
-           [[Para [Str "Eleven"]]
-           ,[Para [Str "Twelve"]]]]]]]]]]]]]
-,Para [Str "Out",Space,Str "of",Space,Str "list!"]
-,Para [Str "Start",Space,Str "with"]
-,OrderedList (7,Decimal,Period)
- [[Para [Str "Seven",Space,Str "Start"]]
- ,[Para [Str "Eight",Space,Str "Continue"]]]]
+Pandoc
+  ( Meta
+    { unMeta = fromList
+      [
+        ( "author"
+        , MetaInlines
+          [ Str "Cynthia", Space, Str "Johnson" ]
+        )
+      ,
+        ( "operator"
+        , MetaInlines
+          [ Str "John", Space, Str "MacFarlane" ]
+        )
+      ,
+        ( "title"
+        , MetaInlines
+          [ Str "Text", Space, Str "before", Space, Str "list" ]
+        )
+      ]
+    }
+  )
+  [ OrderedList
+    ( 1, Decimal, Period )
+    [
+      [ Para [ Str "One" ] ]
+    ,
+      [ Para
+        [ Str "Two" ]
+      , OrderedList
+        ( 1, LowerAlpha, Period )
+        [
+          [ Para [ Str "Three" ] ]
+        ,
+          [ Para
+            [ Str "Four" ]
+          , OrderedList
+            ( 1, LowerRoman, Period )
+            [
+              [ Para [ Str "Five" ] ]
+            ,
+              [ Para
+                [ Str "Six" ]
+              , OrderedList
+                ( 1, UpperAlpha, Period )
+                [
+                  [ Para [ Str "Seven" ] ]
+                ,
+                  [ Para
+                    [ Str "Eight" ]
+                  , OrderedList
+                    ( 1, UpperRoman, Period )
+                    [
+                      [ Para [ Str "Nine" ] ]
+                    ,
+                      [ Para
+                        [ Str "Ten" ]
+                      , BulletList
+                        [
+                          [ Para [ Str "Eleven" ] ]
+                        ,
+                          [ Para [ Str "Twelve" ] ]
+                        ]
+                      ]
+                    ]
+                  ]
+                ]
+              ]
+            ]
+          ]
+        ]
+      ]
+    ]
+  , Para
+    [ Str "Out", Space, Str "of", Space, Str "list!" ]
+  , Para
+    [ Str "Start", Space, Str "with" ]
+  , OrderedList
+    ( 7, Decimal, Period )
+    [
+      [ Para [ Str "Seven", Space, Str "Start" ] ]
+    ,
+      [ Para [ Str "Eight", Space, Str "Continue" ] ]
+    ]
+  ]
diff --git a/test/rtf/list_simple.native b/test/rtf/list_simple.native
index 9281b285a..dc5b65b97 100644
--- a/test/rtf/list_simple.native
+++ b/test/rtf/list_simple.native
@@ -1,8 +1,11 @@
-Pandoc (Meta {unMeta = fromList []})
-[BulletList
- [[Para [Str "one"]]
- ,[Para [Str "two"]
-  ,BulletList
-   [[Para [Str "sub"]]]]]
-,BulletList
- [[Para [Str "new",Space,Str "list"]]]]
+Pandoc
+  ( Meta { unMeta = fromList [] } )
+  [ BulletList
+    [
+      [ Para [ Str "one" ] ]
+    ,
+      [ Para [ Str "two" ], BulletList [ [ Para [ Str "sub" ] ] ] ]
+    ]
+  , BulletList
+    [ [ Para [ Str "new", Space, Str "list" ] ] ]
+  ]
diff --git a/test/rtf/table_error_codes.native b/test/rtf/table_error_codes.native
index bc75d4f81..35d774065 100644
--- a/test/rtf/table_error_codes.native
+++ b/test/rtf/table_error_codes.native
@@ -1,146 +1,369 @@
-Pandoc (Meta {unMeta = fromList []})
-[Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)]
- (TableHead ("",[],[])
- [])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "Code"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "Error"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "3"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "PandocFailOnWarningError"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "4"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "PandocAppError"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "5"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "PandocTemplateError"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "6"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "PandocOptionError"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "21"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "PandocUnknownReaderError"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "22"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "PandocUnknownWriterError"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "23"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "PandocUnsupportedExtensionError"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "24"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "PandocCiteprocError"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "31"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "PandocEpubSubdirectoryError"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "43"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "PandocPDFError"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "44"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "PandocXMLError"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "47"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "PandocPDFProgramNotFoundError"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "61"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "PandocHttpError"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "62"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "PandocShouldNeverHappenError"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "63"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "PandocSomeError"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "64"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "PandocParseError"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "65"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "PandocParsecError"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "66"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "PandocMakePDFError"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "67"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "PandocSyntaxMapError"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "83"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "PandocFilterError"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "91"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "PandocMacroLoop"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "92"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "PandocUTF8DecodingError"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "93"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "PandocIpynbDecodingError"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "94"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "PandocUnsupportedCharsetError"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "97"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "PandocCouldNotFindDataFileError"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "99"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "PandocResourceNotFound"]]]])]
- (TableFoot ("",[],[])
- [])]
+Pandoc
+  ( Meta { unMeta = fromList [] } )
+  [ Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignDefault, ColWidthDefault )
+    ,
+      ( AlignDefault, ColWidthDefault )
+    ]
+    ( TableHead ( "", [], [] ) [] )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "Code" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "Error" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "3" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "PandocFailOnWarningError" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "4" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "PandocAppError" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "5" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "PandocTemplateError" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "6" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "PandocOptionError" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "21" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "PandocUnknownReaderError" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "22" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "PandocUnknownWriterError" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "23" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "PandocUnsupportedExtensionError" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "24" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "PandocCiteprocError" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "31" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "PandocEpubSubdirectoryError" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "43" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "PandocPDFError" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "44" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "PandocXMLError" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "47" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "PandocPDFProgramNotFoundError" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "61" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "PandocHttpError" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "62" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "PandocShouldNeverHappenError" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "63" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "PandocSomeError" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "64" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "PandocParseError" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "65" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "PandocParsecError" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "66" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "PandocMakePDFError" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "67" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "PandocSyntaxMapError" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "83" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "PandocFilterError" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "91" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "PandocMacroLoop" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "92" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "PandocUTF8DecodingError" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "93" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "PandocIpynbDecodingError" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "94" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "PandocUnsupportedCharsetError" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "97" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "PandocCouldNotFindDataFileError" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "99" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "PandocResourceNotFound" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  ]
diff --git a/test/rtf/table_simple.native b/test/rtf/table_simple.native
index 3cff9ac38..05e736829 100644
--- a/test/rtf/table_simple.native
+++ b/test/rtf/table_simple.native
@@ -1,31 +1,68 @@
-Pandoc (Meta {unMeta = fromList []})
-[Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)]
- (TableHead ("",[],[])
- [])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "A"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "B"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "C"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "D"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "E"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "F"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "G"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Para [Str "H"]]]])]
- (TableFoot ("",[],[])
- [])]
+Pandoc
+  ( Meta { unMeta = fromList [] } )
+  [ Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignDefault, ColWidthDefault )
+    ,
+      ( AlignDefault, ColWidthDefault )
+    ,
+      ( AlignDefault, ColWidthDefault )
+    ,
+      ( AlignDefault, ColWidthDefault )
+    ]
+    ( TableHead ( "", [], [] ) [] )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "A" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "B" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "C" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "D" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "E" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "F" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "G" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Para [ Str "H" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  ]
diff --git a/test/rtf/unicode.native b/test/rtf/unicode.native
index fc104491d..4e2340b84 100644
--- a/test/rtf/unicode.native
+++ b/test/rtf/unicode.native
@@ -1,2 +1,3 @@
-Pandoc (Meta {unMeta = fromList []})
-[Para [Str "\8220hi\8221\8216hi\8217\61623\945\228"]]
+Pandoc
+  ( Meta { unMeta = fromList [] } )
+  [ Para [ Str "\8220hi\8221\8216hi\8217\61623\945\228" ] ]
diff --git a/test/tables-rstsubset.native b/test/tables-rstsubset.native
index 2536ff954..dce2c9406 100644
--- a/test/tables-rstsubset.native
+++ b/test/tables-rstsubset.native
@@ -1,301 +1,913 @@
-[Para [Str "Simple",Space,Str "table",Space,Str "with",Space,Str "caption:"]
-,Table ("",[],[]) (Caption Nothing
- [Plain [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."]])
- [(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Right"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Left"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Center"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Default"]]]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]]])]
- (TableFoot ("",[],[])
- [])
-,Para [Str "Simple",Space,Str "table",Space,Str "without",Space,Str "caption:"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Right"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Left"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Center"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Default"]]]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]]])]
- (TableFoot ("",[],[])
- [])
-,Para [Str "Simple",Space,Str "table",Space,Str "indented",Space,Str "two",Space,Str "spaces:"]
-,Table ("",[],[]) (Caption Nothing
- [Plain [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."]])
- [(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Right"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Left"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Center"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Default"]]]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]]])]
- (TableFoot ("",[],[])
- [])
-,Para [Str "Multiline",Space,Str "table",Space,Str "with",Space,Str "caption:"]
-,Table ("",[],[]) (Caption Nothing
- [Plain [Str "Here\8217s",Space,Str "the",Space,Str "caption.",Space,Str "It",Space,Str "may",Space,Str "span",Space,Str "multiple",Space,Str "lines."]])
- [(AlignDefault,ColWidth 0.1375)
- ,(AlignDefault,ColWidth 0.125)
- ,(AlignDefault,ColWidth 0.15)
- ,(AlignDefault,ColWidth 0.3375)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Centered",SoftBreak,Str "Header"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Left",SoftBreak,Str "Aligned"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Right",SoftBreak,Str "Aligned"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Default",Space,Str "aligned"]]]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "First"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "row"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12.0"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",SoftBreak,Str "spans",Space,Str "multiple",Space,Str "lines."]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Second"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "row"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "5.0"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",Space,Str "Note",SoftBreak,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",SoftBreak,Str "rows."]]]])]
- (TableFoot ("",[],[])
- [])
-,Para [Str "Multiline",Space,Str "table",Space,Str "without",Space,Str "caption:"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidth 0.1375)
- ,(AlignDefault,ColWidth 0.125)
- ,(AlignDefault,ColWidth 0.15)
- ,(AlignDefault,ColWidth 0.3375)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Centered",SoftBreak,Str "Header"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Left",SoftBreak,Str "Aligned"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Right",SoftBreak,Str "Aligned"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Default",Space,Str "aligned"]]]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "First"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "row"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12.0"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",SoftBreak,Str "spans",Space,Str "multiple",Space,Str "lines."]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Second"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "row"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "5.0"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",Space,Str "Note",SoftBreak,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",SoftBreak,Str "rows."]]]])]
- (TableFoot ("",[],[])
- [])
-,Para [Str "Table",Space,Str "without",Space,Str "column",Space,Str "headers:"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   []
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   []
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   []
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   []]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]]])]
- (TableFoot ("",[],[])
- [])
-,Para [Str "Multiline",Space,Str "table",Space,Str "without",Space,Str "column",Space,Str "headers:"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidth 0.1375)
- ,(AlignDefault,ColWidth 0.125)
- ,(AlignDefault,ColWidth 0.15)
- ,(AlignDefault,ColWidth 0.3375)]
- (TableHead ("",[],[])
- [])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "First"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "row"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12.0"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",SoftBreak,Str "spans",Space,Str "multiple",Space,Str "lines."]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Second"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "row"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "5.0"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",Space,Str "Note",SoftBreak,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",SoftBreak,Str "rows."]]]])]
- (TableFoot ("",[],[])
- [])]
+[ Para
+  [ Str "Simple", Space, Str "table", Space, Str "with", Space, Str "caption:" ]
+, Table
+  ( "", [], [] )
+  ( Caption Nothing
+    [ Plain
+      [ Str "Demonstration"
+      , Space
+      , Str "of"
+      , Space
+      , Str "simple"
+      , Space
+      , Str "table"
+      , Space
+      , Str "syntax."
+      ]
+    ]
+  )
+  [
+    ( AlignDefault, ColWidthDefault )
+  ,
+    ( AlignDefault, ColWidthDefault )
+  ,
+    ( AlignDefault, ColWidthDefault )
+  ,
+    ( AlignDefault, ColWidthDefault )
+  ]
+  ( TableHead
+    ( "", [], [] )
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Right" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Left" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Center" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Default" ] ]
+      ]
+    ]
+  )
+  [ TableBody
+    ( "", [], [] )
+    ( RowHeadColumns 0 ) []
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      ]
+    , Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      ]
+    , Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      ]
+    ]
+  ]
+  ( TableFoot ( "", [], [] ) [] )
+, Para
+  [ Str "Simple"
+  , Space
+  , Str "table"
+  , Space
+  , Str "without"
+  , Space
+  , Str "caption:"
+  ]
+, Table
+  ( "", [], [] )
+  ( Caption Nothing [] )
+  [
+    ( AlignDefault, ColWidthDefault )
+  ,
+    ( AlignDefault, ColWidthDefault )
+  ,
+    ( AlignDefault, ColWidthDefault )
+  ,
+    ( AlignDefault, ColWidthDefault )
+  ]
+  ( TableHead
+    ( "", [], [] )
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Right" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Left" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Center" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Default" ] ]
+      ]
+    ]
+  )
+  [ TableBody
+    ( "", [], [] )
+    ( RowHeadColumns 0 ) []
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      ]
+    , Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      ]
+    , Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      ]
+    ]
+  ]
+  ( TableFoot ( "", [], [] ) [] )
+, Para
+  [ Str "Simple"
+  , Space
+  , Str "table"
+  , Space
+  , Str "indented"
+  , Space
+  , Str "two"
+  , Space
+  , Str "spaces:"
+  ]
+, Table
+  ( "", [], [] )
+  ( Caption Nothing
+    [ Plain
+      [ Str "Demonstration"
+      , Space
+      , Str "of"
+      , Space
+      , Str "simple"
+      , Space
+      , Str "table"
+      , Space
+      , Str "syntax."
+      ]
+    ]
+  )
+  [
+    ( AlignDefault, ColWidthDefault )
+  ,
+    ( AlignDefault, ColWidthDefault )
+  ,
+    ( AlignDefault, ColWidthDefault )
+  ,
+    ( AlignDefault, ColWidthDefault )
+  ]
+  ( TableHead
+    ( "", [], [] )
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Right" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Left" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Center" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Default" ] ]
+      ]
+    ]
+  )
+  [ TableBody
+    ( "", [], [] )
+    ( RowHeadColumns 0 ) []
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      ]
+    , Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      ]
+    , Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      ]
+    ]
+  ]
+  ( TableFoot ( "", [], [] ) [] )
+, Para
+  [ Str "Multiline"
+  , Space
+  , Str "table"
+  , Space
+  , Str "with"
+  , Space
+  , Str "caption:"
+  ]
+, Table
+  ( "", [], [] )
+  ( Caption Nothing
+    [ Plain
+      [ Str "Here\8217s"
+      , Space
+      , Str "the"
+      , Space
+      , Str "caption."
+      , Space
+      , Str "It"
+      , Space
+      , Str "may"
+      , Space
+      , Str "span"
+      , Space
+      , Str "multiple"
+      , Space
+      , Str "lines."
+      ]
+    ]
+  )
+  [
+    ( AlignDefault, ColWidth 0.15 )
+  ,
+    ( AlignDefault, ColWidth 0.1375 )
+  ,
+    ( AlignDefault, ColWidth 0.1625 )
+  ,
+    ( AlignDefault, ColWidth 0.35 )
+  ]
+  ( TableHead
+    ( "", [], [] )
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Centered", SoftBreak, Str "Header" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Left", SoftBreak, Str "Aligned" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Right", SoftBreak, Str "Aligned" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Default", Space, Str "aligned" ] ]
+      ]
+    ]
+  )
+  [ TableBody
+    ( "", [], [] )
+    ( RowHeadColumns 0 ) []
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "First" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "row" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12.0" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain
+          [ Str "Example"
+          , Space
+          , Str "of"
+          , Space
+          , Str "a"
+          , Space
+          , Str "row"
+          , Space
+          , Str "that"
+          , SoftBreak
+          , Str "spans"
+          , Space
+          , Str "multiple"
+          , Space
+          , Str "lines."
+          ]
+        ]
+      ]
+    , Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Second" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "row" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "5.0" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain
+          [ Str "Here\8217s"
+          , Space
+          , Str "another"
+          , Space
+          , Str "one."
+          , Space
+          , Str "Note"
+          , SoftBreak
+          , Str "the"
+          , Space
+          , Str "blank"
+          , Space
+          , Str "line"
+          , Space
+          , Str "between"
+          , SoftBreak
+          , Str "rows."
+          ]
+        ]
+      ]
+    ]
+  ]
+  ( TableFoot ( "", [], [] ) [] )
+, Para
+  [ Str "Multiline"
+  , Space
+  , Str "table"
+  , Space
+  , Str "without"
+  , Space
+  , Str "caption:"
+  ]
+, Table
+  ( "", [], [] )
+  ( Caption Nothing [] )
+  [
+    ( AlignDefault, ColWidth 0.15 )
+  ,
+    ( AlignDefault, ColWidth 0.1375 )
+  ,
+    ( AlignDefault, ColWidth 0.1625 )
+  ,
+    ( AlignDefault, ColWidth 0.35 )
+  ]
+  ( TableHead
+    ( "", [], [] )
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Centered", SoftBreak, Str "Header" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Left", SoftBreak, Str "Aligned" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Right", SoftBreak, Str "Aligned" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Default", Space, Str "aligned" ] ]
+      ]
+    ]
+  )
+  [ TableBody
+    ( "", [], [] )
+    ( RowHeadColumns 0 ) []
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "First" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "row" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12.0" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain
+          [ Str "Example"
+          , Space
+          , Str "of"
+          , Space
+          , Str "a"
+          , Space
+          , Str "row"
+          , Space
+          , Str "that"
+          , SoftBreak
+          , Str "spans"
+          , Space
+          , Str "multiple"
+          , Space
+          , Str "lines."
+          ]
+        ]
+      ]
+    , Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Second" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "row" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "5.0" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain
+          [ Str "Here\8217s"
+          , Space
+          , Str "another"
+          , Space
+          , Str "one."
+          , Space
+          , Str "Note"
+          , SoftBreak
+          , Str "the"
+          , Space
+          , Str "blank"
+          , Space
+          , Str "line"
+          , Space
+          , Str "between"
+          , SoftBreak
+          , Str "rows."
+          ]
+        ]
+      ]
+    ]
+  ]
+  ( TableFoot ( "", [], [] ) [] )
+, Para
+  [ Str "Table"
+  , Space
+  , Str "without"
+  , Space
+  , Str "column"
+  , Space
+  , Str "headers:"
+  ]
+, Table
+  ( "", [], [] )
+  ( Caption Nothing [] )
+  [
+    ( AlignDefault, ColWidthDefault )
+  ,
+    ( AlignDefault, ColWidthDefault )
+  ,
+    ( AlignDefault, ColWidthDefault )
+  ,
+    ( AlignDefault, ColWidthDefault )
+  ]
+  ( TableHead
+    ( "", [], [] )
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 ) []
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 ) []
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 ) []
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 ) []
+      ]
+    ]
+  )
+  [ TableBody
+    ( "", [], [] )
+    ( RowHeadColumns 0 ) []
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      ]
+    , Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      ]
+    , Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      ]
+    ]
+  ]
+  ( TableFoot ( "", [], [] ) [] )
+, Para
+  [ Str "Multiline"
+  , Space
+  , Str "table"
+  , Space
+  , Str "without"
+  , Space
+  , Str "column"
+  , Space
+  , Str "headers:"
+  ]
+, Table
+  ( "", [], [] )
+  ( Caption Nothing [] )
+  [
+    ( AlignDefault, ColWidth 0.15 )
+  ,
+    ( AlignDefault, ColWidth 0.1375 )
+  ,
+    ( AlignDefault, ColWidth 0.1625 )
+  ,
+    ( AlignDefault, ColWidth 0.35 )
+  ]
+  ( TableHead ( "", [], [] ) [] )
+  [ TableBody
+    ( "", [], [] )
+    ( RowHeadColumns 0 ) []
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "First" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "row" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12.0" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain
+          [ Str "Example"
+          , Space
+          , Str "of"
+          , Space
+          , Str "a"
+          , Space
+          , Str "row"
+          , Space
+          , Str "that"
+          , SoftBreak
+          , Str "spans"
+          , Space
+          , Str "multiple"
+          , Space
+          , Str "lines."
+          ]
+        ]
+      ]
+    , Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Second" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "row" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "5.0" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain
+          [ Str "Here\8217s"
+          , Space
+          , Str "another"
+          , Space
+          , Str "one."
+          , Space
+          , Str "Note"
+          , SoftBreak
+          , Str "the"
+          , Space
+          , Str "blank"
+          , Space
+          , Str "line"
+          , Space
+          , Str "between"
+          , SoftBreak
+          , Str "rows."
+          ]
+        ]
+      ]
+    ]
+  ]
+  ( TableFoot ( "", [], [] ) [] )
+]
diff --git a/test/tables.haddock b/test/tables.haddock
index fcc26d27e..e6d5c8308 100644
--- a/test/tables.haddock
+++ b/test/tables.haddock
@@ -40,33 +40,33 @@ Demonstration of simple table syntax.
 
 Multiline table with caption:
 
-+----------+---------+-----------+--------------------------+
-| Centered | Left    | Right     | Default aligned          |
-| Header   | Aligned | Aligned   |                          |
-+==========+=========+===========+==========================+
-| First    | row     | 12.0      | Example of a row that    |
-|          |         |           | spans multiple lines.    |
-+----------+---------+-----------+--------------------------+
-| Second   | row     | 5.0       | Here’s another one. Note |
-|          |         |           | the blank line between   |
-|          |         |           | rows.                    |
-+----------+---------+-----------+--------------------------+
++-----------+----------+------------+---------------------------+
+| Centered  | Left     | Right      | Default aligned           |
+| Header    | Aligned  | Aligned    |                           |
++===========+==========+============+===========================+
+| First     | row      | 12.0       | Example of a row that     |
+|           |          |            | spans multiple lines.     |
++-----------+----------+------------+---------------------------+
+| Second    | row      | 5.0        | Here’s another one. Note  |
+|           |          |            | the blank line between    |
+|           |          |            | rows.                     |
++-----------+----------+------------+---------------------------+
 
 Here’s the caption. It may span multiple lines.
 
 Multiline table without caption:
 
-+----------+---------+-----------+--------------------------+
-| Centered | Left    | Right     | Default aligned          |
-| Header   | Aligned | Aligned   |                          |
-+==========+=========+===========+==========================+
-| First    | row     | 12.0      | Example of a row that    |
-|          |         |           | spans multiple lines.    |
-+----------+---------+-----------+--------------------------+
-| Second   | row     | 5.0       | Here’s another one. Note |
-|          |         |           | the blank line between   |
-|          |         |           | rows.                    |
-+----------+---------+-----------+--------------------------+
++-----------+----------+------------+---------------------------+
+| Centered  | Left     | Right      | Default aligned           |
+| Header    | Aligned  | Aligned    |                           |
++===========+==========+============+===========================+
+| First     | row      | 12.0       | Example of a row that     |
+|           |          |            | spans multiple lines.     |
++-----------+----------+------------+---------------------------+
+| Second    | row      | 5.0        | Here’s another one. Note  |
+|           |          |            | the blank line between    |
+|           |          |            | rows.                     |
++-----------+----------+------------+---------------------------+
 
 Table without column headers:
 
@@ -80,11 +80,11 @@ Table without column headers:
 
 Multiline table without column headers:
 
-+----------+---------+-----------+--------------------------+
-| First    | row     | 12.0      | Example of a row that    |
-|          |         |           | spans multiple lines.    |
-+----------+---------+-----------+--------------------------+
-| Second   | row     | 5.0       | Here’s another one. Note |
-|          |         |           | the blank line between   |
-|          |         |           | rows.                    |
-+----------+---------+-----------+--------------------------+
++-----------+----------+------------+---------------------------+
+| First     | row      | 12.0       | Example of a row that     |
+|           |          |            | spans multiple lines.     |
++-----------+----------+------------+---------------------------+
+| Second    | row      | 5.0        | Here’s another one. Note  |
+|           |          |            | the blank line between    |
+|           |          |            | rows.                     |
++-----------+----------+------------+---------------------------+
diff --git a/test/tables.markdown b/test/tables.markdown
index 7f89bfc08..97ffd82d7 100644
--- a/test/tables.markdown
+++ b/test/tables.markdown
@@ -28,33 +28,33 @@ Simple table indented two spaces:
 
 Multiline table with caption:
 
-  --------------------------------------------------------------
+  ---------------------------------------------------------------
    Centered   Left              Right Default aligned
     Header    Aligned         Aligned 
-  ----------- ---------- ------------ --------------------------
-     First    row                12.0 Example of a row that
-                                      spans multiple lines.
+  ----------- ---------- ------------ ---------------------------
+     First    row                12.0 Example of a row that spans
+                                      multiple lines.
 
     Second    row                 5.0 Here's another one. Note
                                       the blank line between
                                       rows.
-  --------------------------------------------------------------
+  ---------------------------------------------------------------
 
   : Here's the caption. It may span multiple lines.
 
 Multiline table without caption:
 
-  --------------------------------------------------------------
+  ---------------------------------------------------------------
    Centered   Left              Right Default aligned
     Header    Aligned         Aligned 
-  ----------- ---------- ------------ --------------------------
-     First    row                12.0 Example of a row that
-                                      spans multiple lines.
+  ----------- ---------- ------------ ---------------------------
+     First    row                12.0 Example of a row that spans
+                                      multiple lines.
 
     Second    row                 5.0 Here's another one. Note
                                       the blank line between
                                       rows.
-  --------------------------------------------------------------
+  ---------------------------------------------------------------
 
 Table without column headers:
 
@@ -66,11 +66,11 @@ Table without column headers:
 
 Multiline table without column headers:
 
-  ----------- ---------- ------------ --------------------------
-     First    row                12.0 Example of a row that
-                                      spans multiple lines.
+  ----------- ---------- ------------ ---------------------------
+     First    row                12.0 Example of a row that spans
+                                      multiple lines.
 
     Second    row                 5.0 Here's another one. Note
                                       the blank line between
                                       rows.
-  ----------- ---------- ------------ --------------------------
+  ----------- ---------- ------------ ---------------------------
diff --git a/test/tables.muse b/test/tables.muse
index 98e721cf0..6b3af561d 100644
--- a/test/tables.muse
+++ b/test/tables.muse
@@ -23,24 +23,24 @@ Simple table indented two spaces:
 
 Multiline table with caption:
 
-+----------+---------+-----------+--------------------------+
-| First    | row     | 12.0      | Example of a row that    |
-|          |         |           | spans multiple lines.    |
-+----------+---------+-----------+--------------------------+
-| Second   | row     | 5.0       | Here’s another one. Note |
-|          |         |           | the blank line between   |
-|          |         |           | rows.                    |
-+----------+---------+-----------+--------------------------+
++-----------+----------+------------+---------------------------+
+| First     | row      | 12.0       | Example of a row that     |
+|           |          |            | spans multiple lines.     |
++-----------+----------+------------+---------------------------+
+| Second    | row      | 5.0        | Here’s another one. Note  |
+|           |          |            | the blank line between    |
+|           |          |            | rows.                     |
++-----------+----------+------------+---------------------------+
 Multiline table without caption:
 
-+----------+---------+-----------+--------------------------+
-| First    | row     | 12.0      | Example of a row that    |
-|          |         |           | spans multiple lines.    |
-+----------+---------+-----------+--------------------------+
-| Second   | row     | 5.0       | Here’s another one. Note |
-|          |         |           | the blank line between   |
-|          |         |           | rows.                    |
-+----------+---------+-----------+--------------------------+
++-----------+----------+------------+---------------------------+
+| First     | row      | 12.0       | Example of a row that     |
+|           |          |            | spans multiple lines.     |
++-----------+----------+------------+---------------------------+
+| Second    | row      | 5.0        | Here’s another one. Note  |
+|           |          |            | the blank line between    |
+|           |          |            | rows.                     |
++-----------+----------+------------+---------------------------+
 Table without column headers:
 
  12  | 12  | 12  | 12
@@ -49,11 +49,11 @@ Table without column headers:
 
 Multiline table without column headers:
 
-+----------+---------+-----------+--------------------------+
-| First    | row     | 12.0      | Example of a row that    |
-|          |         |           | spans multiple lines.    |
-+----------+---------+-----------+--------------------------+
-| Second   | row     | 5.0       | Here’s another one. Note |
-|          |         |           | the blank line between   |
-|          |         |           | rows.                    |
-+----------+---------+-----------+--------------------------+
++-----------+----------+------------+---------------------------+
+| First     | row      | 12.0       | Example of a row that     |
+|           |          |            | spans multiple lines.     |
++-----------+----------+------------+---------------------------+
+| Second    | row      | 5.0        | Here’s another one. Note  |
+|           |          |            | the blank line between    |
+|           |          |            | rows.                     |
++-----------+----------+------------+---------------------------+
diff --git a/test/tables.native b/test/tables.native
index dc74826e0..c3a2537cb 100644
--- a/test/tables.native
+++ b/test/tables.native
@@ -1,293 +1,891 @@
-[Para [Str "Simple",Space,Str "table",Space,Str "with",Space,Str "caption:"]
-,Table ("",[],[]) (Caption Nothing
- [Plain [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."]])
- [(AlignRight,ColWidthDefault)
- ,(AlignLeft,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Right"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Left"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Center"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Default"]]]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]]])]
- (TableFoot ("",[],[])
- [])
-,Para [Str "Simple",Space,Str "table",Space,Str "without",Space,Str "caption:"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignRight,ColWidthDefault)
- ,(AlignLeft,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Right"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Left"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Center"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Default"]]]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]]])]
- (TableFoot ("",[],[])
- [])
-,Para [Str "Simple",Space,Str "table",Space,Str "indented",Space,Str "two",Space,Str "spaces:"]
-,Table ("",[],[]) (Caption Nothing
- [Plain [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."]])
- [(AlignRight,ColWidthDefault)
- ,(AlignLeft,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Right"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Left"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Center"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Default"]]]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]]])]
- (TableFoot ("",[],[])
- [])
-,Para [Str "Multiline",Space,Str "table",Space,Str "with",Space,Str "caption:"]
-,Table ("",[],[]) (Caption Nothing
- [Plain [Str "Here\8217s",Space,Str "the",Space,Str "caption.",SoftBreak,Str "It",Space,Str "may",Space,Str "span",Space,Str "multiple",Space,Str "lines."]])
- [(AlignCenter,ColWidth 0.15)
- ,(AlignLeft,ColWidth 0.1375)
- ,(AlignRight,ColWidth 0.1625)
- ,(AlignLeft,ColWidth 0.35)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Centered",SoftBreak,Str "Header"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Left",SoftBreak,Str "Aligned"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Right",SoftBreak,Str "Aligned"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Default",Space,Str "aligned"]]]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "First"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "row"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12.0"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",SoftBreak,Str "multiple",Space,Str "lines."]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Second"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "row"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "5.0"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",Space,Str "Note",SoftBreak,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",Space,Str "rows."]]]])]
- (TableFoot ("",[],[])
- [])
-,Para [Str "Multiline",Space,Str "table",Space,Str "without",Space,Str "caption:"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignCenter,ColWidth 0.15)
- ,(AlignLeft,ColWidth 0.1375)
- ,(AlignRight,ColWidth 0.1625)
- ,(AlignLeft,ColWidth 0.35)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Centered",SoftBreak,Str "Header"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Left",SoftBreak,Str "Aligned"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Right",SoftBreak,Str "Aligned"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Default",Space,Str "aligned"]]]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "First"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "row"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12.0"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",SoftBreak,Str "multiple",Space,Str "lines."]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Second"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "row"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "5.0"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",Space,Str "Note",SoftBreak,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",Space,Str "rows."]]]])]
- (TableFoot ("",[],[])
- [])
-,Para [Str "Table",Space,Str "without",Space,Str "column",Space,Str "headers:"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignRight,ColWidthDefault)
- ,(AlignLeft,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignRight,ColWidthDefault)]
- (TableHead ("",[],[])
- [])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "123"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]]])]
- (TableFoot ("",[],[])
- [])
-,Para [Str "Multiline",Space,Str "table",Space,Str "without",Space,Str "column",Space,Str "headers:"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignCenter,ColWidth 0.15)
- ,(AlignLeft,ColWidth 0.1375)
- ,(AlignRight,ColWidth 0.1625)
- ,(AlignDefault,ColWidth 0.35)]
- (TableHead ("",[],[])
- [])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "First"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "row"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "12.0"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",SoftBreak,Str "multiple",Space,Str "lines."]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Second"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "row"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "5.0"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",Space,Str "Note",SoftBreak,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",Space,Str "rows."]]]])]
- (TableFoot ("",[],[])
- [])]
+[ Para
+  [ Str "Simple", Space, Str "table", Space, Str "with", Space, Str "caption:" ]
+, Table
+  ( "", [], [] )
+  ( Caption Nothing
+    [ Plain
+      [ Str "Demonstration"
+      , Space
+      , Str "of"
+      , Space
+      , Str "simple"
+      , Space
+      , Str "table"
+      , Space
+      , Str "syntax."
+      ]
+    ]
+  )
+  [
+    ( AlignRight, ColWidthDefault )
+  ,
+    ( AlignLeft, ColWidthDefault )
+  ,
+    ( AlignCenter, ColWidthDefault )
+  ,
+    ( AlignDefault, ColWidthDefault )
+  ]
+  ( TableHead
+    ( "", [], [] )
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Right" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Left" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Center" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Default" ] ]
+      ]
+    ]
+  )
+  [ TableBody
+    ( "", [], [] )
+    ( RowHeadColumns 0 ) []
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      ]
+    , Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      ]
+    , Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      ]
+    ]
+  ]
+  ( TableFoot ( "", [], [] ) [] )
+, Para
+  [ Str "Simple"
+  , Space
+  , Str "table"
+  , Space
+  , Str "without"
+  , Space
+  , Str "caption:"
+  ]
+, Table
+  ( "", [], [] )
+  ( Caption Nothing [] )
+  [
+    ( AlignRight, ColWidthDefault )
+  ,
+    ( AlignLeft, ColWidthDefault )
+  ,
+    ( AlignCenter, ColWidthDefault )
+  ,
+    ( AlignDefault, ColWidthDefault )
+  ]
+  ( TableHead
+    ( "", [], [] )
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Right" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Left" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Center" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Default" ] ]
+      ]
+    ]
+  )
+  [ TableBody
+    ( "", [], [] )
+    ( RowHeadColumns 0 ) []
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      ]
+    , Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      ]
+    , Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      ]
+    ]
+  ]
+  ( TableFoot ( "", [], [] ) [] )
+, Para
+  [ Str "Simple"
+  , Space
+  , Str "table"
+  , Space
+  , Str "indented"
+  , Space
+  , Str "two"
+  , Space
+  , Str "spaces:"
+  ]
+, Table
+  ( "", [], [] )
+  ( Caption Nothing
+    [ Plain
+      [ Str "Demonstration"
+      , Space
+      , Str "of"
+      , Space
+      , Str "simple"
+      , Space
+      , Str "table"
+      , Space
+      , Str "syntax."
+      ]
+    ]
+  )
+  [
+    ( AlignRight, ColWidthDefault )
+  ,
+    ( AlignLeft, ColWidthDefault )
+  ,
+    ( AlignCenter, ColWidthDefault )
+  ,
+    ( AlignDefault, ColWidthDefault )
+  ]
+  ( TableHead
+    ( "", [], [] )
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Right" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Left" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Center" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Default" ] ]
+      ]
+    ]
+  )
+  [ TableBody
+    ( "", [], [] )
+    ( RowHeadColumns 0 ) []
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      ]
+    , Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      ]
+    , Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      ]
+    ]
+  ]
+  ( TableFoot ( "", [], [] ) [] )
+, Para
+  [ Str "Multiline"
+  , Space
+  , Str "table"
+  , Space
+  , Str "with"
+  , Space
+  , Str "caption:"
+  ]
+, Table
+  ( "", [], [] )
+  ( Caption Nothing
+    [ Plain
+      [ Str "Here\8217s"
+      , Space
+      , Str "the"
+      , Space
+      , Str "caption."
+      , SoftBreak
+      , Str "It"
+      , Space
+      , Str "may"
+      , Space
+      , Str "span"
+      , Space
+      , Str "multiple"
+      , Space
+      , Str "lines."
+      ]
+    ]
+  )
+  [
+    ( AlignCenter, ColWidth 0.15 )
+  ,
+    ( AlignLeft, ColWidth 0.1375 )
+  ,
+    ( AlignRight, ColWidth 0.1625 )
+  ,
+    ( AlignLeft, ColWidth 0.35 )
+  ]
+  ( TableHead
+    ( "", [], [] )
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Centered", SoftBreak, Str "Header" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Left", SoftBreak, Str "Aligned" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Right", SoftBreak, Str "Aligned" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Default", Space, Str "aligned" ] ]
+      ]
+    ]
+  )
+  [ TableBody
+    ( "", [], [] )
+    ( RowHeadColumns 0 ) []
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "First" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "row" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12.0" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain
+          [ Str "Example"
+          , Space
+          , Str "of"
+          , Space
+          , Str "a"
+          , Space
+          , Str "row"
+          , Space
+          , Str "that"
+          , Space
+          , Str "spans"
+          , SoftBreak
+          , Str "multiple"
+          , Space
+          , Str "lines."
+          ]
+        ]
+      ]
+    , Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Second" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "row" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "5.0" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain
+          [ Str "Here\8217s"
+          , Space
+          , Str "another"
+          , Space
+          , Str "one."
+          , Space
+          , Str "Note"
+          , SoftBreak
+          , Str "the"
+          , Space
+          , Str "blank"
+          , Space
+          , Str "line"
+          , Space
+          , Str "between"
+          , Space
+          , Str "rows."
+          ]
+        ]
+      ]
+    ]
+  ]
+  ( TableFoot ( "", [], [] ) [] )
+, Para
+  [ Str "Multiline"
+  , Space
+  , Str "table"
+  , Space
+  , Str "without"
+  , Space
+  , Str "caption:"
+  ]
+, Table
+  ( "", [], [] )
+  ( Caption Nothing [] )
+  [
+    ( AlignCenter, ColWidth 0.15 )
+  ,
+    ( AlignLeft, ColWidth 0.1375 )
+  ,
+    ( AlignRight, ColWidth 0.1625 )
+  ,
+    ( AlignLeft, ColWidth 0.35 )
+  ]
+  ( TableHead
+    ( "", [], [] )
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Centered", SoftBreak, Str "Header" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Left", SoftBreak, Str "Aligned" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Right", SoftBreak, Str "Aligned" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Default", Space, Str "aligned" ] ]
+      ]
+    ]
+  )
+  [ TableBody
+    ( "", [], [] )
+    ( RowHeadColumns 0 ) []
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "First" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "row" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12.0" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain
+          [ Str "Example"
+          , Space
+          , Str "of"
+          , Space
+          , Str "a"
+          , Space
+          , Str "row"
+          , Space
+          , Str "that"
+          , Space
+          , Str "spans"
+          , SoftBreak
+          , Str "multiple"
+          , Space
+          , Str "lines."
+          ]
+        ]
+      ]
+    , Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Second" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "row" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "5.0" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain
+          [ Str "Here\8217s"
+          , Space
+          , Str "another"
+          , Space
+          , Str "one."
+          , Space
+          , Str "Note"
+          , SoftBreak
+          , Str "the"
+          , Space
+          , Str "blank"
+          , Space
+          , Str "line"
+          , Space
+          , Str "between"
+          , Space
+          , Str "rows."
+          ]
+        ]
+      ]
+    ]
+  ]
+  ( TableFoot ( "", [], [] ) [] )
+, Para
+  [ Str "Table"
+  , Space
+  , Str "without"
+  , Space
+  , Str "column"
+  , Space
+  , Str "headers:"
+  ]
+, Table
+  ( "", [], [] )
+  ( Caption Nothing [] )
+  [
+    ( AlignRight, ColWidthDefault )
+  ,
+    ( AlignLeft, ColWidthDefault )
+  ,
+    ( AlignCenter, ColWidthDefault )
+  ,
+    ( AlignRight, ColWidthDefault )
+  ]
+  ( TableHead ( "", [], [] ) [] )
+  [ TableBody
+    ( "", [], [] )
+    ( RowHeadColumns 0 ) []
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12" ] ]
+      ]
+    , Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "123" ] ]
+      ]
+    , Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "1" ] ]
+      ]
+    ]
+  ]
+  ( TableFoot ( "", [], [] ) [] )
+, Para
+  [ Str "Multiline"
+  , Space
+  , Str "table"
+  , Space
+  , Str "without"
+  , Space
+  , Str "column"
+  , Space
+  , Str "headers:"
+  ]
+, Table
+  ( "", [], [] )
+  ( Caption Nothing [] )
+  [
+    ( AlignCenter, ColWidth 0.15 )
+  ,
+    ( AlignLeft, ColWidth 0.1375 )
+  ,
+    ( AlignRight, ColWidth 0.1625 )
+  ,
+    ( AlignDefault, ColWidth 0.35 )
+  ]
+  ( TableHead ( "", [], [] ) [] )
+  [ TableBody
+    ( "", [], [] )
+    ( RowHeadColumns 0 ) []
+    [ Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "First" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "row" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "12.0" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain
+          [ Str "Example"
+          , Space
+          , Str "of"
+          , Space
+          , Str "a"
+          , Space
+          , Str "row"
+          , Space
+          , Str "that"
+          , Space
+          , Str "spans"
+          , SoftBreak
+          , Str "multiple"
+          , Space
+          , Str "lines."
+          ]
+        ]
+      ]
+    , Row
+      ( "", [], [] )
+      [ Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "Second" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "row" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain [ Str "5.0" ] ]
+      , Cell
+        ( "", [], [] ) AlignDefault
+        ( RowSpan 1 )
+        ( ColSpan 1 )
+        [ Plain
+          [ Str "Here\8217s"
+          , Space
+          , Str "another"
+          , Space
+          , Str "one."
+          , Space
+          , Str "Note"
+          , SoftBreak
+          , Str "the"
+          , Space
+          , Str "blank"
+          , Space
+          , Str "line"
+          , Space
+          , Str "between"
+          , Space
+          , Str "rows."
+          ]
+        ]
+      ]
+    ]
+  ]
+  ( TableFoot ( "", [], [] ) [] )
+]
diff --git a/test/tables.opendocument b/test/tables.opendocument
index cda121dd4..5216dc613 100644
--- a/test/tables.opendocument
+++ b/test/tables.opendocument
@@ -201,8 +201,8 @@ syntax.
 
 Multiline table with
 caption:
-Here’s the caption. It may span
-multiple lines.
+Here’s the caption. It may span multiple
+lines.
 
   
   
diff --git a/test/tables.plain b/test/tables.plain
index e46317a6f..f1d304cda 100644
--- a/test/tables.plain
+++ b/test/tables.plain
@@ -28,33 +28,33 @@ Simple table indented two spaces:
 
 Multiline table with caption:
 
-  --------------------------------------------------------------
+  ---------------------------------------------------------------
    Centered   Left              Right Default aligned
     Header    Aligned         Aligned 
-  ----------- ---------- ------------ --------------------------
-     First    row                12.0 Example of a row that
-                                      spans multiple lines.
+  ----------- ---------- ------------ ---------------------------
+     First    row                12.0 Example of a row that spans
+                                      multiple lines.
 
     Second    row                 5.0 Here’s another one. Note
                                       the blank line between
                                       rows.
-  --------------------------------------------------------------
+  ---------------------------------------------------------------
 
   : Here’s the caption. It may span multiple lines.
 
 Multiline table without caption:
 
-  --------------------------------------------------------------
+  ---------------------------------------------------------------
    Centered   Left              Right Default aligned
     Header    Aligned         Aligned 
-  ----------- ---------- ------------ --------------------------
-     First    row                12.0 Example of a row that
-                                      spans multiple lines.
+  ----------- ---------- ------------ ---------------------------
+     First    row                12.0 Example of a row that spans
+                                      multiple lines.
 
     Second    row                 5.0 Here’s another one. Note
                                       the blank line between
                                       rows.
-  --------------------------------------------------------------
+  ---------------------------------------------------------------
 
 Table without column headers:
 
@@ -66,11 +66,11 @@ Table without column headers:
 
 Multiline table without column headers:
 
-  ----------- ---------- ------------ --------------------------
-     First    row                12.0 Example of a row that
-                                      spans multiple lines.
+  ----------- ---------- ------------ ---------------------------
+     First    row                12.0 Example of a row that spans
+                                      multiple lines.
 
     Second    row                 5.0 Here’s another one. Note
                                       the blank line between
                                       rows.
-  ----------- ---------- ------------ --------------------------
+  ----------- ---------- ------------ ---------------------------
diff --git a/test/tables.rst b/test/tables.rst
index 660df61d4..4b475c0b6 100644
--- a/test/tables.rst
+++ b/test/tables.rst
@@ -36,31 +36,31 @@ Multiline table with caption:
 
 .. table:: Here’s the caption. It may span multiple lines.
 
-   +----------+---------+-----------+--------------------------+
-   | Centered | Left    | Right     | Default aligned          |
-   | Header   | Aligned | Aligned   |                          |
-   +==========+=========+===========+==========================+
-   | First    | row     | 12.0      | Example of a row that    |
-   |          |         |           | spans multiple lines.    |
-   +----------+---------+-----------+--------------------------+
-   | Second   | row     | 5.0       | Here’s another one. Note |
-   |          |         |           | the blank line between   |
-   |          |         |           | rows.                    |
-   +----------+---------+-----------+--------------------------+
+   +-----------+----------+------------+---------------------------+
+   | Centered  | Left     | Right      | Default aligned           |
+   | Header    | Aligned  | Aligned    |                           |
+   +===========+==========+============+===========================+
+   | First     | row      | 12.0       | Example of a row that     |
+   |           |          |            | spans multiple lines.     |
+   +-----------+----------+------------+---------------------------+
+   | Second    | row      | 5.0        | Here’s another one. Note  |
+   |           |          |            | the blank line between    |
+   |           |          |            | rows.                     |
+   +-----------+----------+------------+---------------------------+
 
 Multiline table without caption:
 
-+----------+---------+-----------+--------------------------+
-| Centered | Left    | Right     | Default aligned          |
-| Header   | Aligned | Aligned   |                          |
-+==========+=========+===========+==========================+
-| First    | row     | 12.0      | Example of a row that    |
-|          |         |           | spans multiple lines.    |
-+----------+---------+-----------+--------------------------+
-| Second   | row     | 5.0       | Here’s another one. Note |
-|          |         |           | the blank line between   |
-|          |         |           | rows.                    |
-+----------+---------+-----------+--------------------------+
++-----------+----------+------------+---------------------------+
+| Centered  | Left     | Right      | Default aligned           |
+| Header    | Aligned  | Aligned    |                           |
++===========+==========+============+===========================+
+| First     | row      | 12.0       | Example of a row that     |
+|           |          |            | spans multiple lines.     |
++-----------+----------+------------+---------------------------+
+| Second    | row      | 5.0        | Here’s another one. Note  |
+|           |          |            | the blank line between    |
+|           |          |            | rows.                     |
++-----------+----------+------------+---------------------------+
 
 Table without column headers:
 
@@ -72,11 +72,11 @@ Table without column headers:
 
 Multiline table without column headers:
 
-+----------+---------+-----------+--------------------------+
-| First    | row     | 12.0      | Example of a row that    |
-|          |         |           | spans multiple lines.    |
-+----------+---------+-----------+--------------------------+
-| Second   | row     | 5.0       | Here’s another one. Note |
-|          |         |           | the blank line between   |
-|          |         |           | rows.                    |
-+----------+---------+-----------+--------------------------+
++-----------+----------+------------+---------------------------+
+| First     | row      | 12.0       | Example of a row that     |
+|           |          |            | spans multiple lines.     |
++-----------+----------+------------+---------------------------+
+| Second    | row      | 5.0        | Here’s another one. Note  |
+|           |          |            | the blank line between    |
+|           |          |            | rows.                     |
++-----------+----------+------------+---------------------------+
diff --git a/test/tables/planets.latex b/test/tables/planets.latex
index b22c3adeb..1e703143d 100644
--- a/test/tables/planets.latex
+++ b/test/tables/planets.latex
@@ -18,13 +18,13 @@
 & & Earth & 5.97 & 12,756 & 5514 & 9.8 & 24.0 & 149.6 & 15 & 1 & Our world \\
 & & Mars & 0.642 & 6,792 & 3933 & 3.7 & 24.7 & 227.9 & -65 & 2 & The red
 planet \\
-\multirow{4}{*}{Jovian planets} & \multirow{2}{*}{Gas giants} & Jupiter & 1898
-& 142,984 & 1326 & 23.1 & 9.9 & 778.6 & -110 & 67 & The largest planet \\
+\multirow{4}{*}{Jovian planets} & \multirow{2}{*}{Gas giants} & Jupiter & 1898 &
+142,984 & 1326 & 23.1 & 9.9 & 778.6 & -110 & 67 & The largest planet \\
 & & Saturn & 568 & 120,536 & 687 & 9.0 & 10.7 & 1433.5 & -140 & 62 & \\
 & \multirow{2}{*}{Ice giants} & Uranus & 86.8 & 51,118 & 1271 & 8.7 & 17.2 &
 2872.5 & -195 & 27 & \\
 & & Neptune & 102 & 49,528 & 1638 & 11.0 & 16.1 & 4495.1 & -200 & 14 & \\
-\multicolumn{2}{c}{Dwarf planets} & Pluto & 0.0146 & 2,370 & 2095 & 0.7 &
-153.3 & 5906.4 & -225 & 5 & Declassified as a planet in 2006. \\
+\multicolumn{2}{c}{Dwarf planets} & Pluto & 0.0146 & 2,370 & 2095 & 0.7 & 153.3
+& 5906.4 & -225 & 5 & Declassified as a planet in 2006. \\
 \bottomrule
 \end{longtable}
diff --git a/test/testsuite.native b/test/testsuite.native
index f9132c797..d6b91ca69 100644
--- a/test/testsuite.native
+++ b/test/testsuite.native
@@ -1,409 +1,2491 @@
-Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "John",Space,Str "MacFarlane"],MetaInlines [Str "Anonymous"]]),("date",MetaInlines [Str "July",Space,Str "17,",Space,Str "2006"]),("title",MetaInlines [Str "Pandoc",Space,Str "Test",Space,Str "Suite"])]})
-[Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "set",Space,Str "of",Space,Str "tests",Space,Str "for",Space,Str "pandoc.",Space,Str "Most",Space,Str "of",Space,Str "them",Space,Str "are",Space,Str "adapted",Space,Str "from",SoftBreak,Str "John",Space,Str "Gruber\8217s",Space,Str "markdown",Space,Str "test",Space,Str "suite."]
-,HorizontalRule
-,Header 1 ("headers",[],[]) [Str "Headers"]
-,Header 2 ("level-2-with-an-embedded-link",[],[]) [Str "Level",Space,Str "2",Space,Str "with",Space,Str "an",Space,Link ("",[],[]) [Str "embedded",Space,Str "link"] ("/url","")]
-,Header 3 ("level-3-with-emphasis",[],[]) [Str "Level",Space,Str "3",Space,Str "with",Space,Emph [Str "emphasis"]]
-,Header 4 ("level-4",[],[]) [Str "Level",Space,Str "4"]
-,Header 5 ("level-5",[],[]) [Str "Level",Space,Str "5"]
-,Header 1 ("level-1",[],[]) [Str "Level",Space,Str "1"]
-,Header 2 ("level-2-with-emphasis",[],[]) [Str "Level",Space,Str "2",Space,Str "with",Space,Emph [Str "emphasis"]]
-,Header 3 ("level-3",[],[]) [Str "Level",Space,Str "3"]
-,Para [Str "with",Space,Str "no",Space,Str "blank",Space,Str "line"]
-,Header 2 ("level-2",[],[]) [Str "Level",Space,Str "2"]
-,Para [Str "with",Space,Str "no",Space,Str "blank",Space,Str "line"]
-,HorizontalRule
-,Header 1 ("paragraphs",[],[]) [Str "Paragraphs"]
-,Para [Str "Here\8217s",Space,Str "a",Space,Str "regular",Space,Str "paragraph."]
-,Para [Str "In",Space,Str "Markdown",Space,Str "1.0.0",Space,Str "and",Space,Str "earlier.",Space,Str "Version",SoftBreak,Str "8.",Space,Str "This",Space,Str "line",Space,Str "turns",Space,Str "into",Space,Str "a",Space,Str "list",Space,Str "item.",SoftBreak,Str "Because",Space,Str "a",Space,Str "hard-wrapped",Space,Str "line",Space,Str "in",Space,Str "the",SoftBreak,Str "middle",Space,Str "of",Space,Str "a",Space,Str "paragraph",Space,Str "looked",Space,Str "like",Space,Str "a",SoftBreak,Str "list",Space,Str "item."]
-,Para [Str "Here\8217s",Space,Str "one",Space,Str "with",Space,Str "a",Space,Str "bullet.",SoftBreak,Str "*",Space,Str "criminey."]
-,Para [Str "There",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "hard",Space,Str "line",Space,Str "break",LineBreak,Str "here."]
-,HorizontalRule
-,Header 1 ("block-quotes",[],[]) [Str "Block",Space,Str "Quotes"]
-,Para [Str "E-mail",Space,Str "style:"]
-,BlockQuote
- [Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "block",Space,Str "quote.",SoftBreak,Str "It",Space,Str "is",Space,Str "pretty",Space,Str "short."]]
-,BlockQuote
- [Para [Str "Code",Space,Str "in",Space,Str "a",Space,Str "block",Space,Str "quote:"]
- ,CodeBlock ("",[],[]) "sub status {\n    print \"working\";\n}"
- ,Para [Str "A",Space,Str "list:"]
- ,OrderedList (1,Decimal,Period)
-  [[Plain [Str "item",Space,Str "one"]]
-  ,[Plain [Str "item",Space,Str "two"]]]
- ,Para [Str "Nested",Space,Str "block",Space,Str "quotes:"]
- ,BlockQuote
-  [Para [Str "nested"]]
- ,BlockQuote
-  [Para [Str "nested"]]]
-,Para [Str "This",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "a",Space,Str "block",Space,Str "quote:",Space,Str "2",SoftBreak,Str ">",Space,Str "1."]
-,Para [Str "And",Space,Str "a",Space,Str "following",Space,Str "paragraph."]
-,HorizontalRule
-,Header 1 ("code-blocks",[],[]) [Str "Code",Space,Str "Blocks"]
-,Para [Str "Code:"]
-,CodeBlock ("",[],[]) "---- (should be four hyphens)\n\nsub status {\n    print \"working\";\n}\n\nthis code block is indented by one tab"
-,Para [Str "And:"]
-,CodeBlock ("",[],[]) "    this code block is indented by two tabs\n\nThese should not be escaped:  \\$ \\\\ \\> \\[ \\{"
-,HorizontalRule
-,Header 1 ("lists",[],[]) [Str "Lists"]
-,Header 2 ("unordered",[],[]) [Str "Unordered"]
-,Para [Str "Asterisks",Space,Str "tight:"]
-,BulletList
- [[Plain [Str "asterisk",Space,Str "1"]]
- ,[Plain [Str "asterisk",Space,Str "2"]]
- ,[Plain [Str "asterisk",Space,Str "3"]]]
-,Para [Str "Asterisks",Space,Str "loose:"]
-,BulletList
- [[Para [Str "asterisk",Space,Str "1"]]
- ,[Para [Str "asterisk",Space,Str "2"]]
- ,[Para [Str "asterisk",Space,Str "3"]]]
-,Para [Str "Pluses",Space,Str "tight:"]
-,BulletList
- [[Plain [Str "Plus",Space,Str "1"]]
- ,[Plain [Str "Plus",Space,Str "2"]]
- ,[Plain [Str "Plus",Space,Str "3"]]]
-,Para [Str "Pluses",Space,Str "loose:"]
-,BulletList
- [[Para [Str "Plus",Space,Str "1"]]
- ,[Para [Str "Plus",Space,Str "2"]]
- ,[Para [Str "Plus",Space,Str "3"]]]
-,Para [Str "Minuses",Space,Str "tight:"]
-,BulletList
- [[Plain [Str "Minus",Space,Str "1"]]
- ,[Plain [Str "Minus",Space,Str "2"]]
- ,[Plain [Str "Minus",Space,Str "3"]]]
-,Para [Str "Minuses",Space,Str "loose:"]
-,BulletList
- [[Para [Str "Minus",Space,Str "1"]]
- ,[Para [Str "Minus",Space,Str "2"]]
- ,[Para [Str "Minus",Space,Str "3"]]]
-,Header 2 ("ordered",[],[]) [Str "Ordered"]
-,Para [Str "Tight:"]
-,OrderedList (1,Decimal,Period)
- [[Plain [Str "First"]]
- ,[Plain [Str "Second"]]
- ,[Plain [Str "Third"]]]
-,Para [Str "and:"]
-,OrderedList (1,Decimal,Period)
- [[Plain [Str "One"]]
- ,[Plain [Str "Two"]]
- ,[Plain [Str "Three"]]]
-,Para [Str "Loose",Space,Str "using",Space,Str "tabs:"]
-,OrderedList (1,Decimal,Period)
- [[Para [Str "First"]]
- ,[Para [Str "Second"]]
- ,[Para [Str "Third"]]]
-,Para [Str "and",Space,Str "using",Space,Str "spaces:"]
-,OrderedList (1,Decimal,Period)
- [[Para [Str "One"]]
- ,[Para [Str "Two"]]
- ,[Para [Str "Three"]]]
-,Para [Str "Multiple",Space,Str "paragraphs:"]
-,OrderedList (1,Decimal,Period)
- [[Para [Str "Item",Space,Str "1,",Space,Str "graf",Space,Str "one."]
-  ,Para [Str "Item",Space,Str "1.",Space,Str "graf",Space,Str "two.",Space,Str "The",Space,Str "quick",Space,Str "brown",Space,Str "fox",Space,Str "jumped",Space,Str "over",Space,Str "the",Space,Str "lazy",Space,Str "dog\8217s",SoftBreak,Str "back."]]
- ,[Para [Str "Item",Space,Str "2."]]
- ,[Para [Str "Item",Space,Str "3."]]]
-,Header 2 ("nested",[],[]) [Str "Nested"]
-,BulletList
- [[Plain [Str "Tab"]
-  ,BulletList
-   [[Plain [Str "Tab"]
-    ,BulletList
-     [[Plain [Str "Tab"]]]]]]]
-,Para [Str "Here\8217s",Space,Str "another:"]
-,OrderedList (1,Decimal,Period)
- [[Plain [Str "First"]]
- ,[Plain [Str "Second:"]
-  ,BulletList
-   [[Plain [Str "Fee"]]
-   ,[Plain [Str "Fie"]]
-   ,[Plain [Str "Foe"]]]]
- ,[Plain [Str "Third"]]]
-,Para [Str "Same",Space,Str "thing",Space,Str "but",Space,Str "with",Space,Str "paragraphs:"]
-,OrderedList (1,Decimal,Period)
- [[Para [Str "First"]]
- ,[Para [Str "Second:"]
-  ,BulletList
-   [[Plain [Str "Fee"]]
-   ,[Plain [Str "Fie"]]
-   ,[Plain [Str "Foe"]]]]
- ,[Para [Str "Third"]]]
-,Header 2 ("tabs-and-spaces",[],[]) [Str "Tabs",Space,Str "and",Space,Str "spaces"]
-,BulletList
- [[Para [Str "this",Space,Str "is",Space,Str "a",Space,Str "list",Space,Str "item",SoftBreak,Str "indented",Space,Str "with",Space,Str "tabs"]]
- ,[Para [Str "this",Space,Str "is",Space,Str "a",Space,Str "list",Space,Str "item",SoftBreak,Str "indented",Space,Str "with",Space,Str "spaces"]
-  ,BulletList
-   [[Para [Str "this",Space,Str "is",Space,Str "an",Space,Str "example",Space,Str "list",Space,Str "item",SoftBreak,Str "indented",Space,Str "with",Space,Str "tabs"]]
-   ,[Para [Str "this",Space,Str "is",Space,Str "an",Space,Str "example",Space,Str "list",Space,Str "item",SoftBreak,Str "indented",Space,Str "with",Space,Str "spaces"]]]]]
-,Header 2 ("fancy-list-markers",[],[]) [Str "Fancy",Space,Str "list",Space,Str "markers"]
-,OrderedList (2,Decimal,TwoParens)
- [[Para [Str "begins",Space,Str "with",Space,Str "2"]]
- ,[Para [Str "and",Space,Str "now",Space,Str "3"]
-  ,Para [Str "with",Space,Str "a",Space,Str "continuation"]
-  ,OrderedList (4,LowerRoman,Period)
-   [[Plain [Str "sublist",Space,Str "with",Space,Str "roman",Space,Str "numerals,",SoftBreak,Str "starting",Space,Str "with",Space,Str "4"]]
-   ,[Plain [Str "more",Space,Str "items"]
-    ,OrderedList (1,UpperAlpha,TwoParens)
-     [[Plain [Str "a",Space,Str "subsublist"]]
-     ,[Plain [Str "a",Space,Str "subsublist"]]]]]]]
-,Para [Str "Nesting:"]
-,OrderedList (1,UpperAlpha,Period)
- [[Plain [Str "Upper",Space,Str "Alpha"]
-  ,OrderedList (1,UpperRoman,Period)
-   [[Plain [Str "Upper",Space,Str "Roman."]
-    ,OrderedList (6,Decimal,TwoParens)
-     [[Plain [Str "Decimal",Space,Str "start",Space,Str "with",Space,Str "6"]
-      ,OrderedList (3,LowerAlpha,OneParen)
-       [[Plain [Str "Lower",Space,Str "alpha",Space,Str "with",Space,Str "paren"]]]]]]]]]
-,Para [Str "Autonumbering:"]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Plain [Str "Autonumber."]]
- ,[Plain [Str "More."]
-  ,OrderedList (1,DefaultStyle,DefaultDelim)
-   [[Plain [Str "Nested."]]]]]
-,Para [Str "Should",Space,Str "not",Space,Str "be",Space,Str "a",Space,Str "list",Space,Str "item:"]
-,Para [Str "M.A.\160\&2007"]
-,Para [Str "B.",Space,Str "Williams"]
-,HorizontalRule
-,Header 1 ("definition-lists",[],[]) [Str "Definition",Space,Str "Lists"]
-,Para [Str "Tight",Space,Str "using",Space,Str "spaces:"]
-,DefinitionList
- [([Str "apple"],
-   [[Plain [Str "red",Space,Str "fruit"]]])
- ,([Str "orange"],
-   [[Plain [Str "orange",Space,Str "fruit"]]])
- ,([Str "banana"],
-   [[Plain [Str "yellow",Space,Str "fruit"]]])]
-,Para [Str "Tight",Space,Str "using",Space,Str "tabs:"]
-,DefinitionList
- [([Str "apple"],
-   [[Plain [Str "red",Space,Str "fruit"]]])
- ,([Str "orange"],
-   [[Plain [Str "orange",Space,Str "fruit"]]])
- ,([Str "banana"],
-   [[Plain [Str "yellow",Space,Str "fruit"]]])]
-,Para [Str "Loose:"]
-,DefinitionList
- [([Str "apple"],
-   [[Para [Str "red",Space,Str "fruit"]]])
- ,([Str "orange"],
-   [[Para [Str "orange",Space,Str "fruit"]]])
- ,([Str "banana"],
-   [[Para [Str "yellow",Space,Str "fruit"]]])]
-,Para [Str "Multiple",Space,Str "blocks",Space,Str "with",Space,Str "italics:"]
-,DefinitionList
- [([Emph [Str "apple"]],
-   [[Para [Str "red",Space,Str "fruit"]
-    ,Para [Str "contains",Space,Str "seeds,",SoftBreak,Str "crisp,",Space,Str "pleasant",Space,Str "to",Space,Str "taste"]]])
- ,([Emph [Str "orange"]],
-   [[Para [Str "orange",Space,Str "fruit"]
-    ,CodeBlock ("",[],[]) "{ orange code block }"
-    ,BlockQuote
-     [Para [Str "orange",Space,Str "block",Space,Str "quote"]]]])]
-,Para [Str "Multiple",Space,Str "definitions,",Space,Str "tight:"]
-,DefinitionList
- [([Str "apple"],
-   [[Plain [Str "red",Space,Str "fruit"]]
-   ,[Plain [Str "computer"]]])
- ,([Str "orange"],
-   [[Plain [Str "orange",Space,Str "fruit"]]
-   ,[Plain [Str "bank"]]])]
-,Para [Str "Multiple",Space,Str "definitions,",Space,Str "loose:"]
-,DefinitionList
- [([Str "apple"],
-   [[Para [Str "red",Space,Str "fruit"]]
-   ,[Para [Str "computer"]]])
- ,([Str "orange"],
-   [[Para [Str "orange",Space,Str "fruit"]]
-   ,[Para [Str "bank"]]])]
-,Para [Str "Blank",Space,Str "line",Space,Str "after",Space,Str "term,",Space,Str "indented",Space,Str "marker,",Space,Str "alternate",Space,Str "markers:"]
-,DefinitionList
- [([Str "apple"],
-   [[Para [Str "red",Space,Str "fruit"]]
-   ,[Para [Str "computer"]]])
- ,([Str "orange"],
-   [[Para [Str "orange",Space,Str "fruit"]
-    ,OrderedList (1,Decimal,Period)
-     [[Plain [Str "sublist"]]
-     ,[Plain [Str "sublist"]]]]])]
-,Header 1 ("html-blocks",[],[]) [Str "HTML",Space,Str "Blocks"]
-,Para [Str "Simple",Space,Str "block",Space,Str "on",Space,Str "one",Space,Str "line:"]
-,Div ("",[],[])
- [Plain [Str "foo"]]
-,Para [Str "And",Space,Str "nested",Space,Str "without",Space,Str "indentation:"]
-,Div ("",[],[])
- [Div ("",[],[])
-  [Div ("",[],[])
-   [Para [Str "foo"]]]
- ,Div ("",[],[])
-  [Plain [Str "bar"]]]
-,Para [Str "Interpreted",Space,Str "markdown",Space,Str "in",Space,Str "a",Space,Str "table:"]
-,RawBlock (Format "html") ""
-,RawBlock (Format "html") ""
-,RawBlock (Format "html") ""
-,RawBlock (Format "html") ""
-,RawBlock (Format "html") ""
-,RawBlock (Format "html") ""
-,Plain [Str "This",Space,Str "is",Space,Emph [Str "emphasized"]]
-,RawBlock (Format "html") " "
-,Plain [Str "And",Space,Str "this",Space,Str "is",Space,Strong [Str "strong"]]
-,RawBlock (Format "html") ""
-,RawBlock (Format "html") ""
-,Para [Str "Here\8217s",Space,Str "a",Space,Str "simple",Space,Str "block:"]
-,Div ("",[],[])
- [Para [Str "foo"]]
-,Para [Str "This",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "code",Space,Str "block,",Space,Str "though:"]
-,CodeBlock ("",[],[]) "\n    foo\n"
-,Para [Str "As",Space,Str "should",Space,Str "this:"]
-,CodeBlock ("",[],[]) "foo"
-,Para [Str "Now,",Space,Str "nested:"]
-,Div ("",[],[])
- [Div ("",[],[])
-  [Div ("",[],[])
-   [Plain [Str "foo"]]]]
-,Para [Str "This",Space,Str "should",Space,Str "just",Space,Str "be",Space,Str "an",Space,Str "HTML",Space,Str "comment:"]
-,RawBlock (Format "html") ""
-,Para [Str "Multiline:"]
-,RawBlock (Format "html") ""
-,RawBlock (Format "html") ""
-,Para [Str "Code",Space,Str "block:"]
-,CodeBlock ("",[],[]) ""
-,Para [Str "Just",Space,Str "plain",Space,Str "comment,",Space,Str "with",Space,Str "trailing",Space,Str "spaces",Space,Str "on",Space,Str "the",Space,Str "line:"]
-,RawBlock (Format "html") ""
-,Para [Str "Code:"]
-,CodeBlock ("",[],[]) ""
-,Para [Str "Hr\8217s:"]
-,RawBlock (Format "html") ""
-,RawBlock (Format "html") ""
-,RawBlock (Format "html") ""
-,RawBlock (Format "html") ""
-,RawBlock (Format "html") ""
-,RawBlock (Format "html") ""
-,RawBlock (Format "html") ""
-,RawBlock (Format "html") ""
-,RawBlock (Format "html") ""
-,HorizontalRule
-,Header 1 ("inline-markup",[],[]) [Str "Inline",Space,Str "Markup"]
-,Para [Str "This",Space,Str "is",Space,Emph [Str "emphasized"],Str ",",Space,Str "and",Space,Str "so",Space,Emph [Str "is",Space,Str "this"],Str "."]
-,Para [Str "This",Space,Str "is",Space,Strong [Str "strong"],Str ",",Space,Str "and",Space,Str "so",Space,Strong [Str "is",Space,Str "this"],Str "."]
-,Para [Str "An",Space,Emph [Link ("",[],[]) [Str "emphasized",Space,Str "link"] ("/url","")],Str "."]
-,Para [Strong [Emph [Str "This",Space,Str "is",Space,Str "strong",Space,Str "and",Space,Str "em."]]]
-,Para [Str "So",Space,Str "is",Space,Strong [Emph [Str "this"]],Space,Str "word."]
-,Para [Strong [Emph [Str "This",Space,Str "is",Space,Str "strong",Space,Str "and",Space,Str "em."]]]
-,Para [Str "So",Space,Str "is",Space,Strong [Emph [Str "this"]],Space,Str "word."]
-,Para [Str "This",Space,Str "is",Space,Str "code:",Space,Code ("",[],[]) ">",Str ",",Space,Code ("",[],[]) "$",Str ",",Space,Code ("",[],[]) "\\",Str ",",Space,Code ("",[],[]) "\\$",Str ",",Space,Code ("",[],[]) "",Str "."]
-,Para [Strikeout [Str "This",Space,Str "is",Space,Emph [Str "strikeout"],Str "."]]
-,Para [Str "Superscripts:",Space,Str "a",Superscript [Str "bc"],Str "d",Space,Str "a",Superscript [Emph [Str "hello"]],Space,Str "a",Superscript [Str "hello\160there"],Str "."]
-,Para [Str "Subscripts:",Space,Str "H",Subscript [Str "2"],Str "O,",Space,Str "H",Subscript [Str "23"],Str "O,",Space,Str "H",Subscript [Str "many\160of\160them"],Str "O."]
-,Para [Str "These",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "superscripts",Space,Str "or",Space,Str "subscripts,",SoftBreak,Str "because",Space,Str "of",Space,Str "the",Space,Str "unescaped",Space,Str "spaces:",Space,Str "a^b",Space,Str "c^d,",Space,Str "a~b",Space,Str "c~d."]
-,HorizontalRule
-,Header 1 ("smart-quotes-ellipses-dashes",[],[]) [Str "Smart",Space,Str "quotes,",Space,Str "ellipses,",Space,Str "dashes"]
-,Para [Quoted DoubleQuote [Str "Hello,"],Space,Str "said",Space,Str "the",Space,Str "spider.",Space,Quoted DoubleQuote [Quoted SingleQuote [Str "Shelob"],Space,Str "is",Space,Str "my",Space,Str "name."]]
-,Para [Quoted SingleQuote [Str "A"],Str ",",Space,Quoted SingleQuote [Str "B"],Str ",",Space,Str "and",Space,Quoted SingleQuote [Str "C"],Space,Str "are",Space,Str "letters."]
-,Para [Quoted SingleQuote [Str "Oak,"],Space,Quoted SingleQuote [Str "elm,"],Space,Str "and",Space,Quoted SingleQuote [Str "beech"],Space,Str "are",Space,Str "names",Space,Str "of",Space,Str "trees.",SoftBreak,Str "So",Space,Str "is",Space,Quoted SingleQuote [Str "pine."]]
-,Para [Quoted SingleQuote [Str "He",Space,Str "said,",Space,Quoted DoubleQuote [Str "I",Space,Str "want",Space,Str "to",Space,Str "go."]],Space,Str "Were",Space,Str "you",Space,Str "alive",Space,Str "in",Space,Str "the",SoftBreak,Str "70\8217s?"]
-,Para [Str "Here",Space,Str "is",Space,Str "some",Space,Str "quoted",Space,Quoted SingleQuote [Code ("",[],[]) "code"],Space,Str "and",Space,Str "a",Space,Quoted DoubleQuote [Link ("",[],[]) [Str "quoted",Space,Str "link"] ("http://example.com/?foo=1&bar=2","")],Str "."]
-,Para [Str "Some",Space,Str "dashes:",Space,Str "one\8212two",Space,Str "\8212",Space,Str "three\8212four",Space,Str "\8212",Space,Str "five."]
-,Para [Str "Dashes",Space,Str "between",Space,Str "numbers:",Space,Str "5\8211\&7,",Space,Str "255\8211\&66,",Space,Str "1987\8211\&1999."]
-,Para [Str "Ellipses\8230and\8230and\8230."]
-,HorizontalRule
-,Header 1 ("latex",[],[]) [Str "LaTeX"]
-,BulletList
- [[Plain [RawInline (Format "tex") "\\cite[22-23]{smith.1899}"]]
- ,[Plain [Math InlineMath "2+2=4"]]
- ,[Plain [Math InlineMath "x \\in y"]]
- ,[Plain [Math InlineMath "\\alpha \\wedge \\omega"]]
- ,[Plain [Math InlineMath "223"]]
- ,[Plain [Math InlineMath "p",Str "-Tree"]]
- ,[Plain [Str "Here\8217s",Space,Str "some",Space,Str "display",Space,Str "math:",SoftBreak,Math DisplayMath "\\frac{d}{dx}f(x)=\\lim_{h\\to 0}\\frac{f(x+h)-f(x)}{h}"]]
- ,[Plain [Str "Here\8217s",Space,Str "one",Space,Str "that",Space,Str "has",Space,Str "a",Space,Str "line",Space,Str "break",Space,Str "in",Space,Str "it:",Space,Math InlineMath "\\alpha + \\omega \\times x^2",Str "."]]]
-,Para [Str "These",Space,Str "shouldn\8217t",Space,Str "be",Space,Str "math:"]
-,BulletList
- [[Plain [Str "To",Space,Str "get",Space,Str "the",Space,Str "famous",Space,Str "equation,",Space,Str "write",Space,Code ("",[],[]) "$e = mc^2$",Str "."]]
- ,[Plain [Str "$22,000",Space,Str "is",Space,Str "a",Space,Emph [Str "lot"],Space,Str "of",Space,Str "money.",Space,Str "So",Space,Str "is",Space,Str "$34,000.",SoftBreak,Str "(It",Space,Str "worked",Space,Str "if",Space,Quoted DoubleQuote [Str "lot"],Space,Str "is",Space,Str "emphasized.)"]]
- ,[Plain [Str "Shoes",Space,Str "($20)",Space,Str "and",Space,Str "socks",Space,Str "($5)."]]
- ,[Plain [Str "Escaped",Space,Code ("",[],[]) "$",Str ":",Space,Str "$73",Space,Emph [Str "this",Space,Str "should",Space,Str "be",Space,Str "emphasized"],Space,Str "23$."]]]
-,Para [Str "Here\8217s",Space,Str "a",Space,Str "LaTeX",Space,Str "table:"]
-,RawBlock (Format "tex") "\\begin{tabular}{|l|l|}\\hline\nAnimal & Number \\\\ \\hline\nDog    & 2      \\\\\nCat    & 1      \\\\ \\hline\n\\end{tabular}"
-,HorizontalRule
-,Header 1 ("special-characters",[],[]) [Str "Special",Space,Str "Characters"]
-,Para [Str "Here",Space,Str "is",Space,Str "some",Space,Str "unicode:"]
-,BulletList
- [[Plain [Str "I",Space,Str "hat:",Space,Str "\206"]]
- ,[Plain [Str "o",Space,Str "umlaut:",Space,Str "\246"]]
- ,[Plain [Str "section:",Space,Str "\167"]]
- ,[Plain [Str "set",Space,Str "membership:",Space,Str "\8712"]]
- ,[Plain [Str "copyright:",Space,Str "\169"]]]
-,Para [Str "AT&T",Space,Str "has",Space,Str "an",Space,Str "ampersand",Space,Str "in",Space,Str "their",Space,Str "name."]
-,Para [Str "AT&T",Space,Str "is",Space,Str "another",Space,Str "way",Space,Str "to",Space,Str "write",Space,Str "it."]
-,Para [Str "This",Space,Str "&",Space,Str "that."]
-,Para [Str "4",Space,Str "<",Space,Str "5."]
-,Para [Str "6",Space,Str ">",Space,Str "5."]
-,Para [Str "Backslash:",Space,Str "\\"]
-,Para [Str "Backtick:",Space,Str "`"]
-,Para [Str "Asterisk:",Space,Str "*"]
-,Para [Str "Underscore:",Space,Str "_"]
-,Para [Str "Left",Space,Str "brace:",Space,Str "{"]
-,Para [Str "Right",Space,Str "brace:",Space,Str "}"]
-,Para [Str "Left",Space,Str "bracket:",Space,Str "["]
-,Para [Str "Right",Space,Str "bracket:",Space,Str "]"]
-,Para [Str "Left",Space,Str "paren:",Space,Str "("]
-,Para [Str "Right",Space,Str "paren:",Space,Str ")"]
-,Para [Str "Greater-than:",Space,Str ">"]
-,Para [Str "Hash:",Space,Str "#"]
-,Para [Str "Period:",Space,Str "."]
-,Para [Str "Bang:",Space,Str "!"]
-,Para [Str "Plus:",Space,Str "+"]
-,Para [Str "Minus:",Space,Str "-"]
-,HorizontalRule
-,Header 1 ("links",[],[]) [Str "Links"]
-,Header 2 ("explicit",[],[]) [Str "Explicit"]
-,Para [Str "Just",Space,Str "a",Space,Link ("",[],[]) [Str "URL"] ("/url/",""),Str "."]
-,Para [Link ("",[],[]) [Str "URL",Space,Str "and",Space,Str "title"] ("/url/","title"),Str "."]
-,Para [Link ("",[],[]) [Str "URL",Space,Str "and",Space,Str "title"] ("/url/","title preceded by two spaces"),Str "."]
-,Para [Link ("",[],[]) [Str "URL",Space,Str "and",Space,Str "title"] ("/url/","title preceded by a tab"),Str "."]
-,Para [Link ("",[],[]) [Str "URL",Space,Str "and",Space,Str "title"] ("/url/","title with \"quotes\" in it")]
-,Para [Link ("",[],[]) [Str "URL",Space,Str "and",Space,Str "title"] ("/url/","title with single quotes")]
-,Para [Link ("",[],[]) [Str "with_underscore"] ("/url/with_underscore","")]
-,Para [Link ("",[],[]) [Str "Email",Space,Str "link"] ("mailto:nobody@nowhere.net","")]
-,Para [Link ("",[],[]) [Str "Empty"] ("",""),Str "."]
-,Header 2 ("reference",[],[]) [Str "Reference"]
-,Para [Str "Foo",Space,Link ("",[],[]) [Str "bar"] ("/url/",""),Str "."]
-,Para [Str "With",Space,Link ("",[],[]) [Str "embedded",Space,Str "[brackets]"] ("/url/",""),Str "."]
-,Para [Link ("",[],[]) [Str "b"] ("/url/",""),Space,Str "by",Space,Str "itself",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "link."]
-,Para [Str "Indented",Space,Link ("",[],[]) [Str "once"] ("/url",""),Str "."]
-,Para [Str "Indented",Space,Link ("",[],[]) [Str "twice"] ("/url",""),Str "."]
-,Para [Str "Indented",Space,Link ("",[],[]) [Str "thrice"] ("/url",""),Str "."]
-,Para [Str "This",Space,Str "should",Space,Str "[not][]",Space,Str "be",Space,Str "a",Space,Str "link."]
-,CodeBlock ("",[],[]) "[not]: /url"
-,Para [Str "Foo",Space,Link ("",[],[]) [Str "bar"] ("/url/","Title with \"quotes\" inside"),Str "."]
-,Para [Str "Foo",Space,Link ("",[],[]) [Str "biz"] ("/url/","Title with \"quote\" inside"),Str "."]
-,Header 2 ("with-ampersands",[],[]) [Str "With",Space,Str "ampersands"]
-,Para [Str "Here\8217s",Space,Str "a",Space,Link ("",[],[]) [Str "link",Space,Str "with",Space,Str "an",Space,Str "ampersand",Space,Str "in",Space,Str "the",Space,Str "URL"] ("http://example.com/?foo=1&bar=2",""),Str "."]
-,Para [Str "Here\8217s",Space,Str "a",Space,Str "link",Space,Str "with",Space,Str "an",Space,Str "amersand",Space,Str "in",Space,Str "the",Space,Str "link",Space,Str "text:",Space,Link ("",[],[]) [Str "AT&T"] ("http://att.com/","AT&T"),Str "."]
-,Para [Str "Here\8217s",Space,Str "an",Space,Link ("",[],[]) [Str "inline",Space,Str "link"] ("/script?foo=1&bar=2",""),Str "."]
-,Para [Str "Here\8217s",Space,Str "an",Space,Link ("",[],[]) [Str "inline",Space,Str "link",Space,Str "in",Space,Str "pointy",Space,Str "braces"] ("/script?foo=1&bar=2",""),Str "."]
-,Header 2 ("autolinks",[],[]) [Str "Autolinks"]
-,Para [Str "With",Space,Str "an",Space,Str "ampersand:",Space,Link ("",["uri"],[]) [Str "http://example.com/?foo=1&bar=2"] ("http://example.com/?foo=1&bar=2","")]
-,BulletList
- [[Plain [Str "In",Space,Str "a",Space,Str "list?"]]
- ,[Plain [Link ("",["uri"],[]) [Str "http://example.com/"] ("http://example.com/","")]]
- ,[Plain [Str "It",Space,Str "should."]]]
-,Para [Str "An",Space,Str "e-mail",Space,Str "address:",Space,Link ("",["email"],[]) [Str "nobody@nowhere.net"] ("mailto:nobody@nowhere.net","")]
-,BlockQuote
- [Para [Str "Blockquoted:",Space,Link ("",["uri"],[]) [Str "http://example.com/"] ("http://example.com/","")]]
-,Para [Str "Auto-links",Space,Str "should",Space,Str "not",Space,Str "occur",Space,Str "here:",Space,Code ("",[],[]) ""]
-,CodeBlock ("",[],[]) "or here: "
-,HorizontalRule
-,Header 1 ("images",[],[]) [Str "Images"]
-,Para [Str "From",Space,Quoted DoubleQuote [Str "Voyage",Space,Str "dans",Space,Str "la",Space,Str "Lune"],Space,Str "by",Space,Str "Georges",Space,Str "Melies",Space,Str "(1902):"]
-,Para [Image ("",[],[]) [Str "lalune"] ("lalune.jpg","fig:Voyage dans la Lune")]
-,Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "movie",Space,Image ("",[],[]) [Str "movie"] ("movie.jpg",""),Space,Str "icon."]
-,HorizontalRule
-,Header 1 ("footnotes",[],[]) [Str "Footnotes"]
-,Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "footnote",Space,Str "reference,",Note [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",SoftBreak,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."]],Space,Str "and",Space,Str "another.",Note [Para [Str "Here\8217s",Space,Str "the",Space,Str "long",Space,Str "note.",Space,Str "This",Space,Str "one",Space,Str "contains",Space,Str "multiple",SoftBreak,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",SoftBreak,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",SoftBreak,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."]],SoftBreak,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",SoftBreak,Str "contains",Space,Str "a",Space,Str "space.[^my",Space,Str "note]",Space,Str "Here",Space,Str "is",Space,Str "an",Space,Str "inline",Space,Str "note.",Note [Para [Str "This",SoftBreak,Str "is",Space,Emph [Str "easier"],Space,Str "to",Space,Str "type.",Space,Str "Inline",Space,Str "notes",Space,Str "may",Space,Str "contain",SoftBreak,Link ("",[],[]) [Str "links"] ("http://google.com",""),Space,Str "and",Space,Code ("",[],[]) "]",Space,Str "verbatim",Space,Str "characters,",SoftBreak,Str "as",Space,Str "well",Space,Str "as",Space,Str "[bracketed",Space,Str "text]."]]]
-,BlockQuote
- [Para [Str "Notes",Space,Str "can",Space,Str "go",Space,Str "in",Space,Str "quotes.",Note [Para [Str "In",Space,Str "quote."]]]]
-,OrderedList (1,Decimal,Period)
- [[Plain [Str "And",Space,Str "in",Space,Str "list",Space,Str "items.",Note [Para [Str "In",Space,Str "list."]]]]]
-,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."]]
+Pandoc
+  ( Meta
+    { unMeta = fromList
+      [
+        ( "author"
+        , MetaList
+          [ MetaInlines
+            [ Str "John", Space, Str "MacFarlane" ]
+          , MetaInlines
+            [ Str "Anonymous" ]
+          ]
+        )
+      ,
+        ( "date"
+        , MetaInlines
+          [ Str "July", Space, Str "17,", Space, Str "2006" ]
+        )
+      ,
+        ( "title"
+        , MetaInlines
+          [ Str "Pandoc", Space, Str "Test", Space, Str "Suite" ]
+        )
+      ]
+    }
+  )
+  [ Para
+    [ Str "This"
+    , Space
+    , Str "is"
+    , Space
+    , Str "a"
+    , Space
+    , Str "set"
+    , Space
+    , Str "of"
+    , Space
+    , Str "tests"
+    , Space
+    , Str "for"
+    , Space
+    , Str "pandoc."
+    , Space
+    , Str "Most"
+    , Space
+    , Str "of"
+    , Space
+    , Str "them"
+    , Space
+    , Str "are"
+    , Space
+    , Str "adapted"
+    , Space
+    , Str "from"
+    , SoftBreak
+    , Str "John"
+    , Space
+    , Str "Gruber\8217s"
+    , Space
+    , Str "markdown"
+    , Space
+    , Str "test"
+    , Space
+    , Str "suite."
+    ]
+  , HorizontalRule
+  , Header 1
+    ( "headers", [], [] )
+    [ Str "Headers" ]
+  , Header 2
+    ( "level-2-with-an-embedded-link", [], [] )
+    [ Str "Level"
+    , Space
+    , Str "2"
+    , Space
+    , Str "with"
+    , Space
+    , Str "an"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "embedded", Space, Str "link" ]
+      ( "/url", "" )
+    ]
+  , Header 3
+    ( "level-3-with-emphasis", [], [] )
+    [ Str "Level"
+    , Space
+    , Str "3"
+    , Space
+    , Str "with"
+    , Space
+    , Emph
+      [ Str "emphasis" ]
+    ]
+  , Header 4
+    ( "level-4", [], [] )
+    [ Str "Level", Space, Str "4" ]
+  , Header 5
+    ( "level-5", [], [] )
+    [ Str "Level", Space, Str "5" ]
+  , Header 1
+    ( "level-1", [], [] )
+    [ Str "Level", Space, Str "1" ]
+  , Header 2
+    ( "level-2-with-emphasis", [], [] )
+    [ Str "Level"
+    , Space
+    , Str "2"
+    , Space
+    , Str "with"
+    , Space
+    , Emph
+      [ Str "emphasis" ]
+    ]
+  , Header 3
+    ( "level-3", [], [] )
+    [ Str "Level", Space, Str "3" ]
+  , Para
+    [ Str "with"
+    , Space
+    , Str "no"
+    , Space
+    , Str "blank"
+    , Space
+    , Str "line"
+    ]
+  , Header 2
+    ( "level-2", [], [] )
+    [ Str "Level", Space, Str "2" ]
+  , Para
+    [ Str "with"
+    , Space
+    , Str "no"
+    , Space
+    , Str "blank"
+    , Space
+    , Str "line"
+    ]
+  , HorizontalRule
+  , Header 1
+    ( "paragraphs", [], [] )
+    [ Str "Paragraphs" ]
+  , Para
+    [ Str "Here\8217s"
+    , Space
+    , Str "a"
+    , Space
+    , Str "regular"
+    , Space
+    , Str "paragraph."
+    ]
+  , Para
+    [ Str "In"
+    , Space
+    , Str "Markdown"
+    , Space
+    , Str "1.0.0"
+    , Space
+    , Str "and"
+    , Space
+    , Str "earlier."
+    , Space
+    , Str "Version"
+    , SoftBreak
+    , Str "8."
+    , Space
+    , Str "This"
+    , Space
+    , Str "line"
+    , Space
+    , Str "turns"
+    , Space
+    , Str "into"
+    , Space
+    , Str "a"
+    , Space
+    , Str "list"
+    , Space
+    , Str "item."
+    , SoftBreak
+    , Str "Because"
+    , Space
+    , Str "a"
+    , Space
+    , Str "hard-wrapped"
+    , Space
+    , Str "line"
+    , Space
+    , Str "in"
+    , Space
+    , Str "the"
+    , SoftBreak
+    , Str "middle"
+    , Space
+    , Str "of"
+    , Space
+    , Str "a"
+    , Space
+    , Str "paragraph"
+    , Space
+    , Str "looked"
+    , Space
+    , Str "like"
+    , Space
+    , Str "a"
+    , SoftBreak
+    , Str "list"
+    , Space
+    , Str "item."
+    ]
+  , Para
+    [ Str "Here\8217s"
+    , Space
+    , Str "one"
+    , Space
+    , Str "with"
+    , Space
+    , Str "a"
+    , Space
+    , Str "bullet."
+    , SoftBreak
+    , Str "*"
+    , Space
+    , Str "criminey."
+    ]
+  , Para
+    [ Str "There"
+    , Space
+    , Str "should"
+    , Space
+    , Str "be"
+    , Space
+    , Str "a"
+    , Space
+    , Str "hard"
+    , Space
+    , Str "line"
+    , Space
+    , Str "break"
+    , LineBreak
+    , Str "here."
+    ]
+  , HorizontalRule
+  , Header 1
+    ( "block-quotes", [], [] )
+    [ Str "Block", Space, Str "Quotes" ]
+  , Para
+    [ Str "E-mail", Space, Str "style:" ]
+  , BlockQuote
+    [ Para
+      [ Str "This"
+      , Space
+      , Str "is"
+      , Space
+      , Str "a"
+      , Space
+      , Str "block"
+      , Space
+      , Str "quote."
+      , SoftBreak
+      , Str "It"
+      , Space
+      , Str "is"
+      , Space
+      , Str "pretty"
+      , Space
+      , Str "short."
+      ]
+    ]
+  , BlockQuote
+    [ Para
+      [ Str "Code"
+      , Space
+      , Str "in"
+      , Space
+      , Str "a"
+      , Space
+      , Str "block"
+      , Space
+      , Str "quote:"
+      ]
+    , CodeBlock
+      ( "", [], [] ) "sub status {\n    print \"working\";\n}"
+    , Para
+      [ Str "A", Space, Str "list:" ]
+    , OrderedList
+      ( 1, Decimal, Period )
+      [
+        [ Plain [ Str "item", Space, Str "one" ] ]
+      ,
+        [ Plain [ Str "item", Space, Str "two" ] ]
+      ]
+    , Para
+      [ Str "Nested", Space, Str "block", Space, Str "quotes:" ]
+    , BlockQuote
+      [ Para [ Str "nested" ] ]
+    , BlockQuote
+      [ Para [ Str "nested" ] ]
+    ]
+  , Para
+    [ Str "This"
+    , Space
+    , Str "should"
+    , Space
+    , Str "not"
+    , Space
+    , Str "be"
+    , Space
+    , Str "a"
+    , Space
+    , Str "block"
+    , Space
+    , Str "quote:"
+    , Space
+    , Str "2"
+    , SoftBreak
+    , Str ">"
+    , Space
+    , Str "1."
+    ]
+  , Para
+    [ Str "And"
+    , Space
+    , Str "a"
+    , Space
+    , Str "following"
+    , Space
+    , Str "paragraph."
+    ]
+  , HorizontalRule
+  , Header 1
+    ( "code-blocks", [], [] )
+    [ Str "Code", Space, Str "Blocks" ]
+  , Para
+    [ Str "Code:" ]
+  , CodeBlock
+    ( ""
+    , []
+    , []
+    ) "---- (should be four hyphens)\n\nsub status {\n    print \"working\";\n}\n\nthis code block is indented by one tab"
+  , Para
+    [ Str "And:" ]
+  , CodeBlock
+    ( ""
+    , []
+    , []
+    ) "    this code block is indented by two tabs\n\nThese should not be escaped:  \\$ \\\\ \\> \\[ \\{"
+  , HorizontalRule
+  , Header 1
+    ( "lists", [], [] )
+    [ Str "Lists" ]
+  , Header 2
+    ( "unordered", [], [] )
+    [ Str "Unordered" ]
+  , Para
+    [ Str "Asterisks", Space, Str "tight:" ]
+  , BulletList
+    [
+      [ Plain [ Str "asterisk", Space, Str "1" ] ]
+    ,
+      [ Plain [ Str "asterisk", Space, Str "2" ] ]
+    ,
+      [ Plain [ Str "asterisk", Space, Str "3" ] ]
+    ]
+  , Para
+    [ Str "Asterisks", Space, Str "loose:" ]
+  , BulletList
+    [
+      [ Para [ Str "asterisk", Space, Str "1" ] ]
+    ,
+      [ Para [ Str "asterisk", Space, Str "2" ] ]
+    ,
+      [ Para [ Str "asterisk", Space, Str "3" ] ]
+    ]
+  , Para
+    [ Str "Pluses", Space, Str "tight:" ]
+  , BulletList
+    [
+      [ Plain [ Str "Plus", Space, Str "1" ] ]
+    ,
+      [ Plain [ Str "Plus", Space, Str "2" ] ]
+    ,
+      [ Plain [ Str "Plus", Space, Str "3" ] ]
+    ]
+  , Para
+    [ Str "Pluses", Space, Str "loose:" ]
+  , BulletList
+    [
+      [ Para [ Str "Plus", Space, Str "1" ] ]
+    ,
+      [ Para [ Str "Plus", Space, Str "2" ] ]
+    ,
+      [ Para [ Str "Plus", Space, Str "3" ] ]
+    ]
+  , Para
+    [ Str "Minuses", Space, Str "tight:" ]
+  , BulletList
+    [
+      [ Plain [ Str "Minus", Space, Str "1" ] ]
+    ,
+      [ Plain [ Str "Minus", Space, Str "2" ] ]
+    ,
+      [ Plain [ Str "Minus", Space, Str "3" ] ]
+    ]
+  , Para
+    [ Str "Minuses", Space, Str "loose:" ]
+  , BulletList
+    [
+      [ Para [ Str "Minus", Space, Str "1" ] ]
+    ,
+      [ Para [ Str "Minus", Space, Str "2" ] ]
+    ,
+      [ Para [ Str "Minus", Space, Str "3" ] ]
+    ]
+  , Header 2
+    ( "ordered", [], [] )
+    [ Str "Ordered" ]
+  , Para
+    [ Str "Tight:" ]
+  , OrderedList
+    ( 1, Decimal, Period )
+    [
+      [ Plain [ Str "First" ] ]
+    ,
+      [ Plain [ Str "Second" ] ]
+    ,
+      [ Plain [ Str "Third" ] ]
+    ]
+  , Para
+    [ Str "and:" ]
+  , OrderedList
+    ( 1, Decimal, Period )
+    [
+      [ Plain [ Str "One" ] ]
+    ,
+      [ Plain [ Str "Two" ] ]
+    ,
+      [ Plain [ Str "Three" ] ]
+    ]
+  , Para
+    [ Str "Loose", Space, Str "using", Space, Str "tabs:" ]
+  , OrderedList
+    ( 1, Decimal, Period )
+    [
+      [ Para [ Str "First" ] ]
+    ,
+      [ Para [ Str "Second" ] ]
+    ,
+      [ Para [ Str "Third" ] ]
+    ]
+  , Para
+    [ Str "and", Space, Str "using", Space, Str "spaces:" ]
+  , OrderedList
+    ( 1, Decimal, Period )
+    [
+      [ Para [ Str "One" ] ]
+    ,
+      [ Para [ Str "Two" ] ]
+    ,
+      [ Para [ Str "Three" ] ]
+    ]
+  , Para
+    [ Str "Multiple", Space, Str "paragraphs:" ]
+  , OrderedList
+    ( 1, Decimal, Period )
+    [
+      [ Para
+        [ Str "Item"
+        , Space
+        , Str "1,"
+        , Space
+        , Str "graf"
+        , Space
+        , Str "one."
+        ]
+      , Para
+        [ Str "Item"
+        , Space
+        , Str "1."
+        , Space
+        , Str "graf"
+        , Space
+        , Str "two."
+        , Space
+        , Str "The"
+        , Space
+        , Str "quick"
+        , Space
+        , Str "brown"
+        , Space
+        , Str "fox"
+        , Space
+        , Str "jumped"
+        , Space
+        , Str "over"
+        , Space
+        , Str "the"
+        , Space
+        , Str "lazy"
+        , Space
+        , Str "dog\8217s"
+        , SoftBreak
+        , Str "back."
+        ]
+      ]
+    ,
+      [ Para [ Str "Item", Space, Str "2." ] ]
+    ,
+      [ Para [ Str "Item", Space, Str "3." ] ]
+    ]
+  , Header 2
+    ( "nested", [], [] )
+    [ Str "Nested" ]
+  , BulletList
+    [
+      [ Plain
+        [ Str "Tab" ]
+      , BulletList
+        [
+          [ Plain
+            [ Str "Tab" ]
+          , BulletList
+            [ [ Plain [ Str "Tab" ] ] ]
+          ]
+        ]
+      ]
+    ]
+  , Para
+    [ Str "Here\8217s", Space, Str "another:" ]
+  , OrderedList
+    ( 1, Decimal, Period )
+    [
+      [ Plain [ Str "First" ] ]
+    ,
+      [ Plain
+        [ Str "Second:" ]
+      , BulletList
+        [
+          [ Plain [ Str "Fee" ] ]
+        ,
+          [ Plain [ Str "Fie" ] ]
+        ,
+          [ Plain [ Str "Foe" ] ]
+        ]
+      ]
+    ,
+      [ Plain [ Str "Third" ] ]
+    ]
+  , Para
+    [ Str "Same"
+    , Space
+    , Str "thing"
+    , Space
+    , Str "but"
+    , Space
+    , Str "with"
+    , Space
+    , Str "paragraphs:"
+    ]
+  , OrderedList
+    ( 1, Decimal, Period )
+    [
+      [ Para [ Str "First" ] ]
+    ,
+      [ Para
+        [ Str "Second:" ]
+      , BulletList
+        [
+          [ Plain [ Str "Fee" ] ]
+        ,
+          [ Plain [ Str "Fie" ] ]
+        ,
+          [ Plain [ Str "Foe" ] ]
+        ]
+      ]
+    ,
+      [ Para [ Str "Third" ] ]
+    ]
+  , Header 2
+    ( "tabs-and-spaces", [], [] )
+    [ Str "Tabs", Space, Str "and", Space, Str "spaces" ]
+  , BulletList
+    [
+      [ Para
+        [ Str "this"
+        , Space
+        , Str "is"
+        , Space
+        , Str "a"
+        , Space
+        , Str "list"
+        , Space
+        , Str "item"
+        , SoftBreak
+        , Str "indented"
+        , Space
+        , Str "with"
+        , Space
+        , Str "tabs"
+        ]
+      ]
+    ,
+      [ Para
+        [ Str "this"
+        , Space
+        , Str "is"
+        , Space
+        , Str "a"
+        , Space
+        , Str "list"
+        , Space
+        , Str "item"
+        , SoftBreak
+        , Str "indented"
+        , Space
+        , Str "with"
+        , Space
+        , Str "spaces"
+        ]
+      , BulletList
+        [
+          [ Para
+            [ Str "this"
+            , Space
+            , Str "is"
+            , Space
+            , Str "an"
+            , Space
+            , Str "example"
+            , Space
+            , Str "list"
+            , Space
+            , Str "item"
+            , SoftBreak
+            , Str "indented"
+            , Space
+            , Str "with"
+            , Space
+            , Str "tabs"
+            ]
+          ]
+        ,
+          [ Para
+            [ Str "this"
+            , Space
+            , Str "is"
+            , Space
+            , Str "an"
+            , Space
+            , Str "example"
+            , Space
+            , Str "list"
+            , Space
+            , Str "item"
+            , SoftBreak
+            , Str "indented"
+            , Space
+            , Str "with"
+            , Space
+            , Str "spaces"
+            ]
+          ]
+        ]
+      ]
+    ]
+  , Header 2
+    ( "fancy-list-markers", [], [] )
+    [ Str "Fancy", Space, Str "list", Space, Str "markers" ]
+  , OrderedList
+    ( 2, Decimal, TwoParens )
+    [
+      [ Para [ Str "begins", Space, Str "with", Space, Str "2" ] ]
+    ,
+      [ Para
+        [ Str "and", Space, Str "now", Space, Str "3" ]
+      , Para
+        [ Str "with", Space, Str "a", Space, Str "continuation" ]
+      , OrderedList
+        ( 4, LowerRoman, Period )
+        [
+          [ Plain
+            [ Str "sublist"
+            , Space
+            , Str "with"
+            , Space
+            , Str "roman"
+            , Space
+            , Str "numerals,"
+            , SoftBreak
+            , Str "starting"
+            , Space
+            , Str "with"
+            , Space
+            , Str "4"
+            ]
+          ]
+        ,
+          [ Plain
+            [ Str "more", Space, Str "items" ]
+          , OrderedList
+            ( 1, UpperAlpha, TwoParens )
+            [
+              [ Plain [ Str "a", Space, Str "subsublist" ] ]
+            ,
+              [ Plain [ Str "a", Space, Str "subsublist" ] ]
+            ]
+          ]
+        ]
+      ]
+    ]
+  , Para
+    [ Str "Nesting:" ]
+  , OrderedList
+    ( 1, UpperAlpha, Period )
+    [
+      [ Plain
+        [ Str "Upper", Space, Str "Alpha" ]
+      , OrderedList
+        ( 1, UpperRoman, Period )
+        [
+          [ Plain
+            [ Str "Upper", Space, Str "Roman." ]
+          , OrderedList
+            ( 6, Decimal, TwoParens )
+            [
+              [ Plain
+                [ Str "Decimal"
+                , Space
+                , Str "start"
+                , Space
+                , Str "with"
+                , Space
+                , Str "6"
+                ]
+              , OrderedList
+                ( 3, LowerAlpha, OneParen )
+                [
+                  [ Plain
+                    [ Str "Lower"
+                    , Space
+                    , Str "alpha"
+                    , Space
+                    , Str "with"
+                    , Space
+                    , Str "paren"
+                    ]
+                  ]
+                ]
+              ]
+            ]
+          ]
+        ]
+      ]
+    ]
+  , Para
+    [ Str "Autonumbering:" ]
+  , OrderedList
+    ( 1, DefaultStyle, DefaultDelim )
+    [
+      [ Plain [ Str "Autonumber." ] ]
+    ,
+      [ Plain
+        [ Str "More." ]
+      , OrderedList
+        ( 1, DefaultStyle, DefaultDelim )
+        [ [ Plain [ Str "Nested." ] ] ]
+      ]
+    ]
+  , Para
+    [ Str "Should"
+    , Space
+    , Str "not"
+    , Space
+    , Str "be"
+    , Space
+    , Str "a"
+    , Space
+    , Str "list"
+    , Space
+    , Str "item:"
+    ]
+  , Para
+    [ Str "M.A.\160\&2007" ]
+  , Para
+    [ Str "B.", Space, Str "Williams" ]
+  , HorizontalRule
+  , Header 1
+    ( "definition-lists", [], [] )
+    [ Str "Definition", Space, Str "Lists" ]
+  , Para
+    [ Str "Tight", Space, Str "using", Space, Str "spaces:" ]
+  , DefinitionList
+    [
+      (
+        [ Str "apple" ]
+      ,
+        [ [ Plain [ Str "red", Space, Str "fruit" ] ] ]
+      )
+    ,
+      (
+        [ Str "orange" ]
+      ,
+        [ [ Plain [ Str "orange", Space, Str "fruit" ] ] ]
+      )
+    ,
+      (
+        [ Str "banana" ]
+      ,
+        [ [ Plain [ Str "yellow", Space, Str "fruit" ] ] ]
+      )
+    ]
+  , Para
+    [ Str "Tight", Space, Str "using", Space, Str "tabs:" ]
+  , DefinitionList
+    [
+      (
+        [ Str "apple" ]
+      ,
+        [ [ Plain [ Str "red", Space, Str "fruit" ] ] ]
+      )
+    ,
+      (
+        [ Str "orange" ]
+      ,
+        [ [ Plain [ Str "orange", Space, Str "fruit" ] ] ]
+      )
+    ,
+      (
+        [ Str "banana" ]
+      ,
+        [ [ Plain [ Str "yellow", Space, Str "fruit" ] ] ]
+      )
+    ]
+  , Para
+    [ Str "Loose:" ]
+  , DefinitionList
+    [
+      (
+        [ Str "apple" ]
+      ,
+        [ [ Para [ Str "red", Space, Str "fruit" ] ] ]
+      )
+    ,
+      (
+        [ Str "orange" ]
+      ,
+        [ [ Para [ Str "orange", Space, Str "fruit" ] ] ]
+      )
+    ,
+      (
+        [ Str "banana" ]
+      ,
+        [ [ Para [ Str "yellow", Space, Str "fruit" ] ] ]
+      )
+    ]
+  , Para
+    [ Str "Multiple"
+    , Space
+    , Str "blocks"
+    , Space
+    , Str "with"
+    , Space
+    , Str "italics:"
+    ]
+  , DefinitionList
+    [
+      (
+        [ Emph [ Str "apple" ] ]
+      ,
+        [
+          [ Para
+            [ Str "red", Space, Str "fruit" ]
+          , Para
+            [ Str "contains"
+            , Space
+            , Str "seeds,"
+            , SoftBreak
+            , Str "crisp,"
+            , Space
+            , Str "pleasant"
+            , Space
+            , Str "to"
+            , Space
+            , Str "taste"
+            ]
+          ]
+        ]
+      )
+    ,
+      (
+        [ Emph [ Str "orange" ] ]
+      ,
+        [
+          [ Para
+            [ Str "orange", Space, Str "fruit" ]
+          , CodeBlock
+            ( "", [], [] ) "{ orange code block }"
+          , BlockQuote
+            [ Para
+              [ Str "orange", Space, Str "block", Space, Str "quote" ]
+            ]
+          ]
+        ]
+      )
+    ]
+  , Para
+    [ Str "Multiple", Space, Str "definitions,", Space, Str "tight:" ]
+  , DefinitionList
+    [
+      (
+        [ Str "apple" ]
+      ,
+        [
+          [ Plain [ Str "red", Space, Str "fruit" ] ]
+        ,
+          [ Plain [ Str "computer" ] ]
+        ]
+      )
+    ,
+      (
+        [ Str "orange" ]
+      ,
+        [
+          [ Plain [ Str "orange", Space, Str "fruit" ] ]
+        ,
+          [ Plain [ Str "bank" ] ]
+        ]
+      )
+    ]
+  , Para
+    [ Str "Multiple", Space, Str "definitions,", Space, Str "loose:" ]
+  , DefinitionList
+    [
+      (
+        [ Str "apple" ]
+      ,
+        [
+          [ Para [ Str "red", Space, Str "fruit" ] ]
+        ,
+          [ Para [ Str "computer" ] ]
+        ]
+      )
+    ,
+      (
+        [ Str "orange" ]
+      ,
+        [
+          [ Para [ Str "orange", Space, Str "fruit" ] ]
+        ,
+          [ Para [ Str "bank" ] ]
+        ]
+      )
+    ]
+  , Para
+    [ Str "Blank"
+    , Space
+    , Str "line"
+    , Space
+    , Str "after"
+    , Space
+    , Str "term,"
+    , Space
+    , Str "indented"
+    , Space
+    , Str "marker,"
+    , Space
+    , Str "alternate"
+    , Space
+    , Str "markers:"
+    ]
+  , DefinitionList
+    [
+      (
+        [ Str "apple" ]
+      ,
+        [
+          [ Para [ Str "red", Space, Str "fruit" ] ]
+        ,
+          [ Para [ Str "computer" ] ]
+        ]
+      )
+    ,
+      (
+        [ Str "orange" ]
+      ,
+        [
+          [ Para
+            [ Str "orange", Space, Str "fruit" ]
+          , OrderedList
+            ( 1, Decimal, Period )
+            [ [ Plain [ Str "sublist" ] ], [ Plain [ Str "sublist" ] ] ]
+          ]
+        ]
+      )
+    ]
+  , Header 1
+    ( "html-blocks", [], [] )
+    [ Str "HTML", Space, Str "Blocks" ]
+  , Para
+    [ Str "Simple"
+    , Space
+    , Str "block"
+    , Space
+    , Str "on"
+    , Space
+    , Str "one"
+    , Space
+    , Str "line:"
+    ]
+  , Div
+    ( "", [], [] )
+    [ Plain [ Str "foo" ] ]
+  , Para
+    [ Str "And"
+    , Space
+    , Str "nested"
+    , Space
+    , Str "without"
+    , Space
+    , Str "indentation:"
+    ]
+  , Div
+    ( "", [], [] )
+    [ Div
+      ( "", [], [] )
+      [ Div ( "", [], [] ) [ Para [ Str "foo" ] ] ]
+    , Div
+      ( "", [], [] )
+      [ Plain [ Str "bar" ] ]
+    ]
+  , Para
+    [ Str "Interpreted"
+    , Space
+    , Str "markdown"
+    , Space
+    , Str "in"
+    , Space
+    , Str "a"
+    , Space
+    , Str "table:"
+    ]
+  , RawBlock
+    ( Format "html" ) ""
+  , RawBlock
+    ( Format "html" ) ""
+  , RawBlock
+    ( Format "html" ) ""
+  , RawBlock
+    ( Format "html" ) ""
+  , RawBlock
+    ( Format "html" ) ""
+  , RawBlock
+    ( Format "html" ) ""
+  , Plain
+    [ Str "This", Space, Str "is", Space, Emph [ Str "emphasized" ] ]
+  , RawBlock
+    ( Format "html" ) " "
+  , Plain
+    [ Str "And"
+    , Space
+    , Str "this"
+    , Space
+    , Str "is"
+    , Space
+    , Strong
+      [ Str "strong" ]
+    ]
+  , RawBlock
+    ( Format "html" ) ""
+  , RawBlock
+    ( Format "html" ) ""
+  , Para
+    [ Str "Here\8217s"
+    , Space
+    , Str "a"
+    , Space
+    , Str "simple"
+    , Space
+    , Str "block:"
+    ]
+  , Div
+    ( "", [], [] )
+    [ Para [ Str "foo" ] ]
+  , Para
+    [ Str "This"
+    , Space
+    , Str "should"
+    , Space
+    , Str "be"
+    , Space
+    , Str "a"
+    , Space
+    , Str "code"
+    , Space
+    , Str "block,"
+    , Space
+    , Str "though:"
+    ]
+  , CodeBlock
+    ( "", [], [] ) "\n    foo\n"
+  , Para
+    [ Str "As", Space, Str "should", Space, Str "this:" ]
+  , CodeBlock
+    ( "", [], [] ) "foo"
+  , Para
+    [ Str "Now,", Space, Str "nested:" ]
+  , Div
+    ( "", [], [] )
+    [ Div
+      ( "", [], [] )
+      [ Div ( "", [], [] ) [ Plain [ Str "foo" ] ] ]
+    ]
+  , Para
+    [ Str "This"
+    , Space
+    , Str "should"
+    , Space
+    , Str "just"
+    , Space
+    , Str "be"
+    , Space
+    , Str "an"
+    , Space
+    , Str "HTML"
+    , Space
+    , Str "comment:"
+    ]
+  , RawBlock
+    ( Format "html" ) ""
+  , Para
+    [ Str "Multiline:" ]
+  , RawBlock
+    ( Format "html" ) ""
+  , RawBlock
+    ( Format "html" ) ""
+  , Para
+    [ Str "Code", Space, Str "block:" ]
+  , CodeBlock
+    ( "", [], [] ) ""
+  , Para
+    [ Str "Just"
+    , Space
+    , Str "plain"
+    , Space
+    , Str "comment,"
+    , Space
+    , Str "with"
+    , Space
+    , Str "trailing"
+    , Space
+    , Str "spaces"
+    , Space
+    , Str "on"
+    , Space
+    , Str "the"
+    , Space
+    , Str "line:"
+    ]
+  , RawBlock
+    ( Format "html" ) ""
+  , Para
+    [ Str "Code:" ]
+  , CodeBlock
+    ( "", [], [] ) ""
+  , Para
+    [ Str "Hr\8217s:" ]
+  , RawBlock
+    ( Format "html" ) ""
+  , RawBlock
+    ( Format "html" ) ""
+  , RawBlock
+    ( Format "html" ) ""
+  , RawBlock
+    ( Format "html" ) ""
+  , RawBlock
+    ( Format "html" ) ""
+  , RawBlock
+    ( Format "html" ) ""
+  , RawBlock
+    ( Format "html" ) ""
+  , RawBlock
+    ( Format "html" ) ""
+  , RawBlock
+    ( Format "html" ) ""
+  , HorizontalRule
+  , Header 1
+    ( "inline-markup", [], [] )
+    [ Str "Inline", Space, Str "Markup" ]
+  , Para
+    [ Str "This"
+    , Space
+    , Str "is"
+    , Space
+    , Emph
+      [ Str "emphasized" ]
+    , Str ","
+    , Space
+    , Str "and"
+    , Space
+    , Str "so"
+    , Space
+    , Emph
+      [ Str "is", Space, Str "this" ]
+    , Str "."
+    ]
+  , Para
+    [ Str "This"
+    , Space
+    , Str "is"
+    , Space
+    , Strong
+      [ Str "strong" ]
+    , Str ","
+    , Space
+    , Str "and"
+    , Space
+    , Str "so"
+    , Space
+    , Strong
+      [ Str "is", Space, Str "this" ]
+    , Str "."
+    ]
+  , Para
+    [ Str "An"
+    , Space
+    , Emph
+      [ Link
+        ( "", [], [] )
+        [ Str "emphasized", Space, Str "link" ]
+        ( "/url", "" )
+      ]
+    , Str "."
+    ]
+  , Para
+    [ Strong
+      [ Emph
+        [ Str "This"
+        , Space
+        , Str "is"
+        , Space
+        , Str "strong"
+        , Space
+        , Str "and"
+        , Space
+        , Str "em."
+        ]
+      ]
+    ]
+  , Para
+    [ Str "So"
+    , Space
+    , Str "is"
+    , Space
+    , Strong
+      [ Emph [ Str "this" ] ]
+    , Space
+    , Str "word."
+    ]
+  , Para
+    [ Strong
+      [ Emph
+        [ Str "This"
+        , Space
+        , Str "is"
+        , Space
+        , Str "strong"
+        , Space
+        , Str "and"
+        , Space
+        , Str "em."
+        ]
+      ]
+    ]
+  , Para
+    [ Str "So"
+    , Space
+    , Str "is"
+    , Space
+    , Strong
+      [ Emph [ Str "this" ] ]
+    , Space
+    , Str "word."
+    ]
+  , Para
+    [ Str "This"
+    , Space
+    , Str "is"
+    , Space
+    , Str "code:"
+    , Space
+    , Code
+      ( "", [], [] ) ">"
+    , Str ","
+    , Space
+    , Code
+      ( "", [], [] ) "$"
+    , Str ","
+    , Space
+    , Code
+      ( "", [], [] ) "\\"
+    , Str ","
+    , Space
+    , Code
+      ( "", [], [] ) "\\$"
+    , Str ","
+    , Space
+    , Code
+      ( "", [], [] ) ""
+    , Str "."
+    ]
+  , Para
+    [ Strikeout
+      [ Str "This"
+      , Space
+      , Str "is"
+      , Space
+      , Emph
+        [ Str "strikeout" ]
+      , Str "."
+      ]
+    ]
+  , Para
+    [ Str "Superscripts:"
+    , Space
+    , Str "a"
+    , Superscript
+      [ Str "bc" ]
+    , Str "d"
+    , Space
+    , Str "a"
+    , Superscript
+      [ Emph [ Str "hello" ] ]
+    , Space
+    , Str "a"
+    , Superscript
+      [ Str "hello\160there" ]
+    , Str "."
+    ]
+  , Para
+    [ Str "Subscripts:"
+    , Space
+    , Str "H"
+    , Subscript
+      [ Str "2" ]
+    , Str "O,"
+    , Space
+    , Str "H"
+    , Subscript
+      [ Str "23" ]
+    , Str "O,"
+    , Space
+    , Str "H"
+    , Subscript
+      [ Str "many\160of\160them" ]
+    , Str "O."
+    ]
+  , Para
+    [ Str "These"
+    , Space
+    , Str "should"
+    , Space
+    , Str "not"
+    , Space
+    , Str "be"
+    , Space
+    , Str "superscripts"
+    , Space
+    , Str "or"
+    , Space
+    , Str "subscripts,"
+    , SoftBreak
+    , Str "because"
+    , Space
+    , Str "of"
+    , Space
+    , Str "the"
+    , Space
+    , Str "unescaped"
+    , Space
+    , Str "spaces:"
+    , Space
+    , Str "a^b"
+    , Space
+    , Str "c^d,"
+    , Space
+    , Str "a~b"
+    , Space
+    , Str "c~d."
+    ]
+  , HorizontalRule
+  , Header 1
+    ( "smart-quotes-ellipses-dashes", [], [] )
+    [ Str "Smart"
+    , Space
+    , Str "quotes,"
+    , Space
+    , Str "ellipses,"
+    , Space
+    , Str "dashes"
+    ]
+  , Para
+    [ Quoted DoubleQuote
+      [ Str "Hello," ]
+    , Space
+    , Str "said"
+    , Space
+    , Str "the"
+    , Space
+    , Str "spider."
+    , Space
+    , Quoted DoubleQuote
+      [ Quoted SingleQuote
+        [ Str "Shelob" ]
+      , Space
+      , Str "is"
+      , Space
+      , Str "my"
+      , Space
+      , Str "name."
+      ]
+    ]
+  , Para
+    [ Quoted SingleQuote
+      [ Str "A" ]
+    , Str ","
+    , Space
+    , Quoted SingleQuote
+      [ Str "B" ]
+    , Str ","
+    , Space
+    , Str "and"
+    , Space
+    , Quoted SingleQuote
+      [ Str "C" ]
+    , Space
+    , Str "are"
+    , Space
+    , Str "letters."
+    ]
+  , Para
+    [ Quoted SingleQuote
+      [ Str "Oak," ]
+    , Space
+    , Quoted SingleQuote
+      [ Str "elm," ]
+    , Space
+    , Str "and"
+    , Space
+    , Quoted SingleQuote
+      [ Str "beech" ]
+    , Space
+    , Str "are"
+    , Space
+    , Str "names"
+    , Space
+    , Str "of"
+    , Space
+    , Str "trees."
+    , SoftBreak
+    , Str "So"
+    , Space
+    , Str "is"
+    , Space
+    , Quoted SingleQuote
+      [ Str "pine." ]
+    ]
+  , Para
+    [ Quoted SingleQuote
+      [ Str "He"
+      , Space
+      , Str "said,"
+      , Space
+      , Quoted DoubleQuote
+        [ Str "I"
+        , Space
+        , Str "want"
+        , Space
+        , Str "to"
+        , Space
+        , Str "go."
+        ]
+      ]
+    , Space
+    , Str "Were"
+    , Space
+    , Str "you"
+    , Space
+    , Str "alive"
+    , Space
+    , Str "in"
+    , Space
+    , Str "the"
+    , SoftBreak
+    , Str "70\8217s?"
+    ]
+  , Para
+    [ Str "Here"
+    , Space
+    , Str "is"
+    , Space
+    , Str "some"
+    , Space
+    , Str "quoted"
+    , Space
+    , Quoted SingleQuote
+      [ Code ( "", [], [] ) "code" ]
+    , Space
+    , Str "and"
+    , Space
+    , Str "a"
+    , Space
+    , Quoted DoubleQuote
+      [ Link
+        ( "", [], [] )
+        [ Str "quoted", Space, Str "link" ]
+        ( "http://example.com/?foo=1&bar=2", "" )
+      ]
+    , Str "."
+    ]
+  , Para
+    [ Str "Some"
+    , Space
+    , Str "dashes:"
+    , Space
+    , Str "one\8212two"
+    , Space
+    , Str "\8212"
+    , Space
+    , Str "three\8212four"
+    , Space
+    , Str "\8212"
+    , Space
+    , Str "five."
+    ]
+  , Para
+    [ Str "Dashes"
+    , Space
+    , Str "between"
+    , Space
+    , Str "numbers:"
+    , Space
+    , Str "5\8211\&7,"
+    , Space
+    , Str "255\8211\&66,"
+    , Space
+    , Str "1987\8211\&1999."
+    ]
+  , Para
+    [ Str "Ellipses\8230and\8230and\8230." ]
+  , HorizontalRule
+  , Header 1
+    ( "latex", [], [] )
+    [ Str "LaTeX" ]
+  , BulletList
+    [
+      [ Plain
+        [ RawInline ( Format "tex" ) "\\cite[22-23]{smith.1899}" ]
+      ]
+    ,
+      [ Plain [ Math InlineMath "2+2=4" ] ]
+    ,
+      [ Plain [ Math InlineMath "x \\in y" ] ]
+    ,
+      [ Plain [ Math InlineMath "\\alpha \\wedge \\omega" ] ]
+    ,
+      [ Plain [ Math InlineMath "223" ] ]
+    ,
+      [ Plain [ Math InlineMath "p", Str "-Tree" ] ]
+    ,
+      [ Plain
+        [ Str "Here\8217s"
+        , Space
+        , Str "some"
+        , Space
+        , Str "display"
+        , Space
+        , Str "math:"
+        , SoftBreak
+        , Math DisplayMath "\\frac{d}{dx}f(x)=\\lim_{h\\to 0}\\frac{f(x+h)-f(x)}{h}"
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "Here\8217s"
+        , Space
+        , Str "one"
+        , Space
+        , Str "that"
+        , Space
+        , Str "has"
+        , Space
+        , Str "a"
+        , Space
+        , Str "line"
+        , Space
+        , Str "break"
+        , Space
+        , Str "in"
+        , Space
+        , Str "it:"
+        , Space
+        , Math InlineMath "\\alpha + \\omega \\times x^2"
+        , Str "."
+        ]
+      ]
+    ]
+  , Para
+    [ Str "These"
+    , Space
+    , Str "shouldn\8217t"
+    , Space
+    , Str "be"
+    , Space
+    , Str "math:"
+    ]
+  , BulletList
+    [
+      [ Plain
+        [ Str "To"
+        , Space
+        , Str "get"
+        , Space
+        , Str "the"
+        , Space
+        , Str "famous"
+        , Space
+        , Str "equation,"
+        , Space
+        , Str "write"
+        , Space
+        , Code
+          ( "", [], [] ) "$e = mc^2$"
+        , Str "."
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "$22,000"
+        , Space
+        , Str "is"
+        , Space
+        , Str "a"
+        , Space
+        , Emph
+          [ Str "lot" ]
+        , Space
+        , Str "of"
+        , Space
+        , Str "money."
+        , Space
+        , Str "So"
+        , Space
+        , Str "is"
+        , Space
+        , Str "$34,000."
+        , SoftBreak
+        , Str "(It"
+        , Space
+        , Str "worked"
+        , Space
+        , Str "if"
+        , Space
+        , Quoted DoubleQuote
+          [ Str "lot" ]
+        , Space
+        , Str "is"
+        , Space
+        , Str "emphasized.)"
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "Shoes"
+        , Space
+        , Str "($20)"
+        , Space
+        , Str "and"
+        , Space
+        , Str "socks"
+        , Space
+        , Str "($5)."
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "Escaped"
+        , Space
+        , Code
+          ( "", [], [] ) "$"
+        , Str ":"
+        , Space
+        , Str "$73"
+        , Space
+        , Emph
+          [ Str "this"
+          , Space
+          , Str "should"
+          , Space
+          , Str "be"
+          , Space
+          , Str "emphasized"
+          ]
+        , Space
+        , Str "23$."
+        ]
+      ]
+    ]
+  , Para
+    [ Str "Here\8217s"
+    , Space
+    , Str "a"
+    , Space
+    , Str "LaTeX"
+    , Space
+    , Str "table:"
+    ]
+  , RawBlock
+    ( Format "tex" ) "\\begin{tabular}{|l|l|}\\hline\nAnimal & Number \\\\ \\hline\nDog    & 2      \\\\\nCat    & 1      \\\\ \\hline\n\\end{tabular}"
+  , HorizontalRule
+  , Header 1
+    ( "special-characters", [], [] )
+    [ Str "Special", Space, Str "Characters" ]
+  , Para
+    [ Str "Here"
+    , Space
+    , Str "is"
+    , Space
+    , Str "some"
+    , Space
+    , Str "unicode:"
+    ]
+  , BulletList
+    [
+      [ Plain [ Str "I", Space, Str "hat:", Space, Str "\206" ] ]
+    ,
+      [ Plain [ Str "o", Space, Str "umlaut:", Space, Str "\246" ] ]
+    ,
+      [ Plain [ Str "section:", Space, Str "\167" ] ]
+    ,
+      [ Plain
+        [ Str "set", Space, Str "membership:", Space, Str "\8712" ]
+      ]
+    ,
+      [ Plain [ Str "copyright:", Space, Str "\169" ] ]
+    ]
+  , Para
+    [ Str "AT&T"
+    , Space
+    , Str "has"
+    , Space
+    , Str "an"
+    , Space
+    , Str "ampersand"
+    , Space
+    , Str "in"
+    , Space
+    , Str "their"
+    , Space
+    , Str "name."
+    ]
+  , Para
+    [ Str "AT&T"
+    , Space
+    , Str "is"
+    , Space
+    , Str "another"
+    , Space
+    , Str "way"
+    , Space
+    , Str "to"
+    , Space
+    , Str "write"
+    , Space
+    , Str "it."
+    ]
+  , Para
+    [ Str "This", Space, Str "&", Space, Str "that." ]
+  , Para
+    [ Str "4", Space, Str "<", Space, Str "5." ]
+  , Para
+    [ Str "6", Space, Str ">", Space, Str "5." ]
+  , Para
+    [ Str "Backslash:", Space, Str "\\" ]
+  , Para
+    [ Str "Backtick:", Space, Str "`" ]
+  , Para
+    [ Str "Asterisk:", Space, Str "*" ]
+  , Para
+    [ Str "Underscore:", Space, Str "_" ]
+  , Para
+    [ Str "Left", Space, Str "brace:", Space, Str "{" ]
+  , Para
+    [ Str "Right", Space, Str "brace:", Space, Str "}" ]
+  , Para
+    [ Str "Left", Space, Str "bracket:", Space, Str "[" ]
+  , Para
+    [ Str "Right", Space, Str "bracket:", Space, Str "]" ]
+  , Para
+    [ Str "Left", Space, Str "paren:", Space, Str "(" ]
+  , Para
+    [ Str "Right", Space, Str "paren:", Space, Str ")" ]
+  , Para
+    [ Str "Greater-than:", Space, Str ">" ]
+  , Para
+    [ Str "Hash:", Space, Str "#" ]
+  , Para
+    [ Str "Period:", Space, Str "." ]
+  , Para
+    [ Str "Bang:", Space, Str "!" ]
+  , Para
+    [ Str "Plus:", Space, Str "+" ]
+  , Para
+    [ Str "Minus:", Space, Str "-" ]
+  , HorizontalRule
+  , Header 1
+    ( "links", [], [] )
+    [ Str "Links" ]
+  , Header 2
+    ( "explicit", [], [] )
+    [ Str "Explicit" ]
+  , Para
+    [ Str "Just"
+    , Space
+    , Str "a"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "URL" ]
+      ( "/url/", "" )
+    , Str "."
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "URL", Space, Str "and", Space, Str "title" ]
+      ( "/url/", "title" )
+    , Str "."
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "URL", Space, Str "and", Space, Str "title" ]
+      ( "/url/", "title preceded by two spaces" )
+    , Str "."
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "URL", Space, Str "and", Space, Str "title" ]
+      ( "/url/", "title preceded by a tab" )
+    , Str "."
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "URL", Space, Str "and", Space, Str "title" ]
+      ( "/url/", "title with \"quotes\" in it" )
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "URL", Space, Str "and", Space, Str "title" ]
+      ( "/url/", "title with single quotes" )
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "with_underscore" ]
+      ( "/url/with_underscore", "" )
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "Email", Space, Str "link" ]
+      ( "mailto:nobody@nowhere.net", "" )
+    ]
+  , Para
+    [ Link ( "", [], [] ) [ Str "Empty" ] ( "", "" ), Str "." ]
+  , Header 2
+    ( "reference", [], [] )
+    [ Str "Reference" ]
+  , Para
+    [ Str "Foo"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "bar" ]
+      ( "/url/", "" )
+    , Str "."
+    ]
+  , Para
+    [ Str "With"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "embedded", Space, Str "[brackets]" ]
+      ( "/url/", "" )
+    , Str "."
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "b" ]
+      ( "/url/", "" )
+    , Space
+    , Str "by"
+    , Space
+    , Str "itself"
+    , Space
+    , Str "should"
+    , Space
+    , Str "be"
+    , Space
+    , Str "a"
+    , Space
+    , Str "link."
+    ]
+  , Para
+    [ Str "Indented"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "once" ]
+      ( "/url", "" )
+    , Str "."
+    ]
+  , Para
+    [ Str "Indented"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "twice" ]
+      ( "/url", "" )
+    , Str "."
+    ]
+  , Para
+    [ Str "Indented"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "thrice" ]
+      ( "/url", "" )
+    , Str "."
+    ]
+  , Para
+    [ Str "This"
+    , Space
+    , Str "should"
+    , Space
+    , Str "[not][]"
+    , Space
+    , Str "be"
+    , Space
+    , Str "a"
+    , Space
+    , Str "link."
+    ]
+  , CodeBlock
+    ( "", [], [] ) "[not]: /url"
+  , Para
+    [ Str "Foo"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "bar" ]
+      ( "/url/", "Title with \"quotes\" inside" )
+    , Str "."
+    ]
+  , Para
+    [ Str "Foo"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "biz" ]
+      ( "/url/", "Title with \"quote\" inside" )
+    , Str "."
+    ]
+  , Header 2
+    ( "with-ampersands", [], [] )
+    [ Str "With", Space, Str "ampersands" ]
+  , Para
+    [ Str "Here\8217s"
+    , Space
+    , Str "a"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "link"
+      , Space
+      , Str "with"
+      , Space
+      , Str "an"
+      , Space
+      , Str "ampersand"
+      , Space
+      , Str "in"
+      , Space
+      , Str "the"
+      , Space
+      , Str "URL"
+      ]
+      ( "http://example.com/?foo=1&bar=2", "" )
+    , Str "."
+    ]
+  , Para
+    [ Str "Here\8217s"
+    , Space
+    , Str "a"
+    , Space
+    , Str "link"
+    , Space
+    , Str "with"
+    , Space
+    , Str "an"
+    , Space
+    , Str "amersand"
+    , Space
+    , Str "in"
+    , Space
+    , Str "the"
+    , Space
+    , Str "link"
+    , Space
+    , Str "text:"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "AT&T" ]
+      ( "http://att.com/", "AT&T" )
+    , Str "."
+    ]
+  , Para
+    [ Str "Here\8217s"
+    , Space
+    , Str "an"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "inline", Space, Str "link" ]
+      ( "/script?foo=1&bar=2", "" )
+    , Str "."
+    ]
+  , Para
+    [ Str "Here\8217s"
+    , Space
+    , Str "an"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "inline"
+      , Space
+      , Str "link"
+      , Space
+      , Str "in"
+      , Space
+      , Str "pointy"
+      , Space
+      , Str "braces"
+      ]
+      ( "/script?foo=1&bar=2", "" )
+    , Str "."
+    ]
+  , Header 2
+    ( "autolinks", [], [] )
+    [ Str "Autolinks" ]
+  , Para
+    [ Str "With"
+    , Space
+    , Str "an"
+    , Space
+    , Str "ampersand:"
+    , Space
+    , Link
+      ( "", [ "uri" ], [] )
+      [ Str "http://example.com/?foo=1&bar=2" ]
+      ( "http://example.com/?foo=1&bar=2", "" )
+    ]
+  , BulletList
+    [
+      [ Plain [ Str "In", Space, Str "a", Space, Str "list?" ] ]
+    ,
+      [ Plain
+        [ Link
+          ( "", [ "uri" ], [] )
+          [ Str "http://example.com/" ]
+          ( "http://example.com/", "" )
+        ]
+      ]
+    ,
+      [ Plain [ Str "It", Space, Str "should." ] ]
+    ]
+  , Para
+    [ Str "An"
+    , Space
+    , Str "e-mail"
+    , Space
+    , Str "address:"
+    , Space
+    , Link
+      ( "", [ "email" ], [] )
+      [ Str "nobody@nowhere.net" ]
+      ( "mailto:nobody@nowhere.net", "" )
+    ]
+  , BlockQuote
+    [ Para
+      [ Str "Blockquoted:"
+      , Space
+      , Link
+        ( "", [ "uri" ], [] )
+        [ Str "http://example.com/" ]
+        ( "http://example.com/", "" )
+      ]
+    ]
+  , Para
+    [ Str "Auto-links"
+    , Space
+    , Str "should"
+    , Space
+    , Str "not"
+    , Space
+    , Str "occur"
+    , Space
+    , Str "here:"
+    , Space
+    , Code
+      ( "", [], [] ) ""
+    ]
+  , CodeBlock
+    ( "", [], [] ) "or here: "
+  , HorizontalRule
+  , Header 1
+    ( "images", [], [] )
+    [ Str "Images" ]
+  , Para
+    [ Str "From"
+    , Space
+    , Quoted DoubleQuote
+      [ Str "Voyage"
+      , Space
+      , Str "dans"
+      , Space
+      , Str "la"
+      , Space
+      , Str "Lune"
+      ]
+    , Space
+    , Str "by"
+    , Space
+    , Str "Georges"
+    , Space
+    , Str "Melies"
+    , Space
+    , Str "(1902):"
+    ]
+  , Para
+    [ Image
+      ( "", [], [] )
+      [ Str "lalune" ]
+      ( "lalune.jpg", "fig:Voyage dans la Lune" )
+    ]
+  , Para
+    [ Str "Here"
+    , Space
+    , Str "is"
+    , Space
+    , Str "a"
+    , Space
+    , Str "movie"
+    , Space
+    , Image
+      ( "", [], [] )
+      [ Str "movie" ]
+      ( "movie.jpg", "" )
+    , Space
+    , Str "icon."
+    ]
+  , HorizontalRule
+  , Header 1
+    ( "footnotes", [], [] )
+    [ Str "Footnotes" ]
+  , Para
+    [ Str "Here"
+    , Space
+    , Str "is"
+    , Space
+    , Str "a"
+    , Space
+    , Str "footnote"
+    , Space
+    , Str "reference,"
+    , Note
+      [ 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"
+        , SoftBreak
+        , 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."
+        ]
+      ]
+    , Space
+    , Str "and"
+    , Space
+    , Str "another."
+    , Note
+      [ Para
+        [ Str "Here\8217s"
+        , Space
+        , Str "the"
+        , Space
+        , Str "long"
+        , Space
+        , Str "note."
+        , Space
+        , Str "This"
+        , Space
+        , Str "one"
+        , Space
+        , Str "contains"
+        , Space
+        , Str "multiple"
+        , SoftBreak
+        , 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"
+        , SoftBreak
+        , 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"
+        , SoftBreak
+        , 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."
+        ]
+      ]
+    , SoftBreak
+    , 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"
+    , SoftBreak
+    , Str "contains"
+    , Space
+    , Str "a"
+    , Space
+    , Str "space.[^my"
+    , Space
+    , Str "note]"
+    , Space
+    , Str "Here"
+    , Space
+    , Str "is"
+    , Space
+    , Str "an"
+    , Space
+    , Str "inline"
+    , Space
+    , Str "note."
+    , Note
+      [ Para
+        [ Str "This"
+        , SoftBreak
+        , Str "is"
+        , Space
+        , Emph
+          [ Str "easier" ]
+        , Space
+        , Str "to"
+        , Space
+        , Str "type."
+        , Space
+        , Str "Inline"
+        , Space
+        , Str "notes"
+        , Space
+        , Str "may"
+        , Space
+        , Str "contain"
+        , SoftBreak
+        , Link
+          ( "", [], [] )
+          [ Str "links" ]
+          ( "http://google.com", "" )
+        , Space
+        , Str "and"
+        , Space
+        , Code
+          ( "", [], [] ) "]"
+        , Space
+        , Str "verbatim"
+        , Space
+        , Str "characters,"
+        , SoftBreak
+        , Str "as"
+        , Space
+        , Str "well"
+        , Space
+        , Str "as"
+        , Space
+        , Str "[bracketed"
+        , Space
+        , Str "text]."
+        ]
+      ]
+    ]
+  , BlockQuote
+    [ Para
+      [ Str "Notes"
+      , Space
+      , Str "can"
+      , Space
+      , Str "go"
+      , Space
+      , Str "in"
+      , Space
+      , Str "quotes."
+      , Note
+        [ Para [ Str "In", Space, Str "quote." ] ]
+      ]
+    ]
+  , OrderedList
+    ( 1, Decimal, Period )
+    [
+      [ Plain
+        [ Str "And"
+        , Space
+        , Str "in"
+        , Space
+        , Str "list"
+        , Space
+        , Str "items."
+        , Note
+          [ Para [ Str "In", Space, Str "list." ] ]
+        ]
+      ]
+    ]
+  , 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."
+    ]
+  ]
diff --git a/test/textile-reader.native b/test/textile-reader.native
index e691e41fc..34dfa7ca3 100644
--- a/test/textile-reader.native
+++ b/test/textile-reader.native
@@ -1,243 +1,1317 @@
-Pandoc (Meta {unMeta = fromList []})
-[Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "set",Space,Str "of",Space,Str "tests",Space,Str "for",Space,Str "pandoc",Space,Str "Textile",Space,Str "Reader.",Space,Str "Part",Space,Str "of",Space,Str "it",Space,Str "comes",LineBreak,Str "from",Space,Str "John",Space,Str "Gruber\8217s",Space,Str "markdown",Space,Str "test",Space,Str "suite."]
-,HorizontalRule
-,Header 1 ("headers",[],[]) [Str "Headers"]
-,Header 2 ("level-2-with-an-embedded-link",[],[]) [Str "Level",Space,Str "2",Space,Str "with",Space,Str "an",Space,Link ("",[],[]) [Str "embedded",Space,Str "link"] ("http://www.example.com","")]
-,Header 3 ("level-3-with-emphasis",[],[]) [Str "Level",Space,Str "3",Space,Str "with",Space,Strong [Str "emphasis"]]
-,Header 4 ("level-4",[],[]) [Str "Level",Space,Str "4"]
-,Header 5 ("level-5",[],[]) [Str "Level",Space,Str "5"]
-,Header 6 ("level-6",[],[]) [Str "Level",Space,Str "6"]
-,Header 1 ("paragraphs",[],[]) [Str "Paragraphs"]
-,Para [Str "Here\8217s",Space,Str "a",Space,Str "regular",Space,Str "paragraph."]
-,Para [Str "Line",Space,Str "breaks",Space,Str "are",Space,Str "preserved",Space,Str "in",Space,Str "textile,",Space,Str "so",Space,Str "you",Space,Str "can",Space,Str "not",Space,Str "wrap",Space,Str "your",Space,Str "very",LineBreak,Str "long",Space,Str "paragraph",Space,Str "with",Space,Str "your",Space,Str "favourite",Space,Str "text",Space,Str "editor",Space,Str "and",Space,Str "have",Space,Str "it",Space,Str "rendered",LineBreak,Str "with",Space,Str "no",Space,Str "break."]
-,Para [Str "Here\8217s",Space,Str "one",Space,Str "with",Space,Str "a",Space,Str "bullet."]
-,BulletList
- [[Plain [Str "criminey."]]]
-,Para [Str "There",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "paragraph",Space,Str "break",Space,Str "between",Space,Str "here"]
-,Para [Str "and",Space,Str "here."]
-,Para [Str "pandoc",Space,Str "converts",Space,Str "textile."]
-,Header 1 ("block-quotes",[],[]) [Str "Block",Space,Str "Quotes"]
-,BlockQuote
- [Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "famous",Space,Str "quote",Space,Str "from",Space,Str "somebody.",Space,Str "He",Space,Str "had",Space,Str "a",Space,Str "lot",Space,Str "of",Space,Str "things",Space,Str "to",LineBreak,Str "say,",Space,Str "so",Space,Str "the",Space,Str "text",Space,Str "is",Space,Str "really",Space,Str "really",Space,Str "long",Space,Str "and",Space,Str "spans",Space,Str "on",Space,Str "multiple",Space,Str "lines."]]
-,Para [Str "And",Space,Str "a",Space,Str "following",Space,Str "paragraph."]
-,Header 1 ("code-blocks",[],[]) [Str "Code",Space,Str "Blocks"]
-,Para [Str "Code:"]
-,CodeBlock ("",[],[]) "    ---- (should be four hyphens)\n\n    sub status {\n        print \"working\";\n    }\n\n    this code block is indented by one tab"
-,Para [Str "And:"]
-,CodeBlock ("",[],[]) "        this code block is indented by two tabs\n\n    These should not be escaped:  \\$ \\\\ \\> \\[ \\{"
-,CodeBlock ("",[],[]) "Code block with .bc\n        continued\n    @",Str ",",Space,Code ("",[],[]) "@",Str "."]
-,Header 1 ("notextile",[],[]) [Str "Notextile"]
-,Para [Str "A",Space,Str "block",Space,Str "of",Space,Str "text",Space,Str "can",Space,Str "be",Space,Str "protected",Space,Str "with",Space,Str "notextile",Space,Str ":"]
-,Para [Str "\nNo *bold* and\n* no bullet\n"]
-,Para [Str "and",Space,Str "inlines",Space,Str "can",Space,Str "be",Space,Str "protected",Space,Str "with",Space,Str "double *equals (=)* markup."]
-,Header 1 ("lists",[],[]) [Str "Lists"]
-,Header 2 ("unordered",[],[]) [Str "Unordered"]
-,Para [Str "Asterisks",Space,Str "tight:"]
-,BulletList
- [[Plain [Str "asterisk",Space,Str "1"]]
- ,[Plain [Str "asterisk",Space,Str "2"]]
- ,[Plain [Str "asterisk",Space,Str "3"]]]
-,Para [Str "With",Space,Str "line",Space,Str "breaks:"]
-,BulletList
- [[Plain [Str "asterisk",Space,Str "1",LineBreak,Str "newline"]]
- ,[Plain [Str "asterisk",Space,Str "2"]]]
-,Header 2 ("ordered",[],[]) [Str "Ordered"]
-,Para [Str "Tight:"]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Plain [Str "First"]]
- ,[Plain [Str "Second"]]
- ,[Plain [Str "Third"]]]
-,Header 2 ("nested",[],[]) [Str "Nested"]
-,BulletList
- [[Plain [Str "ui",Space,Str "1"]
-  ,BulletList
-   [[Plain [Str "ui",Space,Str "1.1"]
-    ,OrderedList (1,DefaultStyle,DefaultDelim)
-     [[Plain [Str "oi",Space,Str "1.1.1"]]
-     ,[Plain [Str "oi",Space,Str "1.1.2"]]]]
-   ,[Plain [Str "ui",Space,Str "1.2"]]]]
- ,[Plain [Str "ui",Space,Str "2"]
-  ,OrderedList (1,DefaultStyle,DefaultDelim)
-   [[Plain [Str "oi",Space,Str "2.1"]
-    ,BulletList
-     [[Plain [Str "ui",Space,Str "2.1.1"]]
-     ,[Plain [Str "ui",Space,Str "2.1.2"]]]]]]]
-,Header 2 ("issue-1500",[],[]) [Str "Issue",Space,Str "#1500"]
-,BulletList
- [[Plain [Str "one"]]
- ,[Plain [Str "two",LineBreak,Str "->",Space,Str "and",Space,Str "more"]]]
-,Header 2 ("issue-1513",[],[]) [Str "Issue",Space,Str "#1513"]
-,Para [Str "List:"]
-,BulletList
- [[Plain [Str "one"]]
- ,[Plain [Str "two"]]]
-,Header 2 ("definition-list",[],[]) [Str "Definition",Space,Str "List"]
-,DefinitionList
- [([Str "coffee"],
-   [[Plain [Str "Hot",Space,Str "and",Space,Str "black"]]])
- ,([Str "tea"],
-   [[Plain [Str "Also",Space,Str "hot,",Space,Str "but",Space,Str "a",Space,Str "little",Space,Str "less",Space,Str "black"]]])
- ,([Str "milk"],
-   [[Para [Str "Nourishing",Space,Str "beverage",Space,Str "for",Space,Str "baby",Space,Str "cows."]
-    ,Para [Str "Cold",Space,Str "drink",Space,Str "that",Space,Str "goes",Space,Str "great",Space,Str "with",Space,Str "cookies."]]])
- ,([Str "beer"],
-   [[Plain [Str "fresh",Space,Str "and",Space,Str "bitter"]]])]
-,Header 1 ("inline-markup",[],[]) [Str "Inline",Space,Str "Markup"]
-,Para [Str "This",Space,Str "is",Space,Emph [Str "emphasized"],Str ",",Space,Str "and",Space,Str "so",Space,Emph [Str "is",Space,Str "this"],Str ".",LineBreak,Str "This",Space,Str "is",Space,Strong [Str "strong"],Str ",",Space,Str "and",Space,Str "so",Space,Strong [Str "is",Space,Str "this"],Str ".",LineBreak,Str "This",Space,Str "is",Space,Underline [Str "inserted"],Str ",",Space,Str "and",Space,Str "this",Space,Str "is",Space,Strikeout [Str "deleted"],Str ".",LineBreak,Str "Hyphenated-words-are-ok,",Space,Str "as",Space,Str "well",Space,Str "as",Space,Str "strange_underscore_notation.",LineBreak,Str "A",Space,Link ("",[],[]) [Strong [Str "strong",Space,Str "link"]] ("http://www.foobar.com",""),Str "."]
-,Para [Emph [Strong [Str "This",Space,Str "is",Space,Str "strong",Space,Str "and",Space,Str "em."]],LineBreak,Str "So",Space,Str "is",Space,Strong [Emph [Str "this"]],Space,Str "word",Space,Str "and",Space,Emph [Strong [Str "that",Space,Str "one"]],Str ".",LineBreak,Strikeout [Str "This",Space,Str "is",Space,Str "strikeout",Space,Str "and",Space,Strong [Str "strong"]]]
-,Para [Str "Superscripts:",Space,Str "a",Superscript [Str "bc"],Str "d",Space,Str "a",Space,Superscript [Strong [Str "hello"]],Space,Str "a",Superscript [Str "hello",Space,Str "there"],Str ".",LineBreak,Str "Subscripts:",Space,Subscript [Str "here"],Space,Str "H",Space,Subscript [Str "2"],Str "O,",Space,Str "H",Space,Subscript [Str "23"],Str "O,",Space,Str "H",Space,Subscript [Str "many",Space,Str "of",Space,Str "them"],Str "O."]
-,Para [Str "Dashes",Space,Str ":",Space,Str "How",Space,Str "cool",Space,Str "\8212",Space,Str "automatic",Space,Str "dashes."]
-,Para [Str "Ellipses",Space,Str ":",Space,Str "He",Space,Str "thought",Space,Str "and",Space,Str "thought",Space,Str "\8230",Space,Str "and",Space,Str "then",Space,Str "thought",Space,Str "some",Space,Str "more."]
-,Para [Str "Quotes",Space,Str "and",Space,Str "apostrophes",Space,Str ":",Space,Quoted DoubleQuote [Str "I\8217d",Space,Str "like",Space,Str "to",Space,Str "thank",Space,Str "you"],Space,Str "for",Space,Str "example."]
-,Header 1 ("links",[],[]) [Str "Links"]
-,Header 2 ("explicit",[],[]) [Str "Explicit"]
-,Para [Str "Just",Space,Str "a",Space,Link ("",[],[]) [Str "url"] ("http://www.url.com","")]
-,Para [Link ("",[],[]) [Str "Email",Space,Str "link"] ("mailto:nobody@nowhere.net","")]
-,Para [Quoted DoubleQuote [Str "not",Space,Str "a",Space,Str "link"],Str ":",Space,Str "foo"]
-,Para [Str "Automatic",Space,Str "linking",Space,Str "to",Space,Link ("",[],[]) [Str "http://www.example.com"] ("http://www.example.com",""),Str "."]
-,Para [Link ("",[],[]) [Str "Example"] ("http://www.example.com/",""),Str ":",Space,Str "Example",Space,Str "of",Space,Str "a",Space,Str "link",Space,Str "followed",Space,Str "by",Space,Str "a",Space,Str "colon."]
-,Para [Str "A",Space,Str "link",Link ("",[],[]) [Str "with",Space,Str "brackets"] ("http://www.example.com",""),Str "and",Space,Str "no",Space,Str "spaces."]
-,Header 1 ("tables",[],[]) [Str "Tables"]
-,Para [Str "Textile",Space,Str "allows",Space,Str "tables",Space,Str "with",Space,Str "and",Space,Str "without",Space,Str "headers",Space,Str ":"]
-,Header 2 ("without-headers",[],[]) [Str "Without",Space,Str "headers"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)]
- (TableHead ("",[],[])
- [])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "name"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "age"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "sex"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "joan"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "24"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "f"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "archie"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "29"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "m"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "bella"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "45"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "f"]]]])]
- (TableFoot ("",[],[])
- [])
-,Para [Str "and",Space,Str "some",Space,Str "text",Space,Str "following",Space,Str "\8230"]
-,Header 2 ("with-headers",[],[]) [Str "With",Space,Str "headers"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "name"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "age"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "sex"]]]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "joan"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "24"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "f"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "archie"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "29"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "m"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "bella"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "45"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "f"]]]])]
- (TableFoot ("",[],[])
- [])
-,Header 1 ("images",[],[]) [Str "Images"]
-,Para [Str "Textile",Space,Str "inline",Space,Str "image",Space,Str "syntax,",Space,Str "like",LineBreak,Str "here",Space,Image ("",[],[]) [Str "this is the alt text"] ("this_is_an_image.png","this is the alt text"),LineBreak,Str "and",Space,Str "here",Space,Image ("",[],[]) [Str ""] ("this_is_an_image.png",""),Str "."]
-,Header 1 ("attributes",[],[]) [Str "Attributes"]
-,Header 2 ("ident",["bar","foo"],[("style","color:red;"),("lang","en")]) [Str "HTML",Space,Str "and",Space,Str "CSS",Space,Str "attributes",Space,Str "are",Space,Str "parsed",Space,Str "in",Space,Str "headers."]
-,Header 2 ("centered",[],[("style","text-align:center;")]) [Str "Centered"]
-,Header 2 ("right",[],[("style","text-align:right;")]) [Str "Right"]
-,Header 2 ("justified",[],[("lang","en"),("style","color:blue;text-align:justify;")]) [Str "Justified"]
-,Para [Str "as",Space,Str "well",Space,Str "as",Space,Strong [Span ("",["foo"],[]) [Str "inline",Space,Str "attributes"]],Space,Str "of",Space,Span ("",[],[("style","color:red;")]) [Str "all",Space,Str "kind"]]
-,Para [Str "and",Space,Str "paragraph",Space,Str "attributes,",Space,Str "and",Space,Str "table",Space,Str "attributes."]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)]
- (TableHead ("",[],[])
- [])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "name"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "age"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "sex"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "joan"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "24"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "f"]]]])]
- (TableFoot ("",[],[])
- [])
-,Para [Emph [Str "(class#id)",Space,Str "emph"]]
-,Para [Emph [Str "(no",Space,Str "class#id)",Space,Str "emph"]]
-,Header 1 ("entities",[],[]) [Str "Entities"]
-,Para [Str "*",LineBreak,Str "&"]
-,Header 1 ("raw-html",[],[]) [Str "Raw",Space,Str "HTML"]
-,Para [Str "However,",Space,RawInline (Format "html") "",Space,Str "raw",Space,Str "HTML",Space,Str "inlines",Space,RawInline (Format "html") "",Space,Str "are",Space,Str "accepted,",Space,Str "as",Space,Str "well",Space,Str "as",Space,Str ":"]
-,RawBlock (Format "html") ""
-,Para [Str "any",Space,Strong [Str "Raw",Space,Str "HTML",Space,Str "Block"],Space,Str "with",Space,Str "bold"]
-,RawBlock (Format "html") ""
-,Para [Str "Html",Space,Str "blocks",Space,Str "can"]
-,RawBlock (Format "html") ""
-,Para [Str "interrupt",Space,Str "paragraphs"]
-,RawBlock (Format "html") ""
-,Para [Str "as",Space,Str "well."]
-,Para [Str "Can",Space,Str "you",Space,Str "prove",Space,Str "that",Space,Str "2",Space,Str "<",Space,Str "3",Space,Str "?"]
-,Header 1 ("acronyms-and-marks",[],[]) [Str "Acronyms",Space,Str "and",Space,Str "marks"]
-,Para [Str "PBS (Public Broadcasting System)"]
-,Para [Str "Hi\8482"]
-,Para [Str "Hi",Space,Str "\8482"]
-,Para [Str "\174",Space,Str "Hi\174"]
-,Para [Str "Hi\169\&2008",Space,Str "\169",Space,Str "2008"]
-,Header 1 ("footnotes",[],[]) [Str "Footnotes"]
-,Para [Str "A",Space,Str "note.",Note [Para [Str "The",Space,Str "note",LineBreak,Str "is",Space,Str "here!"]],Space,Str "Another",Space,Str "note",Note [Para [Str "Other",Space,Str "note."]],Str "."]
-,Header 1 ("comment-blocks",[],[]) [Str "Comment",Space,Str "blocks"]
-,Para [Str "not",Space,Str "a",Space,Str "comment."]]
+Pandoc
+  ( Meta { unMeta = fromList [] } )
+  [ Para
+    [ Str "This"
+    , Space
+    , Str "is"
+    , Space
+    , Str "a"
+    , Space
+    , Str "set"
+    , Space
+    , Str "of"
+    , Space
+    , Str "tests"
+    , Space
+    , Str "for"
+    , Space
+    , Str "pandoc"
+    , Space
+    , Str "Textile"
+    , Space
+    , Str "Reader."
+    , Space
+    , Str "Part"
+    , Space
+    , Str "of"
+    , Space
+    , Str "it"
+    , Space
+    , Str "comes"
+    , LineBreak
+    , Str "from"
+    , Space
+    , Str "John"
+    , Space
+    , Str "Gruber\8217s"
+    , Space
+    , Str "markdown"
+    , Space
+    , Str "test"
+    , Space
+    , Str "suite."
+    ]
+  , HorizontalRule
+  , Header 1
+    ( "headers", [], [] )
+    [ Str "Headers" ]
+  , Header 2
+    ( "level-2-with-an-embedded-link", [], [] )
+    [ Str "Level"
+    , Space
+    , Str "2"
+    , Space
+    , Str "with"
+    , Space
+    , Str "an"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "embedded", Space, Str "link" ]
+      ( "http://www.example.com", "" )
+    ]
+  , Header 3
+    ( "level-3-with-emphasis", [], [] )
+    [ Str "Level"
+    , Space
+    , Str "3"
+    , Space
+    , Str "with"
+    , Space
+    , Strong
+      [ Str "emphasis" ]
+    ]
+  , Header 4
+    ( "level-4", [], [] )
+    [ Str "Level", Space, Str "4" ]
+  , Header 5
+    ( "level-5", [], [] )
+    [ Str "Level", Space, Str "5" ]
+  , Header 6
+    ( "level-6", [], [] )
+    [ Str "Level", Space, Str "6" ]
+  , Header 1
+    ( "paragraphs", [], [] )
+    [ Str "Paragraphs" ]
+  , Para
+    [ Str "Here\8217s"
+    , Space
+    , Str "a"
+    , Space
+    , Str "regular"
+    , Space
+    , Str "paragraph."
+    ]
+  , Para
+    [ Str "Line"
+    , Space
+    , Str "breaks"
+    , Space
+    , Str "are"
+    , Space
+    , Str "preserved"
+    , Space
+    , Str "in"
+    , Space
+    , Str "textile,"
+    , Space
+    , Str "so"
+    , Space
+    , Str "you"
+    , Space
+    , Str "can"
+    , Space
+    , Str "not"
+    , Space
+    , Str "wrap"
+    , Space
+    , Str "your"
+    , Space
+    , Str "very"
+    , LineBreak
+    , Str "long"
+    , Space
+    , Str "paragraph"
+    , Space
+    , Str "with"
+    , Space
+    , Str "your"
+    , Space
+    , Str "favourite"
+    , Space
+    , Str "text"
+    , Space
+    , Str "editor"
+    , Space
+    , Str "and"
+    , Space
+    , Str "have"
+    , Space
+    , Str "it"
+    , Space
+    , Str "rendered"
+    , LineBreak
+    , Str "with"
+    , Space
+    , Str "no"
+    , Space
+    , Str "break."
+    ]
+  , Para
+    [ Str "Here\8217s"
+    , Space
+    , Str "one"
+    , Space
+    , Str "with"
+    , Space
+    , Str "a"
+    , Space
+    , Str "bullet."
+    ]
+  , BulletList
+    [ [ Plain [ Str "criminey." ] ] ]
+  , Para
+    [ Str "There"
+    , Space
+    , Str "should"
+    , Space
+    , Str "be"
+    , Space
+    , Str "a"
+    , Space
+    , Str "paragraph"
+    , Space
+    , Str "break"
+    , Space
+    , Str "between"
+    , Space
+    , Str "here"
+    ]
+  , Para
+    [ Str "and", Space, Str "here." ]
+  , Para
+    [ Str "pandoc", Space, Str "converts", Space, Str "textile." ]
+  , Header 1
+    ( "block-quotes", [], [] )
+    [ Str "Block", Space, Str "Quotes" ]
+  , BlockQuote
+    [ Para
+      [ Str "This"
+      , Space
+      , Str "is"
+      , Space
+      , Str "a"
+      , Space
+      , Str "famous"
+      , Space
+      , Str "quote"
+      , Space
+      , Str "from"
+      , Space
+      , Str "somebody."
+      , Space
+      , Str "He"
+      , Space
+      , Str "had"
+      , Space
+      , Str "a"
+      , Space
+      , Str "lot"
+      , Space
+      , Str "of"
+      , Space
+      , Str "things"
+      , Space
+      , Str "to"
+      , LineBreak
+      , Str "say,"
+      , Space
+      , Str "so"
+      , Space
+      , Str "the"
+      , Space
+      , Str "text"
+      , Space
+      , Str "is"
+      , Space
+      , Str "really"
+      , Space
+      , Str "really"
+      , Space
+      , Str "long"
+      , Space
+      , Str "and"
+      , Space
+      , Str "spans"
+      , Space
+      , Str "on"
+      , Space
+      , Str "multiple"
+      , Space
+      , Str "lines."
+      ]
+    ]
+  , Para
+    [ Str "And"
+    , Space
+    , Str "a"
+    , Space
+    , Str "following"
+    , Space
+    , Str "paragraph."
+    ]
+  , Header 1
+    ( "code-blocks", [], [] )
+    [ Str "Code", Space, Str "Blocks" ]
+  , Para
+    [ Str "Code:" ]
+  , CodeBlock
+    ( ""
+    , []
+    , []
+    ) "    ---- (should be four hyphens)\n\n    sub status {\n        print \"working\";\n    }\n\n    this code block is indented by one tab"
+  , Para
+    [ Str "And:" ]
+  , CodeBlock
+    ( ""
+    , []
+    , []
+    ) "        this code block is indented by two tabs\n\n    These should not be escaped:  \\$ \\\\ \\> \\[ \\{"
+  , CodeBlock
+    ( "", [], [] ) "Code block with .bc\n        continued\n    @"
+    , Str ","
+    , Space
+    , Code
+      ( "", [], [] ) "@"
+    , Str "."
+    ]
+  , Header 1
+    ( "notextile", [], [] )
+    [ Str "Notextile" ]
+  , Para
+    [ Str "A"
+    , Space
+    , Str "block"
+    , Space
+    , Str "of"
+    , Space
+    , Str "text"
+    , Space
+    , Str "can"
+    , Space
+    , Str "be"
+    , Space
+    , Str "protected"
+    , Space
+    , Str "with"
+    , Space
+    , Str "notextile"
+    , Space
+    , Str ":"
+    ]
+  , Para
+    [ Str "\nNo *bold* and\n* no bullet\n" ]
+  , Para
+    [ Str "and"
+    , Space
+    , Str "inlines"
+    , Space
+    , Str "can"
+    , Space
+    , Str "be"
+    , Space
+    , Str "protected"
+    , Space
+    , Str "with"
+    , Space
+    , Str "double *equals (=)* markup."
+    ]
+  , Header 1
+    ( "lists", [], [] )
+    [ Str "Lists" ]
+  , Header 2
+    ( "unordered", [], [] )
+    [ Str "Unordered" ]
+  , Para
+    [ Str "Asterisks", Space, Str "tight:" ]
+  , BulletList
+    [
+      [ Plain [ Str "asterisk", Space, Str "1" ] ]
+    ,
+      [ Plain [ Str "asterisk", Space, Str "2" ] ]
+    ,
+      [ Plain [ Str "asterisk", Space, Str "3" ] ]
+    ]
+  , Para
+    [ Str "With", Space, Str "line", Space, Str "breaks:" ]
+  , BulletList
+    [
+      [ Plain
+        [ Str "asterisk", Space, Str "1", LineBreak, Str "newline" ]
+      ]
+    ,
+      [ Plain [ Str "asterisk", Space, Str "2" ] ]
+    ]
+  , Header 2
+    ( "ordered", [], [] )
+    [ Str "Ordered" ]
+  , Para
+    [ Str "Tight:" ]
+  , OrderedList
+    ( 1, DefaultStyle, DefaultDelim )
+    [
+      [ Plain [ Str "First" ] ]
+    ,
+      [ Plain [ Str "Second" ] ]
+    ,
+      [ Plain [ Str "Third" ] ]
+    ]
+  , Header 2
+    ( "nested", [], [] )
+    [ Str "Nested" ]
+  , BulletList
+    [
+      [ Plain
+        [ Str "ui", Space, Str "1" ]
+      , BulletList
+        [
+          [ Plain
+            [ Str "ui", Space, Str "1.1" ]
+          , OrderedList
+            ( 1, DefaultStyle, DefaultDelim )
+            [
+              [ Plain [ Str "oi", Space, Str "1.1.1" ] ]
+            ,
+              [ Plain [ Str "oi", Space, Str "1.1.2" ] ]
+            ]
+          ]
+        ,
+          [ Plain [ Str "ui", Space, Str "1.2" ] ]
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "ui", Space, Str "2" ]
+      , OrderedList
+        ( 1, DefaultStyle, DefaultDelim )
+        [
+          [ Plain
+            [ Str "oi", Space, Str "2.1" ]
+          , BulletList
+            [
+              [ Plain [ Str "ui", Space, Str "2.1.1" ] ]
+            ,
+              [ Plain [ Str "ui", Space, Str "2.1.2" ] ]
+            ]
+          ]
+        ]
+      ]
+    ]
+  , Header 2
+    ( "issue-1500", [], [] )
+    [ Str "Issue", Space, Str "#1500" ]
+  , BulletList
+    [
+      [ Plain [ Str "one" ] ]
+    ,
+      [ Plain
+        [ Str "two"
+        , LineBreak
+        , Str "->"
+        , Space
+        , Str "and"
+        , Space
+        , Str "more"
+        ]
+      ]
+    ]
+  , Header 2
+    ( "issue-1513", [], [] )
+    [ Str "Issue", Space, Str "#1513" ]
+  , Para
+    [ Str "List:" ]
+  , BulletList
+    [ [ Plain [ Str "one" ] ], [ Plain [ Str "two" ] ] ]
+  , Header 2
+    ( "definition-list", [], [] )
+    [ Str "Definition", Space, Str "List" ]
+  , DefinitionList
+    [
+      (
+        [ Str "coffee" ]
+      ,
+        [
+          [ Plain [ Str "Hot", Space, Str "and", Space, Str "black" ] ]
+        ]
+      )
+    ,
+      (
+        [ Str "tea" ]
+      ,
+        [
+          [ Plain
+            [ Str "Also"
+            , Space
+            , Str "hot,"
+            , Space
+            , Str "but"
+            , Space
+            , Str "a"
+            , Space
+            , Str "little"
+            , Space
+            , Str "less"
+            , Space
+            , Str "black"
+            ]
+          ]
+        ]
+      )
+    ,
+      (
+        [ Str "milk" ]
+      ,
+        [
+          [ Para
+            [ Str "Nourishing"
+            , Space
+            , Str "beverage"
+            , Space
+            , Str "for"
+            , Space
+            , Str "baby"
+            , Space
+            , Str "cows."
+            ]
+          , Para
+            [ Str "Cold"
+            , Space
+            , Str "drink"
+            , Space
+            , Str "that"
+            , Space
+            , Str "goes"
+            , Space
+            , Str "great"
+            , Space
+            , Str "with"
+            , Space
+            , Str "cookies."
+            ]
+          ]
+        ]
+      )
+    ,
+      (
+        [ Str "beer" ]
+      ,
+        [
+          [ Plain
+            [ Str "fresh", Space, Str "and", Space, Str "bitter" ]
+          ]
+        ]
+      )
+    ]
+  , Header 1
+    ( "inline-markup", [], [] )
+    [ Str "Inline", Space, Str "Markup" ]
+  , Para
+    [ Str "This"
+    , Space
+    , Str "is"
+    , Space
+    , Emph
+      [ Str "emphasized" ]
+    , Str ","
+    , Space
+    , Str "and"
+    , Space
+    , Str "so"
+    , Space
+    , Emph
+      [ Str "is", Space, Str "this" ]
+    , Str "."
+    , LineBreak
+    , Str "This"
+    , Space
+    , Str "is"
+    , Space
+    , Strong
+      [ Str "strong" ]
+    , Str ","
+    , Space
+    , Str "and"
+    , Space
+    , Str "so"
+    , Space
+    , Strong
+      [ Str "is", Space, Str "this" ]
+    , Str "."
+    , LineBreak
+    , Str "This"
+    , Space
+    , Str "is"
+    , Space
+    , Underline
+      [ Str "inserted" ]
+    , Str ","
+    , Space
+    , Str "and"
+    , Space
+    , Str "this"
+    , Space
+    , Str "is"
+    , Space
+    , Strikeout
+      [ Str "deleted" ]
+    , Str "."
+    , LineBreak
+    , Str "Hyphenated-words-are-ok,"
+    , Space
+    , Str "as"
+    , Space
+    , Str "well"
+    , Space
+    , Str "as"
+    , Space
+    , Str "strange_underscore_notation."
+    , LineBreak
+    , Str "A"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Strong [ Str "strong", Space, Str "link" ] ]
+      ( "http://www.foobar.com", "" )
+    , Str "."
+    ]
+  , Para
+    [ Emph
+      [ Strong
+        [ Str "This"
+        , Space
+        , Str "is"
+        , Space
+        , Str "strong"
+        , Space
+        , Str "and"
+        , Space
+        , Str "em."
+        ]
+      ]
+    , LineBreak
+    , Str "So"
+    , Space
+    , Str "is"
+    , Space
+    , Strong
+      [ Emph [ Str "this" ] ]
+    , Space
+    , Str "word"
+    , Space
+    , Str "and"
+    , Space
+    , Emph
+      [ Strong [ Str "that", Space, Str "one" ] ]
+    , Str "."
+    , LineBreak
+    , Strikeout
+      [ Str "This"
+      , Space
+      , Str "is"
+      , Space
+      , Str "strikeout"
+      , Space
+      , Str "and"
+      , Space
+      , Strong
+        [ Str "strong" ]
+      ]
+    ]
+  , Para
+    [ Str "Superscripts:"
+    , Space
+    , Str "a"
+    , Superscript
+      [ Str "bc" ]
+    , Str "d"
+    , Space
+    , Str "a"
+    , Space
+    , Superscript
+      [ Strong [ Str "hello" ] ]
+    , Space
+    , Str "a"
+    , Superscript
+      [ Str "hello", Space, Str "there" ]
+    , Str "."
+    , LineBreak
+    , Str "Subscripts:"
+    , Space
+    , Subscript
+      [ Str "here" ]
+    , Space
+    , Str "H"
+    , Space
+    , Subscript
+      [ Str "2" ]
+    , Str "O,"
+    , Space
+    , Str "H"
+    , Space
+    , Subscript
+      [ Str "23" ]
+    , Str "O,"
+    , Space
+    , Str "H"
+    , Space
+    , Subscript
+      [ Str "many", Space, Str "of", Space, Str "them" ]
+    , Str "O."
+    ]
+  , Para
+    [ Str "Dashes"
+    , Space
+    , Str ":"
+    , Space
+    , Str "How"
+    , Space
+    , Str "cool"
+    , Space
+    , Str "\8212"
+    , Space
+    , Str "automatic"
+    , Space
+    , Str "dashes."
+    ]
+  , Para
+    [ Str "Ellipses"
+    , Space
+    , Str ":"
+    , Space
+    , Str "He"
+    , Space
+    , Str "thought"
+    , Space
+    , Str "and"
+    , Space
+    , Str "thought"
+    , Space
+    , Str "\8230"
+    , Space
+    , Str "and"
+    , Space
+    , Str "then"
+    , Space
+    , Str "thought"
+    , Space
+    , Str "some"
+    , Space
+    , Str "more."
+    ]
+  , Para
+    [ Str "Quotes"
+    , Space
+    , Str "and"
+    , Space
+    , Str "apostrophes"
+    , Space
+    , Str ":"
+    , Space
+    , Quoted DoubleQuote
+      [ Str "I\8217d"
+      , Space
+      , Str "like"
+      , Space
+      , Str "to"
+      , Space
+      , Str "thank"
+      , Space
+      , Str "you"
+      ]
+    , Space
+    , Str "for"
+    , Space
+    , Str "example."
+    ]
+  , Header 1
+    ( "links", [], [] )
+    [ Str "Links" ]
+  , Header 2
+    ( "explicit", [], [] )
+    [ Str "Explicit" ]
+  , Para
+    [ Str "Just"
+    , Space
+    , Str "a"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "url" ]
+      ( "http://www.url.com", "" )
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "Email", Space, Str "link" ]
+      ( "mailto:nobody@nowhere.net", "" )
+    ]
+  , Para
+    [ Quoted DoubleQuote
+      [ Str "not", Space, Str "a", Space, Str "link" ]
+    , Str ":"
+    , Space
+    , Str "foo"
+    ]
+  , Para
+    [ Str "Automatic"
+    , Space
+    , Str "linking"
+    , Space
+    , Str "to"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "http://www.example.com" ]
+      ( "http://www.example.com", "" )
+    , Str "."
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "Example" ]
+      ( "http://www.example.com/", "" )
+    , Str ":"
+    , Space
+    , Str "Example"
+    , Space
+    , Str "of"
+    , Space
+    , Str "a"
+    , Space
+    , Str "link"
+    , Space
+    , Str "followed"
+    , Space
+    , Str "by"
+    , Space
+    , Str "a"
+    , Space
+    , Str "colon."
+    ]
+  , Para
+    [ Str "A"
+    , Space
+    , Str "link"
+    , Link
+      ( "", [], [] )
+      [ Str "with", Space, Str "brackets" ]
+      ( "http://www.example.com", "" )
+    , Str "and"
+    , Space
+    , Str "no"
+    , Space
+    , Str "spaces."
+    ]
+  , Header 1
+    ( "tables", [], [] )
+    [ Str "Tables" ]
+  , Para
+    [ Str "Textile"
+    , Space
+    , Str "allows"
+    , Space
+    , Str "tables"
+    , Space
+    , Str "with"
+    , Space
+    , Str "and"
+    , Space
+    , Str "without"
+    , Space
+    , Str "headers"
+    , Space
+    , Str ":"
+    ]
+  , Header 2
+    ( "without-headers", [], [] )
+    [ Str "Without", Space, Str "headers" ]
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignDefault, ColWidthDefault )
+    ,
+      ( AlignDefault, ColWidthDefault )
+    ,
+      ( AlignDefault, ColWidthDefault )
+    ]
+    ( TableHead ( "", [], [] ) [] )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "name" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "age" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "sex" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "joan" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "24" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "f" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "archie" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "29" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "m" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "bella" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "45" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "f" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Para
+    [ Str "and"
+    , Space
+    , Str "some"
+    , Space
+    , Str "text"
+    , Space
+    , Str "following"
+    , Space
+    , Str "\8230"
+    ]
+  , Header 2
+    ( "with-headers", [], [] )
+    [ Str "With", Space, Str "headers" ]
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignDefault, ColWidthDefault )
+    ,
+      ( AlignDefault, ColWidthDefault )
+    ,
+      ( AlignDefault, ColWidthDefault )
+    ]
+    ( TableHead
+      ( "", [], [] )
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "name" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "age" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "sex" ] ]
+        ]
+      ]
+    )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "joan" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "24" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "f" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "archie" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "29" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "m" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "bella" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "45" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "f" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Header 1
+    ( "images", [], [] )
+    [ Str "Images" ]
+  , Para
+    [ Str "Textile"
+    , Space
+    , Str "inline"
+    , Space
+    , Str "image"
+    , Space
+    , Str "syntax,"
+    , Space
+    , Str "like"
+    , LineBreak
+    , Str "here"
+    , Space
+    , Image
+      ( "", [], [] )
+      [ Str "this is the alt text" ]
+      ( "this_is_an_image.png", "this is the alt text" )
+    , LineBreak
+    , Str "and"
+    , Space
+    , Str "here"
+    , Space
+    , Image
+      ( "", [], [] )
+      [ Str "" ]
+      ( "this_is_an_image.png", "" )
+    , Str "."
+    ]
+  , Header 1
+    ( "attributes", [], [] )
+    [ Str "Attributes" ]
+  , Header 2
+    ( "ident"
+    ,
+      [ "bar", "foo" ]
+    ,
+      [ ( "style", "color:red;" ), ( "lang", "en" ) ]
+    )
+    [ Str "HTML"
+    , Space
+    , Str "and"
+    , Space
+    , Str "CSS"
+    , Space
+    , Str "attributes"
+    , Space
+    , Str "are"
+    , Space
+    , Str "parsed"
+    , Space
+    , Str "in"
+    , Space
+    , Str "headers."
+    ]
+  , Header 2
+    ( "centered", [], [ ( "style", "text-align:center;" ) ] )
+    [ Str "Centered" ]
+  , Header 2
+    ( "right", [], [ ( "style", "text-align:right;" ) ] )
+    [ Str "Right" ]
+  , Header 2
+    ( "justified"
+    , []
+    ,
+      [
+        ( "lang", "en" )
+      ,
+        ( "style", "color:blue;text-align:justify;" )
+      ]
+    )
+    [ Str "Justified" ]
+  , Para
+    [ Str "as"
+    , Space
+    , Str "well"
+    , Space
+    , Str "as"
+    , Space
+    , Strong
+      [ Span
+        ( "", [ "foo" ], [] )
+        [ Str "inline", Space, Str "attributes" ]
+      ]
+    , Space
+    , Str "of"
+    , Space
+    , Span
+      ( "", [], [ ( "style", "color:red;" ) ] )
+      [ Str "all", Space, Str "kind" ]
+    ]
+  , Para
+    [ Str "and"
+    , Space
+    , Str "paragraph"
+    , Space
+    , Str "attributes,"
+    , Space
+    , Str "and"
+    , Space
+    , Str "table"
+    , Space
+    , Str "attributes."
+    ]
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignDefault, ColWidthDefault )
+    ,
+      ( AlignDefault, ColWidthDefault )
+    ,
+      ( AlignDefault, ColWidthDefault )
+    ]
+    ( TableHead ( "", [], [] ) [] )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "name" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "age" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "sex" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "joan" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "24" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "f" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Para
+    [ Emph [ Str "(class#id)", Space, Str "emph" ] ]
+  , Para
+    [ Emph [ Str "(no", Space, Str "class#id)", Space, Str "emph" ] ]
+  , Header 1
+    ( "entities", [], [] )
+    [ Str "Entities" ]
+  , Para
+    [ Str "*", LineBreak, Str "&" ]
+  , Header 1
+    ( "raw-html", [], [] )
+    [ Str "Raw", Space, Str "HTML" ]
+  , Para
+    [ Str "However,"
+    , Space
+    , RawInline
+      ( Format "html" ) ""
+    , Space
+    , Str "raw"
+    , Space
+    , Str "HTML"
+    , Space
+    , Str "inlines"
+    , Space
+    , RawInline
+      ( Format "html" ) ""
+    , Space
+    , Str "are"
+    , Space
+    , Str "accepted,"
+    , Space
+    , Str "as"
+    , Space
+    , Str "well"
+    , Space
+    , Str "as"
+    , Space
+    , Str ":"
+    ]
+  , RawBlock
+    ( Format "html" ) ""
+  , Para
+    [ Str "any"
+    , Space
+    , Strong
+      [ Str "Raw", Space, Str "HTML", Space, Str "Block" ]
+    , Space
+    , Str "with"
+    , Space
+    , Str "bold"
+    ]
+  , RawBlock
+    ( Format "html" ) ""
+  , Para
+    [ Str "Html", Space, Str "blocks", Space, Str "can" ]
+  , RawBlock
+    ( Format "html" ) ""
+  , Para
+    [ Str "interrupt", Space, Str "paragraphs" ]
+  , RawBlock
+    ( Format "html" ) ""
+  , Para
+    [ Str "as", Space, Str "well." ]
+  , Para
+    [ Str "Can"
+    , Space
+    , Str "you"
+    , Space
+    , Str "prove"
+    , Space
+    , Str "that"
+    , Space
+    , Str "2"
+    , Space
+    , Str "<"
+    , Space
+    , Str "3"
+    , Space
+    , Str "?"
+    ]
+  , Header 1
+    ( "acronyms-and-marks", [], [] )
+    [ Str "Acronyms", Space, Str "and", Space, Str "marks" ]
+  , Para
+    [ Str "PBS (Public Broadcasting System)" ]
+  , Para
+    [ Str "Hi\8482" ]
+  , Para
+    [ Str "Hi", Space, Str "\8482" ]
+  , Para
+    [ Str "\174", Space, Str "Hi\174" ]
+  , Para
+    [ Str "Hi\169\&2008", Space, Str "\169", Space, Str "2008" ]
+  , Header 1
+    ( "footnotes", [], [] )
+    [ Str "Footnotes" ]
+  , Para
+    [ Str "A"
+    , Space
+    , Str "note."
+    , Note
+      [ Para
+        [ Str "The"
+        , Space
+        , Str "note"
+        , LineBreak
+        , Str "is"
+        , Space
+        , Str "here!"
+        ]
+      ]
+    , Space
+    , Str "Another"
+    , Space
+    , Str "note"
+    , Note
+      [ Para [ Str "Other", Space, Str "note." ] ]
+    , Str "."
+    ]
+  , Header 1
+    ( "comment-blocks", [], [] )
+    [ Str "Comment", Space, Str "blocks" ]
+  , Para
+    [ Str "not", Space, Str "a", Space, Str "comment." ]
+  ]
diff --git a/test/tikiwiki-reader.native b/test/tikiwiki-reader.native
index 0c34f60ce..eb10421da 100644
--- a/test/tikiwiki-reader.native
+++ b/test/tikiwiki-reader.native
@@ -1,212 +1,761 @@
-Pandoc (Meta {unMeta = fromList []})
-[Header 1 ("header",[],[]) [Str "header"]
-,Header 2 ("header-level-two",[],[]) [Str "header",Space,Str "level",Space,Str "two"]
-,Header 3 ("header-level-3",[],[]) [Str "header",Space,Str "level",Space,Str "3"]
-,Header 4 ("header-_level_-four",[],[]) [Str "header",Space,Str "_level_",Space,Str "four"]
-,Header 5 ("header-level-5",[],[]) [Str "header",Space,Str "level",Space,Str "5"]
-,Header 6 ("header-level-6",[],[]) [Str "header",Space,Str "level",Space,Str "6"]
-,Para [Str "!!!!!!!",Space,Str "not",Space,Str "a",Space,Str "header"]
-,Para [Str "--++",Space,Str "not",Space,Str "a",Space,Str "header"]
-,Header 1 ("emph-and-strong",[],[]) [Str "emph",Space,Str "and",Space,Str "strong"]
-,Para [Emph [Str "emph"],Space,Strong [Str "strong"]]
-,Para [Emph [Strong [Str "strong",Space,Str "and",Space,Str "emph",Space,Str "1"]]]
-,Para [Strong [Emph [Str "strong",Space,Str "and",Space,Str "emph",Space,Str "2"]]]
-,Para [Strong [Emph [Str "emph",Space,Str "inside"],Space,Str "strong"]]
-,Para [Strong [Str "strong",Space,Str "with",Space,Emph [Str "emph"]]]
-,Para [Emph [Strong [Str "strong",Space,Str "inside"],Space,Str "emph"]]
-,Header 1 ("horizontal-rule",[],[]) [Str "horizontal",Space,Str "rule"]
-,Para [Str "top"]
-,HorizontalRule
-,Para [Str "bottom"]
-,HorizontalRule
-,Header 1 ("nop",[],[]) [Str "nop"]
-,Para [Str "__not emph__"]
-,Header 1 ("entities",[],[]) [Str "entities"]
-,Para [Str "hi",Space,Str "&",Space,Str "low"]
-,Para [Str "hi",Space,Str "&",Space,Str "low"]
-,Para [Str "G\246del"]
-,Para [Str "\777\2730"]
-,Header 1 ("linebreaks",[],[]) [Str "linebreaks"]
-,Para [Str "hi",LineBreak,Str "there"]
-,Para [Str "hi",LineBreak,Str "there"]
-,Header 1 ("inline-code",[],[]) [Str "inline",Space,Str "code"]
-,Para [Code ("",[],[]) "*\8594*",Space,Code ("",[],[]) "typed",Space,Code ("",[],[]) ">>="]
-,Header 1 ("code-blocks",[],[]) [Str "code",Space,Str "blocks"]
-,CodeBlock ("",[],[]) "\ncase xs of\n     (_:_) -> reverse xs\n     []    -> ['*']\n"
-,CodeBlock ("",["haskell"],[("colors","haskell"),("ln","0")]) "\ncase xs of\n     (_:_) -> reverse xs\n     []    -> ['*']\n"
-,Header 1 ("external-links",[],[]) [Str "external",Space,Str "links"]
-,Para [Link ("",[],[]) [Emph [Str "Google"],Space,Str "search",Space,Str "engine"] ("http://google.com","")]
-,Para [Link ("",[],[]) [Str "http://pandoc.org"] ("http://pandoc.org","")]
-,Para [Link ("",[],[]) [Str "http://google.com"] ("http://google.com",""),Space,Link ("",[],[]) [Str "http://yahoo.com"] ("http://yahoo.com","")]
-,Para [Link ("",[],[]) [Str "email",Space,Str "me"] ("mailto:info@example.org","")]
-,Para [Str "http://google.com"]
-,Para [Str "info@example.org"]
-,Header 1 ("lists",[],[]) [Str "lists"]
-,BulletList
- [[Plain [Str "Start",Space,Str "each",Space,Str "line"]]
- ,[Plain [Str "with",Space,Str "an",Space,Str "asterisk",Space,Str "(*)."]
-  ,BulletList
-   [[Plain [Str "More",Space,Str "asterisks",Space,Str "gives",Space,Str "deeper"]
-    ,BulletList
-     [[Plain [Str "and",Space,Str "deeper",Space,Str "levels."]]]]]]
- ,[Plain [Str "Line",Space,Str "breaks",LineBreak,Str "don't",Space,Str "break",Space,Str "levels."]]
- ,[Plain [Str "Continuations",Space,Str "are",Space,Str "also",Space,Str "possible"]
-  ,BulletList
-   [[Plain [Str "and",Space,Str "do",Space,Str "not",Space,Str "break",Space,Str "the",Space,Str "list",Space,Str "flow"]]]]
- ,[Plain [Str "Level",Space,Str "one"]]]
-,Para [Str "Any",Space,Str "other",Space,Str "start",Space,Str "ends",Space,Str "the",Space,Str "list."]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Plain [Str "Start",Space,Str "each",Space,Str "line"]]
- ,[Plain [Str "with",Space,Str "a",Space,Str "number",Space,Str "(1.)."]
-  ,OrderedList (1,DefaultStyle,DefaultDelim)
-   [[Plain [Str "More",Space,Str "number",Space,Str "signs",Space,Str "gives",Space,Str "deeper"]
-    ,OrderedList (1,DefaultStyle,DefaultDelim)
-     [[Plain [Str "and",Space,Str "deeper"]]
-     ,[Plain [Str "levels."]]]]]]
- ,[Plain [Str "Line",Space,Str "breaks",LineBreak,Str "don't",Space,Str "break",Space,Str "levels."]]
- ,[Plain [Str "Blank",Space,Str "lines"]]]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Plain [Str "end",Space,Str "the",Space,Str "list",Space,Str "and",Space,Str "start",Space,Str "another."]]]
-,Para [Str "Any",Space,Str "other",Space,Str "start",Space,Str "also",Space,Str "ends",Space,Str "the",Space,Str "list."]
-,DefinitionList
- [([Str "item",Space,Str "1"],
-   [[Plain [Str "definition",Space,Str "1"]]])
- ,([Str "item",Space,Str "2"],
-   [[Plain [Str "definition",Space,Str "2-1",Space,Str "definition",Space,Str "2-2"]]])
- ,([Str "item",Space,Emph [Str "3"]],
-   [[Plain [Str "definition",Space,Emph [Str "3"]]]])]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Plain [Str "one"]]
- ,[Plain [Str "two"]
-  ,BulletList
-   [[Plain [Str "two",Space,Str "point",Space,Str "one"]]
-   ,[Plain [Str "two",Space,Str "point",Space,Str "two"]]]]
- ,[Plain [Str "three"]]
- ,[Plain [Str "four"]]
- ,[Plain [Str "five"]
-  ,OrderedList (1,DefaultStyle,DefaultDelim)
-   [[Plain [Str "five",Space,Str "sub",Space,Str "1"]
-    ,OrderedList (1,DefaultStyle,DefaultDelim)
-     [[Plain [Str "five",Space,Str "sub",Space,Str "1",Space,Str "sub",Space,Str "1"]]]]
-   ,[Plain [Str "five",Space,Str "sub",Space,Str "2"]]]]]
-,Header 1 ("tables",[],[]) [Str "tables"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str ""]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str ""]]]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Orange"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Apple"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Bread"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Pie"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Butter"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Ice",Space,Str "cream"]]]])]
- (TableFoot ("",[],[])
- [])
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str ""]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str ""]]]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Orange"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Apple"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Bread"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Pie"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Strong [Str "Butter"]]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Ice",Space,Str "cream"]]]])]
- (TableFoot ("",[],[])
- [])
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str ""]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str ""]]]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Orange"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Apple"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Bread",LineBreak,LineBreak,Str "and",Space,Str "cheese"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Pie",LineBreak,LineBreak,Strong [Str "apple"],Space,Str "and",Space,Emph [Str "carrot"],Space]]]])]
- (TableFoot ("",[],[])
- [])
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str ""]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str ""]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str ""]]]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Space,Str "Orange",Space]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Space,Str "Apple",Space]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Space,Str "more"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Space,Str "Bread",Space]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Space,Str "Pie",Space]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Space,Str "more"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Space,Str "Butter",Space]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Space,Str "Ice",Space,Str "cream",Space]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Space,Str "and",Space,Str "more",Space]]]])]
- (TableFoot ("",[],[])
- [])]
+Pandoc
+  ( Meta { unMeta = fromList [] } )
+  [ Header 1
+    ( "header", [], [] )
+    [ Str "header" ]
+  , Header 2
+    ( "header-level-two", [], [] )
+    [ Str "header", Space, Str "level", Space, Str "two" ]
+  , Header 3
+    ( "header-level-3", [], [] )
+    [ Str "header", Space, Str "level", Space, Str "3" ]
+  , Header 4
+    ( "header-_level_-four", [], [] )
+    [ Str "header", Space, Str "_level_", Space, Str "four" ]
+  , Header 5
+    ( "header-level-5", [], [] )
+    [ Str "header", Space, Str "level", Space, Str "5" ]
+  , Header 6
+    ( "header-level-6", [], [] )
+    [ Str "header", Space, Str "level", Space, Str "6" ]
+  , Para
+    [ Str "!!!!!!!"
+    , Space
+    , Str "not"
+    , Space
+    , Str "a"
+    , Space
+    , Str "header"
+    ]
+  , Para
+    [ Str "--++"
+    , Space
+    , Str "not"
+    , Space
+    , Str "a"
+    , Space
+    , Str "header"
+    ]
+  , Header 1
+    ( "emph-and-strong", [], [] )
+    [ Str "emph", Space, Str "and", Space, Str "strong" ]
+  , Para
+    [ Emph [ Str "emph" ], Space, Strong [ Str "strong" ] ]
+  , Para
+    [ Emph
+      [ Strong
+        [ Str "strong"
+        , Space
+        , Str "and"
+        , Space
+        , Str "emph"
+        , Space
+        , Str "1"
+        ]
+      ]
+    ]
+  , Para
+    [ Strong
+      [ Emph
+        [ Str "strong"
+        , Space
+        , Str "and"
+        , Space
+        , Str "emph"
+        , Space
+        , Str "2"
+        ]
+      ]
+    ]
+  , Para
+    [ Strong
+      [ Emph [ Str "emph", Space, Str "inside" ], Space, Str "strong" ]
+    ]
+  , Para
+    [ Strong
+      [ Str "strong", Space, Str "with", Space, Emph [ Str "emph" ] ]
+    ]
+  , Para
+    [ Emph
+      [ Strong
+        [ Str "strong", Space, Str "inside" ]
+      , Space
+      , Str "emph"
+      ]
+    ]
+  , Header 1
+    ( "horizontal-rule", [], [] )
+    [ Str "horizontal", Space, Str "rule" ]
+  , Para
+    [ Str "top" ]
+  , HorizontalRule
+  , Para
+    [ Str "bottom" ]
+  , HorizontalRule
+  , Header 1
+    ( "nop", [], [] )
+    [ Str "nop" ]
+  , Para
+    [ Str "__not emph__" ]
+  , Header 1
+    ( "entities", [], [] )
+    [ Str "entities" ]
+  , Para
+    [ Str "hi", Space, Str "&", Space, Str "low" ]
+  , Para
+    [ Str "hi", Space, Str "&", Space, Str "low" ]
+  , Para
+    [ Str "G\246del" ]
+  , Para
+    [ Str "\777\2730" ]
+  , Header 1
+    ( "linebreaks", [], [] )
+    [ Str "linebreaks" ]
+  , Para
+    [ Str "hi", LineBreak, Str "there" ]
+  , Para
+    [ Str "hi", LineBreak, Str "there" ]
+  , Header 1
+    ( "inline-code", [], [] )
+    [ Str "inline", Space, Str "code" ]
+  , Para
+    [ Code
+      ( "", [], [] ) "*\8594*"
+    , Space
+    , Code
+      ( "", [], [] ) "typed"
+    , Space
+    , Code
+      ( "", [], [] ) ">>="
+    ]
+  , Header 1
+    ( "code-blocks", [], [] )
+    [ Str "code", Space, Str "blocks" ]
+  , CodeBlock
+    ( ""
+    , []
+    , []
+    ) "\ncase xs of\n     (_:_) -> reverse xs\n     []    -> ['*']\n"
+  , CodeBlock
+    ( ""
+    , [ "haskell" ]
+    ,
+      [ ( "colors", "haskell" ), ( "ln", "0" ) ]
+    ) "\ncase xs of\n     (_:_) -> reverse xs\n     []    -> ['*']\n"
+  , Header 1
+    ( "external-links", [], [] )
+    [ Str "external", Space, Str "links" ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Emph
+        [ Str "Google" ]
+      , Space
+      , Str "search"
+      , Space
+      , Str "engine"
+      ]
+      ( "http://google.com", "" )
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "http://pandoc.org" ]
+      ( "http://pandoc.org", "" )
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "http://google.com" ]
+      ( "http://google.com", "" )
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "http://yahoo.com" ]
+      ( "http://yahoo.com", "" )
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "email", Space, Str "me" ]
+      ( "mailto:info@example.org", "" )
+    ]
+  , Para
+    [ Str "http://google.com" ]
+  , Para
+    [ Str "info@example.org" ]
+  , Header 1
+    ( "lists", [], [] )
+    [ Str "lists" ]
+  , BulletList
+    [
+      [ Plain [ Str "Start", Space, Str "each", Space, Str "line" ] ]
+    ,
+      [ Plain
+        [ Str "with"
+        , Space
+        , Str "an"
+        , Space
+        , Str "asterisk"
+        , Space
+        , Str "(*)."
+        ]
+      , BulletList
+        [
+          [ Plain
+            [ Str "More"
+            , Space
+            , Str "asterisks"
+            , Space
+            , Str "gives"
+            , Space
+            , Str "deeper"
+            ]
+          , BulletList
+            [
+              [ Plain
+                [ Str "and", Space, Str "deeper", Space, Str "levels." ]
+              ]
+            ]
+          ]
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "Line"
+        , Space
+        , Str "breaks"
+        , LineBreak
+        , Str "don't"
+        , Space
+        , Str "break"
+        , Space
+        , Str "levels."
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "Continuations"
+        , Space
+        , Str "are"
+        , Space
+        , Str "also"
+        , Space
+        , Str "possible"
+        ]
+      , BulletList
+        [
+          [ Plain
+            [ Str "and"
+            , Space
+            , Str "do"
+            , Space
+            , Str "not"
+            , Space
+            , Str "break"
+            , Space
+            , Str "the"
+            , Space
+            , Str "list"
+            , Space
+            , Str "flow"
+            ]
+          ]
+        ]
+      ]
+    ,
+      [ Plain [ Str "Level", Space, Str "one" ] ]
+    ]
+  , Para
+    [ Str "Any"
+    , Space
+    , Str "other"
+    , Space
+    , Str "start"
+    , Space
+    , Str "ends"
+    , Space
+    , Str "the"
+    , Space
+    , Str "list."
+    ]
+  , OrderedList
+    ( 1, DefaultStyle, DefaultDelim )
+    [
+      [ Plain [ Str "Start", Space, Str "each", Space, Str "line" ] ]
+    ,
+      [ Plain
+        [ Str "with"
+        , Space
+        , Str "a"
+        , Space
+        , Str "number"
+        , Space
+        , Str "(1.)."
+        ]
+      , OrderedList
+        ( 1, DefaultStyle, DefaultDelim )
+        [
+          [ Plain
+            [ Str "More"
+            , Space
+            , Str "number"
+            , Space
+            , Str "signs"
+            , Space
+            , Str "gives"
+            , Space
+            , Str "deeper"
+            ]
+          , OrderedList
+            ( 1, DefaultStyle, DefaultDelim )
+            [
+              [ Plain [ Str "and", Space, Str "deeper" ] ]
+            ,
+              [ Plain [ Str "levels." ] ]
+            ]
+          ]
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "Line"
+        , Space
+        , Str "breaks"
+        , LineBreak
+        , Str "don't"
+        , Space
+        , Str "break"
+        , Space
+        , Str "levels."
+        ]
+      ]
+    ,
+      [ Plain [ Str "Blank", Space, Str "lines" ] ]
+    ]
+  , OrderedList
+    ( 1, DefaultStyle, DefaultDelim )
+    [
+      [ Plain
+        [ Str "end"
+        , Space
+        , Str "the"
+        , Space
+        , Str "list"
+        , Space
+        , Str "and"
+        , Space
+        , Str "start"
+        , Space
+        , Str "another."
+        ]
+      ]
+    ]
+  , Para
+    [ Str "Any"
+    , Space
+    , Str "other"
+    , Space
+    , Str "start"
+    , Space
+    , Str "also"
+    , Space
+    , Str "ends"
+    , Space
+    , Str "the"
+    , Space
+    , Str "list."
+    ]
+  , DefinitionList
+    [
+      (
+        [ Str "item", Space, Str "1" ]
+      ,
+        [ [ Plain [ Str "definition", Space, Str "1" ] ] ]
+      )
+    ,
+      (
+        [ Str "item", Space, Str "2" ]
+      ,
+        [
+          [ Plain
+            [ Str "definition"
+            , Space
+            , Str "2-1"
+            , Space
+            , Str "definition"
+            , Space
+            , Str "2-2"
+            ]
+          ]
+        ]
+      )
+    ,
+      (
+        [ Str "item", Space, Emph [ Str "3" ] ]
+      ,
+        [ [ Plain [ Str "definition", Space, Emph [ Str "3" ] ] ] ]
+      )
+    ]
+  , OrderedList
+    ( 1, DefaultStyle, DefaultDelim )
+    [
+      [ Plain [ Str "one" ] ]
+    ,
+      [ Plain
+        [ Str "two" ]
+      , BulletList
+        [
+          [ Plain [ Str "two", Space, Str "point", Space, Str "one" ] ]
+        ,
+          [ Plain [ Str "two", Space, Str "point", Space, Str "two" ] ]
+        ]
+      ]
+    ,
+      [ Plain [ Str "three" ] ]
+    ,
+      [ Plain [ Str "four" ] ]
+    ,
+      [ Plain
+        [ Str "five" ]
+      , OrderedList
+        ( 1, DefaultStyle, DefaultDelim )
+        [
+          [ Plain
+            [ Str "five", Space, Str "sub", Space, Str "1" ]
+          , OrderedList
+            ( 1, DefaultStyle, DefaultDelim )
+            [
+              [ Plain
+                [ Str "five"
+                , Space
+                , Str "sub"
+                , Space
+                , Str "1"
+                , Space
+                , Str "sub"
+                , Space
+                , Str "1"
+                ]
+              ]
+            ]
+          ]
+        ,
+          [ Plain [ Str "five", Space, Str "sub", Space, Str "2" ] ]
+        ]
+      ]
+    ]
+  , Header 1
+    ( "tables", [], [] )
+    [ Str "tables" ]
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignDefault, ColWidthDefault )
+    ,
+      ( AlignDefault, ColWidthDefault )
+    ]
+    ( TableHead
+      ( "", [], [] )
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "" ] ]
+        ]
+      ]
+    )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Orange" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Apple" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Bread" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Pie" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Butter" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Ice", Space, Str "cream" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignDefault, ColWidthDefault )
+    ,
+      ( AlignDefault, ColWidthDefault )
+    ]
+    ( TableHead
+      ( "", [], [] )
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "" ] ]
+        ]
+      ]
+    )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Orange" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Apple" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Bread" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Pie" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Strong [ Str "Butter" ] ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Ice", Space, Str "cream" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignDefault, ColWidthDefault )
+    ,
+      ( AlignDefault, ColWidthDefault )
+    ]
+    ( TableHead
+      ( "", [], [] )
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "" ] ]
+        ]
+      ]
+    )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Orange" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Apple" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain
+            [ Str "Bread"
+            , LineBreak
+            , LineBreak
+            , Str "and"
+            , Space
+            , Str "cheese"
+            ]
+          ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain
+            [ Str "Pie"
+            , LineBreak
+            , LineBreak
+            , Strong
+              [ Str "apple" ]
+            , Space
+            , Str "and"
+            , Space
+            , Emph
+              [ Str "carrot" ]
+            , Space
+            ]
+          ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignDefault, ColWidthDefault )
+    ,
+      ( AlignDefault, ColWidthDefault )
+    ,
+      ( AlignDefault, ColWidthDefault )
+    ]
+    ( TableHead
+      ( "", [], [] )
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "" ] ]
+        ]
+      ]
+    )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Space, Str "Orange", Space ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Space, Str "Apple", Space ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Space, Str "more" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Space, Str "Bread", Space ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Space, Str "Pie", Space ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Space, Str "more" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Space, Str "Butter", Space ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Space, Str "Ice", Space, Str "cream", Space ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Space, Str "and", Space, Str "more", Space ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  ]
diff --git a/test/twiki-reader.native b/test/twiki-reader.native
index 704bcbd9a..d0a225712 100644
--- a/test/twiki-reader.native
+++ b/test/twiki-reader.native
@@ -1,250 +1,875 @@
-Pandoc (Meta {unMeta = fromList []})
-[Header 1 ("header",[],[]) [Str "header"]
-,Header 2 ("header-level-two",[],[]) [Str "header",Space,Str "level",Space,Str "two"]
-,Header 3 ("header-level-3",[],[]) [Str "header",Space,Str "level",Space,Str "3"]
-,Header 4 ("header-level-four",[],[]) [Str "header",Space,Emph [Str "level"],Space,Str "four"]
-,Header 5 ("header-level-5",[],[]) [Str "header",Space,Str "level",Space,Str "5"]
-,Header 6 ("header-level-6",[],[]) [Str "header",Space,Str "level",Space,Str "6"]
-,Para [Str "---+++++++",Space,Str "not",Space,Str "a",Space,Str "header"]
-,Para [Str "--++",Space,Str "not",Space,Str "a",Space,Str "header"]
-,Header 1 ("emph-and-strong",[],[]) [Str "emph",Space,Str "and",Space,Str "strong"]
-,Para [Emph [Str "emph"],Space,Strong [Str "strong"]]
-,Para [Emph [Strong [Str "strong",Space,Str "and",Space,Str "emph"]]]
-,Para [Strong [Emph [Str "emph",Space,Str "inside"],Space,Str "strong"]]
-,Para [Strong [Str "strong",Space,Str "with",Space,Emph [Str "emph"]]]
-,Para [Emph [Strong [Str "strong",Space,Str "inside"],Space,Str "emph"]]
-,Header 1 ("horizontal-rule",[],[]) [Str "horizontal",Space,Str "rule"]
-,Para [Str "top"]
-,HorizontalRule
-,Para [Str "bottom"]
-,HorizontalRule
-,Header 1 ("nop",[],[]) [Str "nop"]
-,Para [Str "_not",Space,Str "emph_"]
-,Header 1 ("entities",[],[]) [Str "entities"]
-,Para [Str "hi",Space,Str "&",Space,Str "low"]
-,Para [Str "hi",Space,Str "&",Space,Str "low"]
-,Para [Str "G\246del"]
-,Para [Str "\777\2730"]
-,Header 1 ("comments",[],[]) [Str "comments"]
-,Para [Str "inline",Space,Str "comment"]
-,Para [Str "between",Space,Str "blocks"]
-,Header 1 ("linebreaks",[],[]) [Str "linebreaks"]
-,Para [Str "hi",LineBreak,Str "there"]
-,Para [Str "hi",LineBreak,Str "there"]
-,Header 1 ("inline-code",[],[]) [Str "inline",Space,Str "code"]
-,Para [Code ("",[],[]) "*\8594*",Space,Code ("",[],[]) "typed",Space,Code ("",["haskell"],[]) ">>="]
-,Header 1 ("code-blocks",[],[]) [Str "code",Space,Str "blocks"]
-,CodeBlock ("",[],[]) "case xs of\n     (_:_) -> reverse xs\n     []    -> ['*']"
-,CodeBlock ("",["haskell"],[]) "case xs of\n     (_:_) -> reverse xs\n     []    -> ['*']"
-,Header 1 ("block-quotes",[],[]) [Str "block",Space,Str "quotes"]
-,Para [Str "Regular",Space,Str "paragraph"]
-,BlockQuote
- [Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "block",Space,Str "quote."]
- ,Para [Str "With",Space,Str "two",Space,Str "paragraphs."]]
-,Para [Str "Nother",Space,Str "paragraph."]
-,Header 1 ("external-links",[],[]) [Str "external",Space,Str "links"]
-,Para [Link ("",[],[]) [Emph [Str "Google"],Space,Str "search",Space,Str "engine"] ("http://google.com","")]
-,Para [Link ("",[],[]) [Str "http://pandoc.org"] ("http://pandoc.org","")]
-,Para [Link ("",[],[]) [Str "http://google.com"] ("http://google.com",""),Space,Link ("",[],[]) [Str "http://yahoo.com"] ("http://yahoo.com","")]
-,Para [Link ("",[],[]) [Str "email",Space,Str "me"] ("mailto:info@example.org","")]
-,Para [Str "http://google.com"]
-,Para [Str "http://google.com"]
-,Para [Str "http://google.com"]
-,Para [Str "info@example.org"]
-,Para [Str "info@example.org"]
-,Para [Str "info@example.org"]
-,Header 1 ("lists",[],[]) [Str "lists"]
-,BulletList
- [[Plain [Str "Start",Space,Str "each",Space,Str "line"]]
- ,[Plain [Str "with",Space,Str "an",Space,Str "asterisk",Space,Str "(*)."]
-  ,BulletList
-   [[Plain [Str "More",Space,Str "asterisks",Space,Str "gives",Space,Str "deeper"]
-    ,BulletList
-     [[Plain [Str "and",Space,Str "deeper",Space,Str "levels."]]]]]]
- ,[Plain [Str "Line",Space,Str "breaks",LineBreak,Str "don't",Space,Str "break",Space,Str "levels."]]
- ,[Plain [Str "Continuations",Space,Str "are",Space,Str "also",Space,Str "possible"]
-  ,BulletList
-   [[Plain [Str "and",Space,Str "do",Space,Str "not",Space,Str "break",Space,Str "the",Space,Str "list",Space,Str "flow"]]]]
- ,[Plain [Str "Level",Space,Str "one"]]]
-,Para [Str "Any",Space,Str "other",Space,Str "start",Space,Str "ends",Space,Str "the",Space,Str "list."]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Plain [Str "Start",Space,Str "each",Space,Str "line"]]
- ,[Plain [Str "with",Space,Str "a",Space,Str "number",Space,Str "(1.)."]
-  ,OrderedList (1,DefaultStyle,DefaultDelim)
-   [[Plain [Str "More",Space,Str "number",Space,Str "signs",Space,Str "gives",Space,Str "deeper"]
-    ,OrderedList (1,DefaultStyle,DefaultDelim)
-     [[Plain [Str "and",Space,Str "deeper"]]
-     ,[Plain [Str "levels."]]]]]]
- ,[Plain [Str "Line",Space,Str "breaks",LineBreak,Str "don't",Space,Str "break",Space,Str "levels."]]
- ,[Plain [Str "Blank",Space,Str "lines"]]]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Plain [Str "end",Space,Str "the",Space,Str "list",Space,Str "and",Space,Str "start",Space,Str "another."]]]
-,Para [Str "Any",Space,Str "other",Space,Str "start",Space,Str "also",Space,Str "ends",Space,Str "the",Space,Str "list."]
-,DefinitionList
- [([Str "item",Space,Str "1"],
-   [[Plain [Str "definition",Space,Str "1"]]])
- ,([Str "item",Space,Str "2"],
-   [[Plain [Str "definition",Space,Str "2-1",Space,Str "definition",Space,Str "2-2"]]])
- ,([Str "item",Space,Emph [Str "3"]],
-   [[Plain [Str "definition",Space,Emph [Str "3"]]]])]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Plain [Str "one"]]
- ,[Plain [Str "two"]
-  ,BulletList
-   [[Plain [Str "two",Space,Str "point",Space,Str "one"]]
-   ,[Plain [Str "two",Space,Str "point",Space,Str "two"]]]]
- ,[Plain [Str "three"]
-  ,DefinitionList
-   [([Str "three",Space,Str "item",Space,Str "one"],
-     [[Plain [Str "three",Space,Str "def",Space,Str "one"]]])]]
- ,[Plain [Str "four"]
-  ,DefinitionList
-   [([Str "four",Space,Str "def",Space,Str "one"],
-     [[Plain [Str "this",Space,Str "is",Space,Str "a",Space,Str "continuation"]]])]]
- ,[Plain [Str "five"]
-  ,OrderedList (1,DefaultStyle,DefaultDelim)
-   [[Plain [Str "five",Space,Str "sub",Space,Str "1"]
-    ,OrderedList (1,DefaultStyle,DefaultDelim)
-     [[Plain [Str "five",Space,Str "sub",Space,Str "1",Space,Str "sub",Space,Str "1"]]]]
-   ,[Plain [Str "five",Space,Str "sub",Space,Str "2"]]]]]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Plain [Str "other"]
-  ,OrderedList (1,UpperRoman,DefaultDelim)
-   [[Plain [Str "list"]]
-   ,[Plain [Str "styles"]]]]
- ,[Plain [Str "are"]
-  ,OrderedList (1,LowerRoman,DefaultDelim)
-   [[Plain [Str "also"]]
-   ,[Plain [Str "possible"]]]]
- ,[Plain [Str "all"]
-  ,OrderedList (1,LowerAlpha,DefaultDelim)
-   [[Plain [Str "the"]]
-   ,[Plain [Str "different"]]
-   ,[Plain [Str "styles"]]]]
- ,[Plain [Str "are"]
-  ,OrderedList (1,UpperAlpha,DefaultDelim)
-   [[Plain [Str "implemented"]]
-   ,[Plain [Str "and"]]
-   ,[Plain [Str "supported"]]]]]
-,Header 1 ("tables",[],[]) [Str "tables"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   []
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   []]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Orange"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Apple"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Bread"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Pie"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Butter"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Ice",Space,Str "cream"]]]])]
- (TableFoot ("",[],[])
- [])
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignLeft,ColWidthDefault)
- ,(AlignLeft,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Orange"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Apple"]]]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Bread"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Pie"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Strong [Str "Butter"]]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Ice",Space,Str "cream"]]]])]
- (TableFoot ("",[],[])
- [])
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignLeft,ColWidthDefault)
- ,(AlignLeft,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Orange"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Apple"]]]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Bread",LineBreak,LineBreak,Str "and",Space,Str "cheese"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Pie",LineBreak,LineBreak,Strong [Str "apple"],Space,Str "and",Space,Emph [Str "carrot"]]]]])]
- (TableFoot ("",[],[])
- [])
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   []
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   []
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   []]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Orange"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Apple"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "more"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Bread"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Pie"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "more"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Butter"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Ice",Space,Str "cream"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "and",Space,Str "more"]]]])]
- (TableFoot ("",[],[])
- [])
-,Header 1 ("macros",[],[]) [Str "macros"]
-,Para [Span ("",["twiki-macro","TEST"],[]) []]
-,Para [Span ("",["twiki-macro","TEST"],[]) [Str ""]]
-,Para [Span ("",["twiki-macro","TEST"],[]) [Str "content with spaces"]]
-,Para [Span ("",["twiki-macro","TEST"],[]) [Str "content with spaces"]]
-,Para [Span ("",["twiki-macro","TEST"],[("ARG1","test")]) [Str "content with spaces"]]
-,Para [Span ("",["twiki-macro","TEST"],[]) [Str "content with spaces ARG1=test"]]
-,Para [Span ("",["twiki-macro","TEST"],[("ARG1","test")]) [Str "content with spaces"]]
-,Para [Span ("",["twiki-macro","TEST"],[("ARG1","test"),("ARG2","test2")]) [Str ""]]
-,Para [Span ("",["twiki-macro","TEST"],[("ARG1","test"),("ARG2","test2")]) [Str ""]]
-,Para [Span ("",["twiki-macro","TEST"],[("ARG1","test"),("ARG2","test2")]) [Str "multiline\ndoes also work"]]]
+Pandoc
+  ( Meta { unMeta = fromList [] } )
+  [ Header 1
+    ( "header", [], [] )
+    [ Str "header" ]
+  , Header 2
+    ( "header-level-two", [], [] )
+    [ Str "header", Space, Str "level", Space, Str "two" ]
+  , Header 3
+    ( "header-level-3", [], [] )
+    [ Str "header", Space, Str "level", Space, Str "3" ]
+  , Header 4
+    ( "header-level-four", [], [] )
+    [ Str "header", Space, Emph [ Str "level" ], Space, Str "four" ]
+  , Header 5
+    ( "header-level-5", [], [] )
+    [ Str "header", Space, Str "level", Space, Str "5" ]
+  , Header 6
+    ( "header-level-6", [], [] )
+    [ Str "header", Space, Str "level", Space, Str "6" ]
+  , Para
+    [ Str "---+++++++"
+    , Space
+    , Str "not"
+    , Space
+    , Str "a"
+    , Space
+    , Str "header"
+    ]
+  , Para
+    [ Str "--++"
+    , Space
+    , Str "not"
+    , Space
+    , Str "a"
+    , Space
+    , Str "header"
+    ]
+  , Header 1
+    ( "emph-and-strong", [], [] )
+    [ Str "emph", Space, Str "and", Space, Str "strong" ]
+  , Para
+    [ Emph [ Str "emph" ], Space, Strong [ Str "strong" ] ]
+  , Para
+    [ Emph
+      [ Strong [ Str "strong", Space, Str "and", Space, Str "emph" ] ]
+    ]
+  , Para
+    [ Strong
+      [ Emph [ Str "emph", Space, Str "inside" ], Space, Str "strong" ]
+    ]
+  , Para
+    [ Strong
+      [ Str "strong", Space, Str "with", Space, Emph [ Str "emph" ] ]
+    ]
+  , Para
+    [ Emph
+      [ Strong
+        [ Str "strong", Space, Str "inside" ]
+      , Space
+      , Str "emph"
+      ]
+    ]
+  , Header 1
+    ( "horizontal-rule", [], [] )
+    [ Str "horizontal", Space, Str "rule" ]
+  , Para
+    [ Str "top" ]
+  , HorizontalRule
+  , Para
+    [ Str "bottom" ]
+  , HorizontalRule
+  , Header 1
+    ( "nop", [], [] )
+    [ Str "nop" ]
+  , Para
+    [ Str "_not", Space, Str "emph_" ]
+  , Header 1
+    ( "entities", [], [] )
+    [ Str "entities" ]
+  , Para
+    [ Str "hi", Space, Str "&", Space, Str "low" ]
+  , Para
+    [ Str "hi", Space, Str "&", Space, Str "low" ]
+  , Para
+    [ Str "G\246del" ]
+  , Para
+    [ Str "\777\2730" ]
+  , Header 1
+    ( "comments", [], [] )
+    [ Str "comments" ]
+  , Para
+    [ Str "inline", Space, Str "comment" ]
+  , Para
+    [ Str "between", Space, Str "blocks" ]
+  , Header 1
+    ( "linebreaks", [], [] )
+    [ Str "linebreaks" ]
+  , Para
+    [ Str "hi", LineBreak, Str "there" ]
+  , Para
+    [ Str "hi", LineBreak, Str "there" ]
+  , Header 1
+    ( "inline-code", [], [] )
+    [ Str "inline", Space, Str "code" ]
+  , Para
+    [ Code
+      ( "", [], [] ) "*\8594*"
+    , Space
+    , Code
+      ( "", [], [] ) "typed"
+    , Space
+    , Code
+      ( "", [ "haskell" ], [] ) ">>="
+    ]
+  , Header 1
+    ( "code-blocks", [], [] )
+    [ Str "code", Space, Str "blocks" ]
+  , CodeBlock
+    ( ""
+    , []
+    , []
+    ) "case xs of\n     (_:_) -> reverse xs\n     []    -> ['*']"
+  , CodeBlock
+    ( ""
+    , [ "haskell" ]
+    , []
+    ) "case xs of\n     (_:_) -> reverse xs\n     []    -> ['*']"
+  , Header 1
+    ( "block-quotes", [], [] )
+    [ Str "block", Space, Str "quotes" ]
+  , Para
+    [ Str "Regular", Space, Str "paragraph" ]
+  , BlockQuote
+    [ Para
+      [ Str "This"
+      , Space
+      , Str "is"
+      , Space
+      , Str "a"
+      , Space
+      , Str "block"
+      , Space
+      , Str "quote."
+      ]
+    , Para
+      [ Str "With", Space, Str "two", Space, Str "paragraphs." ]
+    ]
+  , Para
+    [ Str "Nother", Space, Str "paragraph." ]
+  , Header 1
+    ( "external-links", [], [] )
+    [ Str "external", Space, Str "links" ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Emph
+        [ Str "Google" ]
+      , Space
+      , Str "search"
+      , Space
+      , Str "engine"
+      ]
+      ( "http://google.com", "" )
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "http://pandoc.org" ]
+      ( "http://pandoc.org", "" )
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "http://google.com" ]
+      ( "http://google.com", "" )
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "http://yahoo.com" ]
+      ( "http://yahoo.com", "" )
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "email", Space, Str "me" ]
+      ( "mailto:info@example.org", "" )
+    ]
+  , Para
+    [ Str "http://google.com" ]
+  , Para
+    [ Str "http://google.com" ]
+  , Para
+    [ Str "http://google.com" ]
+  , Para
+    [ Str "info@example.org" ]
+  , Para
+    [ Str "info@example.org" ]
+  , Para
+    [ Str "info@example.org" ]
+  , Header 1
+    ( "lists", [], [] )
+    [ Str "lists" ]
+  , BulletList
+    [
+      [ Plain [ Str "Start", Space, Str "each", Space, Str "line" ] ]
+    ,
+      [ Plain
+        [ Str "with"
+        , Space
+        , Str "an"
+        , Space
+        , Str "asterisk"
+        , Space
+        , Str "(*)."
+        ]
+      , BulletList
+        [
+          [ Plain
+            [ Str "More"
+            , Space
+            , Str "asterisks"
+            , Space
+            , Str "gives"
+            , Space
+            , Str "deeper"
+            ]
+          , BulletList
+            [
+              [ Plain
+                [ Str "and", Space, Str "deeper", Space, Str "levels." ]
+              ]
+            ]
+          ]
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "Line"
+        , Space
+        , Str "breaks"
+        , LineBreak
+        , Str "don't"
+        , Space
+        , Str "break"
+        , Space
+        , Str "levels."
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "Continuations"
+        , Space
+        , Str "are"
+        , Space
+        , Str "also"
+        , Space
+        , Str "possible"
+        ]
+      , BulletList
+        [
+          [ Plain
+            [ Str "and"
+            , Space
+            , Str "do"
+            , Space
+            , Str "not"
+            , Space
+            , Str "break"
+            , Space
+            , Str "the"
+            , Space
+            , Str "list"
+            , Space
+            , Str "flow"
+            ]
+          ]
+        ]
+      ]
+    ,
+      [ Plain [ Str "Level", Space, Str "one" ] ]
+    ]
+  , Para
+    [ Str "Any"
+    , Space
+    , Str "other"
+    , Space
+    , Str "start"
+    , Space
+    , Str "ends"
+    , Space
+    , Str "the"
+    , Space
+    , Str "list."
+    ]
+  , OrderedList
+    ( 1, DefaultStyle, DefaultDelim )
+    [
+      [ Plain [ Str "Start", Space, Str "each", Space, Str "line" ] ]
+    ,
+      [ Plain
+        [ Str "with"
+        , Space
+        , Str "a"
+        , Space
+        , Str "number"
+        , Space
+        , Str "(1.)."
+        ]
+      , OrderedList
+        ( 1, DefaultStyle, DefaultDelim )
+        [
+          [ Plain
+            [ Str "More"
+            , Space
+            , Str "number"
+            , Space
+            , Str "signs"
+            , Space
+            , Str "gives"
+            , Space
+            , Str "deeper"
+            ]
+          , OrderedList
+            ( 1, DefaultStyle, DefaultDelim )
+            [
+              [ Plain [ Str "and", Space, Str "deeper" ] ]
+            ,
+              [ Plain [ Str "levels." ] ]
+            ]
+          ]
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "Line"
+        , Space
+        , Str "breaks"
+        , LineBreak
+        , Str "don't"
+        , Space
+        , Str "break"
+        , Space
+        , Str "levels."
+        ]
+      ]
+    ,
+      [ Plain [ Str "Blank", Space, Str "lines" ] ]
+    ]
+  , OrderedList
+    ( 1, DefaultStyle, DefaultDelim )
+    [
+      [ Plain
+        [ Str "end"
+        , Space
+        , Str "the"
+        , Space
+        , Str "list"
+        , Space
+        , Str "and"
+        , Space
+        , Str "start"
+        , Space
+        , Str "another."
+        ]
+      ]
+    ]
+  , Para
+    [ Str "Any"
+    , Space
+    , Str "other"
+    , Space
+    , Str "start"
+    , Space
+    , Str "also"
+    , Space
+    , Str "ends"
+    , Space
+    , Str "the"
+    , Space
+    , Str "list."
+    ]
+  , DefinitionList
+    [
+      (
+        [ Str "item", Space, Str "1" ]
+      ,
+        [ [ Plain [ Str "definition", Space, Str "1" ] ] ]
+      )
+    ,
+      (
+        [ Str "item", Space, Str "2" ]
+      ,
+        [
+          [ Plain
+            [ Str "definition"
+            , Space
+            , Str "2-1"
+            , Space
+            , Str "definition"
+            , Space
+            , Str "2-2"
+            ]
+          ]
+        ]
+      )
+    ,
+      (
+        [ Str "item", Space, Emph [ Str "3" ] ]
+      ,
+        [ [ Plain [ Str "definition", Space, Emph [ Str "3" ] ] ] ]
+      )
+    ]
+  , OrderedList
+    ( 1, DefaultStyle, DefaultDelim )
+    [
+      [ Plain [ Str "one" ] ]
+    ,
+      [ Plain
+        [ Str "two" ]
+      , BulletList
+        [
+          [ Plain [ Str "two", Space, Str "point", Space, Str "one" ] ]
+        ,
+          [ Plain [ Str "two", Space, Str "point", Space, Str "two" ] ]
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "three" ]
+      , DefinitionList
+        [
+          (
+            [ Str "three", Space, Str "item", Space, Str "one" ]
+          ,
+            [
+              [ Plain
+                [ Str "three", Space, Str "def", Space, Str "one" ]
+              ]
+            ]
+          )
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "four" ]
+      , DefinitionList
+        [
+          (
+            [ Str "four", Space, Str "def", Space, Str "one" ]
+          ,
+            [
+              [ Plain
+                [ Str "this"
+                , Space
+                , Str "is"
+                , Space
+                , Str "a"
+                , Space
+                , Str "continuation"
+                ]
+              ]
+            ]
+          )
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "five" ]
+      , OrderedList
+        ( 1, DefaultStyle, DefaultDelim )
+        [
+          [ Plain
+            [ Str "five", Space, Str "sub", Space, Str "1" ]
+          , OrderedList
+            ( 1, DefaultStyle, DefaultDelim )
+            [
+              [ Plain
+                [ Str "five"
+                , Space
+                , Str "sub"
+                , Space
+                , Str "1"
+                , Space
+                , Str "sub"
+                , Space
+                , Str "1"
+                ]
+              ]
+            ]
+          ]
+        ,
+          [ Plain [ Str "five", Space, Str "sub", Space, Str "2" ] ]
+        ]
+      ]
+    ]
+  , OrderedList
+    ( 1, DefaultStyle, DefaultDelim )
+    [
+      [ Plain
+        [ Str "other" ]
+      , OrderedList
+        ( 1, UpperRoman, DefaultDelim )
+        [ [ Plain [ Str "list" ] ], [ Plain [ Str "styles" ] ] ]
+      ]
+    ,
+      [ Plain
+        [ Str "are" ]
+      , OrderedList
+        ( 1, LowerRoman, DefaultDelim )
+        [ [ Plain [ Str "also" ] ], [ Plain [ Str "possible" ] ] ]
+      ]
+    ,
+      [ Plain
+        [ Str "all" ]
+      , OrderedList
+        ( 1, LowerAlpha, DefaultDelim )
+        [
+          [ Plain [ Str "the" ] ]
+        ,
+          [ Plain [ Str "different" ] ]
+        ,
+          [ Plain [ Str "styles" ] ]
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "are" ]
+      , OrderedList
+        ( 1, UpperAlpha, DefaultDelim )
+        [
+          [ Plain [ Str "implemented" ] ]
+        ,
+          [ Plain [ Str "and" ] ]
+        ,
+          [ Plain [ Str "supported" ] ]
+        ]
+      ]
+    ]
+  , Header 1
+    ( "tables", [], [] )
+    [ Str "tables" ]
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignDefault, ColWidthDefault )
+    ,
+      ( AlignDefault, ColWidthDefault )
+    ]
+    ( TableHead
+      ( "", [], [] )
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        ]
+      ]
+    )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Orange" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Apple" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Bread" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Pie" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Butter" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Ice", Space, Str "cream" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [ ( AlignLeft, ColWidthDefault ), ( AlignLeft, ColWidthDefault ) ]
+    ( TableHead
+      ( "", [], [] )
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Orange" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Apple" ] ]
+        ]
+      ]
+    )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Bread" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Pie" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Strong [ Str "Butter" ] ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Ice", Space, Str "cream" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [ ( AlignLeft, ColWidthDefault ), ( AlignLeft, ColWidthDefault ) ]
+    ( TableHead
+      ( "", [], [] )
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Orange" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Apple" ] ]
+        ]
+      ]
+    )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain
+            [ Str "Bread"
+            , LineBreak
+            , LineBreak
+            , Str "and"
+            , Space
+            , Str "cheese"
+            ]
+          ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain
+            [ Str "Pie"
+            , LineBreak
+            , LineBreak
+            , Strong
+              [ Str "apple" ]
+            , Space
+            , Str "and"
+            , Space
+            , Emph
+              [ Str "carrot" ]
+            ]
+          ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignDefault, ColWidthDefault )
+    ,
+      ( AlignDefault, ColWidthDefault )
+    ,
+      ( AlignDefault, ColWidthDefault )
+    ]
+    ( TableHead
+      ( "", [], [] )
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        ]
+      ]
+    )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Orange" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Apple" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "more" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Bread" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Pie" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "more" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Butter" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Ice", Space, Str "cream" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "and", Space, Str "more" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Header 1
+    ( "macros", [], [] )
+    [ Str "macros" ]
+  , Para
+    [ Span ( "", [ "twiki-macro", "TEST" ], [] ) [] ]
+  , Para
+    [ Span ( "", [ "twiki-macro", "TEST" ], [] ) [ Str "" ] ]
+  , Para
+    [ Span
+      ( "", [ "twiki-macro", "TEST" ], [] )
+      [ Str "content with spaces" ]
+    ]
+  , Para
+    [ Span
+      ( "", [ "twiki-macro", "TEST" ], [] )
+      [ Str "content with spaces" ]
+    ]
+  , Para
+    [ Span
+      ( "", [ "twiki-macro", "TEST" ], [ ( "ARG1", "test" ) ] )
+      [ Str "content with spaces" ]
+    ]
+  , Para
+    [ Span
+      ( "", [ "twiki-macro", "TEST" ], [] )
+      [ Str "content with spaces ARG1=test" ]
+    ]
+  , Para
+    [ Span
+      ( "", [ "twiki-macro", "TEST" ], [ ( "ARG1", "test" ) ] )
+      [ Str "content with spaces" ]
+    ]
+  , Para
+    [ Span
+      ( ""
+      ,
+        [ "twiki-macro", "TEST" ]
+      ,
+        [ ( "ARG1", "test" ), ( "ARG2", "test2" ) ]
+      )
+      [ Str "" ]
+    ]
+  , Para
+    [ Span
+      ( ""
+      ,
+        [ "twiki-macro", "TEST" ]
+      ,
+        [ ( "ARG1", "test" ), ( "ARG2", "test2" ) ]
+      )
+      [ Str "" ]
+    ]
+  , Para
+    [ Span
+      ( ""
+      ,
+        [ "twiki-macro", "TEST" ]
+      ,
+        [ ( "ARG1", "test" ), ( "ARG2", "test2" ) ]
+      )
+      [ Str "multiline\ndoes also work" ]
+    ]
+  ]
diff --git a/test/txt2tags.native b/test/txt2tags.native
index c52c5929a..ccc8dd36e 100644
--- a/test/txt2tags.native
+++ b/test/txt2tags.native
@@ -1,968 +1,5200 @@
-Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "author"]]),("date",MetaInlines [Str "date"]),("includeconf",MetaString "rules.conf"),("title",MetaInlines [Str "Txt2tags",Space,Str "Markup",Space,Str "Rules"])]})
-[Para [Str "This",Space,Str "document",Space,Str "describes",Space,Str "all",Space,Str "the",Space,Str "details",Space,Str "about",Space,Str "each",Space,Str "txt2tags",Space,Str "mark.",SoftBreak,Str "The",Space,Str "target",Space,Str "audience",Space,Str "are",Space,Strong [Str "experienced"],Space,Str "users.",Space,Str "You",Space,Str "may",Space,Str "find",Space,Str "it",SoftBreak,Str "useful",Space,Str "if",Space,Str "you",Space,Str "want",Space,Str "to",Space,Str "master",Space,Str "the",Space,Str "marks",Space,Str "or",Space,Str "solve",Space,Str "a",Space,Str "specific",Space,Str "problem",SoftBreak,Str "about",Space,Str "a",Space,Str "mark."]
-,Para [Str "If",Space,Str "you",Space,Str "are",Space,Str "new",Space,Str "to",Space,Str "txt2tags",Space,Str "or",Space,Str "just",Space,Str "want",Space,Str "to",Space,Str "know",Space,Str "which",Space,Str "are",Space,Str "the",SoftBreak,Str "available",Space,Str "marks,",Space,Str "please",Space,Str "read",Space,Str "the",Space,Link ("",[],[]) [Str "Markup",Space,Str "Demo"] ("MARKUPDEMO",""),Str "."]
-,Para [Str "Note",Space,Str "1:",Space,Str "This",Space,Str "document",Space,Str "is",Space,Str "generated",Space,Str "directly",Space,Str "from",Space,Str "the",Space,Str "txt2tags",SoftBreak,Str "test-suite.",Space,Str "All",Space,Str "the",Space,Str "rules",Space,Str "mentioned",Space,Str "here",Space,Str "are",Space,Str "100%",Space,Str "in",Space,Str "sync",Space,Str "with",Space,Str "the",SoftBreak,Str "current",Space,Str "program",Space,Str "code."]
-,Para [Str "Note",Space,Str "2:",Space,Str "A",Space,Str "good",Space,Str "practice",Space,Str "is",Space,Str "to",Space,Str "consult",Space,Link ("",[],[]) [Str "the",Space,Str "sources"] ("rules.t2t",""),Space,Str "when",SoftBreak,Str "reading,",Space,Str "to",Space,Str "see",Space,Str "how",Space,Str "the",Space,Str "texts",Space,Str "were",Space,Str "made."]
-,Para [Str "Table",Space,Str "of",Space,Str "Contents:"]
-,HorizontalRule
-,Header 1 ("paragraph",[],[]) [Str "Paragraph"]
-,Para [Str "A",Space,Str "paragraph",Space,Str "is",Space,Str "composed",Space,Str "by",Space,Str "one",Space,Str "or",Space,Str "more",Space,Str "lines.",SoftBreak,Str "A",Space,Str "blank",Space,Str "line",Space,Str "(or",Space,Str "a",Space,Str "table,",Space,Str "or",Space,Str "a",Space,Str "list)",Space,Str "ends",Space,Str "the",SoftBreak,Str "current",Space,Str "paragraph."]
-,Para [Str "Leading",Space,Str "and",Space,Str "trailing",Space,Str "spaces",Space,Str "are",Space,Str "ignored."]
-,Para [Str "A",Space,Str "comment",Space,Str "line",Space,Str "can",Space,Str "be",Space,Str "placed",Space,Str "inside",Space,Str "a",Space,Str "paragraph.",SoftBreak,Str "It",Space,Str "will",Space,Str "not",Space,Str "affect",Space,Str "it."]
-,Para [Str "The",Space,Str "end",Space,Str "of",Space,Str "the",Space,Str "file",Space,Str "(EOF)",Space,Str "closes",Space,Str "the",SoftBreak,Str "currently",Space,Str "open",Space,Str "paragraph."]
-,Header 1 ("comment",[],[]) [Str "Comment"]
-,Para [Str "%",Space,Str "not",Space,Str "on",Space,Str "the",Space,Str "line",Space,Str "beginning",Space,Str "(at",Space,Str "column",Space,Str "2)"]
-,Para [Str "some",Space,Str "text",Space,Str "%",Space,Str "half",Space,Str "line",Space,Str "comments",Space,Str "are",Space,Str "not",Space,Str "allowed"]
-,Header 1 ("line",[],[]) [Str "Line"]
-,HorizontalRule
-,HorizontalRule
-,HorizontalRule
-,HorizontalRule
-,HorizontalRule
-,HorizontalRule
-,HorizontalRule
-,HorizontalRule
-,HorizontalRule
-,HorizontalRule
-,HorizontalRule
-,Para [Strikeout [Str "-----"],SoftBreak,Strikeout [Str "-------",Space,Str "--------"]]
-,Para [Strikeout [Str "-------+--------"]]
-,Para [Str "(",Space,Strikeout [Str "----------------"],Space,Str ")"]
-,Header 1 ("inline",[],[]) [Str "Inline"]
-,Para [Str "i)",Space,Strong [Str "b"],Space,Emph [Str "i"],Space,Underline [Str "u"],Space,Strikeout [Str "s"],Space,Code ("",[],[]) "m",Space,Str "r",Space,RawInline (Format "html") "t",SoftBreak,Str "i)",Space,Strong [Str "bo"],Space,Emph [Str "it"],Space,Underline [Str "un"],Space,Strikeout [Str "st"],Space,Code ("",[],[]) "mo",Space,Str "ra",Space,RawInline (Format "html") "tg",SoftBreak,Str "i)",Space,Strong [Str "bold"],Space,Emph [Str "ital"],Space,Underline [Str "undr"],Space,Strikeout [Str "strk"],Space,Code ("",[],[]) "mono",Space,Str "raw",Space,RawInline (Format "html") "tggd",SoftBreak,Str "i)",Space,Strong [Str "bo",Space,Str "ld"],Space,Emph [Str "it",Space,Str "al"],Space,Underline [Str "un",Space,Str "dr"],Space,Strikeout [Str "st",Space,Str "rk"],Space,Code ("",[],[]) "mo no",Space,Str "r",Space,Str "aw",Space,RawInline (Format "html") "tg gd",SoftBreak,Str "i)",Space,Strong [Str "bo",Space,Str "*",Space,Str "ld"],Space,Emph [Str "it",Space,Str "/",Space,Str "al"],Space,Underline [Str "un",Space,Str "_",Space,Str "dr"],Space,Strikeout [Str "st",Space,Str "-",Space,Str "rk"],Space,Code ("",[],[]) "mo ` no",Space,Str "r",Space,Str "\"",Space,Str "aw",Space,RawInline (Format "html") "tg ' gd",SoftBreak,Str "i)",Space,Strong [Str "bo",Space,Str "**ld"],Space,Emph [Str "it",Space,Str "//al"],Space,Underline [Str "un",Space,Str "__dr"],Space,Strikeout [Str "st",Space,Str "--rk"],Space,Code ("",[],[]) "mo ``no",Space,Str "r",Space,Str "\"\"aw",Space,RawInline (Format "html") "tg ''gd",SoftBreak,Str "i)",Space,Strong [Str "bo",Space,Str "**",Space,Str "ld"],Space,Emph [Str "it",Space,Str "//",Space,Str "al"],Space,Underline [Str "un",Space,Str "__",Space,Str "dr"],Space,Strikeout [Str "st",Space,Str "--",Space,Str "rk"],Space,Code ("",[],[]) "mo `` no",Space,Str "r",Space,Str "\"\"",Space,Str "aw",Space,RawInline (Format "html") "tg '' gd",SoftBreak,Str "i)",Space,Strong [Str "**bold**"],Space,Emph [Str "//ital//"],Space,Underline [Str "__undr__"],Space,Strikeout [Str "--strk--"],Space,Code ("",[],[]) "``mono``",Space,Str "\"\"raw\"\"",Space,RawInline (Format "html") "''tggd''",SoftBreak,Str "i)",Space,Strong [Str "*bold*"],Space,Emph [Str "/ital/"],Space,Underline [Str "_undr_"],Space,Strikeout [Str "-strk-"],Space,Code ("",[],[]) "`mono`",Space,Str "\"raw\"",Space,RawInline (Format "html") "'tggd'"]
-,Para [Str "i)",Space,Strong [Str "*"],Space,Emph [Str "/"],Space,Underline [Str "_"],Space,Strikeout [Str "-"],Space,Code ("",[],[]) "`",Space,Str "\"",Space,RawInline (Format "html") "'",SoftBreak,Str "i)",Space,Strong [Str "**"],Space,Emph [Str "//"],Space,Underline [Str "__"],Space,Strikeout [Str "--"],Space,Code ("",[],[]) "``",Space,Str "\"\"",Space,RawInline (Format "html") "''",SoftBreak,Str "i)",Space,Strong [Str "***"],Space,Emph [Str "///"],Space,Underline [Str "___"],Space,Strikeout [Str "---"],Space,Code ("",[],[]) "```",Space,Str "\"\"\"",Space,RawInline (Format "html") "'''",SoftBreak,Str "i)",Space,Strong [Str "****"],Space,Emph [Str "////"],Space,Underline [Str "____"],Space,Strikeout [Str "----"],Space,Code ("",[],[]) "````",Space,Str "\"\"\"\"",Space,RawInline (Format "html") "''''",SoftBreak,Str "i)",Space,Strong [Str "*****"],Space,Emph [Str "/////"],Space,Underline [Str "_____"],Space,Strikeout [Str "-----"],Space,Code ("",[],[]) "`````",Space,Str "\"\"\"\"\"",Space,RawInline (Format "html") "'''''",SoftBreak,Str "i)",Space,Strong [Str "******"],Space,Emph [Str "//////"],Space,Underline [Str "______"],Space,Strikeout [Str "------"],Space,Code ("",[],[]) "``````",Space,Str "\"\"\"\"\"\"",Space,RawInline (Format "html") "''''''"]
-,Para [Str "i)",Space,Str "****",Space,Str "////",Space,Str "____",Space,Str "----",Space,Str "````",Space,Str "\"\"\"\"",Space,Str "''''",SoftBreak,Str "i)",Space,Str "**",Space,Str "**",Space,Str "//",Space,Str "//",Space,Str "__",Space,Str "__",Space,Str "--",Space,Str "--",Space,Str "``",Space,Str "``",Space,Str "\"\"",Space,Str "\"\"",Space,Str "''",Space,Str "''"]
-,Para [Str "i)",Space,Str "**",Space,Str "bold**",Space,Str "//",Space,Str "ital//",Space,Str "__",Space,Str "undr__",Space,Str "--",Space,Str "strk--",Space,Str "``",Space,Str "mono``",Space,Str "\"\"",Space,Str "raw\"\"",Space,Str "''",Space,Str "tggd''",SoftBreak,Str "i)",Space,Str "**bold",Space,Str "**",Space,Str "//ital",Space,Str "//",Space,Str "__undr",Space,Str "__",Space,Str "--strk",Space,Str "--",Space,Str "``mono",Space,Str "``",Space,Str "\"\"raw",Space,Str "\"\"",Space,Str "''tggd",Space,Str "''",SoftBreak,Str "i)",Space,Str "**",Space,Str "bold",Space,Str "**",Space,Str "//",Space,Str "ital",Space,Str "//",Space,Str "__",Space,Str "undr",Space,Str "__",Space,Str "--",Space,Str "strk",Space,Str "--",Space,Str "``",Space,Str "mono",Space,Str "``",Space,Str "\"\"",Space,Str "raw",Space,Str "\"\"",Space,Str "''",Space,Str "tggd",Space,Str "''"]
-,Header 1 ("link",[],[]) [Str "Link"]
-,Para [Link ("",[],[]) [Str "mailto:user@domain.com"] ("user@domain.com",""),SoftBreak,Link ("",[],[]) [Str "mailto:user@domain.com"] ("user@domain.com",""),Str ".",SoftBreak,Link ("",[],[]) [Str "mailto:user@domain.com"] ("user@domain.com",""),Str ".",Space,Str "any",Space,Str "text.",SoftBreak,Str "any",Space,Str "text:",Space,Link ("",[],[]) [Str "mailto:user@domain.com"] ("user@domain.com",""),Str ".",Space,Str "any",Space,Str "text.",SoftBreak,Link ("",[],[]) [Str "label"] ("user@domain.com",""),SoftBreak,Link ("",[],[]) [Str "mailto:user@domain.com?subject=bla"] ("user@domain.com?subject=bla",""),SoftBreak,Link ("",[],[]) [Str "mailto:user@domain.com?subject=bla"] ("user@domain.com?subject=bla",""),Str ".",SoftBreak,Link ("",[],[]) [Str "mailto:user@domain.com?subject=bla"] ("user@domain.com?subject=bla",""),Str ",",SoftBreak,Link ("",[],[]) [Str "mailto:user@domain.com?subject=bla&cc=otheruser@domain.com"] ("user@domain.com?subject=bla&cc=otheruser@domain.com",""),SoftBreak,Link ("",[],[]) [Str "mailto:user@domain.com?subject=bla&cc=otheruser@domain.com"] ("user@domain.com?subject=bla&cc=otheruser@domain.com",""),Str ".",SoftBreak,Link ("",[],[]) [Str "mailto:user@domain.com?subject=bla&cc=otheruser@domain.com"] ("user@domain.com?subject=bla&cc=otheruser@domain.com",""),Str ",",SoftBreak,Link ("",[],[]) [Str "label"] ("user@domain.com?subject=bla&cc=otheruser@domain.com",""),Str ".",SoftBreak,Link ("",[],[]) [Str "label"] ("user@domain.com?subject=bla&cc=otheruser@domain.com.",""),Str ".",SoftBreak,Link ("",[],[]) [Str "http://www.domain.com"] ("http://www.domain.com",""),SoftBreak,Link ("",[],[]) [Str "http://www.domain.com/dir/"] ("http://www.domain.com/dir/",""),SoftBreak,Link ("",[],[]) [Str "http://www.domain.com/dir///"] ("http://www.domain.com/dir///",""),SoftBreak,Link ("",[],[]) [Str "http://www.domain.com."] ("http://www.domain.com.",""),SoftBreak,Link ("",[],[]) [Str "http://www.domain.com,"] ("http://www.domain.com,",""),SoftBreak,Link ("",[],[]) [Str "http://www.domain.com."] ("http://www.domain.com.",""),Space,Str "any",Space,Str "text.",SoftBreak,Link ("",[],[]) [Str "http://www.domain.com,"] ("http://www.domain.com,",""),Space,Str "any",Space,Str "text.",SoftBreak,Link ("",[],[]) [Str "http://www.domain.com/dir/."] ("http://www.domain.com/dir/.",""),Space,Str "any",Space,Str "text.",SoftBreak,Str "any",Space,Str "text:",Space,Link ("",[],[]) [Str "http://www.domain.com."] ("http://www.domain.com.",""),Space,Str "any",Space,Str "text.",SoftBreak,Str "any",Space,Str "text:",Space,Link ("",[],[]) [Str "http://www.domain.com/dir/."] ("http://www.domain.com/dir/.",""),Space,Str "any",Space,Str "text.",SoftBreak,Str "any",Space,Str "text:",Space,Link ("",[],[]) [Str "http://www.domain.com/dir/index.html."] ("http://www.domain.com/dir/index.html.",""),Space,Str "any",Space,Str "text.",SoftBreak,Str "any",Space,Str "text:",Space,Link ("",[],[]) [Str "http://www.domain.com/dir/index.html,"] ("http://www.domain.com/dir/index.html,",""),Space,Str "any",Space,Str "text.",SoftBreak,Link ("",[],[]) [Str "http://www.domain.com/dir/#anchor"] ("http://www.domain.com/dir/#anchor",""),SoftBreak,Link ("",[],[]) [Str "http://www.domain.com/dir/index.html#anchor"] ("http://www.domain.com/dir/index.html#anchor",""),SoftBreak,Link ("",[],[]) [Str "http://www.domain.com/dir/index.html#anchor."] ("http://www.domain.com/dir/index.html#anchor.",""),SoftBreak,Link ("",[],[]) [Str "http://www.domain.com/dir/#anchor."] ("http://www.domain.com/dir/#anchor.",""),Space,Str "any",Space,Str "text.",SoftBreak,Link ("",[],[]) [Str "http://www.domain.com/dir/index.html#anchor."] ("http://www.domain.com/dir/index.html#anchor.",""),Space,Str "any",Space,Str "text.",SoftBreak,Str "any",Space,Str "text:",Space,Link ("",[],[]) [Str "http://www.domain.com/dir/#anchor."] ("http://www.domain.com/dir/#anchor.",""),Space,Str "any",Space,Str "text.",SoftBreak,Str "any",Space,Str "text:",Space,Link ("",[],[]) [Str "http://www.domain.com/dir/index.html#anchor."] ("http://www.domain.com/dir/index.html#anchor.",""),Space,Str "any",Space,Str "text.",SoftBreak,Link ("",[],[]) [Str "http://domain.com?a=a@a.a&b=a+b+c."] ("http://domain.com?a=a@a.a&b=a+b+c.",""),SoftBreak,Link ("",[],[]) [Str "http://domain.com?a=a@a.a&b=a+b+c,"] ("http://domain.com?a=a@a.a&b=a+b+c,",""),SoftBreak,Link ("",[],[]) [Str "http://domain.com/bla.cgi?a=a@a.a&b=a+b+c."] ("http://domain.com/bla.cgi?a=a@a.a&b=a+b+c.",""),SoftBreak,Link ("",[],[]) [Str "http://domain.com/bla.cgi?a=a@a.a&b=a+b+c@."] ("http://domain.com/bla.cgi?a=a@a.a&b=a+b+c@.",""),SoftBreak,Link ("",[],[]) [Str "http://domain.com?a=a@a.a&b=a+b+c.#anchor"] ("http://domain.com?a=a@a.a&b=a+b+c.#anchor",""),SoftBreak,Link ("",[],[]) [Str "http://domain.com/bla.cgi?a=a@a.a&b=a+b+c.#anchor"] ("http://domain.com/bla.cgi?a=a@a.a&b=a+b+c.#anchor",""),SoftBreak,Link ("",[],[]) [Str "http://domain.com/bla.cgi?a=a@a.a&b=a+b+c@.#anchor"] ("http://domain.com/bla.cgi?a=a@a.a&b=a+b+c@.#anchor",""),SoftBreak,Link ("",[],[]) [Str "http://user:password@domain.com/bla.html."] ("http://user:password@domain.com/bla.html.",""),SoftBreak,Link ("",[],[]) [Str "http://user:password@domain.com/dir/."] ("http://user:password@domain.com/dir/.",""),SoftBreak,Link ("",[],[]) [Str "http://user:password@domain.com."] ("http://user:password@domain.com.",""),SoftBreak,Link ("",[],[]) [Str "http://user:@domain.com."] ("http://user:@domain.com.",""),SoftBreak,Link ("",[],[]) [Str "http://user@domain.com."] ("http://user@domain.com.",""),SoftBreak,Link ("",[],[]) [Str "http://user:password@domain.com/bla.cgi?a=a@a.a&b=a+b+c.#anchor"] ("http://user:password@domain.com/bla.cgi?a=a@a.a&b=a+b+c.#anchor",""),SoftBreak,Link ("",[],[]) [Str "http://user:password@domain.com/bla.cgi?a=a@a.a&b=a+b+c@#anchor"] ("http://user:password@domain.com/bla.cgi?a=a@a.a&b=a+b+c@#anchor",""),SoftBreak,Link ("",[],[]) [Str "label"] ("www.domain.com",""),SoftBreak,Str "[",Space,Str "label",Space,Link ("",[],[]) [Str "www.domain.com"] ("www.domain.com",""),Str "]",SoftBreak,Link ("",[],[]) [Str "label",Space] ("www.domain.com",""),SoftBreak,Link ("",[],[]) [Str "anchor",Space] ("http://www.domain.com/dir/index.html#anchor.",""),SoftBreak,Link ("",[],[]) [Str "login",Space] ("http://user:password@domain.com/bla.html",""),SoftBreak,Link ("",[],[]) [Str "form",Space] ("http://www.domain.com/bla.cgi?a=a@a.a&b=a+b+c.",""),SoftBreak,Link ("",[],[]) [Str "form",Space,Str "&",Space,Str "anchor"] ("http://www.domain.com/bla.cgi?a=a@a.a&b=a+b+c.#anchor",""),SoftBreak,Link ("",[],[]) [Str "login",Space,Str "&",Space,Str "form",Space] ("http://user:password@domain.com/bla.cgi?a=a@a.a&b=a+b+c.",""),SoftBreak,Link ("",[],[]) [Str "local",Space,Str "link",Space,Str "up",Space] ("..",""),SoftBreak,Link ("",[],[]) [Str "local",Space,Str "link",Space,Str "file",Space] ("bla.html",""),SoftBreak,Link ("",[],[]) [Str "local",Space,Str "link",Space,Str "anchor",Space] ("#anchor",""),SoftBreak,Link ("",[],[]) [Str "local",Space,Str "link",Space,Str "file/anchor"] ("bla.html#anchor",""),SoftBreak,Link ("",[],[]) [Str "local",Space,Str "link",Space,Str "file/anchor"] ("bla.html#anchor.",""),SoftBreak,Link ("",[],[]) [Str "local",Space,Str "link",Space,Str "img",Space] ("abc.gif",""),SoftBreak,Link ("",[],[]) [Str "www.fake.com"] ("www.domain.com",""),SoftBreak,Link ("",[],[]) [Str "http://domain.com:8080/~user/_st-r@a=n$g,e/index%20new.htm"] ("http://domain.com:8080/~user/_st-r@a=n$g,e/index%20new.htm",""),SoftBreak,Link ("",[],[]) [Str "http://domain.com:8080/~user/_st-r@a=n$g,e/index%20new.htm?a=/%22&b=+.@*_-"] ("http://domain.com:8080/~user/_st-r@a=n$g,e/index%20new.htm?a=/%22&b=+.@*_-",""),SoftBreak,Link ("",[],[]) [Str "http://domain.com:8080/~user/_st-r@a=n$g,e/index%20new.htm?a=/%22&b=+.@*_-#anchor_"] ("http://domain.com:8080/~user/_st-r@a=n$g,e/index%20new.htm?a=/%22&b=+.@*_-#anchor_",""),Str "-1%.",SoftBreak,Link ("",[],[]) [Str "http://foo._user-9:pass!#$%&*()+word@domain.com:8080/~user/_st-r@a=n$g,e/index%20new.htm?a=/%22&b=+.@*_-#anchor_"] ("http://foo._user-9:pass!#$%&*()+word@domain.com:8080/~user/_st-r@a=n$g,e/index%20new.htm?a=/%22&b=+.@*_-#anchor_",""),Str "-1%.",SoftBreak,Link ("",[],[]) [Str "http://L1.com"] ("http://L1.com",""),Space,Str "!",Space,Link ("",[],[]) [Str "mailto:L2@www.com"] ("L2@www.com",""),Space,Str "!",Space,Link ("",[],[]) [Str "L3"] ("www.com",""),Space,Str "!",Space,Link ("",[],[]) [Str "L4"] ("w@ww.com",""),Space,Str "!",Space,Link ("",[],[]) [Str "www.L5.com"] ("www.L5.com",""),SoftBreak,Link ("",[],[]) [Str "www.domain.com"] ("www.domain.com",""),SoftBreak,Link ("",[],[]) [Str "www2.domain.com"] ("www2.domain.com",""),SoftBreak,Link ("",[],[]) [Str "ftp.domain.com"] ("ftp.domain.com",""),SoftBreak,Link ("",[],[]) [Str "WWW.DOMAIN.COM"] ("WWW.DOMAIN.COM",""),SoftBreak,Link ("",[],[]) [Str "FTP.DOMAIN.COM"] ("FTP.DOMAIN.COM",""),SoftBreak,Link ("",[],[]) [Str "label"] ("www.domain.com",""),SoftBreak,Link ("",[],[]) [Str "label"] ("ftp.domain.com",""),SoftBreak,Link ("",[],[]) [Str "label"] ("WWW.DOMAIN.COM",""),SoftBreak,Link ("",[],[]) [Str "label"] ("FTP.DOMAIN.COM",""),SoftBreak,Str "[label",Space,Link ("",[],[]) [Str "www.domain.com"] ("www.domain.com",""),Space,Str "]",SoftBreak,Str "[label]",Space,Link ("",[],[]) [Str "www.domain.com"] ("www.domain.com",""),Str "]"]
-,Header 1 ("image",[],[]) [Str "Image"]
-,Para [Image ("",[],[]) [] ("img.png","")]
-,Para [Link ("",[],[]) [Image ("",[],[]) [] ("img.png","")] ("https://txt2tags.org","")]
-,Para [Image ("",[],[]) [] ("img.png",""),Space,Str "Image",Space,Str "at",Space,Str "the",Space,Str "line",Space,Str "beginning."]
-,Para [Str "Image",Space,Str "in",Space,Str "the",Space,Str "middle",Space,Image ("",[],[]) [] ("img.png",""),Space,Str "of",Space,Str "the",Space,Str "line."]
-,Para [Str "Image",Space,Str "at",Space,Str "the",Space,Str "line",Space,Str "end.",Space,Image ("",[],[]) [] ("img.png","")]
-,Para [Image ("",[],[]) [] ("img.png",""),SoftBreak,Image ("",[],[]) [] ("img.png",""),SoftBreak,Image ("",[],[]) [] ("img.png","")]
-,Para [Image ("",[],[]) [] ("img.png",""),Image ("",[],[]) [] ("img.png","")]
-,Para [Str "Images",Space,Image ("",[],[]) [] ("img.png",""),Space,Str "mixed",Space,Image ("",[],[]) [] ("img.png",""),Space,Str "with",Space,Image ("",[],[]) [] ("img.png",""),Space,Str "text."]
-,Para [Str "Images",Space,Str "glued",Space,Str "together:",Space,Image ("",[],[]) [] ("img.png",""),Image ("",[],[]) [] ("img.png",""),Image ("",[],[]) [] ("img.png",""),Str "."]
-,Para [Str "[img.png",Space,Str "]"]
-,Para [Str "[",Space,Str "img.png]"]
-,Para [Str "[",Space,Str "img.png",Space,Str "]"]
-,Header 1 ("numtitle",[],[]) [Str "Numbered",Space,Str "Title"]
-,Header 1 ("",[],[]) [Str "Title",Space,Str "Level",Space,Str "1"]
-,Header 2 ("",[],[]) [Str "Title",Space,Str "Level",Space,Str "2"]
-,Header 3 ("",[],[]) [Str "Title",Space,Str "Level",Space,Str "3"]
-,Header 4 ("",[],[]) [Str "Title",Space,Str "Level",Space,Str "4"]
-,Header 5 ("",[],[]) [Str "Title",Space,Str "Level",Space,Str "5"]
-,Header 1 ("lab_el-1",[],[]) [Str "Title",Space,Str "Level",Space,Str "1"]
-,Header 2 ("lab_el-2",[],[]) [Str "Title",Space,Str "Level",Space,Str "2"]
-,Header 3 ("lab_el-3",[],[]) [Str "Title",Space,Str "Level",Space,Str "3"]
-,Header 4 ("lab_el-4",[],[]) [Str "Title",Space,Str "Level",Space,Str "4"]
-,Header 5 ("lab_el-5",[],[]) [Str "Title",Space,Str "Level",Space,Str "5"]
-,Header 3 ("",[],[]) [Str "Title",Space,Str "Level",Space,Str "3"]
-,Header 3 ("",[],[]) [Str "Title",Space,Str "Level",Space,Str "3"]
-,Header 3 ("",[],[]) [Str "Title",Space,Str "Level",Space,Str "3"]
-,Header 3 ("",[],[]) [Str "Title",Space,Str "Level",Space,Str "3"]
-,Header 3 ("",[],[]) [Str "Title",Space,Str "Level",Space,Str "3"]
-,Header 3 ("lab_el-9",[],[]) [Str "Title",Space,Str "Level",Space,Str "3"]
-,Para [Str "+Not",Space,Str "Title"]
-,Para [Str "++Not",Space,Str "Title+"]
-,Para [Str "+++Not",Space,Str "Title++++",SoftBreak,Str "++++++Not",Space,Str "Title",Space,Str "6++++++"]
-,Para [Str "+++++++Not",Space,Str "Title",Space,Str "7+++++++",SoftBreak,Str "+Not",Space,Str "Title+",Space,Str "[label1]",SoftBreak,Str "+Not",Space,Str "Title+[",Space,Str "label",Space,Str "]",SoftBreak,Str "+Not",Space,Str "Title+[la/bel]"]
-,Header 1 ("title",[],[]) [Str "Title"]
-,Header 1 ("",[],[]) [Str "Title",Space,Str "Level",Space,Str "1"]
-,Header 2 ("",[],[]) [Str "Title",Space,Str "Level",Space,Str "2"]
-,Header 3 ("",[],[]) [Str "Title",Space,Str "Level",Space,Str "3"]
-,Header 4 ("",[],[]) [Str "Title",Space,Str "Level",Space,Str "4"]
-,Header 5 ("",[],[]) [Str "Title",Space,Str "Level",Space,Str "5"]
-,Header 1 ("lab_el-1",[],[]) [Str "Title",Space,Str "Level",Space,Str "1"]
-,Header 2 ("lab_el-2",[],[]) [Str "Title",Space,Str "Level",Space,Str "2"]
-,Header 3 ("lab_el-3",[],[]) [Str "Title",Space,Str "Level",Space,Str "3"]
-,Header 4 ("lab_el-4",[],[]) [Str "Title",Space,Str "Level",Space,Str "4"]
-,Header 5 ("lab_el-5",[],[]) [Str "Title",Space,Str "Level",Space,Str "5"]
-,Header 3 ("",[],[]) [Str "Title",Space,Str "Level",Space,Str "3"]
-,Header 3 ("",[],[]) [Str "Title",Space,Str "Level",Space,Str "3"]
-,Header 3 ("",[],[]) [Str "Title",Space,Str "Level",Space,Str "3"]
-,Header 3 ("",[],[]) [Str "Title",Space,Str "Level",Space,Str "3"]
-,Header 3 ("",[],[]) [Str "Title",Space,Str "Level",Space,Str "3"]
-,Header 3 ("lab_el-9",[],[]) [Str "Title",Space,Str "Level",Space,Str "3"]
-,Para [Str "=Not",Space,Str "Title"]
-,Para [Str "==Not",Space,Str "Title="]
-,Para [Str "===Not",Space,Str "Title====",SoftBreak,Str "======Not",Space,Str "Title",Space,Str "6======"]
-,Para [Str "=======Not",Space,Str "Title",Space,Str "7=======",SoftBreak,Str "=Not",Space,Str "Title=",Space,Str "[label1]",SoftBreak,Str "=Not",Space,Str "Title=[",Space,Str "label",Space,Str "]",SoftBreak,Str "=Not",Space,Str "Title=[la/bel]"]
-,Header 1 ("quote",[],[]) [Str "Quote"]
-,BlockQuote
- [Para [Str "To",Space,Str "quote",Space,Str "a",Space,Str "paragraph,",Space,Str "just",Space,Str "prefix",Space,Str "it",Space,Str "by",Space,Str "a",Space,Str "TAB",SoftBreak,Str "character.",Space,Str "All",Space,Str "the",Space,Str "lines",Space,Str "of",Space,Str "the",Space,Str "paragraph",Space,Str "must",SoftBreak,Str "begin",Space,Str "with",Space,Str "a",Space,Str "TAB."]]
-,Para [Str "Any",Space,Str "non-tabbed",Space,Str "line",Space,Str "closes",Space,Str "the",Space,Str "quote",Space,Str "block."]
-,BlockQuote
- [Para [Str "The",Space,Str "number",Space,Str "of",Space,Str "leading",Space,Str "TABs",Space,Str "identifies",Space,Str "the",Space,Str "quote",SoftBreak,Str "block",Space,Str "depth.",Space,Str "This",Space,Str "is",Space,Str "quote",Space,Str "level",Space,Str "1."]
- ,BlockQuote
-  [Para [Str "With",Space,Str "two",Space,Str "TABs,",Space,Str "we",Space,Str "are",Space,Str "on",Space,Str "the",Space,Str "quote",SoftBreak,Str "level",Space,Str "2."]
-  ,BlockQuote
-   [Para [Str "The",Space,Str "more",Space,Str "TABs,",Space,Str "more",Space,Str "deep",Space,Str "is",SoftBreak,Str "the",Space,Str "quote",Space,Str "level."]
-   ,BlockQuote
-    [Para [Str "There",Space,Str "isn't",Space,Str "a",Space,Str "limit."]]]]]
-,BlockQuote
- [BlockQuote
-  [BlockQuote
-   [BlockQuote
-    [Para [Str "This",Space,Str "quote",Space,Str "starts",Space,Str "at",SoftBreak,Str "level",Space,Str "4."]]
-   ,Para [Str "Then",Space,Str "its",Space,Str "depth",Space,Str "is",Space,Str "decreased."]]
-  ,Para [Str "Counting",Space,Str "down,",Space,Str "one",Space,Str "by",Space,Str "one."]]
- ,Para [Str "Until",Space,Str "the",Space,Str "level",Space,Str "1."]]
-,BlockQuote
- [BlockQuote
-  [BlockQuote
-   [Para [Str "Unlike",Space,Str "lists,",Space,Str "any",Space,Str "quote",Space,Str "block",Space,Str "is",SoftBreak,Str "independent,",Space,Str "not",Space,Str "part",Space,Str "of",Space,Str "a",Space,Str "tree."]]]
- ,Para [Str "The",Space,Str "TAB",Space,Str "count",Space,Str "don't",Space,Str "need",Space,Str "to",Space,Str "be",Space,Str "incremental",SoftBreak,Str "by",Space,Str "one."]
- ,BlockQuote
-  [BlockQuote
-   [BlockQuote
-    [Para [Str "The",Space,Str "nesting",Space,Str "don't",Space,Str "need",SoftBreak,Str "to",Space,Str "follow",Space,Str "any",Space,Str "rule."]]]
-  ,Para [Str "Quotes",Space,Str "can",Space,Str "be",Space,Str "opened",Space,Str "and",Space,Str "closed",SoftBreak,Str "in",Space,Str "any",Space,Str "way."]
-  ,BlockQuote
-   [BlockQuote
-    [BlockQuote
-     [Para [Str "You",Space,Str "choose."]]]]]]
-,BlockQuote
- [Para [Str "Some",Space,Str "targets",Space,Str "(as",Space,Str "sgml)",Space,Str "don't",Space,Str "support",Space,Str "the",SoftBreak,Str "nesting",Space,Str "of",Space,Str "quotes.",Space,Str "There",Space,Str "is",Space,Str "only",Space,Str "one",Space,Str "quote",SoftBreak,Str "level."]
- ,BlockQuote
-  [Para [Str "In",Space,Str "this",Space,Str "case,",Space,Str "no",Space,Str "matter",Space,Str "how",Space,Str "much",SoftBreak,Str "TABs",Space,Str "are",Space,Str "used",Space,Str "to",Space,Str "define",Space,Str "the",Space,Str "quote",SoftBreak,Str "block,",Space,Str "it",Space,Str "always",Space,Str "will",Space,Str "be",Space,Str "level",Space,Str "1."]]]
-,BlockQuote
- [Para [Str "Spaces",Space,Str "AFTER",Space,Str "the",Space,Str "TAB",Space,Str "character",Space,Str "are",Space,Str "allowed.",SoftBreak,Str "But",Space,Str "be",Space,Str "careful,",Space,Str "it",Space,Str "can",Space,Str "be",Space,Str "confusing."]]
-,Para [Str "Spaces",Space,Str "BEFORE",Space,Str "the",Space,Str "TAB",Space,Str "character",SoftBreak,Str "invalidate",Space,Str "the",Space,Str "mark.",Space,Str "It's",Space,Str "not",Space,Str "quote."]
-,BlockQuote
- [Para [Str "Paragraph",Space,Str "breaks",Space,Str "inside",Space,Str "a",Space,Str "quote",Space,Str "aren't",SoftBreak,Str "possible."]
- ,Para [Str "This",Space,Str "sample",Space,Str "are",Space,Str "two",Space,Str "separated",Space,Str "quoted",SoftBreak,Str "paragraphs,",Space,Str "not",Space,Str "a",Space,Str "quote",Space,Str "block",Space,Str "with",SoftBreak,Str "two",Space,Str "paragraphs",Space,Str "inside."]]
-,BlockQuote
- [Para [Str "The",Space,Str "end",Space,Str "of",Space,Str "the",Space,Str "file",Space,Str "(EOF)",Space,Str "closes",Space,Str "the",SoftBreak,Str "currently",Space,Str "open",Space,Str "quote",Space,Str "block."]]
-,Header 1 ("raw",[],[]) [Str "Raw"]
-,Para [Str "A raw line.\n"]
-,Para [Str "  Another raw line, with leading spaces.\n"]
-,Para [Str "A raw area delimited\n       by lines with marks.\n"]
-,Para [Str "Trailing spaces and TABs after the area marks\nare allowed, but not encouraged nor documented.\n"]
-,Para [Str "\"\"\"Not",Space,Str "a",Space,Str "raw",Space,Str "line,",Space,Str "need",Space,Str "one",Space,Str "space",Space,Str "after",Space,Str "mark."]
-,Para [Str "\"\"\"",SoftBreak,Str "Not",Space,Str "a",Space,Str "raw",Space,Str "area.",SoftBreak,Str "The",Space,Str "marks",Space,Str "must",Space,Str "be",Space,Str "at",Space,Str "the",Space,Str "line",Space,Str "beginning,",SoftBreak,Str "no",Space,Str "leading",Space,Str "spaces.",SoftBreak,Str "\"\"\""]
-,Para [Str "The end of the file (EOF) closes\nthe currently open raw area.\n"]
-,Header 1 ("verbatim",[],[]) [Str "Verbatim"]
-,CodeBlock ("",[],[]) "A verbatim line.\n"
-,CodeBlock ("",[],[]) "  Another verbatim line, with leading spaces.\n"
-,CodeBlock ("",[],[]) "A verbatim area delimited\n       by lines with marks.\n"
-,CodeBlock ("",[],[]) "Trailing spaces and TABs after the area marks\nare allowed, but not encouraged nor documented.\n"
-,Para [Str "```Not",Space,Str "a",Space,Str "verbatim",Space,Str "line,",Space,Str "need",Space,Str "one",Space,Str "space",Space,Str "after",Space,Str "mark."]
-,Para [Str "```",SoftBreak,Str "Not",Space,Str "a",Space,Str "verbatim",Space,Str "area.",SoftBreak,Str "The",Space,Str "marks",Space,Str "must",Space,Str "be",Space,Str "at",Space,Str "the",Space,Str "line",Space,Str "beginning,",SoftBreak,Str "no",Space,Str "leading",Space,Str "spaces.",SoftBreak,Str "```"]
-,CodeBlock ("",[],[]) "The end of the file (EOF) closes\nthe currently open verbatim area.\n"
-,Header 1 ("deflist",[],[]) [Str "Definition",Space,Str "List"]
-,DefinitionList
- [([Str "Definition",Space,Str "list"],
-   [[Plain [Str "A",Space,Str "list",Space,Str "with",Space,Str "terms"]]])
- ,([Str "Start",Space,Str "term",Space,Str "with",Space,Str "colon"],
-   [[Plain [Str "And",Space,Str "its",Space,Str "definition",Space,Str "follows"]]])]
-,Header 1 ("numlist",[],[]) [Str "Numbered",Space,Str "List"]
-,Para [Str "See",Space,Link ("",[],[]) [Str "List"] ("#list",""),Str ",",Space,Str "the",Space,Str "same",Space,Str "rules",Space,Str "apply."]
-,Header 1 ("list",[],[]) [Str "List"]
-,BulletList
- [[Plain [Str "Use",Space,Str "the",Space,Str "hyphen",Space,Str "to",Space,Str "prefix",Space,Str "list",Space,Str "items."]]
- ,[Plain [Str "There",Space,Str "must",Space,Str "be",Space,Str "one",Space,Str "space",Space,Str "after",Space,Str "the",Space,Str "hyphen."]]
- ,[Plain [Str "The",Space,Str "list",Space,Str "is",Space,Str "closed",Space,Str "by",Space,Str "two",Space,Str "consecutive",Space,Str "blank",Space,Str "lines."]]]
-,BulletList
- [[Plain [Str "The",Space,Str "list",Space,Str "can",Space,Str "be",Space,Str "indented",Space,Str "on",Space,Str "the",Space,Str "source",Space,Str "document."]]
- ,[Plain [Str "You",Space,Str "can",Space,Str "use",Space,Str "any",Space,Str "number",Space,Str "of",Space,Str "spaces."]]
- ,[Plain [Str "The",Space,Str "result",Space,Str "will",Space,Str "be",Space,Str "the",Space,Str "same."]]]
-,BulletList
- [[Para [Str "Let",Space,Str "one",Space,Str "blank",Space,Str "line",Space,Str "between",Space,Str "the",Space,Str "list",Space,Str "items."]]
- ,[Para [Str "It",Space,Str "will",Space,Str "be",Space,Str "maintained",Space,Str "on",Space,Str "the",Space,Str "conversion."]]
- ,[Para [Str "Some",Space,Str "targets",Space,Str "don't",Space,Str "support",Space,Str "this",Space,Str "behavior."]]
- ,[Para [Str "This",Space,Str "one",Space,Str "was",Space,Str "separated",Space,Str "by",Space,Str "a",Space,Str "line",Space,Str "with",Space,Str "blanks.",SoftBreak,Str "You",Space,Str "can",Space,Str "also",Space,Str "put",Space,Str "a",Space,Str "blank",Space,Str "line",Space,Str "inside"]
-  ,Para [Str "the",Space,Str "item",Space,Str "contents",Space,Str "and",Space,Str "it",Space,Str "will",Space,Str "be",Space,Str "preserved."]]]
-,Para [Str "-This",Space,Str "is",Space,Str "not",Space,Str "a",Space,Str "list",Space,Str "(no",Space,Str "space)"]
-,Para [Str "-",Space,Str "This",Space,Str "is",Space,Str "not",Space,Str "a",Space,Str "list",Space,Str "(more",Space,Str "than",Space,Str "one",Space,Str "space)"]
-,Para [Str "-",Space,Str "This",Space,Str "is",Space,Str "not",Space,Str "a",Space,Str "list",Space,Str "(a",Space,Str "TAB",Space,Str "instead",Space,Str "the",Space,Str "space)"]
-,BulletList
- [[BulletList
-   [[Plain [Str "This",Space,Str "is",Space,Str "a",Space,Str "list"]]]]
- ,[OrderedList (1,DefaultStyle,DefaultDelim)
-   [[Plain [Str "This",Space,Str "is",Space,Str "a",Space,Str "list"]]]]
- ,[DefinitionList
-   [([Str "This",Space,Str "is",Space,Str "a",Space,Str "list"],
-     [[]])]]]
-,BulletList
- [[Plain [Str "This",Space,Str "is",Space,Str "the",Space,Str "\"mother\"",Space,Str "list",Space,Str "first",Space,Str "item."]]
- ,[Plain [Str "Here",Space,Str "is",Space,Str "the",Space,Str "second,",Space,Str "but",Space,Str "inside",Space,Str "this",Space,Str "item,"]
-  ,BulletList
-   [[Plain [Str "there",Space,Str "is",Space,Str "a",Space,Str "sublist,",Space,Str "with",Space,Str "its",Space,Str "own",Space,Str "items."]]
-   ,[Plain [Str "Note",Space,Str "that",Space,Str "the",Space,Str "items",Space,Str "of",Space,Str "the",Space,Str "same",Space,Str "sublist"]]
-   ,[Plain [Str "must",Space,Str "have",Space,Str "the",Space,Str "same",Space,Str "indentation."]
-    ,BulletList
-     [[Plain [Str "And",Space,Str "this",Space,Str "can",Space,Str "go",Space,Str "on,",Space,Str "opening",Space,Str "sublists."]
-      ,BulletList
-       [[Plain [Str "Just",Space,Str "add",Space,Str "leading",Space,Str "spaces",Space,Str "before",Space,Str "the"]]
-       ,[Plain [Str "hyphen",Space,Str "and",Space,Str "sublists",Space,Str "will",Space,Str "be",Space,Str "opened."]]
-       ,[Plain [Str "The",Space,Str "two",Space,Str "blank",Space,Str "lines",Space,Str "closes",Space,Str "them",Space,Str "all."]]]]]]]]]
-,BulletList
- [[Plain [Str "When",Space,Str "nesting",Space,Str "lists,",Space,Str "the",Space,Str "additional",Space,Str "spaces",Space,Str "are",Space,Str "free."]]
- ,[Plain [Str "You",Space,Str "can",Space,Str "add",Space,Str "just",Space,Str "one,"]
-  ,BulletList
-   [[Plain [Str "or",Space,Str "many."]
-    ,BulletList
-     [[Plain [Str "What",Space,Str "matters",Space,Str "is",Space,Str "to",Space,Str "put",Space,Str "more",Space,Str "than",Space,Str "the",Space,Str "previous."]]
-     ,[Plain [Str "But",Space,Str "remember",Space,Str "that",Space,Str "the",Space,Str "other",Space,Str "items",Space,Str "of",Space,Str "the",Space,Str "same",Space,Str "list"]]
-     ,[Plain [Str "must",Space,Str "use",Space,Str "the",Space,Str "same",Space,Str "indentation."]]]]]]]
-,BulletList
- [[Plain [Str "There",Space,Str "is",Space,Str "not",Space,Str "a",Space,Str "depth",Space,Str "limit,"]
-  ,BulletList
-   [[Plain [Str "you",Space,Str "can",Space,Str "go",Space,Str "deeper",Space,Str "and",Space,Str "deeper."]
-    ,BulletList
-     [[Plain [Str "But",Space,Str "some",Space,Str "targets",Space,Str "may",Space,Str "have",Space,Str "restrictions."]
-      ,BulletList
-       [[Plain [Str "The",Space,Str "LaTeX",Space,Str "maximum",Space,Str "is",Space,Str "here,",Space,Str "4",Space,Str "levels."]]]]]]]]]
-,BulletList
- [[Plain [Str "Reverse",Space,Str "nesting",Space,Str "doesn't",Space,Str "work."]]
- ,[Plain [Str "Because",Space,Str "a",Space,Str "sublist",Space,Str "*must*",Space,Str "have",Space,Str "a",Space,Str "mother",Space,Str "list."]]
- ,[Plain [Str "It's",Space,Str "the",Space,Str "list",Space,Str "concept,",Space,Str "not",Space,Str "a",Space,Str "txt2tags",Space,Str "limitation."]]
- ,[Plain [Str "All",Space,Str "this",Space,Str "sublists",Space,Str "will",Space,Str "be",Space,Str "bumped",Space,Str "to",Space,Str "mother",Space,Str "lists."]]
- ,[Plain [Str "At",Space,Str "level",Space,Str "1,",Space,Str "like",Space,Str "this",Space,Str "one."]]]
-,BulletList
- [[Plain [Str "Level",Space,Str "1"]
-  ,BulletList
-   [[Plain [Str "Level",Space,Str "2"]
-    ,BulletList
-     [[Plain [Str "Level",Space,Str "3"]
-      ,BulletList
-       [[Plain [Str "Level",Space,Str "4"]]]]
-     ,[Plain [Str "Level",Space,Str "3",Space,Str "--",Space,Str "(closed",Space,Str "Level",Space,Str "4)"]]]]
-   ,[Plain [Str "Level",Space,Str "2",Space,Str "--",Space,Str "(closed",Space,Str "Level",Space,Str "3)"]]]]
- ,[Plain [Str "Level",Space,Str "1",Space,Str "--",Space,Str "(closed",Space,Str "Level",Space,Str "2)"]]]
-,BulletList
- [[Plain [Str "Level",Space,Str "1"]
-  ,BulletList
-   [[Plain [Str "Level",Space,Str "2"]
-    ,BulletList
-     [[Plain [Str "Level",Space,Str "3"]
-      ,BulletList
-       [[Plain [Str "Level",Space,Str "4"]]]]]]]]
- ,[Plain [Str "Level",Space,Str "1",Space,Str "--",Space,Str "(closed",Space,Str "Level",Space,Str "4,",Space,Str "Level",Space,Str "3",Space,Str "and",Space,Str "Level",Space,Str "2)"]]]
-,BulletList
- [[Para [Str "Level",Space,Str "1"]
-  ,BulletList
-   [[Para [Str "Level",Space,Str "2",Space,Str "--",Space,Str "blank",Space,Str "BEFORE",Space,Str "and",Space,Str "AFTER",Space,Str "(in)"]
-    ,BulletList
-     [[Plain [Str "Level",Space,Str "3"]]]]]]]
-,BulletList
- [[Plain [Str "Level",Space,Str "4"]]]
-,BulletList
- [[Para [Str "Level",Space,Str "3"]]
- ,[Para [Str "Level",Space,Str "2",Space,Str "--",Space,Str "blank",Space,Str "BEFORE",Space,Str "and",Space,Str "AFTER",Space,Str "(out)"]]
- ,[Para [Str "Level",Space,Str "1"]
-  ,BulletList
-   [[Para [Str "Level",Space,Str "2",Space,Str "--",Space,Str "blank",Space,Str "BEFORE",Space,Str "(spaces)",Space,Str "and",Space,Str "AFTER",Space,Str "(TAB)"]
-    ,BulletList
-     [[Plain [Str "Level",Space,Str "3"]]]]]]]
-,BulletList
- [[Plain [Str "Level",Space,Str "1"]
-  ,BulletList
-   [[Plain [Str "Level",Space,Str "2"]
-    ,BulletList
-     [[Plain [Str "Level",Space,Str "3"]
-      ,BulletList
-       [[Plain [Str "Level",Space,Str "4"]]
-       ,[Plain [Str "Level",Space,Str "3.5",Space,Str "???"]]]]
-     ,[Plain [Str "Level",Space,Str "3"]]
-     ,[Plain [Str "Level",Space,Str "2.5",Space,Str "???"]]]]
-   ,[Plain [Str "Level",Space,Str "2"]]
-   ,[Plain [Str "Level",Space,Str "1.5",Space,Str "???"]]]]
- ,[Plain [Str "Level",Space,Str "1"]]]
-,BulletList
- [[Plain [Str "This",Space,Str "list",Space,Str "is",Space,Str "closed",Space,Str "by",Space,Str "a",Space,Str "line",Space,Str "with",Space,Str "spaces",Space,Str "and",Space,Str "other",Space,Str "with",Space,Str "TABs"]]]
-,BulletList
- [[Plain [Str "This",Space,Str "list",Space,Str "is",Space,Str "NOT",Space,Str "closed",Space,Str "by",Space,Str "two",Space,Str "comment",Space,Str "lines"]]]
-,BulletList
- [[Plain [Str "This",Space,Str "list",Space,Str "is",Space,Str "closed",Space,Str "by",Space,Str "a",Space,Str "line",Space,Str "with",Space,Str "spaces",Space,Str "and",Space,Str "TAB,"]]
- ,[Plain [Str "then",Space,Str "a",Space,Str "comment",Space,Str "line,",Space,Str "then",Space,Str "an",Space,Str "empty",Space,Str "line."]]]
-,BulletList
- [[Plain [Str "Level",Space,Str "1"]
-  ,BulletList
-   [[Plain [Str "Level",Space,Str "2"]
-    ,BulletList
-     [[Plain [Str "Level",Space,Str "3"]]]
-    ,Plain [Str "-",SoftBreak,Str "Level",Space,Str "2"]]]
-  ,Plain [Str "-",SoftBreak,Str "Level",Space,Str "1"]]]
-,Para [Str "-"]
-,BulletList
- [[Plain [Str "Empty",Space,Str "item",Space,Str "with",Space,Str "trailing",Space,Str "spaces."]]]
-,Para [Str "-"]
-,BulletList
- [[Plain [Str "Empty",Space,Str "item",Space,Str "with",Space,Str "trailing",Space,Str "TAB."]]]
-,Para [Str "-"]
-,BulletList
- [[Plain [Str "If",Space,Str "the",Space,Str "end",Space,Str "of",Space,Str "the",Space,Str "file",Space,Str "(EOF)",Space,Str "is",Space,Str "hit,"]
-  ,BulletList
-   [[Plain [Str "all",Space,Str "the",Space,Str "currently",Space,Str "opened",Space,Str "list",Space,Str "are",Space,Str "closed,"]
-    ,BulletList
-     [[Plain [Str "just",Space,Str "like",Space,Str "when",Space,Str "using",Space,Str "the",Space,Str "two",Space,Str "blank",Space,Str "lines."]]]]]]]
-,Header 1 ("table",[],[]) [Str "Table"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignRight,ColWidthDefault)]
- (TableHead ("",[],[])
- [])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Cell",Space,Str "1"]]]])]
- (TableFoot ("",[],[])
- [])
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignRight,ColWidthDefault)]
- (TableHead ("",[],[])
- [])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Cell",Space,Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Cell",Space,Str "2"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Cell",Space,Str "3"]]]])]
- (TableFoot ("",[],[])
- [])
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)]
- (TableHead ("",[],[])
- [])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Cell",Space,Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Cell",Space,Str "2"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Cell",Space,Str "3"]]]])]
- (TableFoot ("",[],[])
- [])
-,Para [Str "||",Space,Str "Cell",Space,Str "1",Space,Str "|",Space,Str "Cell",Space,Str "2",Space,Str "|",Space,Str "Cell",Space,Str "3",Space,Str "|"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)]
- (TableHead ("",[],[])
- [])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Cell",Space,Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Cell",Space,Str "2"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Cell",Space,Str "3"]]]])]
- (TableFoot ("",[],[])
- [])
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Heading"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Heading"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Heading"]]]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "<-"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "--"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "->"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "--"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "--"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "--"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "->"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "--"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "<-"]]]])]
- (TableFoot ("",[],[])
- [])
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "1"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "2"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "3+4"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   []]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "2"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "3"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "4"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1+2+3"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "4"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "2+3"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "4"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1+2+3+4"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []]])]
- (TableFoot ("",[],[])
- [])
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)]
- (TableHead ("",[],[])
- [])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "0"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "2"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "4"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "5"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "7"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "8"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "A"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "B"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "D"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "E"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "F"]]]])]
- (TableFoot ("",[],[])
- [])
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)]
- (TableHead ("",[],[])
- [])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "2"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "2"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "3"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "2"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "3"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "4"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "2"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "3"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "4"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "5"]]]])]
- (TableFoot ("",[],[])
- [])
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)]
- (TableHead ("",[],[])
- [])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Jan"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Fev"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Mar"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "Apr"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "May"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "20%"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "40%"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "60%"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "80%"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "100%"]]]])]
- (TableFoot ("",[],[])
- [])
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignCenter,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)]
- (TableHead ("",[],[])
- [])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "/"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "/",Space,Str "/",Space,Str "/",Space,Str "/",Space,Str "/"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "/",Space,Str "/",Space,Str "/",Space,Str "/",Space,Str "/",Space,Str "/",Space,Str "/",Space,Str "/",Space,Str "/"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "o"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "o"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "."]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "=",Space,Str "=",Space,Str "=",Space,Str "="]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []]])]
- (TableFoot ("",[],[])
- [])
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)]
- (TableHead ("",[],[])
- [])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "01"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "02"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "05"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "07"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "11"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "13"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "16"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "17"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "19"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "20"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "23"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "25"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "26"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "29"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "30"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "32"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "35"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "37"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "39"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "40"]]]])]
- (TableFoot ("",[],[])
- [])
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)
- ,(AlignCenter,ColWidthDefault)]
- (TableHead ("",[],[])
- [])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "0"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "2"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "3"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "4"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "5"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "6"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "7"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "8"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "9"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "A"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "B"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "C"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "D"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "E"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "F"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "0"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "2"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "3"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "4"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "5"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "6"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "7"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "8"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "9"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "A"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "B"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "C"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "D"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "E"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "F"]]]])]
- (TableFoot ("",[],[])
- [])
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignCenter,ColWidthDefault)]
- (TableHead ("",[],[])
- [])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []]])]
- (TableFoot ("",[],[])
- [])
-,Para [Str "|this|is|not|a|table|"]
-,Para [Str "|this|",Space,Str "is|",Space,Str "not|",Space,Str "a|",Space,Str "table|"]
-,Para [Str "|this",Space,Str "|is",Space,Str "|not",Space,Str "|a",Space,Str "|table",Space,Str "|"]
-,Para [Str "|",Space,Str "this\t|",Space,Str "is\t|",Space,Str "not\t|",Space,Str "a\t|",Space,Str "table\t|"]
-,HorizontalRule
-,Para [Str "The",Space,Str "End."]]
+Pandoc
+  ( Meta
+    { unMeta = fromList
+      [
+        ( "author", MetaList [ MetaInlines [ Str "author" ] ] )
+      ,
+        ( "date", MetaInlines [ Str "date" ] )
+      ,
+        ( "includeconf", MetaString "rules.conf" )
+      ,
+        ( "title"
+        , MetaInlines
+          [ Str "Txt2tags", Space, Str "Markup", Space, Str "Rules" ]
+        )
+      ]
+    }
+  )
+  [ Para
+    [ Str "This"
+    , Space
+    , Str "document"
+    , Space
+    , Str "describes"
+    , Space
+    , Str "all"
+    , Space
+    , Str "the"
+    , Space
+    , Str "details"
+    , Space
+    , Str "about"
+    , Space
+    , Str "each"
+    , Space
+    , Str "txt2tags"
+    , Space
+    , Str "mark."
+    , SoftBreak
+    , Str "The"
+    , Space
+    , Str "target"
+    , Space
+    , Str "audience"
+    , Space
+    , Str "are"
+    , Space
+    , Strong
+      [ Str "experienced" ]
+    , Space
+    , Str "users."
+    , Space
+    , Str "You"
+    , Space
+    , Str "may"
+    , Space
+    , Str "find"
+    , Space
+    , Str "it"
+    , SoftBreak
+    , Str "useful"
+    , Space
+    , Str "if"
+    , Space
+    , Str "you"
+    , Space
+    , Str "want"
+    , Space
+    , Str "to"
+    , Space
+    , Str "master"
+    , Space
+    , Str "the"
+    , Space
+    , Str "marks"
+    , Space
+    , Str "or"
+    , Space
+    , Str "solve"
+    , Space
+    , Str "a"
+    , Space
+    , Str "specific"
+    , Space
+    , Str "problem"
+    , SoftBreak
+    , Str "about"
+    , Space
+    , Str "a"
+    , Space
+    , Str "mark."
+    ]
+  , Para
+    [ Str "If"
+    , Space
+    , Str "you"
+    , Space
+    , Str "are"
+    , Space
+    , Str "new"
+    , Space
+    , Str "to"
+    , Space
+    , Str "txt2tags"
+    , Space
+    , Str "or"
+    , Space
+    , Str "just"
+    , Space
+    , Str "want"
+    , Space
+    , Str "to"
+    , Space
+    , Str "know"
+    , Space
+    , Str "which"
+    , Space
+    , Str "are"
+    , Space
+    , Str "the"
+    , SoftBreak
+    , Str "available"
+    , Space
+    , Str "marks,"
+    , Space
+    , Str "please"
+    , Space
+    , Str "read"
+    , Space
+    , Str "the"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "Markup", Space, Str "Demo" ]
+      ( "MARKUPDEMO", "" )
+    , Str "."
+    ]
+  , Para
+    [ Str "Note"
+    , Space
+    , Str "1:"
+    , Space
+    , Str "This"
+    , Space
+    , Str "document"
+    , Space
+    , Str "is"
+    , Space
+    , Str "generated"
+    , Space
+    , Str "directly"
+    , Space
+    , Str "from"
+    , Space
+    , Str "the"
+    , Space
+    , Str "txt2tags"
+    , SoftBreak
+    , Str "test-suite."
+    , Space
+    , Str "All"
+    , Space
+    , Str "the"
+    , Space
+    , Str "rules"
+    , Space
+    , Str "mentioned"
+    , Space
+    , Str "here"
+    , Space
+    , Str "are"
+    , Space
+    , Str "100%"
+    , Space
+    , Str "in"
+    , Space
+    , Str "sync"
+    , Space
+    , Str "with"
+    , Space
+    , Str "the"
+    , SoftBreak
+    , Str "current"
+    , Space
+    , Str "program"
+    , Space
+    , Str "code."
+    ]
+  , Para
+    [ Str "Note"
+    , Space
+    , Str "2:"
+    , Space
+    , Str "A"
+    , Space
+    , Str "good"
+    , Space
+    , Str "practice"
+    , Space
+    , Str "is"
+    , Space
+    , Str "to"
+    , Space
+    , Str "consult"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "the", Space, Str "sources" ]
+      ( "rules.t2t", "" )
+    , Space
+    , Str "when"
+    , SoftBreak
+    , Str "reading,"
+    , Space
+    , Str "to"
+    , Space
+    , Str "see"
+    , Space
+    , Str "how"
+    , Space
+    , Str "the"
+    , Space
+    , Str "texts"
+    , Space
+    , Str "were"
+    , Space
+    , Str "made."
+    ]
+  , Para
+    [ Str "Table", Space, Str "of", Space, Str "Contents:" ]
+  , HorizontalRule
+  , Header 1
+    ( "paragraph", [], [] )
+    [ Str "Paragraph" ]
+  , Para
+    [ Str "A"
+    , Space
+    , Str "paragraph"
+    , Space
+    , Str "is"
+    , Space
+    , Str "composed"
+    , Space
+    , Str "by"
+    , Space
+    , Str "one"
+    , Space
+    , Str "or"
+    , Space
+    , Str "more"
+    , Space
+    , Str "lines."
+    , SoftBreak
+    , Str "A"
+    , Space
+    , Str "blank"
+    , Space
+    , Str "line"
+    , Space
+    , Str "(or"
+    , Space
+    , Str "a"
+    , Space
+    , Str "table,"
+    , Space
+    , Str "or"
+    , Space
+    , Str "a"
+    , Space
+    , Str "list)"
+    , Space
+    , Str "ends"
+    , Space
+    , Str "the"
+    , SoftBreak
+    , Str "current"
+    , Space
+    , Str "paragraph."
+    ]
+  , Para
+    [ Str "Leading"
+    , Space
+    , Str "and"
+    , Space
+    , Str "trailing"
+    , Space
+    , Str "spaces"
+    , Space
+    , Str "are"
+    , Space
+    , Str "ignored."
+    ]
+  , Para
+    [ Str "A"
+    , Space
+    , Str "comment"
+    , Space
+    , Str "line"
+    , Space
+    , Str "can"
+    , Space
+    , Str "be"
+    , Space
+    , Str "placed"
+    , Space
+    , Str "inside"
+    , Space
+    , Str "a"
+    , Space
+    , Str "paragraph."
+    , SoftBreak
+    , Str "It"
+    , Space
+    , Str "will"
+    , Space
+    , Str "not"
+    , Space
+    , Str "affect"
+    , Space
+    , Str "it."
+    ]
+  , Para
+    [ Str "The"
+    , Space
+    , Str "end"
+    , Space
+    , Str "of"
+    , Space
+    , Str "the"
+    , Space
+    , Str "file"
+    , Space
+    , Str "(EOF)"
+    , Space
+    , Str "closes"
+    , Space
+    , Str "the"
+    , SoftBreak
+    , Str "currently"
+    , Space
+    , Str "open"
+    , Space
+    , Str "paragraph."
+    ]
+  , Header 1
+    ( "comment", [], [] )
+    [ Str "Comment" ]
+  , Para
+    [ Str "%"
+    , Space
+    , Str "not"
+    , Space
+    , Str "on"
+    , Space
+    , Str "the"
+    , Space
+    , Str "line"
+    , Space
+    , Str "beginning"
+    , Space
+    , Str "(at"
+    , Space
+    , Str "column"
+    , Space
+    , Str "2)"
+    ]
+  , Para
+    [ Str "some"
+    , Space
+    , Str "text"
+    , Space
+    , Str "%"
+    , Space
+    , Str "half"
+    , Space
+    , Str "line"
+    , Space
+    , Str "comments"
+    , Space
+    , Str "are"
+    , Space
+    , Str "not"
+    , Space
+    , Str "allowed"
+    ]
+  , Header 1
+    ( "line", [], [] )
+    [ Str "Line" ]
+  , HorizontalRule
+  , HorizontalRule
+  , HorizontalRule
+  , HorizontalRule
+  , HorizontalRule
+  , HorizontalRule
+  , HorizontalRule
+  , HorizontalRule
+  , HorizontalRule
+  , HorizontalRule
+  , HorizontalRule
+  , Para
+    [ Strikeout
+      [ Str "-----" ]
+    , SoftBreak
+    , Strikeout
+      [ Str "-------", Space, Str "--------" ]
+    ]
+  , Para
+    [ Strikeout [ Str "-------+--------" ] ]
+  , Para
+    [ Str "("
+    , Space
+    , Strikeout
+      [ Str "----------------" ]
+    , Space
+    , Str ")"
+    ]
+  , Header 1
+    ( "inline", [], [] )
+    [ Str "Inline" ]
+  , Para
+    [ Str "i)"
+    , Space
+    , Strong
+      [ Str "b" ]
+    , Space
+    , Emph
+      [ Str "i" ]
+    , Space
+    , Underline
+      [ Str "u" ]
+    , Space
+    , Strikeout
+      [ Str "s" ]
+    , Space
+    , Code
+      ( "", [], [] ) "m"
+    , Space
+    , Str "r"
+    , Space
+    , RawInline
+      ( Format "html" ) "t"
+    , SoftBreak
+    , Str "i)"
+    , Space
+    , Strong
+      [ Str "bo" ]
+    , Space
+    , Emph
+      [ Str "it" ]
+    , Space
+    , Underline
+      [ Str "un" ]
+    , Space
+    , Strikeout
+      [ Str "st" ]
+    , Space
+    , Code
+      ( "", [], [] ) "mo"
+    , Space
+    , Str "ra"
+    , Space
+    , RawInline
+      ( Format "html" ) "tg"
+    , SoftBreak
+    , Str "i)"
+    , Space
+    , Strong
+      [ Str "bold" ]
+    , Space
+    , Emph
+      [ Str "ital" ]
+    , Space
+    , Underline
+      [ Str "undr" ]
+    , Space
+    , Strikeout
+      [ Str "strk" ]
+    , Space
+    , Code
+      ( "", [], [] ) "mono"
+    , Space
+    , Str "raw"
+    , Space
+    , RawInline
+      ( Format "html" ) "tggd"
+    , SoftBreak
+    , Str "i)"
+    , Space
+    , Strong
+      [ Str "bo", Space, Str "ld" ]
+    , Space
+    , Emph
+      [ Str "it", Space, Str "al" ]
+    , Space
+    , Underline
+      [ Str "un", Space, Str "dr" ]
+    , Space
+    , Strikeout
+      [ Str "st", Space, Str "rk" ]
+    , Space
+    , Code
+      ( "", [], [] ) "mo no"
+    , Space
+    , Str "r"
+    , Space
+    , Str "aw"
+    , Space
+    , RawInline
+      ( Format "html" ) "tg gd"
+    , SoftBreak
+    , Str "i)"
+    , Space
+    , Strong
+      [ Str "bo", Space, Str "*", Space, Str "ld" ]
+    , Space
+    , Emph
+      [ Str "it", Space, Str "/", Space, Str "al" ]
+    , Space
+    , Underline
+      [ Str "un", Space, Str "_", Space, Str "dr" ]
+    , Space
+    , Strikeout
+      [ Str "st", Space, Str "-", Space, Str "rk" ]
+    , Space
+    , Code
+      ( "", [], [] ) "mo ` no"
+    , Space
+    , Str "r"
+    , Space
+    , Str "\""
+    , Space
+    , Str "aw"
+    , Space
+    , RawInline
+      ( Format "html" ) "tg ' gd"
+    , SoftBreak
+    , Str "i)"
+    , Space
+    , Strong
+      [ Str "bo", Space, Str "**ld" ]
+    , Space
+    , Emph
+      [ Str "it", Space, Str "//al" ]
+    , Space
+    , Underline
+      [ Str "un", Space, Str "__dr" ]
+    , Space
+    , Strikeout
+      [ Str "st", Space, Str "--rk" ]
+    , Space
+    , Code
+      ( "", [], [] ) "mo ``no"
+    , Space
+    , Str "r"
+    , Space
+    , Str "\"\"aw"
+    , Space
+    , RawInline
+      ( Format "html" ) "tg ''gd"
+    , SoftBreak
+    , Str "i)"
+    , Space
+    , Strong
+      [ Str "bo", Space, Str "**", Space, Str "ld" ]
+    , Space
+    , Emph
+      [ Str "it", Space, Str "//", Space, Str "al" ]
+    , Space
+    , Underline
+      [ Str "un", Space, Str "__", Space, Str "dr" ]
+    , Space
+    , Strikeout
+      [ Str "st", Space, Str "--", Space, Str "rk" ]
+    , Space
+    , Code
+      ( "", [], [] ) "mo `` no"
+    , Space
+    , Str "r"
+    , Space
+    , Str "\"\""
+    , Space
+    , Str "aw"
+    , Space
+    , RawInline
+      ( Format "html" ) "tg '' gd"
+    , SoftBreak
+    , Str "i)"
+    , Space
+    , Strong
+      [ Str "**bold**" ]
+    , Space
+    , Emph
+      [ Str "//ital//" ]
+    , Space
+    , Underline
+      [ Str "__undr__" ]
+    , Space
+    , Strikeout
+      [ Str "--strk--" ]
+    , Space
+    , Code
+      ( "", [], [] ) "``mono``"
+    , Space
+    , Str "\"\"raw\"\""
+    , Space
+    , RawInline
+      ( Format "html" ) "''tggd''"
+    , SoftBreak
+    , Str "i)"
+    , Space
+    , Strong
+      [ Str "*bold*" ]
+    , Space
+    , Emph
+      [ Str "/ital/" ]
+    , Space
+    , Underline
+      [ Str "_undr_" ]
+    , Space
+    , Strikeout
+      [ Str "-strk-" ]
+    , Space
+    , Code
+      ( "", [], [] ) "`mono`"
+    , Space
+    , Str "\"raw\""
+    , Space
+    , RawInline
+      ( Format "html" ) "'tggd'"
+    ]
+  , Para
+    [ Str "i)"
+    , Space
+    , Strong
+      [ Str "*" ]
+    , Space
+    , Emph
+      [ Str "/" ]
+    , Space
+    , Underline
+      [ Str "_" ]
+    , Space
+    , Strikeout
+      [ Str "-" ]
+    , Space
+    , Code
+      ( "", [], [] ) "`"
+    , Space
+    , Str "\""
+    , Space
+    , RawInline
+      ( Format "html" ) "'"
+    , SoftBreak
+    , Str "i)"
+    , Space
+    , Strong
+      [ Str "**" ]
+    , Space
+    , Emph
+      [ Str "//" ]
+    , Space
+    , Underline
+      [ Str "__" ]
+    , Space
+    , Strikeout
+      [ Str "--" ]
+    , Space
+    , Code
+      ( "", [], [] ) "``"
+    , Space
+    , Str "\"\""
+    , Space
+    , RawInline
+      ( Format "html" ) "''"
+    , SoftBreak
+    , Str "i)"
+    , Space
+    , Strong
+      [ Str "***" ]
+    , Space
+    , Emph
+      [ Str "///" ]
+    , Space
+    , Underline
+      [ Str "___" ]
+    , Space
+    , Strikeout
+      [ Str "---" ]
+    , Space
+    , Code
+      ( "", [], [] ) "```"
+    , Space
+    , Str "\"\"\""
+    , Space
+    , RawInline
+      ( Format "html" ) "'''"
+    , SoftBreak
+    , Str "i)"
+    , Space
+    , Strong
+      [ Str "****" ]
+    , Space
+    , Emph
+      [ Str "////" ]
+    , Space
+    , Underline
+      [ Str "____" ]
+    , Space
+    , Strikeout
+      [ Str "----" ]
+    , Space
+    , Code
+      ( "", [], [] ) "````"
+    , Space
+    , Str "\"\"\"\""
+    , Space
+    , RawInline
+      ( Format "html" ) "''''"
+    , SoftBreak
+    , Str "i)"
+    , Space
+    , Strong
+      [ Str "*****" ]
+    , Space
+    , Emph
+      [ Str "/////" ]
+    , Space
+    , Underline
+      [ Str "_____" ]
+    , Space
+    , Strikeout
+      [ Str "-----" ]
+    , Space
+    , Code
+      ( "", [], [] ) "`````"
+    , Space
+    , Str "\"\"\"\"\""
+    , Space
+    , RawInline
+      ( Format "html" ) "'''''"
+    , SoftBreak
+    , Str "i)"
+    , Space
+    , Strong
+      [ Str "******" ]
+    , Space
+    , Emph
+      [ Str "//////" ]
+    , Space
+    , Underline
+      [ Str "______" ]
+    , Space
+    , Strikeout
+      [ Str "------" ]
+    , Space
+    , Code
+      ( "", [], [] ) "``````"
+    , Space
+    , Str "\"\"\"\"\"\""
+    , Space
+    , RawInline
+      ( Format "html" ) "''''''"
+    ]
+  , Para
+    [ Str "i)"
+    , Space
+    , Str "****"
+    , Space
+    , Str "////"
+    , Space
+    , Str "____"
+    , Space
+    , Str "----"
+    , Space
+    , Str "````"
+    , Space
+    , Str "\"\"\"\""
+    , Space
+    , Str "''''"
+    , SoftBreak
+    , Str "i)"
+    , Space
+    , Str "**"
+    , Space
+    , Str "**"
+    , Space
+    , Str "//"
+    , Space
+    , Str "//"
+    , Space
+    , Str "__"
+    , Space
+    , Str "__"
+    , Space
+    , Str "--"
+    , Space
+    , Str "--"
+    , Space
+    , Str "``"
+    , Space
+    , Str "``"
+    , Space
+    , Str "\"\""
+    , Space
+    , Str "\"\""
+    , Space
+    , Str "''"
+    , Space
+    , Str "''"
+    ]
+  , Para
+    [ Str "i)"
+    , Space
+    , Str "**"
+    , Space
+    , Str "bold**"
+    , Space
+    , Str "//"
+    , Space
+    , Str "ital//"
+    , Space
+    , Str "__"
+    , Space
+    , Str "undr__"
+    , Space
+    , Str "--"
+    , Space
+    , Str "strk--"
+    , Space
+    , Str "``"
+    , Space
+    , Str "mono``"
+    , Space
+    , Str "\"\""
+    , Space
+    , Str "raw\"\""
+    , Space
+    , Str "''"
+    , Space
+    , Str "tggd''"
+    , SoftBreak
+    , Str "i)"
+    , Space
+    , Str "**bold"
+    , Space
+    , Str "**"
+    , Space
+    , Str "//ital"
+    , Space
+    , Str "//"
+    , Space
+    , Str "__undr"
+    , Space
+    , Str "__"
+    , Space
+    , Str "--strk"
+    , Space
+    , Str "--"
+    , Space
+    , Str "``mono"
+    , Space
+    , Str "``"
+    , Space
+    , Str "\"\"raw"
+    , Space
+    , Str "\"\""
+    , Space
+    , Str "''tggd"
+    , Space
+    , Str "''"
+    , SoftBreak
+    , Str "i)"
+    , Space
+    , Str "**"
+    , Space
+    , Str "bold"
+    , Space
+    , Str "**"
+    , Space
+    , Str "//"
+    , Space
+    , Str "ital"
+    , Space
+    , Str "//"
+    , Space
+    , Str "__"
+    , Space
+    , Str "undr"
+    , Space
+    , Str "__"
+    , Space
+    , Str "--"
+    , Space
+    , Str "strk"
+    , Space
+    , Str "--"
+    , Space
+    , Str "``"
+    , Space
+    , Str "mono"
+    , Space
+    , Str "``"
+    , Space
+    , Str "\"\""
+    , Space
+    , Str "raw"
+    , Space
+    , Str "\"\""
+    , Space
+    , Str "''"
+    , Space
+    , Str "tggd"
+    , Space
+    , Str "''"
+    ]
+  , Header 1
+    ( "link", [], [] )
+    [ Str "Link" ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "mailto:user@domain.com" ]
+      ( "user@domain.com", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "mailto:user@domain.com" ]
+      ( "user@domain.com", "" )
+    , Str "."
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "mailto:user@domain.com" ]
+      ( "user@domain.com", "" )
+    , Str "."
+    , Space
+    , Str "any"
+    , Space
+    , Str "text."
+    , SoftBreak
+    , Str "any"
+    , Space
+    , Str "text:"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "mailto:user@domain.com" ]
+      ( "user@domain.com", "" )
+    , Str "."
+    , Space
+    , Str "any"
+    , Space
+    , Str "text."
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "label" ]
+      ( "user@domain.com", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "mailto:user@domain.com?subject=bla" ]
+      ( "user@domain.com?subject=bla", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "mailto:user@domain.com?subject=bla" ]
+      ( "user@domain.com?subject=bla", "" )
+    , Str "."
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "mailto:user@domain.com?subject=bla" ]
+      ( "user@domain.com?subject=bla", "" )
+    , Str ","
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "mailto:user@domain.com?subject=bla&cc=otheruser@domain.com" ]
+      ( "user@domain.com?subject=bla&cc=otheruser@domain.com", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "mailto:user@domain.com?subject=bla&cc=otheruser@domain.com" ]
+      ( "user@domain.com?subject=bla&cc=otheruser@domain.com", "" )
+    , Str "."
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "mailto:user@domain.com?subject=bla&cc=otheruser@domain.com" ]
+      ( "user@domain.com?subject=bla&cc=otheruser@domain.com", "" )
+    , Str ","
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "label" ]
+      ( "user@domain.com?subject=bla&cc=otheruser@domain.com", "" )
+    , Str "."
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "label" ]
+      ( "user@domain.com?subject=bla&cc=otheruser@domain.com.", "" )
+    , Str "."
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "http://www.domain.com" ]
+      ( "http://www.domain.com", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "http://www.domain.com/dir/" ]
+      ( "http://www.domain.com/dir/", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "http://www.domain.com/dir///" ]
+      ( "http://www.domain.com/dir///", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "http://www.domain.com." ]
+      ( "http://www.domain.com.", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "http://www.domain.com," ]
+      ( "http://www.domain.com,", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "http://www.domain.com." ]
+      ( "http://www.domain.com.", "" )
+    , Space
+    , Str "any"
+    , Space
+    , Str "text."
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "http://www.domain.com," ]
+      ( "http://www.domain.com,", "" )
+    , Space
+    , Str "any"
+    , Space
+    , Str "text."
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "http://www.domain.com/dir/." ]
+      ( "http://www.domain.com/dir/.", "" )
+    , Space
+    , Str "any"
+    , Space
+    , Str "text."
+    , SoftBreak
+    , Str "any"
+    , Space
+    , Str "text:"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "http://www.domain.com." ]
+      ( "http://www.domain.com.", "" )
+    , Space
+    , Str "any"
+    , Space
+    , Str "text."
+    , SoftBreak
+    , Str "any"
+    , Space
+    , Str "text:"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "http://www.domain.com/dir/." ]
+      ( "http://www.domain.com/dir/.", "" )
+    , Space
+    , Str "any"
+    , Space
+    , Str "text."
+    , SoftBreak
+    , Str "any"
+    , Space
+    , Str "text:"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "http://www.domain.com/dir/index.html." ]
+      ( "http://www.domain.com/dir/index.html.", "" )
+    , Space
+    , Str "any"
+    , Space
+    , Str "text."
+    , SoftBreak
+    , Str "any"
+    , Space
+    , Str "text:"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "http://www.domain.com/dir/index.html," ]
+      ( "http://www.domain.com/dir/index.html,", "" )
+    , Space
+    , Str "any"
+    , Space
+    , Str "text."
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "http://www.domain.com/dir/#anchor" ]
+      ( "http://www.domain.com/dir/#anchor", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "http://www.domain.com/dir/index.html#anchor" ]
+      ( "http://www.domain.com/dir/index.html#anchor", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "http://www.domain.com/dir/index.html#anchor." ]
+      ( "http://www.domain.com/dir/index.html#anchor.", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "http://www.domain.com/dir/#anchor." ]
+      ( "http://www.domain.com/dir/#anchor.", "" )
+    , Space
+    , Str "any"
+    , Space
+    , Str "text."
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "http://www.domain.com/dir/index.html#anchor." ]
+      ( "http://www.domain.com/dir/index.html#anchor.", "" )
+    , Space
+    , Str "any"
+    , Space
+    , Str "text."
+    , SoftBreak
+    , Str "any"
+    , Space
+    , Str "text:"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "http://www.domain.com/dir/#anchor." ]
+      ( "http://www.domain.com/dir/#anchor.", "" )
+    , Space
+    , Str "any"
+    , Space
+    , Str "text."
+    , SoftBreak
+    , Str "any"
+    , Space
+    , Str "text:"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "http://www.domain.com/dir/index.html#anchor." ]
+      ( "http://www.domain.com/dir/index.html#anchor.", "" )
+    , Space
+    , Str "any"
+    , Space
+    , Str "text."
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "http://domain.com?a=a@a.a&b=a+b+c." ]
+      ( "http://domain.com?a=a@a.a&b=a+b+c.", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "http://domain.com?a=a@a.a&b=a+b+c," ]
+      ( "http://domain.com?a=a@a.a&b=a+b+c,", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "http://domain.com/bla.cgi?a=a@a.a&b=a+b+c." ]
+      ( "http://domain.com/bla.cgi?a=a@a.a&b=a+b+c.", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "http://domain.com/bla.cgi?a=a@a.a&b=a+b+c@." ]
+      ( "http://domain.com/bla.cgi?a=a@a.a&b=a+b+c@.", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "http://domain.com?a=a@a.a&b=a+b+c.#anchor" ]
+      ( "http://domain.com?a=a@a.a&b=a+b+c.#anchor", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "http://domain.com/bla.cgi?a=a@a.a&b=a+b+c.#anchor" ]
+      ( "http://domain.com/bla.cgi?a=a@a.a&b=a+b+c.#anchor", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "http://domain.com/bla.cgi?a=a@a.a&b=a+b+c@.#anchor" ]
+      ( "http://domain.com/bla.cgi?a=a@a.a&b=a+b+c@.#anchor", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "http://user:password@domain.com/bla.html." ]
+      ( "http://user:password@domain.com/bla.html.", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "http://user:password@domain.com/dir/." ]
+      ( "http://user:password@domain.com/dir/.", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "http://user:password@domain.com." ]
+      ( "http://user:password@domain.com.", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "http://user:@domain.com." ]
+      ( "http://user:@domain.com.", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "http://user@domain.com." ]
+      ( "http://user@domain.com.", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "http://user:password@domain.com/bla.cgi?a=a@a.a&b=a+b+c.#anchor" ]
+      ( "http://user:password@domain.com/bla.cgi?a=a@a.a&b=a+b+c.#anchor"
+      , ""
+      )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "http://user:password@domain.com/bla.cgi?a=a@a.a&b=a+b+c@#anchor" ]
+      ( "http://user:password@domain.com/bla.cgi?a=a@a.a&b=a+b+c@#anchor"
+      , ""
+      )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "label" ]
+      ( "www.domain.com", "" )
+    , SoftBreak
+    , Str "["
+    , Space
+    , Str "label"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "www.domain.com" ]
+      ( "www.domain.com", "" )
+    , Str "]"
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "label", Space ]
+      ( "www.domain.com", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "anchor", Space ]
+      ( "http://www.domain.com/dir/index.html#anchor.", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "login", Space ]
+      ( "http://user:password@domain.com/bla.html", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "form", Space ]
+      ( "http://www.domain.com/bla.cgi?a=a@a.a&b=a+b+c.", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "form", Space, Str "&", Space, Str "anchor" ]
+      ( "http://www.domain.com/bla.cgi?a=a@a.a&b=a+b+c.#anchor", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "login", Space, Str "&", Space, Str "form", Space ]
+      ( "http://user:password@domain.com/bla.cgi?a=a@a.a&b=a+b+c.", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "local", Space, Str "link", Space, Str "up", Space ]
+      ( "..", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "local", Space, Str "link", Space, Str "file", Space ]
+      ( "bla.html", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "local", Space, Str "link", Space, Str "anchor", Space ]
+      ( "#anchor", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "local", Space, Str "link", Space, Str "file/anchor" ]
+      ( "bla.html#anchor", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "local", Space, Str "link", Space, Str "file/anchor" ]
+      ( "bla.html#anchor.", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "local", Space, Str "link", Space, Str "img", Space ]
+      ( "abc.gif", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "www.fake.com" ]
+      ( "www.domain.com", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "http://domain.com:8080/~user/_st-r@a=n$g,e/index%20new.htm" ]
+      ( "http://domain.com:8080/~user/_st-r@a=n$g,e/index%20new.htm"
+      , ""
+      )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "http://domain.com:8080/~user/_st-r@a=n$g,e/index%20new.htm?a=/%22&b=+.@*_-" ]
+      ( "http://domain.com:8080/~user/_st-r@a=n$g,e/index%20new.htm?a=/%22&b=+.@*_-"
+      , ""
+      )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "http://domain.com:8080/~user/_st-r@a=n$g,e/index%20new.htm?a=/%22&b=+.@*_-#anchor_" ]
+      ( "http://domain.com:8080/~user/_st-r@a=n$g,e/index%20new.htm?a=/%22&b=+.@*_-#anchor_"
+      , ""
+      )
+    , Str "-1%."
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "http://foo._user-9:pass!#$%&*()+word@domain.com:8080/~user/_st-r@a=n$g,e/index%20new.htm?a=/%22&b=+.@*_-#anchor_" ]
+      ( "http://foo._user-9:pass!#$%&*()+word@domain.com:8080/~user/_st-r@a=n$g,e/index%20new.htm?a=/%22&b=+.@*_-#anchor_"
+      , ""
+      )
+    , Str "-1%."
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "http://L1.com" ]
+      ( "http://L1.com", "" )
+    , Space
+    , Str "!"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "mailto:L2@www.com" ]
+      ( "L2@www.com", "" )
+    , Space
+    , Str "!"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "L3" ]
+      ( "www.com", "" )
+    , Space
+    , Str "!"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "L4" ]
+      ( "w@ww.com", "" )
+    , Space
+    , Str "!"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "www.L5.com" ]
+      ( "www.L5.com", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "www.domain.com" ]
+      ( "www.domain.com", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "www2.domain.com" ]
+      ( "www2.domain.com", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "ftp.domain.com" ]
+      ( "ftp.domain.com", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "WWW.DOMAIN.COM" ]
+      ( "WWW.DOMAIN.COM", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "FTP.DOMAIN.COM" ]
+      ( "FTP.DOMAIN.COM", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "label" ]
+      ( "www.domain.com", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "label" ]
+      ( "ftp.domain.com", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "label" ]
+      ( "WWW.DOMAIN.COM", "" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "label" ]
+      ( "FTP.DOMAIN.COM", "" )
+    , SoftBreak
+    , Str "[label"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "www.domain.com" ]
+      ( "www.domain.com", "" )
+    , Space
+    , Str "]"
+    , SoftBreak
+    , Str "[label]"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "www.domain.com" ]
+      ( "www.domain.com", "" )
+    , Str "]"
+    ]
+  , Header 1
+    ( "image", [], [] )
+    [ Str "Image" ]
+  , Para
+    [ Image ( "", [], [] ) [] ( "img.png", "" ) ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Image ( "", [], [] ) [] ( "img.png", "" ) ]
+      ( "https://txt2tags.org", "" )
+    ]
+  , Para
+    [ Image
+      ( "", [], [] ) []
+      ( "img.png", "" )
+    , Space
+    , Str "Image"
+    , Space
+    , Str "at"
+    , Space
+    , Str "the"
+    , Space
+    , Str "line"
+    , Space
+    , Str "beginning."
+    ]
+  , Para
+    [ Str "Image"
+    , Space
+    , Str "in"
+    , Space
+    , Str "the"
+    , Space
+    , Str "middle"
+    , Space
+    , Image
+      ( "", [], [] ) []
+      ( "img.png", "" )
+    , Space
+    , Str "of"
+    , Space
+    , Str "the"
+    , Space
+    , Str "line."
+    ]
+  , Para
+    [ Str "Image"
+    , Space
+    , Str "at"
+    , Space
+    , Str "the"
+    , Space
+    , Str "line"
+    , Space
+    , Str "end."
+    , Space
+    , Image
+      ( "", [], [] ) []
+      ( "img.png", "" )
+    ]
+  , Para
+    [ Image
+      ( "", [], [] ) []
+      ( "img.png", "" )
+    , SoftBreak
+    , Image
+      ( "", [], [] ) []
+      ( "img.png", "" )
+    , SoftBreak
+    , Image
+      ( "", [], [] ) []
+      ( "img.png", "" )
+    ]
+  , Para
+    [ Image
+      ( "", [], [] ) []
+      ( "img.png", "" )
+    , Image
+      ( "", [], [] ) []
+      ( "img.png", "" )
+    ]
+  , Para
+    [ Str "Images"
+    , Space
+    , Image
+      ( "", [], [] ) []
+      ( "img.png", "" )
+    , Space
+    , Str "mixed"
+    , Space
+    , Image
+      ( "", [], [] ) []
+      ( "img.png", "" )
+    , Space
+    , Str "with"
+    , Space
+    , Image
+      ( "", [], [] ) []
+      ( "img.png", "" )
+    , Space
+    , Str "text."
+    ]
+  , Para
+    [ Str "Images"
+    , Space
+    , Str "glued"
+    , Space
+    , Str "together:"
+    , Space
+    , Image
+      ( "", [], [] ) []
+      ( "img.png", "" )
+    , Image
+      ( "", [], [] ) []
+      ( "img.png", "" )
+    , Image
+      ( "", [], [] ) []
+      ( "img.png", "" )
+    , Str "."
+    ]
+  , Para
+    [ Str "[img.png", Space, Str "]" ]
+  , Para
+    [ Str "[", Space, Str "img.png]" ]
+  , Para
+    [ Str "[", Space, Str "img.png", Space, Str "]" ]
+  , Header 1
+    ( "numtitle", [], [] )
+    [ Str "Numbered", Space, Str "Title" ]
+  , Header 1
+    ( "", [], [] )
+    [ Str "Title", Space, Str "Level", Space, Str "1" ]
+  , Header 2
+    ( "", [], [] )
+    [ Str "Title", Space, Str "Level", Space, Str "2" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Title", Space, Str "Level", Space, Str "3" ]
+  , Header 4
+    ( "", [], [] )
+    [ Str "Title", Space, Str "Level", Space, Str "4" ]
+  , Header 5
+    ( "", [], [] )
+    [ Str "Title", Space, Str "Level", Space, Str "5" ]
+  , Header 1
+    ( "lab_el-1", [], [] )
+    [ Str "Title", Space, Str "Level", Space, Str "1" ]
+  , Header 2
+    ( "lab_el-2", [], [] )
+    [ Str "Title", Space, Str "Level", Space, Str "2" ]
+  , Header 3
+    ( "lab_el-3", [], [] )
+    [ Str "Title", Space, Str "Level", Space, Str "3" ]
+  , Header 4
+    ( "lab_el-4", [], [] )
+    [ Str "Title", Space, Str "Level", Space, Str "4" ]
+  , Header 5
+    ( "lab_el-5", [], [] )
+    [ Str "Title", Space, Str "Level", Space, Str "5" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Title", Space, Str "Level", Space, Str "3" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Title", Space, Str "Level", Space, Str "3" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Title", Space, Str "Level", Space, Str "3" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Title", Space, Str "Level", Space, Str "3" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Title", Space, Str "Level", Space, Str "3" ]
+  , Header 3
+    ( "lab_el-9", [], [] )
+    [ Str "Title", Space, Str "Level", Space, Str "3" ]
+  , Para
+    [ Str "+Not", Space, Str "Title" ]
+  , Para
+    [ Str "++Not", Space, Str "Title+" ]
+  , Para
+    [ Str "+++Not"
+    , Space
+    , Str "Title++++"
+    , SoftBreak
+    , Str "++++++Not"
+    , Space
+    , Str "Title"
+    , Space
+    , Str "6++++++"
+    ]
+  , Para
+    [ Str "+++++++Not"
+    , Space
+    , Str "Title"
+    , Space
+    , Str "7+++++++"
+    , SoftBreak
+    , Str "+Not"
+    , Space
+    , Str "Title+"
+    , Space
+    , Str "[label1]"
+    , SoftBreak
+    , Str "+Not"
+    , Space
+    , Str "Title+["
+    , Space
+    , Str "label"
+    , Space
+    , Str "]"
+    , SoftBreak
+    , Str "+Not"
+    , Space
+    , Str "Title+[la/bel]"
+    ]
+  , Header 1
+    ( "title", [], [] )
+    [ Str "Title" ]
+  , Header 1
+    ( "", [], [] )
+    [ Str "Title", Space, Str "Level", Space, Str "1" ]
+  , Header 2
+    ( "", [], [] )
+    [ Str "Title", Space, Str "Level", Space, Str "2" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Title", Space, Str "Level", Space, Str "3" ]
+  , Header 4
+    ( "", [], [] )
+    [ Str "Title", Space, Str "Level", Space, Str "4" ]
+  , Header 5
+    ( "", [], [] )
+    [ Str "Title", Space, Str "Level", Space, Str "5" ]
+  , Header 1
+    ( "lab_el-1", [], [] )
+    [ Str "Title", Space, Str "Level", Space, Str "1" ]
+  , Header 2
+    ( "lab_el-2", [], [] )
+    [ Str "Title", Space, Str "Level", Space, Str "2" ]
+  , Header 3
+    ( "lab_el-3", [], [] )
+    [ Str "Title", Space, Str "Level", Space, Str "3" ]
+  , Header 4
+    ( "lab_el-4", [], [] )
+    [ Str "Title", Space, Str "Level", Space, Str "4" ]
+  , Header 5
+    ( "lab_el-5", [], [] )
+    [ Str "Title", Space, Str "Level", Space, Str "5" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Title", Space, Str "Level", Space, Str "3" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Title", Space, Str "Level", Space, Str "3" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Title", Space, Str "Level", Space, Str "3" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Title", Space, Str "Level", Space, Str "3" ]
+  , Header 3
+    ( "", [], [] )
+    [ Str "Title", Space, Str "Level", Space, Str "3" ]
+  , Header 3
+    ( "lab_el-9", [], [] )
+    [ Str "Title", Space, Str "Level", Space, Str "3" ]
+  , Para
+    [ Str "=Not", Space, Str "Title" ]
+  , Para
+    [ Str "==Not", Space, Str "Title=" ]
+  , Para
+    [ Str "===Not"
+    , Space
+    , Str "Title===="
+    , SoftBreak
+    , Str "======Not"
+    , Space
+    , Str "Title"
+    , Space
+    , Str "6======"
+    ]
+  , Para
+    [ Str "=======Not"
+    , Space
+    , Str "Title"
+    , Space
+    , Str "7======="
+    , SoftBreak
+    , Str "=Not"
+    , Space
+    , Str "Title="
+    , Space
+    , Str "[label1]"
+    , SoftBreak
+    , Str "=Not"
+    , Space
+    , Str "Title=["
+    , Space
+    , Str "label"
+    , Space
+    , Str "]"
+    , SoftBreak
+    , Str "=Not"
+    , Space
+    , Str "Title=[la/bel]"
+    ]
+  , Header 1
+    ( "quote", [], [] )
+    [ Str "Quote" ]
+  , BlockQuote
+    [ Para
+      [ Str "To"
+      , Space
+      , Str "quote"
+      , Space
+      , Str "a"
+      , Space
+      , Str "paragraph,"
+      , Space
+      , Str "just"
+      , Space
+      , Str "prefix"
+      , Space
+      , Str "it"
+      , Space
+      , Str "by"
+      , Space
+      , Str "a"
+      , Space
+      , Str "TAB"
+      , SoftBreak
+      , Str "character."
+      , Space
+      , Str "All"
+      , Space
+      , Str "the"
+      , Space
+      , Str "lines"
+      , Space
+      , Str "of"
+      , Space
+      , Str "the"
+      , Space
+      , Str "paragraph"
+      , Space
+      , Str "must"
+      , SoftBreak
+      , Str "begin"
+      , Space
+      , Str "with"
+      , Space
+      , Str "a"
+      , Space
+      , Str "TAB."
+      ]
+    ]
+  , Para
+    [ Str "Any"
+    , Space
+    , Str "non-tabbed"
+    , Space
+    , Str "line"
+    , Space
+    , Str "closes"
+    , Space
+    , Str "the"
+    , Space
+    , Str "quote"
+    , Space
+    , Str "block."
+    ]
+  , BlockQuote
+    [ Para
+      [ Str "The"
+      , Space
+      , Str "number"
+      , Space
+      , Str "of"
+      , Space
+      , Str "leading"
+      , Space
+      , Str "TABs"
+      , Space
+      , Str "identifies"
+      , Space
+      , Str "the"
+      , Space
+      , Str "quote"
+      , SoftBreak
+      , Str "block"
+      , Space
+      , Str "depth."
+      , Space
+      , Str "This"
+      , Space
+      , Str "is"
+      , Space
+      , Str "quote"
+      , Space
+      , Str "level"
+      , Space
+      , Str "1."
+      ]
+    , BlockQuote
+      [ Para
+        [ Str "With"
+        , Space
+        , Str "two"
+        , Space
+        , Str "TABs,"
+        , Space
+        , Str "we"
+        , Space
+        , Str "are"
+        , Space
+        , Str "on"
+        , Space
+        , Str "the"
+        , Space
+        , Str "quote"
+        , SoftBreak
+        , Str "level"
+        , Space
+        , Str "2."
+        ]
+      , BlockQuote
+        [ Para
+          [ Str "The"
+          , Space
+          , Str "more"
+          , Space
+          , Str "TABs,"
+          , Space
+          , Str "more"
+          , Space
+          , Str "deep"
+          , Space
+          , Str "is"
+          , SoftBreak
+          , Str "the"
+          , Space
+          , Str "quote"
+          , Space
+          , Str "level."
+          ]
+        , BlockQuote
+          [ Para
+            [ Str "There"
+            , Space
+            , Str "isn't"
+            , Space
+            , Str "a"
+            , Space
+            , Str "limit."
+            ]
+          ]
+        ]
+      ]
+    ]
+  , BlockQuote
+    [ BlockQuote
+      [ BlockQuote
+        [ BlockQuote
+          [ Para
+            [ Str "This"
+            , Space
+            , Str "quote"
+            , Space
+            , Str "starts"
+            , Space
+            , Str "at"
+            , SoftBreak
+            , Str "level"
+            , Space
+            , Str "4."
+            ]
+          ]
+        , Para
+          [ Str "Then"
+          , Space
+          , Str "its"
+          , Space
+          , Str "depth"
+          , Space
+          , Str "is"
+          , Space
+          , Str "decreased."
+          ]
+        ]
+      , Para
+        [ Str "Counting"
+        , Space
+        , Str "down,"
+        , Space
+        , Str "one"
+        , Space
+        , Str "by"
+        , Space
+        , Str "one."
+        ]
+      ]
+    , Para
+      [ Str "Until"
+      , Space
+      , Str "the"
+      , Space
+      , Str "level"
+      , Space
+      , Str "1."
+      ]
+    ]
+  , BlockQuote
+    [ BlockQuote
+      [ BlockQuote
+        [ Para
+          [ Str "Unlike"
+          , Space
+          , Str "lists,"
+          , Space
+          , Str "any"
+          , Space
+          , Str "quote"
+          , Space
+          , Str "block"
+          , Space
+          , Str "is"
+          , SoftBreak
+          , Str "independent,"
+          , Space
+          , Str "not"
+          , Space
+          , Str "part"
+          , Space
+          , Str "of"
+          , Space
+          , Str "a"
+          , Space
+          , Str "tree."
+          ]
+        ]
+      ]
+    , Para
+      [ Str "The"
+      , Space
+      , Str "TAB"
+      , Space
+      , Str "count"
+      , Space
+      , Str "don't"
+      , Space
+      , Str "need"
+      , Space
+      , Str "to"
+      , Space
+      , Str "be"
+      , Space
+      , Str "incremental"
+      , SoftBreak
+      , Str "by"
+      , Space
+      , Str "one."
+      ]
+    , BlockQuote
+      [ BlockQuote
+        [ BlockQuote
+          [ Para
+            [ Str "The"
+            , Space
+            , Str "nesting"
+            , Space
+            , Str "don't"
+            , Space
+            , Str "need"
+            , SoftBreak
+            , Str "to"
+            , Space
+            , Str "follow"
+            , Space
+            , Str "any"
+            , Space
+            , Str "rule."
+            ]
+          ]
+        ]
+      , Para
+        [ Str "Quotes"
+        , Space
+        , Str "can"
+        , Space
+        , Str "be"
+        , Space
+        , Str "opened"
+        , Space
+        , Str "and"
+        , Space
+        , Str "closed"
+        , SoftBreak
+        , Str "in"
+        , Space
+        , Str "any"
+        , Space
+        , Str "way."
+        ]
+      , BlockQuote
+        [ BlockQuote
+          [ BlockQuote [ Para [ Str "You", Space, Str "choose." ] ] ]
+        ]
+      ]
+    ]
+  , BlockQuote
+    [ Para
+      [ Str "Some"
+      , Space
+      , Str "targets"
+      , Space
+      , Str "(as"
+      , Space
+      , Str "sgml)"
+      , Space
+      , Str "don't"
+      , Space
+      , Str "support"
+      , Space
+      , Str "the"
+      , SoftBreak
+      , Str "nesting"
+      , Space
+      , Str "of"
+      , Space
+      , Str "quotes."
+      , Space
+      , Str "There"
+      , Space
+      , Str "is"
+      , Space
+      , Str "only"
+      , Space
+      , Str "one"
+      , Space
+      , Str "quote"
+      , SoftBreak
+      , Str "level."
+      ]
+    , BlockQuote
+      [ Para
+        [ Str "In"
+        , Space
+        , Str "this"
+        , Space
+        , Str "case,"
+        , Space
+        , Str "no"
+        , Space
+        , Str "matter"
+        , Space
+        , Str "how"
+        , Space
+        , Str "much"
+        , SoftBreak
+        , Str "TABs"
+        , Space
+        , Str "are"
+        , Space
+        , Str "used"
+        , Space
+        , Str "to"
+        , Space
+        , Str "define"
+        , Space
+        , Str "the"
+        , Space
+        , Str "quote"
+        , SoftBreak
+        , Str "block,"
+        , Space
+        , Str "it"
+        , Space
+        , Str "always"
+        , Space
+        , Str "will"
+        , Space
+        , Str "be"
+        , Space
+        , Str "level"
+        , Space
+        , Str "1."
+        ]
+      ]
+    ]
+  , BlockQuote
+    [ Para
+      [ Str "Spaces"
+      , Space
+      , Str "AFTER"
+      , Space
+      , Str "the"
+      , Space
+      , Str "TAB"
+      , Space
+      , Str "character"
+      , Space
+      , Str "are"
+      , Space
+      , Str "allowed."
+      , SoftBreak
+      , Str "But"
+      , Space
+      , Str "be"
+      , Space
+      , Str "careful,"
+      , Space
+      , Str "it"
+      , Space
+      , Str "can"
+      , Space
+      , Str "be"
+      , Space
+      , Str "confusing."
+      ]
+    ]
+  , Para
+    [ Str "Spaces"
+    , Space
+    , Str "BEFORE"
+    , Space
+    , Str "the"
+    , Space
+    , Str "TAB"
+    , Space
+    , Str "character"
+    , SoftBreak
+    , Str "invalidate"
+    , Space
+    , Str "the"
+    , Space
+    , Str "mark."
+    , Space
+    , Str "It's"
+    , Space
+    , Str "not"
+    , Space
+    , Str "quote."
+    ]
+  , BlockQuote
+    [ Para
+      [ Str "Paragraph"
+      , Space
+      , Str "breaks"
+      , Space
+      , Str "inside"
+      , Space
+      , Str "a"
+      , Space
+      , Str "quote"
+      , Space
+      , Str "aren't"
+      , SoftBreak
+      , Str "possible."
+      ]
+    , Para
+      [ Str "This"
+      , Space
+      , Str "sample"
+      , Space
+      , Str "are"
+      , Space
+      , Str "two"
+      , Space
+      , Str "separated"
+      , Space
+      , Str "quoted"
+      , SoftBreak
+      , Str "paragraphs,"
+      , Space
+      , Str "not"
+      , Space
+      , Str "a"
+      , Space
+      , Str "quote"
+      , Space
+      , Str "block"
+      , Space
+      , Str "with"
+      , SoftBreak
+      , Str "two"
+      , Space
+      , Str "paragraphs"
+      , Space
+      , Str "inside."
+      ]
+    ]
+  , BlockQuote
+    [ Para
+      [ Str "The"
+      , Space
+      , Str "end"
+      , Space
+      , Str "of"
+      , Space
+      , Str "the"
+      , Space
+      , Str "file"
+      , Space
+      , Str "(EOF)"
+      , Space
+      , Str "closes"
+      , Space
+      , Str "the"
+      , SoftBreak
+      , Str "currently"
+      , Space
+      , Str "open"
+      , Space
+      , Str "quote"
+      , Space
+      , Str "block."
+      ]
+    ]
+  , Header 1
+    ( "raw", [], [] )
+    [ Str "Raw" ]
+  , Para
+    [ Str "A raw line.\n" ]
+  , Para
+    [ Str "  Another raw line, with leading spaces.\n" ]
+  , Para
+    [ Str "A raw area delimited\n       by lines with marks.\n" ]
+  , Para
+    [ Str "Trailing spaces and TABs after the area marks\nare allowed, but not encouraged nor documented.\n" ]
+  , Para
+    [ Str "\"\"\"Not"
+    , Space
+    , Str "a"
+    , Space
+    , Str "raw"
+    , Space
+    , Str "line,"
+    , Space
+    , Str "need"
+    , Space
+    , Str "one"
+    , Space
+    , Str "space"
+    , Space
+    , Str "after"
+    , Space
+    , Str "mark."
+    ]
+  , Para
+    [ Str "\"\"\""
+    , SoftBreak
+    , Str "Not"
+    , Space
+    , Str "a"
+    , Space
+    , Str "raw"
+    , Space
+    , Str "area."
+    , SoftBreak
+    , Str "The"
+    , Space
+    , Str "marks"
+    , Space
+    , Str "must"
+    , Space
+    , Str "be"
+    , Space
+    , Str "at"
+    , Space
+    , Str "the"
+    , Space
+    , Str "line"
+    , Space
+    , Str "beginning,"
+    , SoftBreak
+    , Str "no"
+    , Space
+    , Str "leading"
+    , Space
+    , Str "spaces."
+    , SoftBreak
+    , Str "\"\"\""
+    ]
+  , Para
+    [ Str "The end of the file (EOF) closes\nthe currently open raw area.\n" ]
+  , Header 1
+    ( "verbatim", [], [] )
+    [ Str "Verbatim" ]
+  , CodeBlock
+    ( "", [], [] ) "A verbatim line.\n"
+  , CodeBlock
+    ( "", [], [] ) "  Another verbatim line, with leading spaces.\n"
+  , CodeBlock
+    ( ""
+    , []
+    , []
+    ) "A verbatim area delimited\n       by lines with marks.\n"
+  , CodeBlock
+    ( ""
+    , []
+    , []
+    ) "Trailing spaces and TABs after the area marks\nare allowed, but not encouraged nor documented.\n"
+  , Para
+    [ Str "```Not"
+    , Space
+    , Str "a"
+    , Space
+    , Str "verbatim"
+    , Space
+    , Str "line,"
+    , Space
+    , Str "need"
+    , Space
+    , Str "one"
+    , Space
+    , Str "space"
+    , Space
+    , Str "after"
+    , Space
+    , Str "mark."
+    ]
+  , Para
+    [ Str "```"
+    , SoftBreak
+    , Str "Not"
+    , Space
+    , Str "a"
+    , Space
+    , Str "verbatim"
+    , Space
+    , Str "area."
+    , SoftBreak
+    , Str "The"
+    , Space
+    , Str "marks"
+    , Space
+    , Str "must"
+    , Space
+    , Str "be"
+    , Space
+    , Str "at"
+    , Space
+    , Str "the"
+    , Space
+    , Str "line"
+    , Space
+    , Str "beginning,"
+    , SoftBreak
+    , Str "no"
+    , Space
+    , Str "leading"
+    , Space
+    , Str "spaces."
+    , SoftBreak
+    , Str "```"
+    ]
+  , CodeBlock
+    ( ""
+    , []
+    , []
+    ) "The end of the file (EOF) closes\nthe currently open verbatim area.\n"
+  , Header 1
+    ( "deflist", [], [] )
+    [ Str "Definition", Space, Str "List" ]
+  , DefinitionList
+    [
+      (
+        [ Str "Definition", Space, Str "list" ]
+      ,
+        [
+          [ Plain
+            [ Str "A"
+            , Space
+            , Str "list"
+            , Space
+            , Str "with"
+            , Space
+            , Str "terms"
+            ]
+          ]
+        ]
+      )
+    ,
+      (
+        [ Str "Start"
+        , Space
+        , Str "term"
+        , Space
+        , Str "with"
+        , Space
+        , Str "colon"
+        ]
+      ,
+        [
+          [ Plain
+            [ Str "And"
+            , Space
+            , Str "its"
+            , Space
+            , Str "definition"
+            , Space
+            , Str "follows"
+            ]
+          ]
+        ]
+      )
+    ]
+  , Header 1
+    ( "numlist", [], [] )
+    [ Str "Numbered", Space, Str "List" ]
+  , Para
+    [ Str "See"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "List" ]
+      ( "#list", "" )
+    , Str ","
+    , Space
+    , Str "the"
+    , Space
+    , Str "same"
+    , Space
+    , Str "rules"
+    , Space
+    , Str "apply."
+    ]
+  , Header 1
+    ( "list", [], [] )
+    [ Str "List" ]
+  , BulletList
+    [
+      [ Plain
+        [ Str "Use"
+        , Space
+        , Str "the"
+        , Space
+        , Str "hyphen"
+        , Space
+        , Str "to"
+        , Space
+        , Str "prefix"
+        , Space
+        , Str "list"
+        , Space
+        , Str "items."
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "There"
+        , Space
+        , Str "must"
+        , Space
+        , Str "be"
+        , Space
+        , Str "one"
+        , Space
+        , Str "space"
+        , Space
+        , Str "after"
+        , Space
+        , Str "the"
+        , Space
+        , Str "hyphen."
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "The"
+        , Space
+        , Str "list"
+        , Space
+        , Str "is"
+        , Space
+        , Str "closed"
+        , Space
+        , Str "by"
+        , Space
+        , Str "two"
+        , Space
+        , Str "consecutive"
+        , Space
+        , Str "blank"
+        , Space
+        , Str "lines."
+        ]
+      ]
+    ]
+  , BulletList
+    [
+      [ Plain
+        [ Str "The"
+        , Space
+        , Str "list"
+        , Space
+        , Str "can"
+        , Space
+        , Str "be"
+        , Space
+        , Str "indented"
+        , Space
+        , Str "on"
+        , Space
+        , Str "the"
+        , Space
+        , Str "source"
+        , Space
+        , Str "document."
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "You"
+        , Space
+        , Str "can"
+        , Space
+        , Str "use"
+        , Space
+        , Str "any"
+        , Space
+        , Str "number"
+        , Space
+        , Str "of"
+        , Space
+        , Str "spaces."
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "The"
+        , Space
+        , Str "result"
+        , Space
+        , Str "will"
+        , Space
+        , Str "be"
+        , Space
+        , Str "the"
+        , Space
+        , Str "same."
+        ]
+      ]
+    ]
+  , BulletList
+    [
+      [ Para
+        [ Str "Let"
+        , Space
+        , Str "one"
+        , Space
+        , Str "blank"
+        , Space
+        , Str "line"
+        , Space
+        , Str "between"
+        , Space
+        , Str "the"
+        , Space
+        , Str "list"
+        , Space
+        , Str "items."
+        ]
+      ]
+    ,
+      [ Para
+        [ Str "It"
+        , Space
+        , Str "will"
+        , Space
+        , Str "be"
+        , Space
+        , Str "maintained"
+        , Space
+        , Str "on"
+        , Space
+        , Str "the"
+        , Space
+        , Str "conversion."
+        ]
+      ]
+    ,
+      [ Para
+        [ Str "Some"
+        , Space
+        , Str "targets"
+        , Space
+        , Str "don't"
+        , Space
+        , Str "support"
+        , Space
+        , Str "this"
+        , Space
+        , Str "behavior."
+        ]
+      ]
+    ,
+      [ Para
+        [ Str "This"
+        , Space
+        , Str "one"
+        , Space
+        , Str "was"
+        , Space
+        , Str "separated"
+        , Space
+        , Str "by"
+        , Space
+        , Str "a"
+        , Space
+        , Str "line"
+        , Space
+        , Str "with"
+        , Space
+        , Str "blanks."
+        , SoftBreak
+        , Str "You"
+        , Space
+        , Str "can"
+        , Space
+        , Str "also"
+        , Space
+        , Str "put"
+        , Space
+        , Str "a"
+        , Space
+        , Str "blank"
+        , Space
+        , Str "line"
+        , Space
+        , Str "inside"
+        ]
+      , Para
+        [ Str "the"
+        , Space
+        , Str "item"
+        , Space
+        , Str "contents"
+        , Space
+        , Str "and"
+        , Space
+        , Str "it"
+        , Space
+        , Str "will"
+        , Space
+        , Str "be"
+        , Space
+        , Str "preserved."
+        ]
+      ]
+    ]
+  , Para
+    [ Str "-This"
+    , Space
+    , Str "is"
+    , Space
+    , Str "not"
+    , Space
+    , Str "a"
+    , Space
+    , Str "list"
+    , Space
+    , Str "(no"
+    , Space
+    , Str "space)"
+    ]
+  , Para
+    [ Str "-"
+    , Space
+    , Str "This"
+    , Space
+    , Str "is"
+    , Space
+    , Str "not"
+    , Space
+    , Str "a"
+    , Space
+    , Str "list"
+    , Space
+    , Str "(more"
+    , Space
+    , Str "than"
+    , Space
+    , Str "one"
+    , Space
+    , Str "space)"
+    ]
+  , Para
+    [ Str "-"
+    , Space
+    , Str "This"
+    , Space
+    , Str "is"
+    , Space
+    , Str "not"
+    , Space
+    , Str "a"
+    , Space
+    , Str "list"
+    , Space
+    , Str "(a"
+    , Space
+    , Str "TAB"
+    , Space
+    , Str "instead"
+    , Space
+    , Str "the"
+    , Space
+    , Str "space)"
+    ]
+  , BulletList
+    [
+      [ BulletList
+        [
+          [ Plain
+            [ Str "This"
+            , Space
+            , Str "is"
+            , Space
+            , Str "a"
+            , Space
+            , Str "list"
+            ]
+          ]
+        ]
+      ]
+    ,
+      [ OrderedList
+        ( 1, DefaultStyle, DefaultDelim )
+        [
+          [ Plain
+            [ Str "This"
+            , Space
+            , Str "is"
+            , Space
+            , Str "a"
+            , Space
+            , Str "list"
+            ]
+          ]
+        ]
+      ]
+    ,
+      [ DefinitionList
+        [
+          (
+            [ Str "This"
+            , Space
+            , Str "is"
+            , Space
+            , Str "a"
+            , Space
+            , Str "list"
+            ]
+          , [ [] ]
+          )
+        ]
+      ]
+    ]
+  , BulletList
+    [
+      [ Plain
+        [ Str "This"
+        , Space
+        , Str "is"
+        , Space
+        , Str "the"
+        , Space
+        , Str "\"mother\""
+        , Space
+        , Str "list"
+        , Space
+        , Str "first"
+        , Space
+        , Str "item."
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "Here"
+        , Space
+        , Str "is"
+        , Space
+        , Str "the"
+        , Space
+        , Str "second,"
+        , Space
+        , Str "but"
+        , Space
+        , Str "inside"
+        , Space
+        , Str "this"
+        , Space
+        , Str "item,"
+        ]
+      , BulletList
+        [
+          [ Plain
+            [ Str "there"
+            , Space
+            , Str "is"
+            , Space
+            , Str "a"
+            , Space
+            , Str "sublist,"
+            , Space
+            , Str "with"
+            , Space
+            , Str "its"
+            , Space
+            , Str "own"
+            , Space
+            , Str "items."
+            ]
+          ]
+        ,
+          [ Plain
+            [ Str "Note"
+            , Space
+            , Str "that"
+            , Space
+            , Str "the"
+            , Space
+            , Str "items"
+            , Space
+            , Str "of"
+            , Space
+            , Str "the"
+            , Space
+            , Str "same"
+            , Space
+            , Str "sublist"
+            ]
+          ]
+        ,
+          [ Plain
+            [ Str "must"
+            , Space
+            , Str "have"
+            , Space
+            , Str "the"
+            , Space
+            , Str "same"
+            , Space
+            , Str "indentation."
+            ]
+          , BulletList
+            [
+              [ Plain
+                [ Str "And"
+                , Space
+                , Str "this"
+                , Space
+                , Str "can"
+                , Space
+                , Str "go"
+                , Space
+                , Str "on,"
+                , Space
+                , Str "opening"
+                , Space
+                , Str "sublists."
+                ]
+              , BulletList
+                [
+                  [ Plain
+                    [ Str "Just"
+                    , Space
+                    , Str "add"
+                    , Space
+                    , Str "leading"
+                    , Space
+                    , Str "spaces"
+                    , Space
+                    , Str "before"
+                    , Space
+                    , Str "the"
+                    ]
+                  ]
+                ,
+                  [ Plain
+                    [ Str "hyphen"
+                    , Space
+                    , Str "and"
+                    , Space
+                    , Str "sublists"
+                    , Space
+                    , Str "will"
+                    , Space
+                    , Str "be"
+                    , Space
+                    , Str "opened."
+                    ]
+                  ]
+                ,
+                  [ Plain
+                    [ Str "The"
+                    , Space
+                    , Str "two"
+                    , Space
+                    , Str "blank"
+                    , Space
+                    , Str "lines"
+                    , Space
+                    , Str "closes"
+                    , Space
+                    , Str "them"
+                    , Space
+                    , Str "all."
+                    ]
+                  ]
+                ]
+              ]
+            ]
+          ]
+        ]
+      ]
+    ]
+  , BulletList
+    [
+      [ Plain
+        [ Str "When"
+        , Space
+        , Str "nesting"
+        , Space
+        , Str "lists,"
+        , Space
+        , Str "the"
+        , Space
+        , Str "additional"
+        , Space
+        , Str "spaces"
+        , Space
+        , Str "are"
+        , Space
+        , Str "free."
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "You"
+        , Space
+        , Str "can"
+        , Space
+        , Str "add"
+        , Space
+        , Str "just"
+        , Space
+        , Str "one,"
+        ]
+      , BulletList
+        [
+          [ Plain
+            [ Str "or", Space, Str "many." ]
+          , BulletList
+            [
+              [ Plain
+                [ Str "What"
+                , Space
+                , Str "matters"
+                , Space
+                , Str "is"
+                , Space
+                , Str "to"
+                , Space
+                , Str "put"
+                , Space
+                , Str "more"
+                , Space
+                , Str "than"
+                , Space
+                , Str "the"
+                , Space
+                , Str "previous."
+                ]
+              ]
+            ,
+              [ Plain
+                [ Str "But"
+                , Space
+                , Str "remember"
+                , Space
+                , Str "that"
+                , Space
+                , Str "the"
+                , Space
+                , Str "other"
+                , Space
+                , Str "items"
+                , Space
+                , Str "of"
+                , Space
+                , Str "the"
+                , Space
+                , Str "same"
+                , Space
+                , Str "list"
+                ]
+              ]
+            ,
+              [ Plain
+                [ Str "must"
+                , Space
+                , Str "use"
+                , Space
+                , Str "the"
+                , Space
+                , Str "same"
+                , Space
+                , Str "indentation."
+                ]
+              ]
+            ]
+          ]
+        ]
+      ]
+    ]
+  , BulletList
+    [
+      [ Plain
+        [ Str "There"
+        , Space
+        , Str "is"
+        , Space
+        , Str "not"
+        , Space
+        , Str "a"
+        , Space
+        , Str "depth"
+        , Space
+        , Str "limit,"
+        ]
+      , BulletList
+        [
+          [ Plain
+            [ Str "you"
+            , Space
+            , Str "can"
+            , Space
+            , Str "go"
+            , Space
+            , Str "deeper"
+            , Space
+            , Str "and"
+            , Space
+            , Str "deeper."
+            ]
+          , BulletList
+            [
+              [ Plain
+                [ Str "But"
+                , Space
+                , Str "some"
+                , Space
+                , Str "targets"
+                , Space
+                , Str "may"
+                , Space
+                , Str "have"
+                , Space
+                , Str "restrictions."
+                ]
+              , BulletList
+                [
+                  [ Plain
+                    [ Str "The"
+                    , Space
+                    , Str "LaTeX"
+                    , Space
+                    , Str "maximum"
+                    , Space
+                    , Str "is"
+                    , Space
+                    , Str "here,"
+                    , Space
+                    , Str "4"
+                    , Space
+                    , Str "levels."
+                    ]
+                  ]
+                ]
+              ]
+            ]
+          ]
+        ]
+      ]
+    ]
+  , BulletList
+    [
+      [ Plain
+        [ Str "Reverse"
+        , Space
+        , Str "nesting"
+        , Space
+        , Str "doesn't"
+        , Space
+        , Str "work."
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "Because"
+        , Space
+        , Str "a"
+        , Space
+        , Str "sublist"
+        , Space
+        , Str "*must*"
+        , Space
+        , Str "have"
+        , Space
+        , Str "a"
+        , Space
+        , Str "mother"
+        , Space
+        , Str "list."
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "It's"
+        , Space
+        , Str "the"
+        , Space
+        , Str "list"
+        , Space
+        , Str "concept,"
+        , Space
+        , Str "not"
+        , Space
+        , Str "a"
+        , Space
+        , Str "txt2tags"
+        , Space
+        , Str "limitation."
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "All"
+        , Space
+        , Str "this"
+        , Space
+        , Str "sublists"
+        , Space
+        , Str "will"
+        , Space
+        , Str "be"
+        , Space
+        , Str "bumped"
+        , Space
+        , Str "to"
+        , Space
+        , Str "mother"
+        , Space
+        , Str "lists."
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "At"
+        , Space
+        , Str "level"
+        , Space
+        , Str "1,"
+        , Space
+        , Str "like"
+        , Space
+        , Str "this"
+        , Space
+        , Str "one."
+        ]
+      ]
+    ]
+  , BulletList
+    [
+      [ Plain
+        [ Str "Level", Space, Str "1" ]
+      , BulletList
+        [
+          [ Plain
+            [ Str "Level", Space, Str "2" ]
+          , BulletList
+            [
+              [ Plain
+                [ Str "Level", Space, Str "3" ]
+              , BulletList
+                [ [ Plain [ Str "Level", Space, Str "4" ] ] ]
+              ]
+            ,
+              [ Plain
+                [ Str "Level"
+                , Space
+                , Str "3"
+                , Space
+                , Str "--"
+                , Space
+                , Str "(closed"
+                , Space
+                , Str "Level"
+                , Space
+                , Str "4)"
+                ]
+              ]
+            ]
+          ]
+        ,
+          [ Plain
+            [ Str "Level"
+            , Space
+            , Str "2"
+            , Space
+            , Str "--"
+            , Space
+            , Str "(closed"
+            , Space
+            , Str "Level"
+            , Space
+            , Str "3)"
+            ]
+          ]
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "Level"
+        , Space
+        , Str "1"
+        , Space
+        , Str "--"
+        , Space
+        , Str "(closed"
+        , Space
+        , Str "Level"
+        , Space
+        , Str "2)"
+        ]
+      ]
+    ]
+  , BulletList
+    [
+      [ Plain
+        [ Str "Level", Space, Str "1" ]
+      , BulletList
+        [
+          [ Plain
+            [ Str "Level", Space, Str "2" ]
+          , BulletList
+            [
+              [ Plain
+                [ Str "Level", Space, Str "3" ]
+              , BulletList
+                [ [ Plain [ Str "Level", Space, Str "4" ] ] ]
+              ]
+            ]
+          ]
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "Level"
+        , Space
+        , Str "1"
+        , Space
+        , Str "--"
+        , Space
+        , Str "(closed"
+        , Space
+        , Str "Level"
+        , Space
+        , Str "4,"
+        , Space
+        , Str "Level"
+        , Space
+        , Str "3"
+        , Space
+        , Str "and"
+        , Space
+        , Str "Level"
+        , Space
+        , Str "2)"
+        ]
+      ]
+    ]
+  , BulletList
+    [
+      [ Para
+        [ Str "Level", Space, Str "1" ]
+      , BulletList
+        [
+          [ Para
+            [ Str "Level"
+            , Space
+            , Str "2"
+            , Space
+            , Str "--"
+            , Space
+            , Str "blank"
+            , Space
+            , Str "BEFORE"
+            , Space
+            , Str "and"
+            , Space
+            , Str "AFTER"
+            , Space
+            , Str "(in)"
+            ]
+          , BulletList
+            [ [ Plain [ Str "Level", Space, Str "3" ] ] ]
+          ]
+        ]
+      ]
+    ]
+  , BulletList
+    [ [ Plain [ Str "Level", Space, Str "4" ] ] ]
+  , BulletList
+    [
+      [ Para [ Str "Level", Space, Str "3" ] ]
+    ,
+      [ Para
+        [ Str "Level"
+        , Space
+        , Str "2"
+        , Space
+        , Str "--"
+        , Space
+        , Str "blank"
+        , Space
+        , Str "BEFORE"
+        , Space
+        , Str "and"
+        , Space
+        , Str "AFTER"
+        , Space
+        , Str "(out)"
+        ]
+      ]
+    ,
+      [ Para
+        [ Str "Level", Space, Str "1" ]
+      , BulletList
+        [
+          [ Para
+            [ Str "Level"
+            , Space
+            , Str "2"
+            , Space
+            , Str "--"
+            , Space
+            , Str "blank"
+            , Space
+            , Str "BEFORE"
+            , Space
+            , Str "(spaces)"
+            , Space
+            , Str "and"
+            , Space
+            , Str "AFTER"
+            , Space
+            , Str "(TAB)"
+            ]
+          , BulletList
+            [ [ Plain [ Str "Level", Space, Str "3" ] ] ]
+          ]
+        ]
+      ]
+    ]
+  , BulletList
+    [
+      [ Plain
+        [ Str "Level", Space, Str "1" ]
+      , BulletList
+        [
+          [ Plain
+            [ Str "Level", Space, Str "2" ]
+          , BulletList
+            [
+              [ Plain
+                [ Str "Level", Space, Str "3" ]
+              , BulletList
+                [
+                  [ Plain [ Str "Level", Space, Str "4" ] ]
+                ,
+                  [ Plain
+                    [ Str "Level", Space, Str "3.5", Space, Str "???" ]
+                  ]
+                ]
+              ]
+            ,
+              [ Plain [ Str "Level", Space, Str "3" ] ]
+            ,
+              [ Plain
+                [ Str "Level", Space, Str "2.5", Space, Str "???" ]
+              ]
+            ]
+          ]
+        ,
+          [ Plain [ Str "Level", Space, Str "2" ] ]
+        ,
+          [ Plain [ Str "Level", Space, Str "1.5", Space, Str "???" ] ]
+        ]
+      ]
+    ,
+      [ Plain [ Str "Level", Space, Str "1" ] ]
+    ]
+  , BulletList
+    [
+      [ Plain
+        [ Str "This"
+        , Space
+        , Str "list"
+        , Space
+        , Str "is"
+        , Space
+        , Str "closed"
+        , Space
+        , Str "by"
+        , Space
+        , Str "a"
+        , Space
+        , Str "line"
+        , Space
+        , Str "with"
+        , Space
+        , Str "spaces"
+        , Space
+        , Str "and"
+        , Space
+        , Str "other"
+        , Space
+        , Str "with"
+        , Space
+        , Str "TABs"
+        ]
+      ]
+    ]
+  , BulletList
+    [
+      [ Plain
+        [ Str "This"
+        , Space
+        , Str "list"
+        , Space
+        , Str "is"
+        , Space
+        , Str "NOT"
+        , Space
+        , Str "closed"
+        , Space
+        , Str "by"
+        , Space
+        , Str "two"
+        , Space
+        , Str "comment"
+        , Space
+        , Str "lines"
+        ]
+      ]
+    ]
+  , BulletList
+    [
+      [ Plain
+        [ Str "This"
+        , Space
+        , Str "list"
+        , Space
+        , Str "is"
+        , Space
+        , Str "closed"
+        , Space
+        , Str "by"
+        , Space
+        , Str "a"
+        , Space
+        , Str "line"
+        , Space
+        , Str "with"
+        , Space
+        , Str "spaces"
+        , Space
+        , Str "and"
+        , Space
+        , Str "TAB,"
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "then"
+        , Space
+        , Str "a"
+        , Space
+        , Str "comment"
+        , Space
+        , Str "line,"
+        , Space
+        , Str "then"
+        , Space
+        , Str "an"
+        , Space
+        , Str "empty"
+        , Space
+        , Str "line."
+        ]
+      ]
+    ]
+  , BulletList
+    [
+      [ Plain
+        [ Str "Level", Space, Str "1" ]
+      , BulletList
+        [
+          [ Plain
+            [ Str "Level", Space, Str "2" ]
+          , BulletList
+            [ [ Plain [ Str "Level", Space, Str "3" ] ] ]
+          , Plain
+            [ Str "-", SoftBreak, Str "Level", Space, Str "2" ]
+          ]
+        ]
+      , Plain
+        [ Str "-", SoftBreak, Str "Level", Space, Str "1" ]
+      ]
+    ]
+  , Para
+    [ Str "-" ]
+  , BulletList
+    [
+      [ Plain
+        [ Str "Empty"
+        , Space
+        , Str "item"
+        , Space
+        , Str "with"
+        , Space
+        , Str "trailing"
+        , Space
+        , Str "spaces."
+        ]
+      ]
+    ]
+  , Para
+    [ Str "-" ]
+  , BulletList
+    [
+      [ Plain
+        [ Str "Empty"
+        , Space
+        , Str "item"
+        , Space
+        , Str "with"
+        , Space
+        , Str "trailing"
+        , Space
+        , Str "TAB."
+        ]
+      ]
+    ]
+  , Para
+    [ Str "-" ]
+  , BulletList
+    [
+      [ Plain
+        [ Str "If"
+        , Space
+        , Str "the"
+        , Space
+        , Str "end"
+        , Space
+        , Str "of"
+        , Space
+        , Str "the"
+        , Space
+        , Str "file"
+        , Space
+        , Str "(EOF)"
+        , Space
+        , Str "is"
+        , Space
+        , Str "hit,"
+        ]
+      , BulletList
+        [
+          [ Plain
+            [ Str "all"
+            , Space
+            , Str "the"
+            , Space
+            , Str "currently"
+            , Space
+            , Str "opened"
+            , Space
+            , Str "list"
+            , Space
+            , Str "are"
+            , Space
+            , Str "closed,"
+            ]
+          , BulletList
+            [
+              [ Plain
+                [ Str "just"
+                , Space
+                , Str "like"
+                , Space
+                , Str "when"
+                , Space
+                , Str "using"
+                , Space
+                , Str "the"
+                , Space
+                , Str "two"
+                , Space
+                , Str "blank"
+                , Space
+                , Str "lines."
+                ]
+              ]
+            ]
+          ]
+        ]
+      ]
+    ]
+  , Header 1
+    ( "table", [], [] )
+    [ Str "Table" ]
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [ ( AlignRight, ColWidthDefault ) ]
+    ( TableHead ( "", [], [] ) [] )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Cell", Space, Str "1" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignRight, ColWidthDefault )
+    ]
+    ( TableHead ( "", [], [] ) [] )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Cell", Space, Str "1" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Cell", Space, Str "2" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Cell", Space, Str "3" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ]
+    ( TableHead ( "", [], [] ) [] )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Cell", Space, Str "1" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Cell", Space, Str "2" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Cell", Space, Str "3" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Para
+    [ Str "||"
+    , Space
+    , Str "Cell"
+    , Space
+    , Str "1"
+    , Space
+    , Str "|"
+    , Space
+    , Str "Cell"
+    , Space
+    , Str "2"
+    , Space
+    , Str "|"
+    , Space
+    , Str "Cell"
+    , Space
+    , Str "3"
+    , Space
+    , Str "|"
+    ]
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ]
+    ( TableHead ( "", [], [] ) [] )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Cell", Space, Str "1" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Cell", Space, Str "2" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Cell", Space, Str "3" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignDefault, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignDefault, ColWidthDefault )
+    ]
+    ( TableHead
+      ( "", [], [] )
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Heading" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Heading" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Heading" ] ]
+        ]
+      ]
+    )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "<-" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "--" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "->" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "--" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "--" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "--" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "->" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "--" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "<-" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignDefault, ColWidthDefault )
+    ,
+      ( AlignDefault, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ]
+    ( TableHead
+      ( "", [], [] )
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "1" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "2" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "3+4" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        ]
+      ]
+    )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "1" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "2" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "3" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "4" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "1+2+3" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "4" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "1" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "2+3" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "4" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "1+2+3+4" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ]
+    ( TableHead ( "", [], [] ) [] )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "0" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "1" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "2" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "4" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "5" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "7" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "8" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "A" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "B" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "D" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "E" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "F" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ]
+    ( TableHead ( "", [], [] ) [] )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "1" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "1" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "2" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "1" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "2" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "3" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "1" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "2" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "3" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "4" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "1" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "2" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "3" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "4" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "5" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignDefault, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ]
+    ( TableHead ( "", [], [] ) [] )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Jan" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Fev" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Mar" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Apr" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "May" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "20%" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "40%" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "60%" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "80%" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "100%" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignDefault, ColWidthDefault )
+    ,
+      ( AlignDefault, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ]
+    ( TableHead ( "", [], [] ) [] )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "/" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain
+            [ Str "/"
+            , Space
+            , Str "/"
+            , Space
+            , Str "/"
+            , Space
+            , Str "/"
+            , Space
+            , Str "/"
+            ]
+          ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain
+            [ Str "/"
+            , Space
+            , Str "/"
+            , Space
+            , Str "/"
+            , Space
+            , Str "/"
+            , Space
+            , Str "/"
+            , Space
+            , Str "/"
+            , Space
+            , Str "/"
+            , Space
+            , Str "/"
+            , Space
+            , Str "/"
+            ]
+          ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "o" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "o" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "." ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain
+            [ Str "=", Space, Str "=", Space, Str "=", Space, Str "=" ]
+          ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ]
+    ( TableHead ( "", [], [] ) [] )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "01" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "02" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "05" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "07" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "11" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "13" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "16" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "17" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "19" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "20" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "23" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "25" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "26" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "29" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "30" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "32" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "35" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "37" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "39" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "40" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ,
+      ( AlignCenter, ColWidthDefault )
+    ]
+    ( TableHead ( "", [], [] ) [] )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "0" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "1" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "2" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "3" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "4" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "5" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "6" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "7" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "8" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "9" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "A" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "B" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "C" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "D" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "E" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "F" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "0" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "1" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "2" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "3" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "4" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "5" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "6" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "7" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "8" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "9" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "A" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "B" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "C" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "D" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "E" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "F" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [ ( AlignCenter, ColWidthDefault ) ]
+    ( TableHead ( "", [], [] ) [] )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Para
+    [ Str "|this|is|not|a|table|" ]
+  , Para
+    [ Str "|this|"
+    , Space
+    , Str "is|"
+    , Space
+    , Str "not|"
+    , Space
+    , Str "a|"
+    , Space
+    , Str "table|"
+    ]
+  , Para
+    [ Str "|this"
+    , Space
+    , Str "|is"
+    , Space
+    , Str "|not"
+    , Space
+    , Str "|a"
+    , Space
+    , Str "|table"
+    , Space
+    , Str "|"
+    ]
+  , Para
+    [ Str "|"
+    , Space
+    , Str "this\t|"
+    , Space
+    , Str "is\t|"
+    , Space
+    , Str "not\t|"
+    , Space
+    , Str "a\t|"
+    , Space
+    , Str "table\t|"
+    ]
+  , HorizontalRule
+  , Para
+    [ Str "The", Space, Str "End." ]
+  ]
diff --git a/test/vimwiki-reader.native b/test/vimwiki-reader.native
index 9b09d4904..356d1b949 100644
--- a/test/vimwiki-reader.native
+++ b/test/vimwiki-reader.native
@@ -1,449 +1,2419 @@
-Pandoc (Meta {unMeta = fromList [("date",MetaInlines [Str "2017-05-01"]),("title",MetaInlines [Str "title"])]})
-[Header 1 ("implemented",[],[]) [Emph [Span ("implemented",[],[]) [],Strong [Str "implemented"]]]
-,Header 1 ("header",[],[]) [Str "header"]
-,Header 2 ("header level two",[],[]) [Str "header",Space,Str "level",Space,Str "two"]
-,Header 3 ("header level 3",[],[]) [Str "header",Space,Code ("",[],[]) "level",Space,Str "3"]
-,Header 4 ("header level four",[],[]) [Str "header",Space,Strikeout [Str "level"],Space,Str "four"]
-,Header 5 ("header level 5",[],[]) [Str "header",Space,Emph [Span ("level",[],[]) [],Strong [Str "level"],Space,Str "5"]]
-,Header 6 ("header level 6",[],[]) [Str "header",Space,Str "level",Space,Str "6"]
-,Para [Str "=======",Space,Str "not",Space,Str "a",Space,Str "header",Space,Str "========"]
-,Para [Str "hi==",Space,Str "not",Space,Str "a",Space,Str "header",Space,Str "=="]
-,Para [Str "===",Space,Str "not",Space,Str "a",Space,Str "header",Space,Str "=="]
-,Para [Str "===",Space,Str "not",Space,Str "a",Space,Str "header",Space,Str "===-"]
-,Para [Str "not",Space,Str "a",Space,Str "header:"]
-,Para [Str "=n="]
-,Para [Str "===",Space,Str "not",Space,Str "a",Space,Str "header",Space,Str "===="]
-,Header 2 ("centred header",["justcenter"],[]) [Str "centred",Space,Str "header"]
-,Header 2 ("header with some == in between",[],[]) [Str "header",Space,Str "with",Space,Str "some",Space,Code ("",[],[]) "==",Space,Str "in",Space,Str "between"]
-,Header 2 ("header with some == in between",[],[]) [Str "header",Space,Str "with",Space,Str "some",Space,Str "==",Space,Str "in",Space,Str "between"]
-,Header 2 ("header with some ==in between",[],[]) [Str "header",Space,Str "with",Space,Str "some",Space,Str "==in",Space,Str "between"]
-,Header 2 ("emph strong and strikeout",[],[]) [Str "emph",Space,Str "strong",Space,Str "and",Space,Str "strikeout"]
-,Para [Emph [Str "emph"],Space,Span ("strong",[],[]) [],Strong [Str "strong"]]
-,Para [Span ("strong and emph",[],[]) [],Strong [Emph [Str "strong",Space,Str "and",Space,Str "emph"]]]
-,Para [Emph [Span ("emph and strong",[],[]) [],Strong [Str "emph",Space,Str "and",Space,Str "strong"]]]
-,Para [Span ("emph inside strong",[],[]) [],Strong [Emph [Str "emph",Space,Str "inside"],Space,Str "strong"]]
-,Para [Span ("strong with emph",[],[]) [],Strong [Str "strong",Space,Str "with",Space,Emph [Str "emph"]]]
-,Para [Emph [Span ("strong inside",[],[]) [],Strong [Str "strong",Space,Str "inside"],Space,Str "emph"]]
-,Para [Emph [Strikeout [Str "strikeout"],Space,Str "inside",Space,Str "emph"]]
-,Para [Strikeout [Str "This",Space,Str "is",Space,Emph [Str "struck",Space,Str "out"],Space,Str "with",Space,Str "emph"]]
-,Para [Str "*not",SoftBreak,Str "strong*"]
-,Para [Str "just",Space,Str "two",Space,Str "stars:",Space,Str "**"]
-,Para [Str "just",Space,Str "two",Space,Str "underscores:",Space,Str "__"]
-,Para [Str "just",Space,Str "four",Space,Str "~s:",Space,Str "~~~~"]
-,Para [Str "_not",SoftBreak,Str "emph_"]
-,Para [Str "~~not",SoftBreak,Str "strikeout~~"]
-,Header 2 ("horizontal rule",[],[]) [Str "horizontal",Space,Str "rule"]
-,Para [Str "top"]
-,HorizontalRule
-,Para [Str "middle"]
-,HorizontalRule
-,Para [Str "not",Space,Str "a",Space,Str "rule-----"]
-,Para [Str "not",Space,Str "a",Space,Str "rule",Space,Str "(trailing",Space,Str "spaces):",SoftBreak,Str "-----"]
-,Para [Str "not",Space,Str "a",Space,Str "rule",Space,Str "(leading",Space,Str "spaces):",SoftBreak,Str "----"]
-,Header 2 ("comments",[],[]) [Str "comments"]
-,Para [Str "this",SoftBreak,Str "is",Space,Str "%%",Space,Str "not",Space,Str "secret"]
-,Header 2 ("inline code",[],[]) [Str "inline",Space,Str "code"]
-,Para [Str "Here",Space,Str "is",Space,Str "some",Space,Code ("",[],[]) "inline code",Str "."]
-,Para [Str "Just",Space,Str "two",Space,Str "backticks:",Space,Str "``"]
-,Header 2 ("preformatted text",[],[]) [Str "preformatted",Space,Str "text"]
-,CodeBlock ("",[],[]) "  Tyger! Tyger! burning bright\n   In the forests of the night,\n    What immortal hand or eye\n     Could frame thy fearful symmetry?\n  In what distant deeps or skies\n   Burnt the fire of thine eyes?\n    On what wings dare he aspire?\n     What the hand dare sieze the fire?"
-,Header 3 ("preformatted text with attributes",[],[]) [Str "preformatted",Space,Str "text",Space,Str "with",Space,Str "attributes"]
-,CodeBlock ("",[],[("class","python"),("style","color:blue")]) " for i in range(1, 5):\n     print(i)"
-,Header 3 ("preformatted text with nested syntax",[],[]) [Str "preformatted",Space,Str "text",Space,Str "with",Space,Str "nested",Space,Str "syntax"]
-,CodeBlock ("",["sql"],[]) "SELECT * FROM table"
-,Header 3 ("empty preformatted text",[],[]) [Str "empty",Space,Str "preformatted",Space,Str "text"]
-,CodeBlock ("",[],[]) ""
-,Header 2 ("block quotes",[],[]) [Str "block",Space,Str "quotes"]
-,BlockQuote
- [Plain [Str "(indentation",Space,Str "4",Space,Str "spaces)",Space,Str "This",Space,Str "would",Space,Str "be",Space,Str "a",Space,Str "blockquote",Space,Str "in",Space,Str "Vimwiki.",Space,Str "It",Space,Str "is",Space,Str "not",Space,Span ("highlighted",[],[]) [],Strong [Str "highlighted"],Space,Str "in",Space,Str "Vim",Space,Str "but",SoftBreak,Str "(indentation",Space,Str "1",Space,Str "space",Space,Str "followed",Space,Str "by",Space,Str "1",Space,Str "tab",Space,Str "of",Space,Str "width",Space,Str "4)",Space,Str "could",Space,Str "be",Space,Str "styled",Space,Str "by",Space,Str "CSS",Space,Str "in",Space,Str "HTML.",Space,Str "Blockquotes",Space,Str "are",Space,Str "usually",Space,Str "used",Space,Str "to",Space,Str "quote",Space,Str "a",SoftBreak,Str "(indentation",Space,Str "1",Space,Str "tab",Space,Str "of",Space,Str "width",Space,Str "4)",Space,Str "long",Space,Str "piece",Space,Str "of",Space,Str "text",Space,Str "from",Space,Str "another",Space,Str "source.",Space,Strikeout [Str "blah",Space,Str "blah"],Space,Span ("-blockquote",[],[]) [Str ""],Span ("blockquote",["tag"],[]) [Str "blockquote"]]]
-,Header 2 ("external links",[],[]) [Str "external",Space,Str "links"]
-,Para [Link ("",[],[]) [Emph [Str "Google"],Space,Str "search",Space,Str "engine"] ("http://google.com","")]
-,Para [Link ("",[],[]) [Str "http://pandoc.org"] ("http://pandoc.org","")]
-,Para [Link ("",[],[]) [Str "ftp://vim.org"] ("ftp://vim.org","")]
-,Para [Link ("",[],[]) [Str "http://google.com"] ("http://google.com","")]
-,Para [Link ("",[],[]) [Str "email",Space,Str "me"] ("mailto:info@example.org","")]
-,Para [Link ("",[],[]) [Str "mailto:hello@bye.com"] ("mailto:hello@bye.com","")]
-,Header 2 ("internal links",[],[]) [Str "internal",Space,Str "links"]
-,Para [Link ("",[],[]) [Str "This is a link"] ("This is a link","wikilink")]
-,Para [Link ("",[],[]) [Str "Description",Space,Str "of",Space,Str "the",Space,Str "link"] ("This is a link source","wikilink")]
-,Para [Link ("",[],[]) [Str "projects/Important Project 1"] ("projects/Important Project 1","wikilink"),SoftBreak,Link ("",[],[]) [Str "../index"] ("../index","wikilink"),SoftBreak,Link ("",[],[]) [Str "Other",Space,Str "files"] ("a subdirectory/","wikilink")]
-,Para [Link ("",[],[]) [Str "try",Space,Str "me",Space,Str "to",Space,Str "test",Space,Str "tag",Space,Str "anchors"] ("#tag-one","wikilink")]
-,Para [Link ("",[],[]) [Str "try",Space,Str "me",Space,Str "to",Space,Str "test",Space,Str "header",Space,Str "anchors"] ("#block quotes","wikilink")]
-,Para [Link ("",[],[]) [Str "try",Space,Str "me",Space,Str "to",Space,Str "test",Space,Str "strong",Space,Str "anchors"] ("#strong","wikilink")]
-,Para [Link ("",[],[]) [Str "Tasks",Space,Str "for",Space,Str "tomorrow"] ("Todo List#Tomorrow","wikilink")]
-,Para [Link ("",[],[]) [Str "diary:2017-05-01"] ("diary/2017-05-01","wikilink")]
-,Para [Link ("",[],[]) [Str "Important",Space,Str "Data"] ("file:../assets/data.csv","")]
-,Header 3 ("links with thumbnails",[],[]) [Str "links",Space,Str "with",Space,Str "thumbnails"]
-,Para [Link ("",[],[]) [Image ("",[],[]) [Str ""] ("./movie.jpg","")] ("http://www.google.com","")]
-,Header 2 ("images",[],[]) [Str "images"]
-,Para [Image ("",[],[]) [Str ""] ("file:./lalune.jpg","")]
-,Para [Image ("",[],[]) [Str "Vimwiki"] ("http://vimwiki.googlecode.com/hg/images/vimwiki_logo.png",""),SoftBreak,Image ("",[],[]) [Str ""] ("file:./movie.jpg","")]
-,Header 3 ("image with attributes",[],[]) [Str "image",Space,Str "with",Space,Str "attributes"]
-,Para [Image ("",[],[("style","width:150px;height:120px;")]) [Emph [Str "cool",Space,Str "stuff"]] ("lalune.jpg","")]
-,Para [Image ("",[],[("style","font-color:red")]) [Span ("Non-existing",[],[]) [],Strong [Str "Non-existing"],Space,Str "image"] ("nonexist.jpg","")]
-,Para [Image ("",[],[("style","width:150px;height:120px;")]) [Emph [Str "cool",Space,Str "stuff"]] ("lalune.jpg","")]
-,Header 2 ("lists",[],[]) [Str "lists"]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Plain [Str "ordered",Space,Str "list",Space,Str "item",Space,Str "1,",Space,Str "and",Space,Str "here",Space,Str "is",Space,Str "some",Space,Str "math",Space,Str "belonging",Space,Str "to",Space,Str "list",Space,Str "item",Space,Str "1"]
-  ,Para [Math DisplayMath "a^2 + b^2 = c^2"]
-  ,Plain [Str "and",Space,Str "some",Space,Str "preformatted",Space,Str "and",Space,Str "tables",Space,Str "belonging",Space,Str "to",Space,Str "item",Space,Str "1",Space,Str "as",Space,Str "well"]
-  ,CodeBlock ("",[],[]) "I'm part of item 1."
-  ,Table ("",[],[]) (Caption Nothing
-   [])
-   [(AlignDefault,ColWidthDefault)
-   ,(AlignDefault,ColWidthDefault)]
-   (TableHead ("",[],[])
-   [Row ("",[],[])
-    [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-     []
-    ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-     []]])
-   [(TableBody ("",[],[]) (RowHeadColumns 0)
-    []
-    [Row ("",[],[])
-     [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-      [Plain [Str "this",Space,Str "table"]]
-     ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-      [Plain [Str "is"]]]
-    ,Row ("",[],[])
-     [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-      [Plain [Str "also",Space,Str "a",Space,Str "part"]]
-     ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-      [Plain [Str "of",Space,Str "item",Space,Str "1"]]]])]
-   (TableFoot ("",[],[])
-   [])
-  ,Plain [Str "and",Space,Str "some",Space,Str "more",Space,Str "text",Space,Str "belonging",Space,Str "to",Space,Str "item",Space,Str "1."]]
- ,[Plain [Str "ordered",Space,Str "list",Space,Str "item",Space,Str "2"]]]
-,BulletList
- [[Plain [Str "Bulleted",Space,Str "list",Space,Str "item",Space,Str "1"]]
- ,[Plain [Str "Bulleted",Space,Str "list",Space,Str "item",Space,Str "2"]]]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Plain [Str "Bulleted",Space,Str "list",Space,Str "item",Space,Str "1"]]
- ,[Plain [Str "the",Space,Str "#",Space,Str "become",Space,Str "numbers",Space,Str "when",Space,Str "converted",Space,Str "to",Space,Str "HTML"]]]
-,BulletList
- [[Plain [Str "Bulleted",Space,Str "list",Space,Str "item",Space,Str "1"]]
- ,[Plain [Str "Bulleted",Space,Str "list",Space,Str "item",Space,Str "2"]]]
-,BulletList
- [[Plain [Str "Item",Space,Str "1"]]
- ,[Plain [Str "Item",Space,Str "2"]
-  ,OrderedList (1,DefaultStyle,DefaultDelim)
-   [[Plain [Str "Sub",Space,Str "item",Space,Str "1",Space,Str "(indentation",Space,Str "4",Space,Str "spaces)",SoftBreak,Str "Sub",Space,Str "item",Space,Str "1",Space,Str "continued",Space,Str "line.",SoftBreak,Str "Sub",Space,Str "item",Space,Str "1",Space,Str "next",Space,Str "continued",Space,Str "line."]]
-   ,[Plain [Str "Sub",Space,Str "item",Space,Str "2,",Space,Str "as",Space,Str "an",Space,Str "ordered",Space,Str "list",Space,Str "item",Space,Str "even",Space,Str "though",Space,Str "the",Space,Str "identifier",Space,Str "is",Space,Code ("",[],[]) "*",Space,Str "(indentation",Space,Str "2",Space,Str "spaces",Space,Str "followed",Space,Str "by",Space,Str "one",Space,Str "tab",Space,Str "of",Space,Str "width",Space,Str "4)"]]
-   ,[Plain [Str "etc.",SoftBreak,Str "Continuation",Space,Str "of",Space,Str "Item",Space,Str "2",SoftBreak,Str "Next",Space,Str "continuation",Space,Str "of",Space,Str "Item",Space,Str "2"]]]]]
-,Para [Str "But",Space,Str "this",Space,Str "is",Space,Str "a",Space,Str "new",Space,Str "paragraph."]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Plain [Str "1"]
-  ,BulletList
-   [[Plain [Code ("",[],[]) "1.1"]]]]
- ,[Plain [Str "2"]
-  ,BulletList
-   [[Plain [Str "2.1"]]]]]
-,BulletList
- [[Plain [Str "3"]]]
-,Header 3 ("ordered lists with non-# identifiers",[],[]) [Str "ordered",Space,Str "lists",Space,Str "with",Space,Str "non-#",Space,Str "identifiers"]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "1"]]
- ,[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "2"]]
- ,[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "3"]]]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "1"]]
- ,[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "2"]]
- ,[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "3"]]]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "1"]]
- ,[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "2"]]
- ,[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "3"]]]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "1"]]
- ,[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "2"]]
- ,[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "3"]]]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "1"]]
- ,[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "2"]]
- ,[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "3"]]]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "1"]]
- ,[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "2"]]
- ,[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "3"]]]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "1"]]
- ,[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "2"]]
- ,[Plain [Str "Numbered",Space,Str "list",Space,Str "item",Space,Str "3"]]]
-,BulletList
- [[Plain [Str "Bulleted",Space,Str "list",Space,Str "item",Space,Str "1"]]
- ,[Plain [Str "Bulleted",Space,Str "list",Space,Str "item",Space,Str "2"]
-  ,OrderedList (1,DefaultStyle,DefaultDelim)
-   [[Plain [Str "Numbered",Space,Str "list",Space,Str "sub",Space,Str "item",Space,Str "1"]]
-   ,[Plain [Str "more",Space,Str "..."]
-    ,BulletList
-     [[Plain [Str "and",Space,Str "more",Space,Str "..."]]
-     ,[Plain [Str "..."]]]]
-   ,[Plain [Str "Numbered",Space,Str "list",Space,Str "sub",Space,Str "item",Space,Str "3"]
-    ,OrderedList (1,DefaultStyle,DefaultDelim)
-     [[Plain [Str "Numbered",Space,Str "list",Space,Str "sub",Space,Str "sub",Space,Str "item",Space,Str "1"]]
-     ,[Plain [Str "Numbered",Space,Str "list",Space,Str "sub",Space,Str "sub",Space,Str "item",Space,Str "2"]]]]
-   ,[Plain [Str "etc."]]]]
- ,[Plain [Str "Bulleted",Space,Str "list",Space,Str "item",Space,Str "3"]]]
-,Header 2 ("todo lists",[],[]) [Str "todo",Space,Str "lists"]
-,BulletList
- [[Plain [Span ("",["done0"],[]) [],Str "task",Space,Str "1"]
-  ,OrderedList (1,DefaultStyle,DefaultDelim)
-   [[Plain [Span ("",["done1"],[]) [],Str "5"]]]]
- ,[Plain [Span ("",["done2"],[]) [],Str "3"]]
- ,[Plain [Str "[]",Space,Str "not",Space,Str "a",Space,Str "todo",Space,Str "item"]]
- ,[Plain [Str "[",Space,Str "]not",Space,Str "a",Space,Str "todo",Space,Str "item"]]
- ,[Plain [Str "[r]",Space,Str "not",Space,Str "a",Space,Str "todo",Space,Str "item"]]
- ,[Plain [Str "[",Space,Str "]",Space,Str "not",Space,Str "a",Space,Str "todo",Space,Str "item"]]
- ,[Plain [Span ("",["done2"],[]) [],Str "a",Space,Str "tab",Space,Str "in",Space,Str "the",Space,Str "todo",Space,Str "list",Space,Str "marker",Space,Code ("",[],[]) "[ ]"]
-  ,OrderedList (1,DefaultStyle,DefaultDelim)
-   [[Plain [Span ("",["done3"],[]) [],Str "4",SoftBreak,Str "5"]]
-   ,[Plain [Span ("",["done4"],[]) []]
-    ,Table ("",[],[]) (Caption Nothing
-     [])
-     [(AlignDefault,ColWidthDefault)
-     ,(AlignDefault,ColWidthDefault)]
-     (TableHead ("",[],[])
-     [Row ("",[],[])
-      [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-       []
-      ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-       []]])
-     [(TableBody ("",[],[]) (RowHeadColumns 0)
-      []
-      [Row ("",[],[])
-       [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-        [Plain [Str "a"]]
-       ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-        [Plain [Str "b"]]]])]
-     (TableFoot ("",[],[])
-     [])]]]
- ,[Plain [Span ("",["done4"],[]) [],Str "task",Space,Str "2"]]]
-,Header 2 ("math",[],[]) [Str "math"]
-,Para [Math InlineMath " \\sum_i a_i^2 = 1 "]
-,Para [Math DisplayMath "\\sum_i a_i^2\n=\n1"]
-,Para [Math DisplayMath "\\begin{aligned}\n\\sum_i a_i^2 &= 1 + 1 \\\\\n&= 2.\n\\end{aligned}"]
-,Para [Str "edge",Space,Str "case",Space,Str "(the",Space,Code ("",[],[]) "c^2 + ",Space,Str "after",Space,Str "the",Space,Str "multline",Space,Str "tag",Space,Str "is",Space,Str "in",Space,Str "the",Space,Str "equation):"]
-,Para [Math DisplayMath "\\begin{gathered}\nc^2 + \na^2 + b^2\n\\end{gathered}"]
-,Para [Str "edge",Space,Str "case",Space,Str "(the",Space,Str "tag",Space,Str "is",Space,Code ("",[],[]) "hello%bye",Str ")"]
-,Para [Math DisplayMath "\\begin{hello%bye}\n\\int_a^b f(x) dx\n\\end{hello%bye}"]
-,Para [Str "Just",Space,Str "two",Space,Str "dollar",Space,Str "signs:",Space,Str "$$"]
-,Para [Str "[not",Space,Str "math]",Space,Str "You",Space,Str "have",Space,Str "$1",SoftBreak,Str "and",Space,Str "I",Space,Str "have",Space,Str "$1."]
-,Header 2 ("tags",[],[]) [Str "tags"]
-,Para [Span ("-tag-one",[],[]) [Str ""],Span ("tag-one",["tag"],[]) [Str "tag-one"],Space,Span ("-tag-two",[],[]) [Str ""],Span ("tag-two",["tag"],[]) [Str "tag-two"]]
-,Header 2 ("tables",[],[]) [Str "tables"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Year"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Temperature",Space,Str "(low)"]]
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   [Plain [Str "Temperature",Space,Str "(high)"]]]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1900"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "-10"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "25"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1910"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "-15"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "30"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1920"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "-10"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "32"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1930"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Emph [Str "N/A"]]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Emph [Str "N/A"]]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "1940"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "-2"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "40"]]]])]
- (TableFoot ("",[],[])
- [])
-,Header 3 ("centered headerless tables",[],[]) [Str "centered",Space,Str "headerless",Space,Str "tables"]
-,Div ("",["center"],[])
- [Table ("",[],[]) (Caption Nothing
-  [])
-  [(AlignDefault,ColWidthDefault)
-  ,(AlignDefault,ColWidthDefault)]
-  (TableHead ("",[],[])
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    []]])
-  [(TableBody ("",[],[]) (RowHeadColumns 0)
-   []
-   [Row ("",[],[])
-    [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-     [Plain [Str "a"]]
-    ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-     [Plain [Str "b"]]]
-   ,Row ("",[],[])
-    [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-     [Plain [Str "c"]]
-    ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-     [Plain [Str "d"]]]])]
-  (TableFoot ("",[],[])
-  [])]
-,Header 2 ("paragraphs",[],[]) [Str "paragraphs"]
-,Para [Str "This",Space,Str "is",Space,Str "first",Space,Str "paragraph",SoftBreak,Str "with",Space,Str "two",Space,Str "lines."]
-,Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "second",Space,Str "paragraph",Space,Str "with",SoftBreak,Str "two",Space,Str "lines",Space,Str "after",Space,Str "many",Space,Str "blank",Space,Str "lines."]
-,Header 2 ("definition list",[],[]) [Str "definition",Space,Str "list"]
-,DefinitionList
- [([Str "Term",Space,Str "1"],
-   [[Plain [Str "Definition",Space,Str "1"]]])
- ,([Str "Term",Space,Str "2"],
-   [[Plain [Str "Definition",Space,Str "2"]]
-   ,[Plain [Str "Definition",Space,Str "3"]]])
- ,([Str "Term",Space,Str "::",Space,Span ("separated",[],[]) [],Strong [Str "separated"],Space,Str "by",Space,Str "::",Space,Emph [Str "double",Space,Str "colons"]],
-   [[Plain [Str "Def1"]]
-   ,[Plain [Str "Def2"]]])
- ,([Str "Term",Space,Str "with",Space,Str "lots",Space,Str "of",Space,Str "trailing",Space,Str "colons:::::::"],
-   [[Plain [Str "Definition"]]])
- ,([Str "::",Space,Str "This",Space,Str "is",Space,Str "::",Space,Str "A",Space,Str "term",Space,Str "(rather",Space,Str "than",Space,Str "a",Space,Str "definition)"],
-   [[Plain [Str "and",Space,Str "this",Space,Str "is",Space,Str "a",Space,Str "definition"]]])
- ,([Str "Term",Space,Str "Without",Space,Str "definitions"],
-   [[]])
- ,([Str "Part",Space,Str "::",Space,Str "of",Space,Str "::",Space,Str "dt"],
-   [[Plain [Str "part",Space,Str "of",Space,Str "::dd"]]])]
-,DefinitionList
- [([],
-   [[Plain [Str "Definition",Space,Str "1",Space,Str "without",Space,Str "a",Space,Str "term"]]
-   ,[Plain [Str "Definition",Space,Str "2",Space,Str "without",Space,Str "a",Space,Str "term"]]])]
-,DefinitionList
- [([Str "T1"],
-   [[Plain [Str "D1"]]])]
-,Para [Str "new",Space,Str "paragraph"]
-,DefinitionList
- [([Str "T1"],
-   [[Plain [Str "D1"]]])]
-,Para [Str "Not::Definition"]
-,Para [Str "Not",Space,Str "::Definition"]
-,Para [Str "::Not",Space,Str "definition"]
-,BlockQuote
- [Plain [Str "::",Space,Str "blockquote"]]
-,BlockQuote
- [Plain [Str "block",Space,Str "::",Space,Str "quote"]]
-,Header 2 ("metadata placeholders",[],[]) [Str "metadata",Space,Str "placeholders"]
-,Para [Str "%this",Space,Str "is",Space,Str "not",Space,Str "a",Space,Str "placeholder"]
-,Para [Str "placeholders",SoftBreak,Str "serves",Space,Str "as",Space,Str "space",Space,Str "/",Space,Str "softbreak",Space,Str "in",Space,Str "paragraphs"]
-,Header 2 ("sup, sub",[],[]) [Str "sup,",Space,Str "sub"]
-,Para [Str "super",Superscript [Str "script"]]
-,Para [Str "sub",Subscript [Str "script"]]
-,Header 2 ("the todo mark",[],[]) [Str "the",Space,Str "todo",Space,Str "mark"]
-,Para [Span ("",["todo"],[]) [Str "TODO:"]]
-,Header 1 ("not implemented yet",[],[]) [Emph [Span ("not implemented yet",[],[]) [],Strong [Str "not",Space,Str "implemented",Space,Str "yet"]]]
-,Header 2 ("tables with spans",[],[]) [Str "tables",Space,Str "with",Space,Str "spans"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   []
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   []
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   []
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   []]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "a"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "b"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "c"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "d"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "\\/"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "e"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str ">"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "f"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "\\/"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "\\/"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str ">"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "g"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "h"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str ">"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str ">"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str ">"]]]])]
- (TableFoot ("",[],[])
- [])
-,Header 2 ("tables with multiple lines of headers",[],[]) [Str "tables",Space,Str "with",Space,Str "multiple",Space,Str "lines",Space,Str "of",Space,Str "headers"]
-,Table ("",[],[]) (Caption Nothing
- [])
- [(AlignDefault,ColWidthDefault)
- ,(AlignDefault,ColWidthDefault)]
- (TableHead ("",[],[])
- [Row ("",[],[])
-  [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   []
-  ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-   []]])
- [(TableBody ("",[],[]) (RowHeadColumns 0)
-  []
-  [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "a"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "b"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "c"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "d"]]]
-  ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "---"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
-    [Plain [Str "---"]]]])]
- (TableFoot ("",[],[])
- [])
-,Header 2 ("some other placeholders",[],[]) [Str "some",Space,Str "other",Space,Str "placeholders"]
-,Para [Code ("",[],[]) "template",Space,Str "placeholder",Space,Str "is",Space,Str "ignored."]
-,Para [Code ("",[],[]) "nohtml",Space,Str "placeholder",Space,Str "is",Space,Str "ignored."]]
+Pandoc
+  ( Meta
+    { unMeta = fromList
+      [
+        ( "date", MetaInlines [ Str "2017-05-01" ] )
+      ,
+        ( "title", MetaInlines [ Str "title" ] )
+      ]
+    }
+  )
+  [ Header 1
+    ( "implemented", [], [] )
+    [ Emph
+      [ Span
+        ( "implemented", [], [] ) []
+      , Strong
+        [ Str "implemented" ]
+      ]
+    ]
+  , Header 1
+    ( "header", [], [] )
+    [ Str "header" ]
+  , Header 2
+    ( "header level two", [], [] )
+    [ Str "header", Space, Str "level", Space, Str "two" ]
+  , Header 3
+    ( "header level 3", [], [] )
+    [ Str "header", Space, Code ( "", [], [] ) "level", Space, Str "3" ]
+  , Header 4
+    ( "header level four", [], [] )
+    [ Str "header"
+    , Space
+    , Strikeout
+      [ Str "level" ]
+    , Space
+    , Str "four"
+    ]
+  , Header 5
+    ( "header level 5", [], [] )
+    [ Str "header"
+    , Space
+    , Emph
+      [ Span
+        ( "level", [], [] ) []
+      , Strong
+        [ Str "level" ]
+      , Space
+      , Str "5"
+      ]
+    ]
+  , Header 6
+    ( "header level 6", [], [] )
+    [ Str "header", Space, Str "level", Space, Str "6" ]
+  , Para
+    [ Str "======="
+    , Space
+    , Str "not"
+    , Space
+    , Str "a"
+    , Space
+    , Str "header"
+    , Space
+    , Str "========"
+    ]
+  , Para
+    [ Str "hi=="
+    , Space
+    , Str "not"
+    , Space
+    , Str "a"
+    , Space
+    , Str "header"
+    , Space
+    , Str "=="
+    ]
+  , Para
+    [ Str "==="
+    , Space
+    , Str "not"
+    , Space
+    , Str "a"
+    , Space
+    , Str "header"
+    , Space
+    , Str "=="
+    ]
+  , Para
+    [ Str "==="
+    , Space
+    , Str "not"
+    , Space
+    , Str "a"
+    , Space
+    , Str "header"
+    , Space
+    , Str "===-"
+    ]
+  , Para
+    [ Str "not", Space, Str "a", Space, Str "header:" ]
+  , Para
+    [ Str "=n=" ]
+  , Para
+    [ Str "==="
+    , Space
+    , Str "not"
+    , Space
+    , Str "a"
+    , Space
+    , Str "header"
+    , Space
+    , Str "===="
+    ]
+  , Header 2
+    ( "centred header", [ "justcenter" ], [] )
+    [ Str "centred", Space, Str "header" ]
+  , Header 2
+    ( "header with some == in between", [], [] )
+    [ Str "header"
+    , Space
+    , Str "with"
+    , Space
+    , Str "some"
+    , Space
+    , Code
+      ( "", [], [] ) "=="
+    , Space
+    , Str "in"
+    , Space
+    , Str "between"
+    ]
+  , Header 2
+    ( "header with some == in between", [], [] )
+    [ Str "header"
+    , Space
+    , Str "with"
+    , Space
+    , Str "some"
+    , Space
+    , Str "=="
+    , Space
+    , Str "in"
+    , Space
+    , Str "between"
+    ]
+  , Header 2
+    ( "header with some ==in between", [], [] )
+    [ Str "header"
+    , Space
+    , Str "with"
+    , Space
+    , Str "some"
+    , Space
+    , Str "==in"
+    , Space
+    , Str "between"
+    ]
+  , Header 2
+    ( "emph strong and strikeout", [], [] )
+    [ Str "emph"
+    , Space
+    , Str "strong"
+    , Space
+    , Str "and"
+    , Space
+    , Str "strikeout"
+    ]
+  , Para
+    [ Emph
+      [ Str "emph" ]
+    , Space
+    , Span
+      ( "strong", [], [] ) []
+    , Strong
+      [ Str "strong" ]
+    ]
+  , Para
+    [ Span
+      ( "strong and emph", [], [] ) []
+    , Strong
+      [ Emph [ Str "strong", Space, Str "and", Space, Str "emph" ] ]
+    ]
+  , Para
+    [ Emph
+      [ Span
+        ( "emph and strong", [], [] ) []
+      , Strong
+        [ Str "emph", Space, Str "and", Space, Str "strong" ]
+      ]
+    ]
+  , Para
+    [ Span
+      ( "emph inside strong", [], [] ) []
+    , Strong
+      [ Emph [ Str "emph", Space, Str "inside" ], Space, Str "strong" ]
+    ]
+  , Para
+    [ Span
+      ( "strong with emph", [], [] ) []
+    , Strong
+      [ Str "strong", Space, Str "with", Space, Emph [ Str "emph" ] ]
+    ]
+  , Para
+    [ Emph
+      [ Span
+        ( "strong inside", [], [] ) []
+      , Strong
+        [ Str "strong", Space, Str "inside" ]
+      , Space
+      , Str "emph"
+      ]
+    ]
+  , Para
+    [ Emph
+      [ Strikeout
+        [ Str "strikeout" ]
+      , Space
+      , Str "inside"
+      , Space
+      , Str "emph"
+      ]
+    ]
+  , Para
+    [ Strikeout
+      [ Str "This"
+      , Space
+      , Str "is"
+      , Space
+      , Emph
+        [ Str "struck", Space, Str "out" ]
+      , Space
+      , Str "with"
+      , Space
+      , Str "emph"
+      ]
+    ]
+  , Para
+    [ Str "*not", SoftBreak, Str "strong*" ]
+  , Para
+    [ Str "just"
+    , Space
+    , Str "two"
+    , Space
+    , Str "stars:"
+    , Space
+    , Str "**"
+    ]
+  , Para
+    [ Str "just"
+    , Space
+    , Str "two"
+    , Space
+    , Str "underscores:"
+    , Space
+    , Str "__"
+    ]
+  , Para
+    [ Str "just"
+    , Space
+    , Str "four"
+    , Space
+    , Str "~s:"
+    , Space
+    , Str "~~~~"
+    ]
+  , Para
+    [ Str "_not", SoftBreak, Str "emph_" ]
+  , Para
+    [ Str "~~not", SoftBreak, Str "strikeout~~" ]
+  , Header 2
+    ( "horizontal rule", [], [] )
+    [ Str "horizontal", Space, Str "rule" ]
+  , Para
+    [ Str "top" ]
+  , HorizontalRule
+  , Para
+    [ Str "middle" ]
+  , HorizontalRule
+  , Para
+    [ Str "not", Space, Str "a", Space, Str "rule-----" ]
+  , Para
+    [ Str "not"
+    , Space
+    , Str "a"
+    , Space
+    , Str "rule"
+    , Space
+    , Str "(trailing"
+    , Space
+    , Str "spaces):"
+    , SoftBreak
+    , Str "-----"
+    ]
+  , Para
+    [ Str "not"
+    , Space
+    , Str "a"
+    , Space
+    , Str "rule"
+    , Space
+    , Str "(leading"
+    , Space
+    , Str "spaces):"
+    , SoftBreak
+    , Str "----"
+    ]
+  , Header 2
+    ( "comments", [], [] )
+    [ Str "comments" ]
+  , Para
+    [ Str "this"
+    , SoftBreak
+    , Str "is"
+    , Space
+    , Str "%%"
+    , Space
+    , Str "not"
+    , Space
+    , Str "secret"
+    ]
+  , Header 2
+    ( "inline code", [], [] )
+    [ Str "inline", Space, Str "code" ]
+  , Para
+    [ Str "Here"
+    , Space
+    , Str "is"
+    , Space
+    , Str "some"
+    , Space
+    , Code
+      ( "", [], [] ) "inline code"
+    , Str "."
+    ]
+  , Para
+    [ Str "Just"
+    , Space
+    , Str "two"
+    , Space
+    , Str "backticks:"
+    , Space
+    , Str "``"
+    ]
+  , Header 2
+    ( "preformatted text", [], [] )
+    [ Str "preformatted", Space, Str "text" ]
+  , CodeBlock
+    ( ""
+    , []
+    , []
+    ) "  Tyger! Tyger! burning bright\n   In the forests of the night,\n    What immortal hand or eye\n     Could frame thy fearful symmetry?\n  In what distant deeps or skies\n   Burnt the fire of thine eyes?\n    On what wings dare he aspire?\n     What the hand dare sieze the fire?"
+  , Header 3
+    ( "preformatted text with attributes", [], [] )
+    [ Str "preformatted"
+    , Space
+    , Str "text"
+    , Space
+    , Str "with"
+    , Space
+    , Str "attributes"
+    ]
+  , CodeBlock
+    ( ""
+    , []
+    ,
+      [ ( "class", "python" ), ( "style", "color:blue" ) ]
+    ) " for i in range(1, 5):\n     print(i)"
+  , Header 3
+    ( "preformatted text with nested syntax", [], [] )
+    [ Str "preformatted"
+    , Space
+    , Str "text"
+    , Space
+    , Str "with"
+    , Space
+    , Str "nested"
+    , Space
+    , Str "syntax"
+    ]
+  , CodeBlock
+    ( "", [ "sql" ], [] ) "SELECT * FROM table"
+  , Header 3
+    ( "empty preformatted text", [], [] )
+    [ Str "empty", Space, Str "preformatted", Space, Str "text" ]
+  , CodeBlock
+    ( "", [], [] ) ""
+  , Header 2
+    ( "block quotes", [], [] )
+    [ Str "block", Space, Str "quotes" ]
+  , BlockQuote
+    [ Plain
+      [ Str "(indentation"
+      , Space
+      , Str "4"
+      , Space
+      , Str "spaces)"
+      , Space
+      , Str "This"
+      , Space
+      , Str "would"
+      , Space
+      , Str "be"
+      , Space
+      , Str "a"
+      , Space
+      , Str "blockquote"
+      , Space
+      , Str "in"
+      , Space
+      , Str "Vimwiki."
+      , Space
+      , Str "It"
+      , Space
+      , Str "is"
+      , Space
+      , Str "not"
+      , Space
+      , Span
+        ( "highlighted", [], [] ) []
+      , Strong
+        [ Str "highlighted" ]
+      , Space
+      , Str "in"
+      , Space
+      , Str "Vim"
+      , Space
+      , Str "but"
+      , SoftBreak
+      , Str "(indentation"
+      , Space
+      , Str "1"
+      , Space
+      , Str "space"
+      , Space
+      , Str "followed"
+      , Space
+      , Str "by"
+      , Space
+      , Str "1"
+      , Space
+      , Str "tab"
+      , Space
+      , Str "of"
+      , Space
+      , Str "width"
+      , Space
+      , Str "4)"
+      , Space
+      , Str "could"
+      , Space
+      , Str "be"
+      , Space
+      , Str "styled"
+      , Space
+      , Str "by"
+      , Space
+      , Str "CSS"
+      , Space
+      , Str "in"
+      , Space
+      , Str "HTML."
+      , Space
+      , Str "Blockquotes"
+      , Space
+      , Str "are"
+      , Space
+      , Str "usually"
+      , Space
+      , Str "used"
+      , Space
+      , Str "to"
+      , Space
+      , Str "quote"
+      , Space
+      , Str "a"
+      , SoftBreak
+      , Str "(indentation"
+      , Space
+      , Str "1"
+      , Space
+      , Str "tab"
+      , Space
+      , Str "of"
+      , Space
+      , Str "width"
+      , Space
+      , Str "4)"
+      , Space
+      , Str "long"
+      , Space
+      , Str "piece"
+      , Space
+      , Str "of"
+      , Space
+      , Str "text"
+      , Space
+      , Str "from"
+      , Space
+      , Str "another"
+      , Space
+      , Str "source."
+      , Space
+      , Strikeout
+        [ Str "blah", Space, Str "blah" ]
+      , Space
+      , Span
+        ( "-blockquote", [], [] )
+        [ Str "" ]
+      , Span
+        ( "blockquote", [ "tag" ], [] )
+        [ Str "blockquote" ]
+      ]
+    ]
+  , Header 2
+    ( "external links", [], [] )
+    [ Str "external", Space, Str "links" ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Emph
+        [ Str "Google" ]
+      , Space
+      , Str "search"
+      , Space
+      , Str "engine"
+      ]
+      ( "http://google.com", "" )
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "http://pandoc.org" ]
+      ( "http://pandoc.org", "" )
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "ftp://vim.org" ]
+      ( "ftp://vim.org", "" )
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "http://google.com" ]
+      ( "http://google.com", "" )
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "email", Space, Str "me" ]
+      ( "mailto:info@example.org", "" )
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "mailto:hello@bye.com" ]
+      ( "mailto:hello@bye.com", "" )
+    ]
+  , Header 2
+    ( "internal links", [], [] )
+    [ Str "internal", Space, Str "links" ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "This is a link" ]
+      ( "This is a link", "wikilink" )
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "Description"
+      , Space
+      , Str "of"
+      , Space
+      , Str "the"
+      , Space
+      , Str "link"
+      ]
+      ( "This is a link source", "wikilink" )
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "projects/Important Project 1" ]
+      ( "projects/Important Project 1", "wikilink" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "../index" ]
+      ( "../index", "wikilink" )
+    , SoftBreak
+    , Link
+      ( "", [], [] )
+      [ Str "Other", Space, Str "files" ]
+      ( "a subdirectory/", "wikilink" )
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "try"
+      , Space
+      , Str "me"
+      , Space
+      , Str "to"
+      , Space
+      , Str "test"
+      , Space
+      , Str "tag"
+      , Space
+      , Str "anchors"
+      ]
+      ( "#tag-one", "wikilink" )
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "try"
+      , Space
+      , Str "me"
+      , Space
+      , Str "to"
+      , Space
+      , Str "test"
+      , Space
+      , Str "header"
+      , Space
+      , Str "anchors"
+      ]
+      ( "#block quotes", "wikilink" )
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "try"
+      , Space
+      , Str "me"
+      , Space
+      , Str "to"
+      , Space
+      , Str "test"
+      , Space
+      , Str "strong"
+      , Space
+      , Str "anchors"
+      ]
+      ( "#strong", "wikilink" )
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "Tasks", Space, Str "for", Space, Str "tomorrow" ]
+      ( "Todo List#Tomorrow", "wikilink" )
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "diary:2017-05-01" ]
+      ( "diary/2017-05-01", "wikilink" )
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "Important", Space, Str "Data" ]
+      ( "file:../assets/data.csv", "" )
+    ]
+  , Header 3
+    ( "links with thumbnails", [], [] )
+    [ Str "links", Space, Str "with", Space, Str "thumbnails" ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Image ( "", [], [] ) [ Str "" ] ( "./movie.jpg", "" ) ]
+      ( "http://www.google.com", "" )
+    ]
+  , Header 2
+    ( "images", [], [] )
+    [ Str "images" ]
+  , Para
+    [ Image ( "", [], [] ) [ Str "" ] ( "file:./lalune.jpg", "" ) ]
+  , Para
+    [ Image
+      ( "", [], [] )
+      [ Str "Vimwiki" ]
+      ( "http://vimwiki.googlecode.com/hg/images/vimwiki_logo.png", "" )
+    , SoftBreak
+    , Image
+      ( "", [], [] )
+      [ Str "" ]
+      ( "file:./movie.jpg", "" )
+    ]
+  , Header 3
+    ( "image with attributes", [], [] )
+    [ Str "image", Space, Str "with", Space, Str "attributes" ]
+  , Para
+    [ Image
+      ( "", [], [ ( "style", "width:150px;height:120px;" ) ] )
+      [ Emph [ Str "cool", Space, Str "stuff" ] ]
+      ( "lalune.jpg", "" )
+    ]
+  , Para
+    [ Image
+      ( "", [], [ ( "style", "font-color:red" ) ] )
+      [ Span
+        ( "Non-existing", [], [] ) []
+      , Strong
+        [ Str "Non-existing" ]
+      , Space
+      , Str "image"
+      ]
+      ( "nonexist.jpg", "" )
+    ]
+  , Para
+    [ Image
+      ( "", [], [ ( "style", "width:150px;height:120px;" ) ] )
+      [ Emph [ Str "cool", Space, Str "stuff" ] ]
+      ( "lalune.jpg", "" )
+    ]
+  , Header 2
+    ( "lists", [], [] )
+    [ Str "lists" ]
+  , OrderedList
+    ( 1, DefaultStyle, DefaultDelim )
+    [
+      [ Plain
+        [ Str "ordered"
+        , Space
+        , Str "list"
+        , Space
+        , Str "item"
+        , Space
+        , Str "1,"
+        , Space
+        , Str "and"
+        , Space
+        , Str "here"
+        , Space
+        , Str "is"
+        , Space
+        , Str "some"
+        , Space
+        , Str "math"
+        , Space
+        , Str "belonging"
+        , Space
+        , Str "to"
+        , Space
+        , Str "list"
+        , Space
+        , Str "item"
+        , Space
+        , Str "1"
+        ]
+      , Para
+        [ Math DisplayMath "a^2 + b^2 = c^2" ]
+      , Plain
+        [ Str "and"
+        , Space
+        , Str "some"
+        , Space
+        , Str "preformatted"
+        , Space
+        , Str "and"
+        , Space
+        , Str "tables"
+        , Space
+        , Str "belonging"
+        , Space
+        , Str "to"
+        , Space
+        , Str "item"
+        , Space
+        , Str "1"
+        , Space
+        , Str "as"
+        , Space
+        , Str "well"
+        ]
+      , CodeBlock
+        ( "", [], [] ) "I'm part of item 1."
+      , Table
+        ( "", [], [] )
+        ( Caption Nothing [] )
+        [
+          ( AlignDefault, ColWidthDefault )
+        ,
+          ( AlignDefault, ColWidthDefault )
+        ]
+        ( TableHead
+          ( "", [], [] )
+          [ Row
+            ( "", [], [] )
+            [ Cell
+              ( "", [], [] ) AlignDefault
+              ( RowSpan 1 )
+              ( ColSpan 1 ) []
+            , Cell
+              ( "", [], [] ) AlignDefault
+              ( RowSpan 1 )
+              ( ColSpan 1 ) []
+            ]
+          ]
+        )
+        [ TableBody
+          ( "", [], [] )
+          ( RowHeadColumns 0 ) []
+          [ Row
+            ( "", [], [] )
+            [ Cell
+              ( "", [], [] ) AlignDefault
+              ( RowSpan 1 )
+              ( ColSpan 1 )
+              [ Plain [ Str "this", Space, Str "table" ] ]
+            , Cell
+              ( "", [], [] ) AlignDefault
+              ( RowSpan 1 )
+              ( ColSpan 1 )
+              [ Plain [ Str "is" ] ]
+            ]
+          , Row
+            ( "", [], [] )
+            [ Cell
+              ( "", [], [] ) AlignDefault
+              ( RowSpan 1 )
+              ( ColSpan 1 )
+              [ Plain
+                [ Str "also", Space, Str "a", Space, Str "part" ]
+              ]
+            , Cell
+              ( "", [], [] ) AlignDefault
+              ( RowSpan 1 )
+              ( ColSpan 1 )
+              [ Plain [ Str "of", Space, Str "item", Space, Str "1" ] ]
+            ]
+          ]
+        ]
+        ( TableFoot ( "", [], [] ) [] )
+      , Plain
+        [ Str "and"
+        , Space
+        , Str "some"
+        , Space
+        , Str "more"
+        , Space
+        , Str "text"
+        , Space
+        , Str "belonging"
+        , Space
+        , Str "to"
+        , Space
+        , Str "item"
+        , Space
+        , Str "1."
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "ordered"
+        , Space
+        , Str "list"
+        , Space
+        , Str "item"
+        , Space
+        , Str "2"
+        ]
+      ]
+    ]
+  , BulletList
+    [
+      [ Plain
+        [ Str "Bulleted"
+        , Space
+        , Str "list"
+        , Space
+        , Str "item"
+        , Space
+        , Str "1"
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "Bulleted"
+        , Space
+        , Str "list"
+        , Space
+        , Str "item"
+        , Space
+        , Str "2"
+        ]
+      ]
+    ]
+  , OrderedList
+    ( 1, DefaultStyle, DefaultDelim )
+    [
+      [ Plain
+        [ Str "Bulleted"
+        , Space
+        , Str "list"
+        , Space
+        , Str "item"
+        , Space
+        , Str "1"
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "the"
+        , Space
+        , Str "#"
+        , Space
+        , Str "become"
+        , Space
+        , Str "numbers"
+        , Space
+        , Str "when"
+        , Space
+        , Str "converted"
+        , Space
+        , Str "to"
+        , Space
+        , Str "HTML"
+        ]
+      ]
+    ]
+  , BulletList
+    [
+      [ Plain
+        [ Str "Bulleted"
+        , Space
+        , Str "list"
+        , Space
+        , Str "item"
+        , Space
+        , Str "1"
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "Bulleted"
+        , Space
+        , Str "list"
+        , Space
+        , Str "item"
+        , Space
+        , Str "2"
+        ]
+      ]
+    ]
+  , BulletList
+    [
+      [ Plain [ Str "Item", Space, Str "1" ] ]
+    ,
+      [ Plain
+        [ Str "Item", Space, Str "2" ]
+      , OrderedList
+        ( 1, DefaultStyle, DefaultDelim )
+        [
+          [ Plain
+            [ Str "Sub"
+            , Space
+            , Str "item"
+            , Space
+            , Str "1"
+            , Space
+            , Str "(indentation"
+            , Space
+            , Str "4"
+            , Space
+            , Str "spaces)"
+            , SoftBreak
+            , Str "Sub"
+            , Space
+            , Str "item"
+            , Space
+            , Str "1"
+            , Space
+            , Str "continued"
+            , Space
+            , Str "line."
+            , SoftBreak
+            , Str "Sub"
+            , Space
+            , Str "item"
+            , Space
+            , Str "1"
+            , Space
+            , Str "next"
+            , Space
+            , Str "continued"
+            , Space
+            , Str "line."
+            ]
+          ]
+        ,
+          [ Plain
+            [ Str "Sub"
+            , Space
+            , Str "item"
+            , Space
+            , Str "2,"
+            , Space
+            , Str "as"
+            , Space
+            , Str "an"
+            , Space
+            , Str "ordered"
+            , Space
+            , Str "list"
+            , Space
+            , Str "item"
+            , Space
+            , Str "even"
+            , Space
+            , Str "though"
+            , Space
+            , Str "the"
+            , Space
+            , Str "identifier"
+            , Space
+            , Str "is"
+            , Space
+            , Code
+              ( "", [], [] ) "*"
+            , Space
+            , Str "(indentation"
+            , Space
+            , Str "2"
+            , Space
+            , Str "spaces"
+            , Space
+            , Str "followed"
+            , Space
+            , Str "by"
+            , Space
+            , Str "one"
+            , Space
+            , Str "tab"
+            , Space
+            , Str "of"
+            , Space
+            , Str "width"
+            , Space
+            , Str "4)"
+            ]
+          ]
+        ,
+          [ Plain
+            [ Str "etc."
+            , SoftBreak
+            , Str "Continuation"
+            , Space
+            , Str "of"
+            , Space
+            , Str "Item"
+            , Space
+            , Str "2"
+            , SoftBreak
+            , Str "Next"
+            , Space
+            , Str "continuation"
+            , Space
+            , Str "of"
+            , Space
+            , Str "Item"
+            , Space
+            , Str "2"
+            ]
+          ]
+        ]
+      ]
+    ]
+  , Para
+    [ Str "But"
+    , Space
+    , Str "this"
+    , Space
+    , Str "is"
+    , Space
+    , Str "a"
+    , Space
+    , Str "new"
+    , Space
+    , Str "paragraph."
+    ]
+  , OrderedList
+    ( 1, DefaultStyle, DefaultDelim )
+    [
+      [ Plain
+        [ Str "1" ]
+      , BulletList
+        [ [ Plain [ Code ( "", [], [] ) "1.1" ] ] ]
+      ]
+    ,
+      [ Plain [ Str "2" ], BulletList [ [ Plain [ Str "2.1" ] ] ] ]
+    ]
+  , BulletList
+    [ [ Plain [ Str "3" ] ] ]
+  , Header 3
+    ( "ordered lists with non-# identifiers", [], [] )
+    [ Str "ordered"
+    , Space
+    , Str "lists"
+    , Space
+    , Str "with"
+    , Space
+    , Str "non-#"
+    , Space
+    , Str "identifiers"
+    ]
+  , OrderedList
+    ( 1, DefaultStyle, DefaultDelim )
+    [
+      [ Plain
+        [ Str "Numbered"
+        , Space
+        , Str "list"
+        , Space
+        , Str "item"
+        , Space
+        , Str "1"
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "Numbered"
+        , Space
+        , Str "list"
+        , Space
+        , Str "item"
+        , Space
+        , Str "2"
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "Numbered"
+        , Space
+        , Str "list"
+        , Space
+        , Str "item"
+        , Space
+        , Str "3"
+        ]
+      ]
+    ]
+  , OrderedList
+    ( 1, DefaultStyle, DefaultDelim )
+    [
+      [ Plain
+        [ Str "Numbered"
+        , Space
+        , Str "list"
+        , Space
+        , Str "item"
+        , Space
+        , Str "1"
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "Numbered"
+        , Space
+        , Str "list"
+        , Space
+        , Str "item"
+        , Space
+        , Str "2"
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "Numbered"
+        , Space
+        , Str "list"
+        , Space
+        , Str "item"
+        , Space
+        , Str "3"
+        ]
+      ]
+    ]
+  , OrderedList
+    ( 1, DefaultStyle, DefaultDelim )
+    [
+      [ Plain
+        [ Str "Numbered"
+        , Space
+        , Str "list"
+        , Space
+        , Str "item"
+        , Space
+        , Str "1"
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "Numbered"
+        , Space
+        , Str "list"
+        , Space
+        , Str "item"
+        , Space
+        , Str "2"
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "Numbered"
+        , Space
+        , Str "list"
+        , Space
+        , Str "item"
+        , Space
+        , Str "3"
+        ]
+      ]
+    ]
+  , OrderedList
+    ( 1, DefaultStyle, DefaultDelim )
+    [
+      [ Plain
+        [ Str "Numbered"
+        , Space
+        , Str "list"
+        , Space
+        , Str "item"
+        , Space
+        , Str "1"
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "Numbered"
+        , Space
+        , Str "list"
+        , Space
+        , Str "item"
+        , Space
+        , Str "2"
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "Numbered"
+        , Space
+        , Str "list"
+        , Space
+        , Str "item"
+        , Space
+        , Str "3"
+        ]
+      ]
+    ]
+  , OrderedList
+    ( 1, DefaultStyle, DefaultDelim )
+    [
+      [ Plain
+        [ Str "Numbered"
+        , Space
+        , Str "list"
+        , Space
+        , Str "item"
+        , Space
+        , Str "1"
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "Numbered"
+        , Space
+        , Str "list"
+        , Space
+        , Str "item"
+        , Space
+        , Str "2"
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "Numbered"
+        , Space
+        , Str "list"
+        , Space
+        , Str "item"
+        , Space
+        , Str "3"
+        ]
+      ]
+    ]
+  , OrderedList
+    ( 1, DefaultStyle, DefaultDelim )
+    [
+      [ Plain
+        [ Str "Numbered"
+        , Space
+        , Str "list"
+        , Space
+        , Str "item"
+        , Space
+        , Str "1"
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "Numbered"
+        , Space
+        , Str "list"
+        , Space
+        , Str "item"
+        , Space
+        , Str "2"
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "Numbered"
+        , Space
+        , Str "list"
+        , Space
+        , Str "item"
+        , Space
+        , Str "3"
+        ]
+      ]
+    ]
+  , OrderedList
+    ( 1, DefaultStyle, DefaultDelim )
+    [
+      [ Plain
+        [ Str "Numbered"
+        , Space
+        , Str "list"
+        , Space
+        , Str "item"
+        , Space
+        , Str "1"
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "Numbered"
+        , Space
+        , Str "list"
+        , Space
+        , Str "item"
+        , Space
+        , Str "2"
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "Numbered"
+        , Space
+        , Str "list"
+        , Space
+        , Str "item"
+        , Space
+        , Str "3"
+        ]
+      ]
+    ]
+  , BulletList
+    [
+      [ Plain
+        [ Str "Bulleted"
+        , Space
+        , Str "list"
+        , Space
+        , Str "item"
+        , Space
+        , Str "1"
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "Bulleted"
+        , Space
+        , Str "list"
+        , Space
+        , Str "item"
+        , Space
+        , Str "2"
+        ]
+      , OrderedList
+        ( 1, DefaultStyle, DefaultDelim )
+        [
+          [ Plain
+            [ Str "Numbered"
+            , Space
+            , Str "list"
+            , Space
+            , Str "sub"
+            , Space
+            , Str "item"
+            , Space
+            , Str "1"
+            ]
+          ]
+        ,
+          [ Plain
+            [ Str "more", Space, Str "..." ]
+          , BulletList
+            [
+              [ Plain
+                [ Str "and", Space, Str "more", Space, Str "..." ]
+              ]
+            ,
+              [ Plain [ Str "..." ] ]
+            ]
+          ]
+        ,
+          [ Plain
+            [ Str "Numbered"
+            , Space
+            , Str "list"
+            , Space
+            , Str "sub"
+            , Space
+            , Str "item"
+            , Space
+            , Str "3"
+            ]
+          , OrderedList
+            ( 1, DefaultStyle, DefaultDelim )
+            [
+              [ Plain
+                [ Str "Numbered"
+                , Space
+                , Str "list"
+                , Space
+                , Str "sub"
+                , Space
+                , Str "sub"
+                , Space
+                , Str "item"
+                , Space
+                , Str "1"
+                ]
+              ]
+            ,
+              [ Plain
+                [ Str "Numbered"
+                , Space
+                , Str "list"
+                , Space
+                , Str "sub"
+                , Space
+                , Str "sub"
+                , Space
+                , Str "item"
+                , Space
+                , Str "2"
+                ]
+              ]
+            ]
+          ]
+        ,
+          [ Plain [ Str "etc." ] ]
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "Bulleted"
+        , Space
+        , Str "list"
+        , Space
+        , Str "item"
+        , Space
+        , Str "3"
+        ]
+      ]
+    ]
+  , Header 2
+    ( "todo lists", [], [] )
+    [ Str "todo", Space, Str "lists" ]
+  , BulletList
+    [
+      [ Plain
+        [ Span ( "", [ "done0" ], [] ) [], Str "task", Space, Str "1" ]
+      , OrderedList
+        ( 1, DefaultStyle, DefaultDelim )
+        [ [ Plain [ Span ( "", [ "done1" ], [] ) [], Str "5" ] ] ]
+      ]
+    ,
+      [ Plain [ Span ( "", [ "done2" ], [] ) [], Str "3" ] ]
+    ,
+      [ Plain
+        [ Str "[]"
+        , Space
+        , Str "not"
+        , Space
+        , Str "a"
+        , Space
+        , Str "todo"
+        , Space
+        , Str "item"
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "["
+        , Space
+        , Str "]not"
+        , Space
+        , Str "a"
+        , Space
+        , Str "todo"
+        , Space
+        , Str "item"
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "[r]"
+        , Space
+        , Str "not"
+        , Space
+        , Str "a"
+        , Space
+        , Str "todo"
+        , Space
+        , Str "item"
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "["
+        , Space
+        , Str "]"
+        , Space
+        , Str "not"
+        , Space
+        , Str "a"
+        , Space
+        , Str "todo"
+        , Space
+        , Str "item"
+        ]
+      ]
+    ,
+      [ Plain
+        [ Span
+          ( "", [ "done2" ], [] ) []
+        , Str "a"
+        , Space
+        , Str "tab"
+        , Space
+        , Str "in"
+        , Space
+        , Str "the"
+        , Space
+        , Str "todo"
+        , Space
+        , Str "list"
+        , Space
+        , Str "marker"
+        , Space
+        , Code
+          ( "", [], [] ) "[ ]"
+        ]
+      , OrderedList
+        ( 1, DefaultStyle, DefaultDelim )
+        [
+          [ Plain
+            [ Span
+              ( "", [ "done3" ], [] ) []
+            , Str "4"
+            , SoftBreak
+            , Str "5"
+            ]
+          ]
+        ,
+          [ Plain
+            [ Span ( "", [ "done4" ], [] ) [] ]
+          , Table
+            ( "", [], [] )
+            ( Caption Nothing [] )
+            [
+              ( AlignDefault, ColWidthDefault )
+            ,
+              ( AlignDefault, ColWidthDefault )
+            ]
+            ( TableHead
+              ( "", [], [] )
+              [ Row
+                ( "", [], [] )
+                [ Cell
+                  ( "", [], [] ) AlignDefault
+                  ( RowSpan 1 )
+                  ( ColSpan 1 ) []
+                , Cell
+                  ( "", [], [] ) AlignDefault
+                  ( RowSpan 1 )
+                  ( ColSpan 1 ) []
+                ]
+              ]
+            )
+            [ TableBody
+              ( "", [], [] )
+              ( RowHeadColumns 0 ) []
+              [ Row
+                ( "", [], [] )
+                [ Cell
+                  ( "", [], [] ) AlignDefault
+                  ( RowSpan 1 )
+                  ( ColSpan 1 )
+                  [ Plain [ Str "a" ] ]
+                , Cell
+                  ( "", [], [] ) AlignDefault
+                  ( RowSpan 1 )
+                  ( ColSpan 1 )
+                  [ Plain [ Str "b" ] ]
+                ]
+              ]
+            ]
+            ( TableFoot ( "", [], [] ) [] )
+          ]
+        ]
+      ]
+    ,
+      [ Plain
+        [ Span ( "", [ "done4" ], [] ) [], Str "task", Space, Str "2" ]
+      ]
+    ]
+  , Header 2
+    ( "math", [], [] )
+    [ Str "math" ]
+  , Para
+    [ Math InlineMath " \\sum_i a_i^2 = 1 " ]
+  , Para
+    [ Math DisplayMath "\\sum_i a_i^2\n=\n1" ]
+  , Para
+    [ Math DisplayMath "\\begin{aligned}\n\\sum_i a_i^2 &= 1 + 1 \\\\\n&= 2.\n\\end{aligned}" ]
+  , Para
+    [ Str "edge"
+    , Space
+    , Str "case"
+    , Space
+    , Str "(the"
+    , Space
+    , Code
+      ( "", [], [] ) "c^2 + "
+    , Space
+    , Str "after"
+    , Space
+    , Str "the"
+    , Space
+    , Str "multline"
+    , Space
+    , Str "tag"
+    , Space
+    , Str "is"
+    , Space
+    , Str "in"
+    , Space
+    , Str "the"
+    , Space
+    , Str "equation):"
+    ]
+  , Para
+    [ Math DisplayMath "\\begin{gathered}\nc^2 + \na^2 + b^2\n\\end{gathered}" ]
+  , Para
+    [ Str "edge"
+    , Space
+    , Str "case"
+    , Space
+    , Str "(the"
+    , Space
+    , Str "tag"
+    , Space
+    , Str "is"
+    , Space
+    , Code
+      ( "", [], [] ) "hello%bye"
+    , Str ")"
+    ]
+  , Para
+    [ Math DisplayMath "\\begin{hello%bye}\n\\int_a^b f(x) dx\n\\end{hello%bye}" ]
+  , Para
+    [ Str "Just"
+    , Space
+    , Str "two"
+    , Space
+    , Str "dollar"
+    , Space
+    , Str "signs:"
+    , Space
+    , Str "$$"
+    ]
+  , Para
+    [ Str "[not"
+    , Space
+    , Str "math]"
+    , Space
+    , Str "You"
+    , Space
+    , Str "have"
+    , Space
+    , Str "$1"
+    , SoftBreak
+    , Str "and"
+    , Space
+    , Str "I"
+    , Space
+    , Str "have"
+    , Space
+    , Str "$1."
+    ]
+  , Header 2
+    ( "tags", [], [] )
+    [ Str "tags" ]
+  , Para
+    [ Span
+      ( "-tag-one", [], [] )
+      [ Str "" ]
+    , Span
+      ( "tag-one", [ "tag" ], [] )
+      [ Str "tag-one" ]
+    , Space
+    , Span
+      ( "-tag-two", [], [] )
+      [ Str "" ]
+    , Span
+      ( "tag-two", [ "tag" ], [] )
+      [ Str "tag-two" ]
+    ]
+  , Header 2
+    ( "tables", [], [] )
+    [ Str "tables" ]
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignDefault, ColWidthDefault )
+    ,
+      ( AlignDefault, ColWidthDefault )
+    ,
+      ( AlignDefault, ColWidthDefault )
+    ]
+    ( TableHead
+      ( "", [], [] )
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Year" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Temperature", Space, Str "(low)" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "Temperature", Space, Str "(high)" ] ]
+        ]
+      ]
+    )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "1900" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "-10" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "25" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "1910" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "-15" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "30" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "1920" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "-10" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "32" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "1930" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Emph [ Str "N/A" ] ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Emph [ Str "N/A" ] ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "1940" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "-2" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "40" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Header 3
+    ( "centered headerless tables", [], [] )
+    [ Str "centered", Space, Str "headerless", Space, Str "tables" ]
+  , Div
+    ( "", [ "center" ], [] )
+    [ Table
+      ( "", [], [] )
+      ( Caption Nothing [] )
+      [
+        ( AlignDefault, ColWidthDefault )
+      ,
+        ( AlignDefault, ColWidthDefault )
+      ]
+      ( TableHead
+        ( "", [], [] )
+        [ Row
+          ( "", [], [] )
+          [ Cell
+            ( "", [], [] ) AlignDefault
+            ( RowSpan 1 )
+            ( ColSpan 1 ) []
+          , Cell
+            ( "", [], [] ) AlignDefault
+            ( RowSpan 1 )
+            ( ColSpan 1 ) []
+          ]
+        ]
+      )
+      [ TableBody
+        ( "", [], [] )
+        ( RowHeadColumns 0 ) []
+        [ Row
+          ( "", [], [] )
+          [ Cell
+            ( "", [], [] ) AlignDefault
+            ( RowSpan 1 )
+            ( ColSpan 1 )
+            [ Plain [ Str "a" ] ]
+          , Cell
+            ( "", [], [] ) AlignDefault
+            ( RowSpan 1 )
+            ( ColSpan 1 )
+            [ Plain [ Str "b" ] ]
+          ]
+        , Row
+          ( "", [], [] )
+          [ Cell
+            ( "", [], [] ) AlignDefault
+            ( RowSpan 1 )
+            ( ColSpan 1 )
+            [ Plain [ Str "c" ] ]
+          , Cell
+            ( "", [], [] ) AlignDefault
+            ( RowSpan 1 )
+            ( ColSpan 1 )
+            [ Plain [ Str "d" ] ]
+          ]
+        ]
+      ]
+      ( TableFoot ( "", [], [] ) [] )
+    ]
+  , Header 2
+    ( "paragraphs", [], [] )
+    [ Str "paragraphs" ]
+  , Para
+    [ Str "This"
+    , Space
+    , Str "is"
+    , Space
+    , Str "first"
+    , Space
+    , Str "paragraph"
+    , SoftBreak
+    , Str "with"
+    , Space
+    , Str "two"
+    , Space
+    , Str "lines."
+    ]
+  , Para
+    [ Str "This"
+    , Space
+    , Str "is"
+    , Space
+    , Str "a"
+    , Space
+    , Str "second"
+    , Space
+    , Str "paragraph"
+    , Space
+    , Str "with"
+    , SoftBreak
+    , Str "two"
+    , Space
+    , Str "lines"
+    , Space
+    , Str "after"
+    , Space
+    , Str "many"
+    , Space
+    , Str "blank"
+    , Space
+    , Str "lines."
+    ]
+  , Header 2
+    ( "definition list", [], [] )
+    [ Str "definition", Space, Str "list" ]
+  , DefinitionList
+    [
+      (
+        [ Str "Term", Space, Str "1" ]
+      ,
+        [ [ Plain [ Str "Definition", Space, Str "1" ] ] ]
+      )
+    ,
+      (
+        [ Str "Term", Space, Str "2" ]
+      ,
+        [
+          [ Plain [ Str "Definition", Space, Str "2" ] ]
+        ,
+          [ Plain [ Str "Definition", Space, Str "3" ] ]
+        ]
+      )
+    ,
+      (
+        [ Str "Term"
+        , Space
+        , Str "::"
+        , Space
+        , Span
+          ( "separated", [], [] ) []
+        , Strong
+          [ Str "separated" ]
+        , Space
+        , Str "by"
+        , Space
+        , Str "::"
+        , Space
+        , Emph
+          [ Str "double", Space, Str "colons" ]
+        ]
+      ,
+        [ [ Plain [ Str "Def1" ] ], [ Plain [ Str "Def2" ] ] ]
+      )
+    ,
+      (
+        [ Str "Term"
+        , Space
+        , Str "with"
+        , Space
+        , Str "lots"
+        , Space
+        , Str "of"
+        , Space
+        , Str "trailing"
+        , Space
+        , Str "colons:::::::"
+        ]
+      ,
+        [ [ Plain [ Str "Definition" ] ] ]
+      )
+    ,
+      (
+        [ Str "::"
+        , Space
+        , Str "This"
+        , Space
+        , Str "is"
+        , Space
+        , Str "::"
+        , Space
+        , Str "A"
+        , Space
+        , Str "term"
+        , Space
+        , Str "(rather"
+        , Space
+        , Str "than"
+        , Space
+        , Str "a"
+        , Space
+        , Str "definition)"
+        ]
+      ,
+        [
+          [ Plain
+            [ Str "and"
+            , Space
+            , Str "this"
+            , Space
+            , Str "is"
+            , Space
+            , Str "a"
+            , Space
+            , Str "definition"
+            ]
+          ]
+        ]
+      )
+    ,
+      (
+        [ Str "Term", Space, Str "Without", Space, Str "definitions" ]
+      , [ [] ]
+      )
+    ,
+      (
+        [ Str "Part"
+        , Space
+        , Str "::"
+        , Space
+        , Str "of"
+        , Space
+        , Str "::"
+        , Space
+        , Str "dt"
+        ]
+      ,
+        [ [ Plain [ Str "part", Space, Str "of", Space, Str "::dd" ] ] ]
+      )
+    ]
+  , DefinitionList
+    [
+      ( []
+      ,
+        [
+          [ Plain
+            [ Str "Definition"
+            , Space
+            , Str "1"
+            , Space
+            , Str "without"
+            , Space
+            , Str "a"
+            , Space
+            , Str "term"
+            ]
+          ]
+        ,
+          [ Plain
+            [ Str "Definition"
+            , Space
+            , Str "2"
+            , Space
+            , Str "without"
+            , Space
+            , Str "a"
+            , Space
+            , Str "term"
+            ]
+          ]
+        ]
+      )
+    ]
+  , DefinitionList
+    [ ( [ Str "T1" ], [ [ Plain [ Str "D1" ] ] ] ) ]
+  , Para
+    [ Str "new", Space, Str "paragraph" ]
+  , DefinitionList
+    [ ( [ Str "T1" ], [ [ Plain [ Str "D1" ] ] ] ) ]
+  , Para
+    [ Str "Not::Definition" ]
+  , Para
+    [ Str "Not", Space, Str "::Definition" ]
+  , Para
+    [ Str "::Not", Space, Str "definition" ]
+  , BlockQuote
+    [ Plain [ Str "::", Space, Str "blockquote" ] ]
+  , BlockQuote
+    [ Plain [ Str "block", Space, Str "::", Space, Str "quote" ] ]
+  , Header 2
+    ( "metadata placeholders", [], [] )
+    [ Str "metadata", Space, Str "placeholders" ]
+  , Para
+    [ Str "%this"
+    , Space
+    , Str "is"
+    , Space
+    , Str "not"
+    , Space
+    , Str "a"
+    , Space
+    , Str "placeholder"
+    ]
+  , Para
+    [ Str "placeholders"
+    , SoftBreak
+    , Str "serves"
+    , Space
+    , Str "as"
+    , Space
+    , Str "space"
+    , Space
+    , Str "/"
+    , Space
+    , Str "softbreak"
+    , Space
+    , Str "in"
+    , Space
+    , Str "paragraphs"
+    ]
+  , Header 2
+    ( "sup, sub", [], [] )
+    [ Str "sup,", Space, Str "sub" ]
+  , Para
+    [ Str "super", Superscript [ Str "script" ] ]
+  , Para
+    [ Str "sub", Subscript [ Str "script" ] ]
+  , Header 2
+    ( "the todo mark", [], [] )
+    [ Str "the", Space, Str "todo", Space, Str "mark" ]
+  , Para
+    [ Span ( "", [ "todo" ], [] ) [ Str "TODO:" ] ]
+  , Header 1
+    ( "not implemented yet", [], [] )
+    [ Emph
+      [ Span
+        ( "not implemented yet", [], [] ) []
+      , Strong
+        [ Str "not", Space, Str "implemented", Space, Str "yet" ]
+      ]
+    ]
+  , Header 2
+    ( "tables with spans", [], [] )
+    [ Str "tables", Space, Str "with", Space, Str "spans" ]
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignDefault, ColWidthDefault )
+    ,
+      ( AlignDefault, ColWidthDefault )
+    ,
+      ( AlignDefault, ColWidthDefault )
+    ,
+      ( AlignDefault, ColWidthDefault )
+    ]
+    ( TableHead
+      ( "", [], [] )
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        ]
+      ]
+    )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "a" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "b" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "c" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "d" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "\\/" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "e" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str ">" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "f" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "\\/" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "\\/" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str ">" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "g" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "h" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str ">" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str ">" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str ">" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Header 2
+    ( "tables with multiple lines of headers", [], [] )
+    [ Str "tables"
+    , Space
+    , Str "with"
+    , Space
+    , Str "multiple"
+    , Space
+    , Str "lines"
+    , Space
+    , Str "of"
+    , Space
+    , Str "headers"
+    ]
+  , Table
+    ( "", [], [] )
+    ( Caption Nothing [] )
+    [
+      ( AlignDefault, ColWidthDefault )
+    ,
+      ( AlignDefault, ColWidthDefault )
+    ]
+    ( TableHead
+      ( "", [], [] )
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 ) []
+        ]
+      ]
+    )
+    [ TableBody
+      ( "", [], [] )
+      ( RowHeadColumns 0 ) []
+      [ Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "a" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "b" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "c" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "d" ] ]
+        ]
+      , Row
+        ( "", [], [] )
+        [ Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "---" ] ]
+        , Cell
+          ( "", [], [] ) AlignDefault
+          ( RowSpan 1 )
+          ( ColSpan 1 )
+          [ Plain [ Str "---" ] ]
+        ]
+      ]
+    ]
+    ( TableFoot ( "", [], [] ) [] )
+  , Header 2
+    ( "some other placeholders", [], [] )
+    [ Str "some", Space, Str "other", Space, Str "placeholders" ]
+  , Para
+    [ Code
+      ( "", [], [] ) "template"
+    , Space
+    , Str "placeholder"
+    , Space
+    , Str "is"
+    , Space
+    , Str "ignored."
+    ]
+  , Para
+    [ Code
+      ( "", [], [] ) "nohtml"
+    , Space
+    , Str "placeholder"
+    , Space
+    , Str "is"
+    , Space
+    , Str "ignored."
+    ]
+  ]
diff --git a/test/writer.asciidoc b/test/writer.asciidoc
index 61014ed69..f5fce08f7 100644
--- a/test/writer.asciidoc
+++ b/test/writer.asciidoc
@@ -431,8 +431,8 @@ Superscripts: a^bc^d a^_hello_^ a^hello there^.
 
 Subscripts: H~2~O, H~23~O, H~many of them~O.
 
-These should not be superscripts or subscripts, because of the unescaped
-spaces: a^b c^d, a~b c~d.
+These should not be superscripts or subscripts, because of the unescaped spaces:
+a^b c^d, a~b c~d.
 
 '''''
 
@@ -630,10 +630,10 @@ Here is a movie image:movie.jpg[movie] icon.
 
 == Footnotes
 
-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.[multiblock footnote omitted] This should _not_ be a
-footnote reference, because it contains a space.[^my note] Here is an inline
+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.[multiblock footnote omitted] This should _not_ be a footnote
+reference, because it contains a space.[^my note] Here is an inline
 note.footnote:[This is _easier_ to type. Inline notes may contain
 http://google.com[links] and `]` verbatim characters, as well as [bracketed
 text].]
diff --git a/test/writer.asciidoctor b/test/writer.asciidoctor
index 6e920990e..21ec18ec6 100644
--- a/test/writer.asciidoctor
+++ b/test/writer.asciidoctor
@@ -432,8 +432,8 @@ Superscripts: a^bc^d a^_hello_^ a^hello there^.
 
 Subscripts: H~2~O, H~23~O, H~many of them~O.
 
-These should not be superscripts or subscripts, because of the unescaped
-spaces: a^b c^d, a~b c~d.
+These should not be superscripts or subscripts, because of the unescaped spaces:
+a^b c^d, a~b c~d.
 
 '''''
 
@@ -447,8 +447,8 @@ spaces: a^b c^d, a~b c~d.
 
 '`He said, "`I want to go.`"`' Were you alive in the 70’s?
 
-Here is some quoted '``+code+``' and a
-"`http://example.com/?foo=1&bar=2[quoted link]`".
+Here is some quoted '``+code+``' and a "`http://example.com/?foo=1&bar=2[quoted
+link]`".
 
 Some dashes: one—two — three—four — five.
 
@@ -631,10 +631,10 @@ Here is a movie image:movie.jpg[movie] icon.
 
 == Footnotes
 
-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.[multiblock footnote omitted] This should _not_ be a
-footnote reference, because it contains a space.[^my note] Here is an inline
+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.[multiblock footnote omitted] This should _not_ be a footnote
+reference, because it contains a space.[^my note] Here is an inline
 note.footnote:[This is _easier_ to type. Inline notes may contain
 http://google.com[links] and `+]+` verbatim characters, as well as [bracketed
 text].]
diff --git a/test/writer.context b/test/writer.context
index 78667813b..ae45d1580 100644
--- a/test/writer.context
+++ b/test/writer.context
@@ -643,8 +643,8 @@ Superscripts: a\high{bc}d a\high{{\em hello}} a\high{hello~there}.
 
 Subscripts: H\low{2}O, H\low{23}O, H\low{many~of~them}O.
 
-These should not be superscripts or subscripts, because of the unescaped
-spaces: a^b c^d, a\lettertilde{}b c\lettertilde{}d.
+These should not be superscripts or subscripts, because of the unescaped spaces:
+a^b c^d, a\lettertilde{}b c\lettertilde{}d.
 
 \thinrule
 
@@ -878,10 +878,10 @@ Here is a movie {\externalfigure[movie.jpg]} icon.
 
 \section[title={Footnotes},reference={footnotes}]
 
-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.\startbuffer Here's the long 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.\startbuffer 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).
diff --git a/test/writer.docbook4 b/test/writer.docbook4
index 27d91a2f0..baf1937b5 100644
--- a/test/writer.docbook4
+++ b/test/writer.docbook4
@@ -66,8 +66,8 @@


     
       In Markdown 1.0.0 and earlier. Version 8. This line turns into a list
-      item. Because a hard-wrapped line in the middle of a paragraph looked
-      like a list item.
+      item. Because a hard-wrapped line in the middle of a paragraph looked like
+      a list item.
     
     
       Here’s one with a bullet. * criminey.
@@ -1014,19 +1014,19 @@ These should not be escaped:  \$ \\ \> \[ \{
   
     Smart quotes, ellipses, dashes
     
-      Hello, said the spider. Shelob is
-      my name.
+      Hello, said the spider. Shelob is my
+      name.
     
     
       A, B, and C are letters.
     
     
-      Oak, elm, and beech are
-      names of trees. So is pine.
+      Oak, elm, and beech are names
+      of trees. So is pine.
     
     
-      He said, I want to go. Were you alive in
-      the 70’s?
+      He said, I want to go. Were you alive in the
+      70’s?
     
     
       Here is some quoted code and a
@@ -1366,8 +1366,8 @@ or here: <http://example.com/>
     
       Here is a footnote reference,
         
-          Here is the footnote. It can go anywhere after the footnote
-          reference. It need not be placed at the end of the document.
+          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.
         
@@ -1384,14 +1384,12 @@ or here: <http://example.com/>
           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 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].
+          This is easier to type. Inline notes may contain
+          links and ]
+          verbatim characters, as well as [bracketed text].
         
       
     
diff --git a/test/writer.docbook5 b/test/writer.docbook5
index afee571fa..dd73803aa 100644
--- a/test/writer.docbook5
+++ b/test/writer.docbook5
@@ -68,8 +68,8 @@
     
     
       In Markdown 1.0.0 and earlier. Version 8. This line turns into a list
-      item. Because a hard-wrapped line in the middle of a paragraph looked
-      like a list item.
+      item. Because a hard-wrapped line in the middle of a paragraph looked like
+      a list item.
     
     
       Here’s one with a bullet. * criminey.
@@ -989,19 +989,19 @@ These should not be escaped:  \$ \\ \> \[ \{
   
     Smart quotes, ellipses, dashes
     
-      Hello, said the spider. Shelob is
-      my name.
+      Hello, said the spider. Shelob is my
+      name.
     
     
       A, B, and C are letters.
     
     
-      Oak, elm, and beech are
-      names of trees. So is pine.
+      Oak, elm, and beech are names
+      of trees. So is pine.
     
     
-      He said, I want to go. Were you alive in
-      the 70’s?
+      He said, I want to go. Were you alive in the
+      70’s?
     
     
       Here is some quoted code and a
@@ -1266,8 +1266,7 @@ These should not be escaped:  \$ \\ \> \[ \{
         AT&T.
       
       
-        Here’s an inline
-        link.
+        Here’s an inline link.
       
       
         Here’s an inline link in
@@ -1342,8 +1341,8 @@ or here: <http://example.com/>
     
       Here is a footnote reference,
         
-          Here is the footnote. It can go anywhere after the footnote
-          reference. It need not be placed at the end of the document.
+          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.
         
@@ -1360,14 +1359,12 @@ or here: <http://example.com/>
           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 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].
+          This is easier to type. Inline notes may contain
+          links and
+          ] verbatim characters, as well as [bracketed text].
         
       
     
diff --git a/test/writer.haddock b/test/writer.haddock
index fbe6c257b..82c45f358 100644
--- a/test/writer.haddock
+++ b/test/writer.haddock
@@ -1,7 +1,7 @@
 This is a set of tests for pandoc. Most of them are adapted from John Gruber’s
 markdown test suite.
 
-______________________________________________________________________________
+________________________________________________________________________________
 
 = Headers
 #headers#
@@ -34,7 +34,7 @@ with no blank line
 
 with no blank line
 
-______________________________________________________________________________
+________________________________________________________________________________
 
 = Paragraphs
 #paragraphs#
@@ -50,7 +50,7 @@ Here’s one with a bullet. * criminey.
 There should be a hard line break
 here.
 
-______________________________________________________________________________
+________________________________________________________________________________
 
 = Block Quotes
 #block-quotes#
@@ -80,7 +80,7 @@ This should not be a block quote: 2 > 1.
 
 And a following paragraph.
 
-______________________________________________________________________________
+________________________________________________________________________________
 
 = Code Blocks
 #code-blocks#
@@ -101,7 +101,7 @@ And:
 >
 > These should not be escaped:  \$ \\ \> \[ \{
 
-______________________________________________________________________________
+________________________________________________________________________________
 
 = Lists
 #lists#
@@ -265,7 +265,7 @@ M.A. 2007
 
 B. Williams
 
-______________________________________________________________________________
+________________________________________________________________________________
 
 = Definition Lists
 #definition-lists#
@@ -398,7 +398,7 @@ Code:
 
 Hr’s:
 
-______________________________________________________________________________
+________________________________________________________________________________
 
 = Inline Markup
 #inline-markup#
@@ -425,10 +425,10 @@ Superscripts: abcd a/hello/ ahello there.
 
 Subscripts: H2O, H23O, Hmany of themO.
 
-These should not be superscripts or subscripts, because of the unescaped
-spaces: a^b c^d, a~b c~d.
+These should not be superscripts or subscripts, because of the unescaped spaces:
+a^b c^d, a~b c~d.
 
-______________________________________________________________________________
+________________________________________________________________________________
 
 = Smart quotes, ellipses, dashes
 #smart-quotes-ellipses-dashes#
@@ -450,7 +450,7 @@ Dashes between numbers: 5–7, 255–66, 1987–1999.
 
 Ellipses…and…and….
 
-______________________________________________________________________________
+________________________________________________________________________________
 
 = LaTeX
 #latex#
@@ -475,7 +475,7 @@ These shouldn’t be math:
 
 Here’s a LaTeX table:
 
-______________________________________________________________________________
+________________________________________________________________________________
 
 = Special Characters
 #special-characters#
@@ -530,7 +530,7 @@ Plus: +
 
 Minus: -
 
-______________________________________________________________________________
+________________________________________________________________________________
 
 = Links
 #links#
@@ -607,7 +607,7 @@ Auto-links should not occur here: @\@
 
 > or here: 
 
-______________________________________________________________________________
+________________________________________________________________________________
 
 = Images
 #images#
@@ -618,14 +618,14 @@ From “Voyage dans la Lune” by Georges Melies (1902):
 
 Here is a movie <> icon.
 
-______________________________________________________________________________
+________________________________________________________________________________
 
 = Footnotes
 #footnotes#
 
 Here is a footnote reference,<#notes [1]> and another.<#notes [2]> This should
-/not/ be a footnote reference, because it contains a space.[^my note] Here is
-an inline note.<#notes [3]>
+/not/ be a footnote reference, because it contains a space.[^my note] Here is an
+inline note.<#notes [3]>
 
 Notes can go in quotes.<#notes [4]>
 
@@ -640,17 +640,16 @@ This paragraph should not be part of the note, as it is not indented.
 
 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).
+    Subsequent blocks are indented to show that they belong to the 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.
 
-3.  This is /easier/ to type. Inline notes may contain
-     and @]@ verbatim characters, as well as
-    [bracketed text].
+3.  This is /easier/ to type. Inline notes may contain 
+    and @]@ verbatim characters, as well as [bracketed text].
 
 4.  In quote.
 
diff --git a/test/writer.jats_archiving b/test/writer.jats_archiving
index 70e15b6b8..cc9cdb323 100644
--- a/test/writer.jats_archiving
+++ b/test/writer.jats_archiving
@@ -68,9 +68,9 @@ Gruber’s markdown test suite.
 
   Paragraphs
   Here’s a regular paragraph.
-  In Markdown 1.0.0 and earlier. Version 8. This line turns into a list
-  item. Because a hard-wrapped line in the middle of a paragraph looked like a
-  list item.
+  In Markdown 1.0.0 and earlier. Version 8. This line turns into a list item.
+  Because a hard-wrapped line in the middle of a paragraph looked like a list
+  item.
   Here’s one with a bullet. * criminey.
   There should be a hard line break
   here.
@@ -634,8 +634,7 @@ These should not be escaped:  \$ \\ \> \[ \{
   This is strikeout.
   Superscripts: a^bcd a^hello
   a^hello there.
-  Subscripts: H₂O, H₂₃O,
-  H_{many of them}O.
+  Subscripts: H₂O, H₂₃O, H_{many of them}O.
   These should not be superscripts or subscripts, because of the unescaped
   spaces: a^b c^d, a~b c~d.
 
@@ -689,8 +688,7 @@ These should not be escaped:  \$ \\ \> \[ \{
       ddxf(x)=limh→0f(x+h)−f(x)h
     
     
-      Here’s one that has a line break in it:
-      
+      
Here’s one that has a line break in it: 
       
       α+ω×x2.
     
@@ -780,8 +778,7 @@ These should not be escaped:  \$ \\ \> \[ \{
   
   
     Reference
-    Foo
-    bar.
+    Foo bar.
     With embedded
     [brackets].
     b by itself
@@ -853,9 +850,8 @@ These should not be escaped:  \$ \\ \> \[ \{
   Footnotes
   
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
+  not be a footnote reference, because it contains a space.[^my
+  note] Here is an inline note.3
   
     Notes can go in quotes.4
   
@@ -881,12 +877,12 @@ These should not be escaped:  \$ \\ \> \[ \{
     
         { <code> }
     
-    If you want, you can indent every line, but you can also be lazy and
-    just indent the first line of each block.
+    If you want, you can indent every line, but you can also be lazy and just
+    indent the first line of each block.
   
   
-    3This is easier to type. Inline notes
-    may contain
+    3
This is easier to type. Inline notes may
+    contain
     links
     and ] verbatim characters, as well as [bracketed
     text].
diff --git a/test/writer.jats_articleauthoring b/test/writer.jats_articleauthoring
index 59485a114..c2bddccb6 100644
--- a/test/writer.jats_articleauthoring
+++ b/test/writer.jats_articleauthoring
@@ -57,9 +57,9 @@ Gruber’s markdown test suite.
 
   Paragraphs
   Here’s a regular paragraph.
-  In Markdown 1.0.0 and earlier. Version 8. This line turns into a list
-  item. Because a hard-wrapped line in the middle of a paragraph looked like a
-  list item.
+  In Markdown 1.0.0 and earlier. Version 8. This line turns into a list item.
+  Because a hard-wrapped line in the middle of a paragraph looked like a list
+  item.
   Here’s one with a bullet. * criminey.
   There should be a hard line break
   here.
@@ -631,8 +631,7 @@ These should not be escaped:  \$ \\ \> \[ \{
   This is strikeout.
   Superscripts: a^bcd a^hello
   a^hello there.
-  Subscripts: H₂O, H₂₃O,
-  H_{many of them}O.
+  Subscripts: H₂O, H₂₃O, H_{many of them}O.
   These should not be superscripts or subscripts, because of the unescaped
   spaces: a^b c^d, a~b c~d.
 
@@ -764,8 +763,7 @@ These should not be escaped:  \$ \\ \> \[ \{
   
   
     Reference
-    Foo
-    bar.
+    Foo bar.
     With embedded
     [brackets].
     b by itself
@@ -836,8 +834,8 @@ These should not be escaped:  \$ \\ \> \[ \{
 
   Footnotes
   
Here is a footnote reference,
-    
Here is the footnote. It can go anywhere after the footnote reference.
-    It need not be placed at the end of the document.
+    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
@@ -845,8 +843,8 @@ These should not be escaped:  \$ \\ \> \[ \{
     

         { <code> }
     
-    If you want, you can indent every line, but you can also be lazy and
-    just indent the first line of each block.
+    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
diff --git a/test/writer.jats_publishing b/test/writer.jats_publishing
index e6db4172a..3d4f8ddb3 100644
--- a/test/writer.jats_publishing
+++ b/test/writer.jats_publishing
@@ -68,9 +68,9 @@ Gruber’s markdown test suite.
 
   Paragraphs
   Here’s a regular paragraph.
-  In Markdown 1.0.0 and earlier. Version 8. This line turns into a list
-  item. Because a hard-wrapped line in the middle of a paragraph looked like a
-  list item.
+  In Markdown 1.0.0 and earlier. Version 8. This line turns into a list item.
+  Because a hard-wrapped line in the middle of a paragraph looked like a list
+  item.
   Here’s one with a bullet. * criminey.
   There should be a hard line break
   here.
@@ -634,8 +634,7 @@ These should not be escaped:  \$ \\ \> \[ \{
   This is strikeout.
   Superscripts: a^bcd a^hello
   a^hello there.
-  Subscripts: H₂O, H₂₃O,
-  H_{many of them}O.
+  Subscripts: H₂O, H₂₃O, H_{many of them}O.
   These should not be superscripts or subscripts, because of the unescaped
   spaces: a^b c^d, a~b c~d.
 
@@ -689,8 +688,7 @@ These should not be escaped:  \$ \\ \> \[ \{
       ddxf(x)=limh→0f(x+h)−f(x)h
     
     
-      Here’s one that has a line break in it:
-      
+      
Here’s one that has a line break in it: 
       
       α+ω×x2.
     
@@ -780,8 +778,7 @@ These should not be escaped:  \$ \\ \> \[ \{
   
   
     Reference
-    Foo
-    bar.
+    Foo bar.
     With embedded
     [brackets].
     b by itself
@@ -853,9 +850,8 @@ These should not be escaped:  \$ \\ \> \[ \{
   Footnotes
   
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
+  not be a footnote reference, because it contains a space.[^my
+  note] Here is an inline note.3
   
     Notes can go in quotes.4
   
@@ -881,12 +877,12 @@ These should not be escaped:  \$ \\ \> \[ \{
     
         { <code> }
     
-    If you want, you can indent every line, but you can also be lazy and
-    just indent the first line of each block.
+    If you want, you can indent every line, but you can also be lazy and just
+    indent the first line of each block.
   
   
-    3This is easier to type. Inline notes
-    may contain
+    3
This is easier to type. Inline notes may
+    contain
     links
     and ] verbatim characters, as well as [bracketed
     text].
diff --git a/test/writer.latex b/test/writer.latex
index abf772df4..a89078b31 100644
--- a/test/writer.latex
+++ b/test/writer.latex
@@ -711,8 +711,8 @@ a\textsuperscript{hello~there}.
 Subscripts: H\textsubscript{2}O, H\textsubscript{23}O,
 H\textsubscript{many~of~them}O.
 
-These should not be superscripts or subscripts, because of the unescaped
-spaces: a\^{}b c\^{}d, a\textasciitilde b c\textasciitilde d.
+These should not be superscripts or subscripts, because of the unescaped spaces:
+a\^{}b c\^{}d, a\textasciitilde b c\textasciitilde d.
 
 \begin{center}\rule{0.5\linewidth}{0.5pt}\end{center}
 
@@ -905,8 +905,7 @@ Foo \href{/url/}{biz}.
 Here's a \href{http://example.com/?foo=1\&bar=2}{link with an ampersand in the
 URL}.
 
-Here's a link with an amersand in the link text:
-\href{http://att.com/}{AT\&T}.
+Here's a link with an amersand in the link text: \href{http://att.com/}{AT\&T}.
 
 Here's an \href{/script?foo=1\&bar=2}{inline link}.
 
@@ -961,9 +960,9 @@ Here is a movie \includegraphics{movie.jpg} icon.
 \hypertarget{footnotes}{%
 \section{Footnotes}\label{footnotes}}
 
-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
+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
@@ -977,8 +976,8 @@ Here is a footnote reference,\footnote{Here is the footnote. It can go
   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 \texttt{{]}} verbatim characters, as
-  well as {[}bracketed text{]}.}
+  \href{http://google.com}{links} and \texttt{{]}} verbatim characters, as well
+  as {[}bracketed text{]}.}
 
 \begin{quote}
 Notes can go in quotes.\footnote{In quote.}
diff --git a/test/writer.man b/test/writer.man
index d3f1dfe14..d1d3cfd33 100644
--- a/test/writer.man
+++ b/test/writer.man
@@ -496,8 +496,8 @@ Superscripts: a^bc^d a^\f[I]hello\f[R]^ a^hello\ there^.
 .PP
 Subscripts: H~2~O, H~23~O, H~many\ of\ them~O.
 .PP
-These should not be superscripts or subscripts, because of the unescaped
-spaces: a\[ha]b c\[ha]d, a\[ti]b c\[ti]d.
+These should not be superscripts or subscripts, because of the unescaped spaces:
+a\[ha]b c\[ha]d, a\[ti]b c\[ti]d.
 .PP
    *   *   *   *   *
 .SH Smart quotes, ellipses, dashes
@@ -706,9 +706,9 @@ Here is a movie [IMAGE: movie] icon.
    *   *   *   *   *
 .SH Footnotes
 .PP
-Here is a footnote reference,[1] and another.[2] This should \f[I]not\f[R] be
-a footnote reference, because it contains a space.[\[ha]my note] Here is an
-inline note.[3]
+Here is a footnote reference,[1] and another.[2] This should \f[I]not\f[R] be a
+footnote reference, because it contains a space.[\[ha]my note] Here is an inline
+note.[3]
 .RS
 .PP
 Notes can go in quotes.[4]
@@ -728,8 +728,8 @@ It need not be placed at the end of the document.
 Here\[cq]s the long note.
 This one contains multiple blocks.
 .PP
-Subsequent blocks are indented to show that they belong to the footnote (as
-with list items).
+Subsequent blocks are indented to show that they belong to the footnote (as with
+list items).
 .IP
 .nf
 \f[C]
@@ -737,8 +737,8 @@ with list items).
 \f[R]
 .fi
 .PP
-If you want, you can indent every line, but you can also be lazy and just
-indent the first line of each block.
+If you want, you can indent every line, but you can also be lazy and just indent
+the first line of each block.
 .SS [3]
 .PP
 This is \f[I]easier\f[R] to type.
diff --git a/test/writer.markdown b/test/writer.markdown
index 6a149882c..375e1b864 100644
--- a/test/writer.markdown
+++ b/test/writer.markdown
@@ -9,7 +9,7 @@ title: Pandoc Test Suite
 This is a set of tests for pandoc. Most of them are adapted from John Gruber's
 markdown test suite.
 
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
 
 # Headers
 
@@ -33,7 +33,7 @@ with no blank line
 
 with no blank line
 
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
 
 # Paragraphs
 
@@ -48,7 +48,7 @@ Here's one with a bullet. \* criminey.
 There should be a hard line break\
 here.
 
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
 
 # Block Quotes
 
@@ -77,7 +77,7 @@ This should not be a block quote: 2 \> 1.
 
 And a following paragraph.
 
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
 
 # Code Blocks
 
@@ -97,7 +97,7 @@ And:
 
     These should not be escaped:  \$ \\ \> \[ \{
 
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
 
 # Lists
 
@@ -254,7 +254,7 @@ M.A. 2007
 
 B. Williams
 
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
 
 # Definition Lists
 
@@ -507,7 +507,7 @@ Hr's:
 
 ```
 
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
 
 # Inline Markup
 
@@ -533,10 +533,10 @@ Superscripts: a^bc^d a^*hello*^ a^hello there^.
 
 Subscripts: H~2~O, H~23~O, H~many of them~O.
 
-These should not be superscripts or subscripts, because of the unescaped
-spaces: a\^b c\^d, a\~b c\~d.
+These should not be superscripts or subscripts, because of the unescaped spaces:
+a\^b c\^d, a\~b c\~d.
 
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
 
 # Smart quotes, ellipses, dashes
 
@@ -557,7 +557,7 @@ Dashes between numbers: 5--7, 255--66, 1987--1999.
 
 Ellipses...and...and....
 
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
 
 # LaTeX
 
@@ -589,7 +589,7 @@ Cat    & 1      \\ \hline
 \end{tabular}
 ```
 
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
 
 # Special Characters
 
@@ -643,7 +643,7 @@ Plus: +
 
 Minus: -
 
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
 
 # Links
 
@@ -693,8 +693,7 @@ Foo [biz](/url/ "Title with "quote" inside").
 
 Here's a [link with an ampersand in the URL](http://example.com/?foo=1&bar=2).
 
-Here's a link with an amersand in the link text:
-[AT&T](http://att.com/ "AT&T").
+Here's a link with an amersand in the link text: [AT&T](http://att.com/ "AT&T").
 
 Here's an [inline link](/script?foo=1&bar=2).
 
@@ -716,7 +715,7 @@ Auto-links should not occur here: ``
 
     or here: 
 
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
 
 # Images
 
@@ -726,13 +725,13 @@ From "Voyage dans la Lune" by Georges Melies (1902):
 
 Here is a movie ![movie](movie.jpg) icon.
 
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
 
 # Footnotes
 
 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]
+footnote reference, because it contains a space.\[\^my note\] Here is an inline
+note.[^3]
 
 > Notes can go in quotes.[^4]
 
@@ -740,13 +739,13 @@ 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.
+[^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).
+    Subsequent blocks are indented to show that they belong to the footnote (as
+    with list items).
 
           {  }
 
diff --git a/test/writer.ms b/test/writer.ms
index 329c959fc..fc2e66a34 100644
--- a/test/writer.ms
+++ b/test/writer.ms
@@ -653,8 +653,8 @@ Superscripts: a\*{bc\*}d a\*{\f[I]hello\f[R]\*} a\*{hello\ there\*}.
 .PP
 Subscripts: H\*<2\*>O, H\*<23\*>O, H\*O.
 .PP
-These should not be superscripts or subscripts, because of the unescaped
-spaces: a\[ha]b c\[ha]d, a\[ti]b c\[ti]d.
+These should not be superscripts or subscripts, because of the unescaped spaces:
+a\[ha]b c\[ha]d, a\[ti]b c\[ti]d.
 .HLINE
 .SH 1
 Smart quotes, ellipses, dashes
@@ -973,8 +973,8 @@ and another.\**
 Here\[cq]s the long note.
 This one contains multiple blocks.
 .PP
-Subsequent blocks are indented to show that they belong to the footnote (as
-with list items).
+Subsequent blocks are indented to show that they belong to the footnote (as with
+list items).
 .IP
 .nf
 \f[C]
@@ -982,8 +982,8 @@ with list items).
 \f[]
 .fi
 .LP
-If you want, you can indent every line, but you can also be lazy and just
-indent the first line of each block.
+If you want, you can indent every line, but you can also be lazy and just indent
+the first line of each block.
 .FE
 This should \f[I]not\f[R] be a footnote reference, because it contains a
 space.[\[ha]my note] Here is an inline note.\**
diff --git a/test/writer.muse b/test/writer.muse
index d9efdddd5..2c96f6bf2 100644
--- a/test/writer.muse
+++ b/test/writer.muse
@@ -483,8 +483,8 @@ Superscripts: a^bcd a^*hello* a^hello there.
 
 Subscripts: H₂O, H₂₃O, H_{many of them}O.
 
-These should not be superscripts or subscripts, because of the unescaped
-spaces: a^b c^d, a~b c~d.
+These should not be superscripts or subscripts, because of the unescaped spaces:
+a^b c^d, a~b c~d.
 
 ----
 
@@ -643,8 +643,7 @@ Foo [[/url/][biz]].
 
 ** With ampersands
 
-Here’s a [[http://example.com/?foo=1&bar=2][link with an ampersand in the
-URL]].
+Here’s a [[http://example.com/?foo=1&bar=2][link with an ampersand in the URL]].
 
 Here’s a link with an amersand in the link text: [[http://att.com/][AT&T]].
 
@@ -686,9 +685,8 @@ Here is a movie [[movie.jpg][movie]] icon.
 
 * Footnotes
 
-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]
+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]
@@ -703,8 +701,8 @@ This paragraph should not be part of the note, as it is not indented.
 
 [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).
+    Subsequent blocks are indented to show that they belong to the footnote (as
+    with list items).
 
     
       {  }
diff --git a/test/writer.native b/test/writer.native
index f9132c797..e86464f3e 100644
--- a/test/writer.native
+++ b/test/writer.native
@@ -1,409 +1,2385 @@
-Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "John",Space,Str "MacFarlane"],MetaInlines [Str "Anonymous"]]),("date",MetaInlines [Str "July",Space,Str "17,",Space,Str "2006"]),("title",MetaInlines [Str "Pandoc",Space,Str "Test",Space,Str "Suite"])]})
-[Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "set",Space,Str "of",Space,Str "tests",Space,Str "for",Space,Str "pandoc.",Space,Str "Most",Space,Str "of",Space,Str "them",Space,Str "are",Space,Str "adapted",Space,Str "from",SoftBreak,Str "John",Space,Str "Gruber\8217s",Space,Str "markdown",Space,Str "test",Space,Str "suite."]
-,HorizontalRule
-,Header 1 ("headers",[],[]) [Str "Headers"]
-,Header 2 ("level-2-with-an-embedded-link",[],[]) [Str "Level",Space,Str "2",Space,Str "with",Space,Str "an",Space,Link ("",[],[]) [Str "embedded",Space,Str "link"] ("/url","")]
-,Header 3 ("level-3-with-emphasis",[],[]) [Str "Level",Space,Str "3",Space,Str "with",Space,Emph [Str "emphasis"]]
-,Header 4 ("level-4",[],[]) [Str "Level",Space,Str "4"]
-,Header 5 ("level-5",[],[]) [Str "Level",Space,Str "5"]
-,Header 1 ("level-1",[],[]) [Str "Level",Space,Str "1"]
-,Header 2 ("level-2-with-emphasis",[],[]) [Str "Level",Space,Str "2",Space,Str "with",Space,Emph [Str "emphasis"]]
-,Header 3 ("level-3",[],[]) [Str "Level",Space,Str "3"]
-,Para [Str "with",Space,Str "no",Space,Str "blank",Space,Str "line"]
-,Header 2 ("level-2",[],[]) [Str "Level",Space,Str "2"]
-,Para [Str "with",Space,Str "no",Space,Str "blank",Space,Str "line"]
-,HorizontalRule
-,Header 1 ("paragraphs",[],[]) [Str "Paragraphs"]
-,Para [Str "Here\8217s",Space,Str "a",Space,Str "regular",Space,Str "paragraph."]
-,Para [Str "In",Space,Str "Markdown",Space,Str "1.0.0",Space,Str "and",Space,Str "earlier.",Space,Str "Version",SoftBreak,Str "8.",Space,Str "This",Space,Str "line",Space,Str "turns",Space,Str "into",Space,Str "a",Space,Str "list",Space,Str "item.",SoftBreak,Str "Because",Space,Str "a",Space,Str "hard-wrapped",Space,Str "line",Space,Str "in",Space,Str "the",SoftBreak,Str "middle",Space,Str "of",Space,Str "a",Space,Str "paragraph",Space,Str "looked",Space,Str "like",Space,Str "a",SoftBreak,Str "list",Space,Str "item."]
-,Para [Str "Here\8217s",Space,Str "one",Space,Str "with",Space,Str "a",Space,Str "bullet.",SoftBreak,Str "*",Space,Str "criminey."]
-,Para [Str "There",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "hard",Space,Str "line",Space,Str "break",LineBreak,Str "here."]
-,HorizontalRule
-,Header 1 ("block-quotes",[],[]) [Str "Block",Space,Str "Quotes"]
-,Para [Str "E-mail",Space,Str "style:"]
-,BlockQuote
- [Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "block",Space,Str "quote.",SoftBreak,Str "It",Space,Str "is",Space,Str "pretty",Space,Str "short."]]
-,BlockQuote
- [Para [Str "Code",Space,Str "in",Space,Str "a",Space,Str "block",Space,Str "quote:"]
- ,CodeBlock ("",[],[]) "sub status {\n    print \"working\";\n}"
- ,Para [Str "A",Space,Str "list:"]
- ,OrderedList (1,Decimal,Period)
-  [[Plain [Str "item",Space,Str "one"]]
-  ,[Plain [Str "item",Space,Str "two"]]]
- ,Para [Str "Nested",Space,Str "block",Space,Str "quotes:"]
- ,BlockQuote
-  [Para [Str "nested"]]
- ,BlockQuote
-  [Para [Str "nested"]]]
-,Para [Str "This",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "a",Space,Str "block",Space,Str "quote:",Space,Str "2",SoftBreak,Str ">",Space,Str "1."]
-,Para [Str "And",Space,Str "a",Space,Str "following",Space,Str "paragraph."]
-,HorizontalRule
-,Header 1 ("code-blocks",[],[]) [Str "Code",Space,Str "Blocks"]
-,Para [Str "Code:"]
-,CodeBlock ("",[],[]) "---- (should be four hyphens)\n\nsub status {\n    print \"working\";\n}\n\nthis code block is indented by one tab"
-,Para [Str "And:"]
-,CodeBlock ("",[],[]) "    this code block is indented by two tabs\n\nThese should not be escaped:  \\$ \\\\ \\> \\[ \\{"
-,HorizontalRule
-,Header 1 ("lists",[],[]) [Str "Lists"]
-,Header 2 ("unordered",[],[]) [Str "Unordered"]
-,Para [Str "Asterisks",Space,Str "tight:"]
-,BulletList
- [[Plain [Str "asterisk",Space,Str "1"]]
- ,[Plain [Str "asterisk",Space,Str "2"]]
- ,[Plain [Str "asterisk",Space,Str "3"]]]
-,Para [Str "Asterisks",Space,Str "loose:"]
-,BulletList
- [[Para [Str "asterisk",Space,Str "1"]]
- ,[Para [Str "asterisk",Space,Str "2"]]
- ,[Para [Str "asterisk",Space,Str "3"]]]
-,Para [Str "Pluses",Space,Str "tight:"]
-,BulletList
- [[Plain [Str "Plus",Space,Str "1"]]
- ,[Plain [Str "Plus",Space,Str "2"]]
- ,[Plain [Str "Plus",Space,Str "3"]]]
-,Para [Str "Pluses",Space,Str "loose:"]
-,BulletList
- [[Para [Str "Plus",Space,Str "1"]]
- ,[Para [Str "Plus",Space,Str "2"]]
- ,[Para [Str "Plus",Space,Str "3"]]]
-,Para [Str "Minuses",Space,Str "tight:"]
-,BulletList
- [[Plain [Str "Minus",Space,Str "1"]]
- ,[Plain [Str "Minus",Space,Str "2"]]
- ,[Plain [Str "Minus",Space,Str "3"]]]
-,Para [Str "Minuses",Space,Str "loose:"]
-,BulletList
- [[Para [Str "Minus",Space,Str "1"]]
- ,[Para [Str "Minus",Space,Str "2"]]
- ,[Para [Str "Minus",Space,Str "3"]]]
-,Header 2 ("ordered",[],[]) [Str "Ordered"]
-,Para [Str "Tight:"]
-,OrderedList (1,Decimal,Period)
- [[Plain [Str "First"]]
- ,[Plain [Str "Second"]]
- ,[Plain [Str "Third"]]]
-,Para [Str "and:"]
-,OrderedList (1,Decimal,Period)
- [[Plain [Str "One"]]
- ,[Plain [Str "Two"]]
- ,[Plain [Str "Three"]]]
-,Para [Str "Loose",Space,Str "using",Space,Str "tabs:"]
-,OrderedList (1,Decimal,Period)
- [[Para [Str "First"]]
- ,[Para [Str "Second"]]
- ,[Para [Str "Third"]]]
-,Para [Str "and",Space,Str "using",Space,Str "spaces:"]
-,OrderedList (1,Decimal,Period)
- [[Para [Str "One"]]
- ,[Para [Str "Two"]]
- ,[Para [Str "Three"]]]
-,Para [Str "Multiple",Space,Str "paragraphs:"]
-,OrderedList (1,Decimal,Period)
- [[Para [Str "Item",Space,Str "1,",Space,Str "graf",Space,Str "one."]
-  ,Para [Str "Item",Space,Str "1.",Space,Str "graf",Space,Str "two.",Space,Str "The",Space,Str "quick",Space,Str "brown",Space,Str "fox",Space,Str "jumped",Space,Str "over",Space,Str "the",Space,Str "lazy",Space,Str "dog\8217s",SoftBreak,Str "back."]]
- ,[Para [Str "Item",Space,Str "2."]]
- ,[Para [Str "Item",Space,Str "3."]]]
-,Header 2 ("nested",[],[]) [Str "Nested"]
-,BulletList
- [[Plain [Str "Tab"]
-  ,BulletList
-   [[Plain [Str "Tab"]
-    ,BulletList
-     [[Plain [Str "Tab"]]]]]]]
-,Para [Str "Here\8217s",Space,Str "another:"]
-,OrderedList (1,Decimal,Period)
- [[Plain [Str "First"]]
- ,[Plain [Str "Second:"]
-  ,BulletList
-   [[Plain [Str "Fee"]]
-   ,[Plain [Str "Fie"]]
-   ,[Plain [Str "Foe"]]]]
- ,[Plain [Str "Third"]]]
-,Para [Str "Same",Space,Str "thing",Space,Str "but",Space,Str "with",Space,Str "paragraphs:"]
-,OrderedList (1,Decimal,Period)
- [[Para [Str "First"]]
- ,[Para [Str "Second:"]
-  ,BulletList
-   [[Plain [Str "Fee"]]
-   ,[Plain [Str "Fie"]]
-   ,[Plain [Str "Foe"]]]]
- ,[Para [Str "Third"]]]
-,Header 2 ("tabs-and-spaces",[],[]) [Str "Tabs",Space,Str "and",Space,Str "spaces"]
-,BulletList
- [[Para [Str "this",Space,Str "is",Space,Str "a",Space,Str "list",Space,Str "item",SoftBreak,Str "indented",Space,Str "with",Space,Str "tabs"]]
- ,[Para [Str "this",Space,Str "is",Space,Str "a",Space,Str "list",Space,Str "item",SoftBreak,Str "indented",Space,Str "with",Space,Str "spaces"]
-  ,BulletList
-   [[Para [Str "this",Space,Str "is",Space,Str "an",Space,Str "example",Space,Str "list",Space,Str "item",SoftBreak,Str "indented",Space,Str "with",Space,Str "tabs"]]
-   ,[Para [Str "this",Space,Str "is",Space,Str "an",Space,Str "example",Space,Str "list",Space,Str "item",SoftBreak,Str "indented",Space,Str "with",Space,Str "spaces"]]]]]
-,Header 2 ("fancy-list-markers",[],[]) [Str "Fancy",Space,Str "list",Space,Str "markers"]
-,OrderedList (2,Decimal,TwoParens)
- [[Para [Str "begins",Space,Str "with",Space,Str "2"]]
- ,[Para [Str "and",Space,Str "now",Space,Str "3"]
-  ,Para [Str "with",Space,Str "a",Space,Str "continuation"]
-  ,OrderedList (4,LowerRoman,Period)
-   [[Plain [Str "sublist",Space,Str "with",Space,Str "roman",Space,Str "numerals,",SoftBreak,Str "starting",Space,Str "with",Space,Str "4"]]
-   ,[Plain [Str "more",Space,Str "items"]
-    ,OrderedList (1,UpperAlpha,TwoParens)
-     [[Plain [Str "a",Space,Str "subsublist"]]
-     ,[Plain [Str "a",Space,Str "subsublist"]]]]]]]
-,Para [Str "Nesting:"]
-,OrderedList (1,UpperAlpha,Period)
- [[Plain [Str "Upper",Space,Str "Alpha"]
-  ,OrderedList (1,UpperRoman,Period)
-   [[Plain [Str "Upper",Space,Str "Roman."]
-    ,OrderedList (6,Decimal,TwoParens)
-     [[Plain [Str "Decimal",Space,Str "start",Space,Str "with",Space,Str "6"]
-      ,OrderedList (3,LowerAlpha,OneParen)
-       [[Plain [Str "Lower",Space,Str "alpha",Space,Str "with",Space,Str "paren"]]]]]]]]]
-,Para [Str "Autonumbering:"]
-,OrderedList (1,DefaultStyle,DefaultDelim)
- [[Plain [Str "Autonumber."]]
- ,[Plain [Str "More."]
-  ,OrderedList (1,DefaultStyle,DefaultDelim)
-   [[Plain [Str "Nested."]]]]]
-,Para [Str "Should",Space,Str "not",Space,Str "be",Space,Str "a",Space,Str "list",Space,Str "item:"]
-,Para [Str "M.A.\160\&2007"]
-,Para [Str "B.",Space,Str "Williams"]
-,HorizontalRule
-,Header 1 ("definition-lists",[],[]) [Str "Definition",Space,Str "Lists"]
-,Para [Str "Tight",Space,Str "using",Space,Str "spaces:"]
-,DefinitionList
- [([Str "apple"],
-   [[Plain [Str "red",Space,Str "fruit"]]])
- ,([Str "orange"],
-   [[Plain [Str "orange",Space,Str "fruit"]]])
- ,([Str "banana"],
-   [[Plain [Str "yellow",Space,Str "fruit"]]])]
-,Para [Str "Tight",Space,Str "using",Space,Str "tabs:"]
-,DefinitionList
- [([Str "apple"],
-   [[Plain [Str "red",Space,Str "fruit"]]])
- ,([Str "orange"],
-   [[Plain [Str "orange",Space,Str "fruit"]]])
- ,([Str "banana"],
-   [[Plain [Str "yellow",Space,Str "fruit"]]])]
-,Para [Str "Loose:"]
-,DefinitionList
- [([Str "apple"],
-   [[Para [Str "red",Space,Str "fruit"]]])
- ,([Str "orange"],
-   [[Para [Str "orange",Space,Str "fruit"]]])
- ,([Str "banana"],
-   [[Para [Str "yellow",Space,Str "fruit"]]])]
-,Para [Str "Multiple",Space,Str "blocks",Space,Str "with",Space,Str "italics:"]
-,DefinitionList
- [([Emph [Str "apple"]],
-   [[Para [Str "red",Space,Str "fruit"]
-    ,Para [Str "contains",Space,Str "seeds,",SoftBreak,Str "crisp,",Space,Str "pleasant",Space,Str "to",Space,Str "taste"]]])
- ,([Emph [Str "orange"]],
-   [[Para [Str "orange",Space,Str "fruit"]
-    ,CodeBlock ("",[],[]) "{ orange code block }"
-    ,BlockQuote
-     [Para [Str "orange",Space,Str "block",Space,Str "quote"]]]])]
-,Para [Str "Multiple",Space,Str "definitions,",Space,Str "tight:"]
-,DefinitionList
- [([Str "apple"],
-   [[Plain [Str "red",Space,Str "fruit"]]
-   ,[Plain [Str "computer"]]])
- ,([Str "orange"],
-   [[Plain [Str "orange",Space,Str "fruit"]]
-   ,[Plain [Str "bank"]]])]
-,Para [Str "Multiple",Space,Str "definitions,",Space,Str "loose:"]
-,DefinitionList
- [([Str "apple"],
-   [[Para [Str "red",Space,Str "fruit"]]
-   ,[Para [Str "computer"]]])
- ,([Str "orange"],
-   [[Para [Str "orange",Space,Str "fruit"]]
-   ,[Para [Str "bank"]]])]
-,Para [Str "Blank",Space,Str "line",Space,Str "after",Space,Str "term,",Space,Str "indented",Space,Str "marker,",Space,Str "alternate",Space,Str "markers:"]
-,DefinitionList
- [([Str "apple"],
-   [[Para [Str "red",Space,Str "fruit"]]
-   ,[Para [Str "computer"]]])
- ,([Str "orange"],
-   [[Para [Str "orange",Space,Str "fruit"]
-    ,OrderedList (1,Decimal,Period)
-     [[Plain [Str "sublist"]]
-     ,[Plain [Str "sublist"]]]]])]
-,Header 1 ("html-blocks",[],[]) [Str "HTML",Space,Str "Blocks"]
-,Para [Str "Simple",Space,Str "block",Space,Str "on",Space,Str "one",Space,Str "line:"]
-,Div ("",[],[])
- [Plain [Str "foo"]]
-,Para [Str "And",Space,Str "nested",Space,Str "without",Space,Str "indentation:"]
-,Div ("",[],[])
- [Div ("",[],[])
-  [Div ("",[],[])
-   [Para [Str "foo"]]]
- ,Div ("",[],[])
-  [Plain [Str "bar"]]]
-,Para [Str "Interpreted",Space,Str "markdown",Space,Str "in",Space,Str "a",Space,Str "table:"]
-,RawBlock (Format "html") ""
-,RawBlock (Format "html") ""
-,RawBlock (Format "html") ""
-,RawBlock (Format "html") ""
-,RawBlock (Format "html") ""
-,RawBlock (Format "html") ""
-,Plain [Str "This",Space,Str "is",Space,Emph [Str "emphasized"]]
-,RawBlock (Format "html") " "
-,Plain [Str "And",Space,Str "this",Space,Str "is",Space,Strong [Str "strong"]]
-,RawBlock (Format "html") ""
-,RawBlock (Format "html") ""
-,Para [Str "Here\8217s",Space,Str "a",Space,Str "simple",Space,Str "block:"]
-,Div ("",[],[])
- [Para [Str "foo"]]
-,Para [Str "This",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "code",Space,Str "block,",Space,Str "though:"]
-,CodeBlock ("",[],[]) "\n    foo\n"
-,Para [Str "As",Space,Str "should",Space,Str "this:"]
-,CodeBlock ("",[],[]) "foo"
-,Para [Str "Now,",Space,Str "nested:"]
-,Div ("",[],[])
- [Div ("",[],[])
-  [Div ("",[],[])
-   [Plain [Str "foo"]]]]
-,Para [Str "This",Space,Str "should",Space,Str "just",Space,Str "be",Space,Str "an",Space,Str "HTML",Space,Str "comment:"]
-,RawBlock (Format "html") ""
-,Para [Str "Multiline:"]
-,RawBlock (Format "html") ""
-,RawBlock (Format "html") ""
-,Para [Str "Code",Space,Str "block:"]
-,CodeBlock ("",[],[]) ""
-,Para [Str "Just",Space,Str "plain",Space,Str "comment,",Space,Str "with",Space,Str "trailing",Space,Str "spaces",Space,Str "on",Space,Str "the",Space,Str "line:"]
-,RawBlock (Format "html") ""
-,Para [Str "Code:"]
-,CodeBlock ("",[],[]) ""
-,Para [Str "Hr\8217s:"]
-,RawBlock (Format "html") ""
-,RawBlock (Format "html") ""
-,RawBlock (Format "html") ""
-,RawBlock (Format "html") ""
-,RawBlock (Format "html") ""
-,RawBlock (Format "html") ""
-,RawBlock (Format "html") ""
-,RawBlock (Format "html") ""
-,RawBlock (Format "html") ""
-,HorizontalRule
-,Header 1 ("inline-markup",[],[]) [Str "Inline",Space,Str "Markup"]
-,Para [Str "This",Space,Str "is",Space,Emph [Str "emphasized"],Str ",",Space,Str "and",Space,Str "so",Space,Emph [Str "is",Space,Str "this"],Str "."]
-,Para [Str "This",Space,Str "is",Space,Strong [Str "strong"],Str ",",Space,Str "and",Space,Str "so",Space,Strong [Str "is",Space,Str "this"],Str "."]
-,Para [Str "An",Space,Emph [Link ("",[],[]) [Str "emphasized",Space,Str "link"] ("/url","")],Str "."]
-,Para [Strong [Emph [Str "This",Space,Str "is",Space,Str "strong",Space,Str "and",Space,Str "em."]]]
-,Para [Str "So",Space,Str "is",Space,Strong [Emph [Str "this"]],Space,Str "word."]
-,Para [Strong [Emph [Str "This",Space,Str "is",Space,Str "strong",Space,Str "and",Space,Str "em."]]]
-,Para [Str "So",Space,Str "is",Space,Strong [Emph [Str "this"]],Space,Str "word."]
-,Para [Str "This",Space,Str "is",Space,Str "code:",Space,Code ("",[],[]) ">",Str ",",Space,Code ("",[],[]) "$",Str ",",Space,Code ("",[],[]) "\\",Str ",",Space,Code ("",[],[]) "\\$",Str ",",Space,Code ("",[],[]) "",Str "."]
-,Para [Strikeout [Str "This",Space,Str "is",Space,Emph [Str "strikeout"],Str "."]]
-,Para [Str "Superscripts:",Space,Str "a",Superscript [Str "bc"],Str "d",Space,Str "a",Superscript [Emph [Str "hello"]],Space,Str "a",Superscript [Str "hello\160there"],Str "."]
-,Para [Str "Subscripts:",Space,Str "H",Subscript [Str "2"],Str "O,",Space,Str "H",Subscript [Str "23"],Str "O,",Space,Str "H",Subscript [Str "many\160of\160them"],Str "O."]
-,Para [Str "These",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "superscripts",Space,Str "or",Space,Str "subscripts,",SoftBreak,Str "because",Space,Str "of",Space,Str "the",Space,Str "unescaped",Space,Str "spaces:",Space,Str "a^b",Space,Str "c^d,",Space,Str "a~b",Space,Str "c~d."]
-,HorizontalRule
-,Header 1 ("smart-quotes-ellipses-dashes",[],[]) [Str "Smart",Space,Str "quotes,",Space,Str "ellipses,",Space,Str "dashes"]
-,Para [Quoted DoubleQuote [Str "Hello,"],Space,Str "said",Space,Str "the",Space,Str "spider.",Space,Quoted DoubleQuote [Quoted SingleQuote [Str "Shelob"],Space,Str "is",Space,Str "my",Space,Str "name."]]
-,Para [Quoted SingleQuote [Str "A"],Str ",",Space,Quoted SingleQuote [Str "B"],Str ",",Space,Str "and",Space,Quoted SingleQuote [Str "C"],Space,Str "are",Space,Str "letters."]
-,Para [Quoted SingleQuote [Str "Oak,"],Space,Quoted SingleQuote [Str "elm,"],Space,Str "and",Space,Quoted SingleQuote [Str "beech"],Space,Str "are",Space,Str "names",Space,Str "of",Space,Str "trees.",SoftBreak,Str "So",Space,Str "is",Space,Quoted SingleQuote [Str "pine."]]
-,Para [Quoted SingleQuote [Str "He",Space,Str "said,",Space,Quoted DoubleQuote [Str "I",Space,Str "want",Space,Str "to",Space,Str "go."]],Space,Str "Were",Space,Str "you",Space,Str "alive",Space,Str "in",Space,Str "the",SoftBreak,Str "70\8217s?"]
-,Para [Str "Here",Space,Str "is",Space,Str "some",Space,Str "quoted",Space,Quoted SingleQuote [Code ("",[],[]) "code"],Space,Str "and",Space,Str "a",Space,Quoted DoubleQuote [Link ("",[],[]) [Str "quoted",Space,Str "link"] ("http://example.com/?foo=1&bar=2","")],Str "."]
-,Para [Str "Some",Space,Str "dashes:",Space,Str "one\8212two",Space,Str "\8212",Space,Str "three\8212four",Space,Str "\8212",Space,Str "five."]
-,Para [Str "Dashes",Space,Str "between",Space,Str "numbers:",Space,Str "5\8211\&7,",Space,Str "255\8211\&66,",Space,Str "1987\8211\&1999."]
-,Para [Str "Ellipses\8230and\8230and\8230."]
-,HorizontalRule
-,Header 1 ("latex",[],[]) [Str "LaTeX"]
-,BulletList
- [[Plain [RawInline (Format "tex") "\\cite[22-23]{smith.1899}"]]
- ,[Plain [Math InlineMath "2+2=4"]]
- ,[Plain [Math InlineMath "x \\in y"]]
- ,[Plain [Math InlineMath "\\alpha \\wedge \\omega"]]
- ,[Plain [Math InlineMath "223"]]
- ,[Plain [Math InlineMath "p",Str "-Tree"]]
- ,[Plain [Str "Here\8217s",Space,Str "some",Space,Str "display",Space,Str "math:",SoftBreak,Math DisplayMath "\\frac{d}{dx}f(x)=\\lim_{h\\to 0}\\frac{f(x+h)-f(x)}{h}"]]
- ,[Plain [Str "Here\8217s",Space,Str "one",Space,Str "that",Space,Str "has",Space,Str "a",Space,Str "line",Space,Str "break",Space,Str "in",Space,Str "it:",Space,Math InlineMath "\\alpha + \\omega \\times x^2",Str "."]]]
-,Para [Str "These",Space,Str "shouldn\8217t",Space,Str "be",Space,Str "math:"]
-,BulletList
- [[Plain [Str "To",Space,Str "get",Space,Str "the",Space,Str "famous",Space,Str "equation,",Space,Str "write",Space,Code ("",[],[]) "$e = mc^2$",Str "."]]
- ,[Plain [Str "$22,000",Space,Str "is",Space,Str "a",Space,Emph [Str "lot"],Space,Str "of",Space,Str "money.",Space,Str "So",Space,Str "is",Space,Str "$34,000.",SoftBreak,Str "(It",Space,Str "worked",Space,Str "if",Space,Quoted DoubleQuote [Str "lot"],Space,Str "is",Space,Str "emphasized.)"]]
- ,[Plain [Str "Shoes",Space,Str "($20)",Space,Str "and",Space,Str "socks",Space,Str "($5)."]]
- ,[Plain [Str "Escaped",Space,Code ("",[],[]) "$",Str ":",Space,Str "$73",Space,Emph [Str "this",Space,Str "should",Space,Str "be",Space,Str "emphasized"],Space,Str "23$."]]]
-,Para [Str "Here\8217s",Space,Str "a",Space,Str "LaTeX",Space,Str "table:"]
-,RawBlock (Format "tex") "\\begin{tabular}{|l|l|}\\hline\nAnimal & Number \\\\ \\hline\nDog    & 2      \\\\\nCat    & 1      \\\\ \\hline\n\\end{tabular}"
-,HorizontalRule
-,Header 1 ("special-characters",[],[]) [Str "Special",Space,Str "Characters"]
-,Para [Str "Here",Space,Str "is",Space,Str "some",Space,Str "unicode:"]
-,BulletList
- [[Plain [Str "I",Space,Str "hat:",Space,Str "\206"]]
- ,[Plain [Str "o",Space,Str "umlaut:",Space,Str "\246"]]
- ,[Plain [Str "section:",Space,Str "\167"]]
- ,[Plain [Str "set",Space,Str "membership:",Space,Str "\8712"]]
- ,[Plain [Str "copyright:",Space,Str "\169"]]]
-,Para [Str "AT&T",Space,Str "has",Space,Str "an",Space,Str "ampersand",Space,Str "in",Space,Str "their",Space,Str "name."]
-,Para [Str "AT&T",Space,Str "is",Space,Str "another",Space,Str "way",Space,Str "to",Space,Str "write",Space,Str "it."]
-,Para [Str "This",Space,Str "&",Space,Str "that."]
-,Para [Str "4",Space,Str "<",Space,Str "5."]
-,Para [Str "6",Space,Str ">",Space,Str "5."]
-,Para [Str "Backslash:",Space,Str "\\"]
-,Para [Str "Backtick:",Space,Str "`"]
-,Para [Str "Asterisk:",Space,Str "*"]
-,Para [Str "Underscore:",Space,Str "_"]
-,Para [Str "Left",Space,Str "brace:",Space,Str "{"]
-,Para [Str "Right",Space,Str "brace:",Space,Str "}"]
-,Para [Str "Left",Space,Str "bracket:",Space,Str "["]
-,Para [Str "Right",Space,Str "bracket:",Space,Str "]"]
-,Para [Str "Left",Space,Str "paren:",Space,Str "("]
-,Para [Str "Right",Space,Str "paren:",Space,Str ")"]
-,Para [Str "Greater-than:",Space,Str ">"]
-,Para [Str "Hash:",Space,Str "#"]
-,Para [Str "Period:",Space,Str "."]
-,Para [Str "Bang:",Space,Str "!"]
-,Para [Str "Plus:",Space,Str "+"]
-,Para [Str "Minus:",Space,Str "-"]
-,HorizontalRule
-,Header 1 ("links",[],[]) [Str "Links"]
-,Header 2 ("explicit",[],[]) [Str "Explicit"]
-,Para [Str "Just",Space,Str "a",Space,Link ("",[],[]) [Str "URL"] ("/url/",""),Str "."]
-,Para [Link ("",[],[]) [Str "URL",Space,Str "and",Space,Str "title"] ("/url/","title"),Str "."]
-,Para [Link ("",[],[]) [Str "URL",Space,Str "and",Space,Str "title"] ("/url/","title preceded by two spaces"),Str "."]
-,Para [Link ("",[],[]) [Str "URL",Space,Str "and",Space,Str "title"] ("/url/","title preceded by a tab"),Str "."]
-,Para [Link ("",[],[]) [Str "URL",Space,Str "and",Space,Str "title"] ("/url/","title with \"quotes\" in it")]
-,Para [Link ("",[],[]) [Str "URL",Space,Str "and",Space,Str "title"] ("/url/","title with single quotes")]
-,Para [Link ("",[],[]) [Str "with_underscore"] ("/url/with_underscore","")]
-,Para [Link ("",[],[]) [Str "Email",Space,Str "link"] ("mailto:nobody@nowhere.net","")]
-,Para [Link ("",[],[]) [Str "Empty"] ("",""),Str "."]
-,Header 2 ("reference",[],[]) [Str "Reference"]
-,Para [Str "Foo",Space,Link ("",[],[]) [Str "bar"] ("/url/",""),Str "."]
-,Para [Str "With",Space,Link ("",[],[]) [Str "embedded",Space,Str "[brackets]"] ("/url/",""),Str "."]
-,Para [Link ("",[],[]) [Str "b"] ("/url/",""),Space,Str "by",Space,Str "itself",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "link."]
-,Para [Str "Indented",Space,Link ("",[],[]) [Str "once"] ("/url",""),Str "."]
-,Para [Str "Indented",Space,Link ("",[],[]) [Str "twice"] ("/url",""),Str "."]
-,Para [Str "Indented",Space,Link ("",[],[]) [Str "thrice"] ("/url",""),Str "."]
-,Para [Str "This",Space,Str "should",Space,Str "[not][]",Space,Str "be",Space,Str "a",Space,Str "link."]
-,CodeBlock ("",[],[]) "[not]: /url"
-,Para [Str "Foo",Space,Link ("",[],[]) [Str "bar"] ("/url/","Title with \"quotes\" inside"),Str "."]
-,Para [Str "Foo",Space,Link ("",[],[]) [Str "biz"] ("/url/","Title with \"quote\" inside"),Str "."]
-,Header 2 ("with-ampersands",[],[]) [Str "With",Space,Str "ampersands"]
-,Para [Str "Here\8217s",Space,Str "a",Space,Link ("",[],[]) [Str "link",Space,Str "with",Space,Str "an",Space,Str "ampersand",Space,Str "in",Space,Str "the",Space,Str "URL"] ("http://example.com/?foo=1&bar=2",""),Str "."]
-,Para [Str "Here\8217s",Space,Str "a",Space,Str "link",Space,Str "with",Space,Str "an",Space,Str "amersand",Space,Str "in",Space,Str "the",Space,Str "link",Space,Str "text:",Space,Link ("",[],[]) [Str "AT&T"] ("http://att.com/","AT&T"),Str "."]
-,Para [Str "Here\8217s",Space,Str "an",Space,Link ("",[],[]) [Str "inline",Space,Str "link"] ("/script?foo=1&bar=2",""),Str "."]
-,Para [Str "Here\8217s",Space,Str "an",Space,Link ("",[],[]) [Str "inline",Space,Str "link",Space,Str "in",Space,Str "pointy",Space,Str "braces"] ("/script?foo=1&bar=2",""),Str "."]
-,Header 2 ("autolinks",[],[]) [Str "Autolinks"]
-,Para [Str "With",Space,Str "an",Space,Str "ampersand:",Space,Link ("",["uri"],[]) [Str "http://example.com/?foo=1&bar=2"] ("http://example.com/?foo=1&bar=2","")]
-,BulletList
- [[Plain [Str "In",Space,Str "a",Space,Str "list?"]]
- ,[Plain [Link ("",["uri"],[]) [Str "http://example.com/"] ("http://example.com/","")]]
- ,[Plain [Str "It",Space,Str "should."]]]
-,Para [Str "An",Space,Str "e-mail",Space,Str "address:",Space,Link ("",["email"],[]) [Str "nobody@nowhere.net"] ("mailto:nobody@nowhere.net","")]
-,BlockQuote
- [Para [Str "Blockquoted:",Space,Link ("",["uri"],[]) [Str "http://example.com/"] ("http://example.com/","")]]
-,Para [Str "Auto-links",Space,Str "should",Space,Str "not",Space,Str "occur",Space,Str "here:",Space,Code ("",[],[]) ""]
-,CodeBlock ("",[],[]) "or here: "
-,HorizontalRule
-,Header 1 ("images",[],[]) [Str "Images"]
-,Para [Str "From",Space,Quoted DoubleQuote [Str "Voyage",Space,Str "dans",Space,Str "la",Space,Str "Lune"],Space,Str "by",Space,Str "Georges",Space,Str "Melies",Space,Str "(1902):"]
-,Para [Image ("",[],[]) [Str "lalune"] ("lalune.jpg","fig:Voyage dans la Lune")]
-,Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "movie",Space,Image ("",[],[]) [Str "movie"] ("movie.jpg",""),Space,Str "icon."]
-,HorizontalRule
-,Header 1 ("footnotes",[],[]) [Str "Footnotes"]
-,Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "footnote",Space,Str "reference,",Note [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",SoftBreak,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."]],Space,Str "and",Space,Str "another.",Note [Para [Str "Here\8217s",Space,Str "the",Space,Str "long",Space,Str "note.",Space,Str "This",Space,Str "one",Space,Str "contains",Space,Str "multiple",SoftBreak,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",SoftBreak,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",SoftBreak,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."]],SoftBreak,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",SoftBreak,Str "contains",Space,Str "a",Space,Str "space.[^my",Space,Str "note]",Space,Str "Here",Space,Str "is",Space,Str "an",Space,Str "inline",Space,Str "note.",Note [Para [Str "This",SoftBreak,Str "is",Space,Emph [Str "easier"],Space,Str "to",Space,Str "type.",Space,Str "Inline",Space,Str "notes",Space,Str "may",Space,Str "contain",SoftBreak,Link ("",[],[]) [Str "links"] ("http://google.com",""),Space,Str "and",Space,Code ("",[],[]) "]",Space,Str "verbatim",Space,Str "characters,",SoftBreak,Str "as",Space,Str "well",Space,Str "as",Space,Str "[bracketed",Space,Str "text]."]]]
-,BlockQuote
- [Para [Str "Notes",Space,Str "can",Space,Str "go",Space,Str "in",Space,Str "quotes.",Note [Para [Str "In",Space,Str "quote."]]]]
-,OrderedList (1,Decimal,Period)
- [[Plain [Str "And",Space,Str "in",Space,Str "list",Space,Str "items.",Note [Para [Str "In",Space,Str "list."]]]]]
-,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."]]
+Pandoc
+  ( Meta
+    { unMeta = fromList
+      [
+        ( "author"
+        , MetaList
+          [ MetaInlines
+            [ Str "John", Space, Str "MacFarlane" ]
+          , MetaInlines
+            [ Str "Anonymous" ]
+          ]
+        )
+      ,
+        ( "date"
+        , MetaInlines
+          [ Str "July", Space, Str "17,", Space, Str "2006" ]
+        )
+      ,
+        ( "title"
+        , MetaInlines
+          [ Str "Pandoc", Space, Str "Test", Space, Str "Suite" ]
+        )
+      ]
+    }
+  )
+  [ Para
+    [ Str "This"
+    , Space
+    , Str "is"
+    , Space
+    , Str "a"
+    , Space
+    , Str "set"
+    , Space
+    , Str "of"
+    , Space
+    , Str "tests"
+    , Space
+    , Str "for"
+    , Space
+    , Str "pandoc."
+    , Space
+    , Str "Most"
+    , Space
+    , Str "of"
+    , Space
+    , Str "them"
+    , Space
+    , Str "are"
+    , Space
+    , Str "adapted"
+    , Space
+    , Str "from"
+    , SoftBreak
+    , Str "John"
+    , Space
+    , Str "Gruber\8217s"
+    , Space
+    , Str "markdown"
+    , Space
+    , Str "test"
+    , Space
+    , Str "suite."
+    ]
+  , HorizontalRule
+  , Header 1
+    ( "headers", [], [] )
+    [ Str "Headers" ]
+  , Header 2
+    ( "level-2-with-an-embedded-link", [], [] )
+    [ Str "Level"
+    , Space
+    , Str "2"
+    , Space
+    , Str "with"
+    , Space
+    , Str "an"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "embedded", Space, Str "link" ]
+      ( "/url", "" )
+    ]
+  , Header 3
+    ( "level-3-with-emphasis", [], [] )
+    [ Str "Level"
+    , Space
+    , Str "3"
+    , Space
+    , Str "with"
+    , Space
+    , Emph
+      [ Str "emphasis" ]
+    ]
+  , Header 4
+    ( "level-4", [], [] )
+    [ Str "Level", Space, Str "4" ]
+  , Header 5
+    ( "level-5", [], [] )
+    [ Str "Level", Space, Str "5" ]
+  , Header 1
+    ( "level-1", [], [] )
+    [ Str "Level", Space, Str "1" ]
+  , Header 2
+    ( "level-2-with-emphasis", [], [] )
+    [ Str "Level"
+    , Space
+    , Str "2"
+    , Space
+    , Str "with"
+    , Space
+    , Emph
+      [ Str "emphasis" ]
+    ]
+  , Header 3
+    ( "level-3", [], [] )
+    [ Str "Level", Space, Str "3" ]
+  , Para
+    [ Str "with", Space, Str "no", Space, Str "blank", Space, Str "line" ]
+  , Header 2
+    ( "level-2", [], [] )
+    [ Str "Level", Space, Str "2" ]
+  , Para
+    [ Str "with", Space, Str "no", Space, Str "blank", Space, Str "line" ]
+  , HorizontalRule
+  , Header 1
+    ( "paragraphs", [], [] )
+    [ Str "Paragraphs" ]
+  , Para
+    [ Str "Here\8217s"
+    , Space
+    , Str "a"
+    , Space
+    , Str "regular"
+    , Space
+    , Str "paragraph."
+    ]
+  , Para
+    [ Str "In"
+    , Space
+    , Str "Markdown"
+    , Space
+    , Str "1.0.0"
+    , Space
+    , Str "and"
+    , Space
+    , Str "earlier."
+    , Space
+    , Str "Version"
+    , SoftBreak
+    , Str "8."
+    , Space
+    , Str "This"
+    , Space
+    , Str "line"
+    , Space
+    , Str "turns"
+    , Space
+    , Str "into"
+    , Space
+    , Str "a"
+    , Space
+    , Str "list"
+    , Space
+    , Str "item."
+    , SoftBreak
+    , Str "Because"
+    , Space
+    , Str "a"
+    , Space
+    , Str "hard-wrapped"
+    , Space
+    , Str "line"
+    , Space
+    , Str "in"
+    , Space
+    , Str "the"
+    , SoftBreak
+    , Str "middle"
+    , Space
+    , Str "of"
+    , Space
+    , Str "a"
+    , Space
+    , Str "paragraph"
+    , Space
+    , Str "looked"
+    , Space
+    , Str "like"
+    , Space
+    , Str "a"
+    , SoftBreak
+    , Str "list"
+    , Space
+    , Str "item."
+    ]
+  , Para
+    [ Str "Here\8217s"
+    , Space
+    , Str "one"
+    , Space
+    , Str "with"
+    , Space
+    , Str "a"
+    , Space
+    , Str "bullet."
+    , SoftBreak
+    , Str "*"
+    , Space
+    , Str "criminey."
+    ]
+  , Para
+    [ Str "There"
+    , Space
+    , Str "should"
+    , Space
+    , Str "be"
+    , Space
+    , Str "a"
+    , Space
+    , Str "hard"
+    , Space
+    , Str "line"
+    , Space
+    , Str "break"
+    , LineBreak
+    , Str "here."
+    ]
+  , HorizontalRule
+  , Header 1
+    ( "block-quotes", [], [] )
+    [ Str "Block", Space, Str "Quotes" ]
+  , Para
+    [ Str "E-mail", Space, Str "style:" ]
+  , BlockQuote
+    [ Para
+      [ Str "This"
+      , Space
+      , Str "is"
+      , Space
+      , Str "a"
+      , Space
+      , Str "block"
+      , Space
+      , Str "quote."
+      , SoftBreak
+      , Str "It"
+      , Space
+      , Str "is"
+      , Space
+      , Str "pretty"
+      , Space
+      , Str "short."
+      ]
+    ]
+  , BlockQuote
+    [ Para
+      [ Str "Code"
+      , Space
+      , Str "in"
+      , Space
+      , Str "a"
+      , Space
+      , Str "block"
+      , Space
+      , Str "quote:"
+      ]
+    , CodeBlock
+      ( "", [], [] ) "sub status {\n    print \"working\";\n}"
+    , Para
+      [ Str "A", Space, Str "list:" ]
+    , OrderedList
+      ( 1, Decimal, Period )
+      [
+        [ Plain [ Str "item", Space, Str "one" ] ]
+      ,
+        [ Plain [ Str "item", Space, Str "two" ] ]
+      ]
+    , Para
+      [ Str "Nested", Space, Str "block", Space, Str "quotes:" ]
+    , BlockQuote
+      [ Para [ Str "nested" ] ]
+    , BlockQuote
+      [ Para [ Str "nested" ] ]
+    ]
+  , Para
+    [ Str "This"
+    , Space
+    , Str "should"
+    , Space
+    , Str "not"
+    , Space
+    , Str "be"
+    , Space
+    , Str "a"
+    , Space
+    , Str "block"
+    , Space
+    , Str "quote:"
+    , Space
+    , Str "2"
+    , SoftBreak
+    , Str ">"
+    , Space
+    , Str "1."
+    ]
+  , Para
+    [ Str "And"
+    , Space
+    , Str "a"
+    , Space
+    , Str "following"
+    , Space
+    , Str "paragraph."
+    ]
+  , HorizontalRule
+  , Header 1
+    ( "code-blocks", [], [] )
+    [ Str "Code", Space, Str "Blocks" ]
+  , Para
+    [ Str "Code:" ]
+  , CodeBlock
+    ( ""
+    , []
+    , []
+    ) "---- (should be four hyphens)\n\nsub status {\n    print \"working\";\n}\n\nthis code block is indented by one tab"
+  , Para
+    [ Str "And:" ]
+  , CodeBlock
+    ( ""
+    , []
+    , []
+    ) "    this code block is indented by two tabs\n\nThese should not be escaped:  \\$ \\\\ \\> \\[ \\{"
+  , HorizontalRule
+  , Header 1
+    ( "lists", [], [] )
+    [ Str "Lists" ]
+  , Header 2
+    ( "unordered", [], [] )
+    [ Str "Unordered" ]
+  , Para
+    [ Str "Asterisks", Space, Str "tight:" ]
+  , BulletList
+    [
+      [ Plain [ Str "asterisk", Space, Str "1" ] ]
+    ,
+      [ Plain [ Str "asterisk", Space, Str "2" ] ]
+    ,
+      [ Plain [ Str "asterisk", Space, Str "3" ] ]
+    ]
+  , Para
+    [ Str "Asterisks", Space, Str "loose:" ]
+  , BulletList
+    [
+      [ Para [ Str "asterisk", Space, Str "1" ] ]
+    ,
+      [ Para [ Str "asterisk", Space, Str "2" ] ]
+    ,
+      [ Para [ Str "asterisk", Space, Str "3" ] ]
+    ]
+  , Para
+    [ Str "Pluses", Space, Str "tight:" ]
+  , BulletList
+    [
+      [ Plain [ Str "Plus", Space, Str "1" ] ]
+    ,
+      [ Plain [ Str "Plus", Space, Str "2" ] ]
+    ,
+      [ Plain [ Str "Plus", Space, Str "3" ] ]
+    ]
+  , Para
+    [ Str "Pluses", Space, Str "loose:" ]
+  , BulletList
+    [
+      [ Para [ Str "Plus", Space, Str "1" ] ]
+    ,
+      [ Para [ Str "Plus", Space, Str "2" ] ]
+    ,
+      [ Para [ Str "Plus", Space, Str "3" ] ]
+    ]
+  , Para
+    [ Str "Minuses", Space, Str "tight:" ]
+  , BulletList
+    [
+      [ Plain [ Str "Minus", Space, Str "1" ] ]
+    ,
+      [ Plain [ Str "Minus", Space, Str "2" ] ]
+    ,
+      [ Plain [ Str "Minus", Space, Str "3" ] ]
+    ]
+  , Para
+    [ Str "Minuses", Space, Str "loose:" ]
+  , BulletList
+    [
+      [ Para [ Str "Minus", Space, Str "1" ] ]
+    ,
+      [ Para [ Str "Minus", Space, Str "2" ] ]
+    ,
+      [ Para [ Str "Minus", Space, Str "3" ] ]
+    ]
+  , Header 2
+    ( "ordered", [], [] )
+    [ Str "Ordered" ]
+  , Para
+    [ Str "Tight:" ]
+  , OrderedList
+    ( 1, Decimal, Period )
+    [
+      [ Plain [ Str "First" ] ]
+    ,
+      [ Plain [ Str "Second" ] ]
+    ,
+      [ Plain [ Str "Third" ] ]
+    ]
+  , Para
+    [ Str "and:" ]
+  , OrderedList
+    ( 1, Decimal, Period )
+    [
+      [ Plain [ Str "One" ] ]
+    ,
+      [ Plain [ Str "Two" ] ]
+    ,
+      [ Plain [ Str "Three" ] ]
+    ]
+  , Para
+    [ Str "Loose", Space, Str "using", Space, Str "tabs:" ]
+  , OrderedList
+    ( 1, Decimal, Period )
+    [
+      [ Para [ Str "First" ] ]
+    ,
+      [ Para [ Str "Second" ] ]
+    ,
+      [ Para [ Str "Third" ] ]
+    ]
+  , Para
+    [ Str "and", Space, Str "using", Space, Str "spaces:" ]
+  , OrderedList
+    ( 1, Decimal, Period )
+    [ [ Para [ Str "One" ] ], [ Para [ Str "Two" ] ], [ Para [ Str "Three" ] ] ]
+  , Para
+    [ Str "Multiple", Space, Str "paragraphs:" ]
+  , OrderedList
+    ( 1, Decimal, Period )
+    [
+      [ Para
+        [ Str "Item", Space, Str "1,", Space, Str "graf", Space, Str "one." ]
+      , Para
+        [ Str "Item"
+        , Space
+        , Str "1."
+        , Space
+        , Str "graf"
+        , Space
+        , Str "two."
+        , Space
+        , Str "The"
+        , Space
+        , Str "quick"
+        , Space
+        , Str "brown"
+        , Space
+        , Str "fox"
+        , Space
+        , Str "jumped"
+        , Space
+        , Str "over"
+        , Space
+        , Str "the"
+        , Space
+        , Str "lazy"
+        , Space
+        , Str "dog\8217s"
+        , SoftBreak
+        , Str "back."
+        ]
+      ]
+    ,
+      [ Para [ Str "Item", Space, Str "2." ] ]
+    ,
+      [ Para [ Str "Item", Space, Str "3." ] ]
+    ]
+  , Header 2
+    ( "nested", [], [] )
+    [ Str "Nested" ]
+  , BulletList
+    [
+      [ Plain
+        [ Str "Tab" ]
+      , BulletList
+        [ [ Plain [ Str "Tab" ], BulletList [ [ Plain [ Str "Tab" ] ] ] ] ]
+      ]
+    ]
+  , Para
+    [ Str "Here\8217s", Space, Str "another:" ]
+  , OrderedList
+    ( 1, Decimal, Period )
+    [
+      [ Plain [ Str "First" ] ]
+    ,
+      [ Plain
+        [ Str "Second:" ]
+      , BulletList
+        [
+          [ Plain [ Str "Fee" ] ]
+        ,
+          [ Plain [ Str "Fie" ] ]
+        ,
+          [ Plain [ Str "Foe" ] ]
+        ]
+      ]
+    ,
+      [ Plain [ Str "Third" ] ]
+    ]
+  , Para
+    [ Str "Same"
+    , Space
+    , Str "thing"
+    , Space
+    , Str "but"
+    , Space
+    , Str "with"
+    , Space
+    , Str "paragraphs:"
+    ]
+  , OrderedList
+    ( 1, Decimal, Period )
+    [
+      [ Para [ Str "First" ] ]
+    ,
+      [ Para
+        [ Str "Second:" ]
+      , BulletList
+        [
+          [ Plain [ Str "Fee" ] ]
+        ,
+          [ Plain [ Str "Fie" ] ]
+        ,
+          [ Plain [ Str "Foe" ] ]
+        ]
+      ]
+    ,
+      [ Para [ Str "Third" ] ]
+    ]
+  , Header 2
+    ( "tabs-and-spaces", [], [] )
+    [ Str "Tabs", Space, Str "and", Space, Str "spaces" ]
+  , BulletList
+    [
+      [ Para
+        [ Str "this"
+        , Space
+        , Str "is"
+        , Space
+        , Str "a"
+        , Space
+        , Str "list"
+        , Space
+        , Str "item"
+        , SoftBreak
+        , Str "indented"
+        , Space
+        , Str "with"
+        , Space
+        , Str "tabs"
+        ]
+      ]
+    ,
+      [ Para
+        [ Str "this"
+        , Space
+        , Str "is"
+        , Space
+        , Str "a"
+        , Space
+        , Str "list"
+        , Space
+        , Str "item"
+        , SoftBreak
+        , Str "indented"
+        , Space
+        , Str "with"
+        , Space
+        , Str "spaces"
+        ]
+      , BulletList
+        [
+          [ Para
+            [ Str "this"
+            , Space
+            , Str "is"
+            , Space
+            , Str "an"
+            , Space
+            , Str "example"
+            , Space
+            , Str "list"
+            , Space
+            , Str "item"
+            , SoftBreak
+            , Str "indented"
+            , Space
+            , Str "with"
+            , Space
+            , Str "tabs"
+            ]
+          ]
+        ,
+          [ Para
+            [ Str "this"
+            , Space
+            , Str "is"
+            , Space
+            , Str "an"
+            , Space
+            , Str "example"
+            , Space
+            , Str "list"
+            , Space
+            , Str "item"
+            , SoftBreak
+            , Str "indented"
+            , Space
+            , Str "with"
+            , Space
+            , Str "spaces"
+            ]
+          ]
+        ]
+      ]
+    ]
+  , Header 2
+    ( "fancy-list-markers", [], [] )
+    [ Str "Fancy", Space, Str "list", Space, Str "markers" ]
+  , OrderedList
+    ( 2, Decimal, TwoParens )
+    [
+      [ Para [ Str "begins", Space, Str "with", Space, Str "2" ] ]
+    ,
+      [ Para
+        [ Str "and", Space, Str "now", Space, Str "3" ]
+      , Para
+        [ Str "with", Space, Str "a", Space, Str "continuation" ]
+      , OrderedList
+        ( 4, LowerRoman, Period )
+        [
+          [ Plain
+            [ Str "sublist"
+            , Space
+            , Str "with"
+            , Space
+            , Str "roman"
+            , Space
+            , Str "numerals,"
+            , SoftBreak
+            , Str "starting"
+            , Space
+            , Str "with"
+            , Space
+            , Str "4"
+            ]
+          ]
+        ,
+          [ Plain
+            [ Str "more", Space, Str "items" ]
+          , OrderedList
+            ( 1, UpperAlpha, TwoParens )
+            [
+              [ Plain [ Str "a", Space, Str "subsublist" ] ]
+            ,
+              [ Plain [ Str "a", Space, Str "subsublist" ] ]
+            ]
+          ]
+        ]
+      ]
+    ]
+  , Para
+    [ Str "Nesting:" ]
+  , OrderedList
+    ( 1, UpperAlpha, Period )
+    [
+      [ Plain
+        [ Str "Upper", Space, Str "Alpha" ]
+      , OrderedList
+        ( 1, UpperRoman, Period )
+        [
+          [ Plain
+            [ Str "Upper", Space, Str "Roman." ]
+          , OrderedList
+            ( 6, Decimal, TwoParens )
+            [
+              [ Plain
+                [ Str "Decimal"
+                , Space
+                , Str "start"
+                , Space
+                , Str "with"
+                , Space
+                , Str "6"
+                ]
+              , OrderedList
+                ( 3, LowerAlpha, OneParen )
+                [
+                  [ Plain
+                    [ Str "Lower"
+                    , Space
+                    , Str "alpha"
+                    , Space
+                    , Str "with"
+                    , Space
+                    , Str "paren"
+                    ]
+                  ]
+                ]
+              ]
+            ]
+          ]
+        ]
+      ]
+    ]
+  , Para
+    [ Str "Autonumbering:" ]
+  , OrderedList
+    ( 1, DefaultStyle, DefaultDelim )
+    [
+      [ Plain [ Str "Autonumber." ] ]
+    ,
+      [ Plain
+        [ Str "More." ]
+      , OrderedList
+        ( 1, DefaultStyle, DefaultDelim )
+        [ [ Plain [ Str "Nested." ] ] ]
+      ]
+    ]
+  , Para
+    [ Str "Should"
+    , Space
+    , Str "not"
+    , Space
+    , Str "be"
+    , Space
+    , Str "a"
+    , Space
+    , Str "list"
+    , Space
+    , Str "item:"
+    ]
+  , Para
+    [ Str "M.A.\160\&2007" ]
+  , Para
+    [ Str "B.", Space, Str "Williams" ]
+  , HorizontalRule
+  , Header 1
+    ( "definition-lists", [], [] )
+    [ Str "Definition", Space, Str "Lists" ]
+  , Para
+    [ Str "Tight", Space, Str "using", Space, Str "spaces:" ]
+  , DefinitionList
+    [
+      ( [ Str "apple" ], [ [ Plain [ Str "red", Space, Str "fruit" ] ] ] )
+    ,
+      ( [ Str "orange" ], [ [ Plain [ Str "orange", Space, Str "fruit" ] ] ] )
+    ,
+      ( [ Str "banana" ], [ [ Plain [ Str "yellow", Space, Str "fruit" ] ] ] )
+    ]
+  , Para
+    [ Str "Tight", Space, Str "using", Space, Str "tabs:" ]
+  , DefinitionList
+    [
+      ( [ Str "apple" ], [ [ Plain [ Str "red", Space, Str "fruit" ] ] ] )
+    ,
+      ( [ Str "orange" ], [ [ Plain [ Str "orange", Space, Str "fruit" ] ] ] )
+    ,
+      ( [ Str "banana" ], [ [ Plain [ Str "yellow", Space, Str "fruit" ] ] ] )
+    ]
+  , Para
+    [ Str "Loose:" ]
+  , DefinitionList
+    [
+      ( [ Str "apple" ], [ [ Para [ Str "red", Space, Str "fruit" ] ] ] )
+    ,
+      ( [ Str "orange" ], [ [ Para [ Str "orange", Space, Str "fruit" ] ] ] )
+    ,
+      ( [ Str "banana" ], [ [ Para [ Str "yellow", Space, Str "fruit" ] ] ] )
+    ]
+  , Para
+    [ Str "Multiple"
+    , Space
+    , Str "blocks"
+    , Space
+    , Str "with"
+    , Space
+    , Str "italics:"
+    ]
+  , DefinitionList
+    [
+      (
+        [ Emph [ Str "apple" ] ]
+      ,
+        [
+          [ Para
+            [ Str "red", Space, Str "fruit" ]
+          , Para
+            [ Str "contains"
+            , Space
+            , Str "seeds,"
+            , SoftBreak
+            , Str "crisp,"
+            , Space
+            , Str "pleasant"
+            , Space
+            , Str "to"
+            , Space
+            , Str "taste"
+            ]
+          ]
+        ]
+      )
+    ,
+      (
+        [ Emph [ Str "orange" ] ]
+      ,
+        [
+          [ Para
+            [ Str "orange", Space, Str "fruit" ]
+          , CodeBlock
+            ( "", [], [] ) "{ orange code block }"
+          , BlockQuote
+            [ Para [ Str "orange", Space, Str "block", Space, Str "quote" ] ]
+          ]
+        ]
+      )
+    ]
+  , Para
+    [ Str "Multiple", Space, Str "definitions,", Space, Str "tight:" ]
+  , DefinitionList
+    [
+      (
+        [ Str "apple" ]
+      ,
+        [
+          [ Plain [ Str "red", Space, Str "fruit" ] ]
+        ,
+          [ Plain [ Str "computer" ] ]
+        ]
+      )
+    ,
+      (
+        [ Str "orange" ]
+      ,
+        [
+          [ Plain [ Str "orange", Space, Str "fruit" ] ]
+        ,
+          [ Plain [ Str "bank" ] ]
+        ]
+      )
+    ]
+  , Para
+    [ Str "Multiple", Space, Str "definitions,", Space, Str "loose:" ]
+  , DefinitionList
+    [
+      (
+        [ Str "apple" ]
+      ,
+        [
+          [ Para [ Str "red", Space, Str "fruit" ] ]
+        ,
+          [ Para [ Str "computer" ] ]
+        ]
+      )
+    ,
+      (
+        [ Str "orange" ]
+      ,
+        [
+          [ Para [ Str "orange", Space, Str "fruit" ] ]
+        ,
+          [ Para [ Str "bank" ] ]
+        ]
+      )
+    ]
+  , Para
+    [ Str "Blank"
+    , Space
+    , Str "line"
+    , Space
+    , Str "after"
+    , Space
+    , Str "term,"
+    , Space
+    , Str "indented"
+    , Space
+    , Str "marker,"
+    , Space
+    , Str "alternate"
+    , Space
+    , Str "markers:"
+    ]
+  , DefinitionList
+    [
+      (
+        [ Str "apple" ]
+      ,
+        [
+          [ Para [ Str "red", Space, Str "fruit" ] ]
+        ,
+          [ Para [ Str "computer" ] ]
+        ]
+      )
+    ,
+      (
+        [ Str "orange" ]
+      ,
+        [
+          [ Para
+            [ Str "orange", Space, Str "fruit" ]
+          , OrderedList
+            ( 1, Decimal, Period )
+            [ [ Plain [ Str "sublist" ] ], [ Plain [ Str "sublist" ] ] ]
+          ]
+        ]
+      )
+    ]
+  , Header 1
+    ( "html-blocks", [], [] )
+    [ Str "HTML", Space, Str "Blocks" ]
+  , Para
+    [ Str "Simple"
+    , Space
+    , Str "block"
+    , Space
+    , Str "on"
+    , Space
+    , Str "one"
+    , Space
+    , Str "line:"
+    ]
+  , Div
+    ( "", [], [] )
+    [ Plain [ Str "foo" ] ]
+  , Para
+    [ Str "And"
+    , Space
+    , Str "nested"
+    , Space
+    , Str "without"
+    , Space
+    , Str "indentation:"
+    ]
+  , Div
+    ( "", [], [] )
+    [ Div
+      ( "", [], [] )
+      [ Div ( "", [], [] ) [ Para [ Str "foo" ] ] ]
+    , Div
+      ( "", [], [] )
+      [ Plain [ Str "bar" ] ]
+    ]
+  , Para
+    [ Str "Interpreted"
+    , Space
+    , Str "markdown"
+    , Space
+    , Str "in"
+    , Space
+    , Str "a"
+    , Space
+    , Str "table:"
+    ]
+  , RawBlock
+    ( Format "html" ) ""
+  , RawBlock
+    ( Format "html" ) ""
+  , RawBlock
+    ( Format "html" ) ""
+  , RawBlock
+    ( Format "html" ) ""
+  , RawBlock
+    ( Format "html" ) ""
+  , RawBlock
+    ( Format "html" ) ""
+  , Plain
+    [ Str "This", Space, Str "is", Space, Emph [ Str "emphasized" ] ]
+  , RawBlock
+    ( Format "html" ) " "
+  , Plain
+    [ Str "And"
+    , Space
+    , Str "this"
+    , Space
+    , Str "is"
+    , Space
+    , Strong
+      [ Str "strong" ]
+    ]
+  , RawBlock
+    ( Format "html" ) ""
+  , RawBlock
+    ( Format "html" ) ""
+  , Para
+    [ Str "Here\8217s"
+    , Space
+    , Str "a"
+    , Space
+    , Str "simple"
+    , Space
+    , Str "block:"
+    ]
+  , Div
+    ( "", [], [] )
+    [ Para [ Str "foo" ] ]
+  , Para
+    [ Str "This"
+    , Space
+    , Str "should"
+    , Space
+    , Str "be"
+    , Space
+    , Str "a"
+    , Space
+    , Str "code"
+    , Space
+    , Str "block,"
+    , Space
+    , Str "though:"
+    ]
+  , CodeBlock
+    ( "", [], [] ) "\n    foo\n"
+  , Para
+    [ Str "As", Space, Str "should", Space, Str "this:" ]
+  , CodeBlock
+    ( "", [], [] ) "foo"
+  , Para
+    [ Str "Now,", Space, Str "nested:" ]
+  , Div
+    ( "", [], [] )
+    [ Div ( "", [], [] ) [ Div ( "", [], [] ) [ Plain [ Str "foo" ] ] ] ]
+  , Para
+    [ Str "This"
+    , Space
+    , Str "should"
+    , Space
+    , Str "just"
+    , Space
+    , Str "be"
+    , Space
+    , Str "an"
+    , Space
+    , Str "HTML"
+    , Space
+    , Str "comment:"
+    ]
+  , RawBlock
+    ( Format "html" ) ""
+  , Para
+    [ Str "Multiline:" ]
+  , RawBlock
+    ( Format "html" ) ""
+  , RawBlock
+    ( Format "html" ) ""
+  , Para
+    [ Str "Code", Space, Str "block:" ]
+  , CodeBlock
+    ( "", [], [] ) ""
+  , Para
+    [ Str "Just"
+    , Space
+    , Str "plain"
+    , Space
+    , Str "comment,"
+    , Space
+    , Str "with"
+    , Space
+    , Str "trailing"
+    , Space
+    , Str "spaces"
+    , Space
+    , Str "on"
+    , Space
+    , Str "the"
+    , Space
+    , Str "line:"
+    ]
+  , RawBlock
+    ( Format "html" ) ""
+  , Para
+    [ Str "Code:" ]
+  , CodeBlock
+    ( "", [], [] ) ""
+  , Para
+    [ Str "Hr\8217s:" ]
+  , RawBlock
+    ( Format "html" ) ""
+  , RawBlock
+    ( Format "html" ) ""
+  , RawBlock
+    ( Format "html" ) ""
+  , RawBlock
+    ( Format "html" ) ""
+  , RawBlock
+    ( Format "html" ) ""
+  , RawBlock
+    ( Format "html" ) ""
+  , RawBlock
+    ( Format "html" ) ""
+  , RawBlock
+    ( Format "html" ) ""
+  , RawBlock
+    ( Format "html" ) ""
+  , HorizontalRule
+  , Header 1
+    ( "inline-markup", [], [] )
+    [ Str "Inline", Space, Str "Markup" ]
+  , Para
+    [ Str "This"
+    , Space
+    , Str "is"
+    , Space
+    , Emph
+      [ Str "emphasized" ]
+    , Str ","
+    , Space
+    , Str "and"
+    , Space
+    , Str "so"
+    , Space
+    , Emph
+      [ Str "is", Space, Str "this" ]
+    , Str "."
+    ]
+  , Para
+    [ Str "This"
+    , Space
+    , Str "is"
+    , Space
+    , Strong
+      [ Str "strong" ]
+    , Str ","
+    , Space
+    , Str "and"
+    , Space
+    , Str "so"
+    , Space
+    , Strong
+      [ Str "is", Space, Str "this" ]
+    , Str "."
+    ]
+  , Para
+    [ Str "An"
+    , Space
+    , Emph
+      [ Link
+        ( "", [], [] )
+        [ Str "emphasized", Space, Str "link" ]
+        ( "/url", "" )
+      ]
+    , Str "."
+    ]
+  , Para
+    [ Strong
+      [ Emph
+        [ Str "This"
+        , Space
+        , Str "is"
+        , Space
+        , Str "strong"
+        , Space
+        , Str "and"
+        , Space
+        , Str "em."
+        ]
+      ]
+    ]
+  , Para
+    [ Str "So"
+    , Space
+    , Str "is"
+    , Space
+    , Strong
+      [ Emph [ Str "this" ] ]
+    , Space
+    , Str "word."
+    ]
+  , Para
+    [ Strong
+      [ Emph
+        [ Str "This"
+        , Space
+        , Str "is"
+        , Space
+        , Str "strong"
+        , Space
+        , Str "and"
+        , Space
+        , Str "em."
+        ]
+      ]
+    ]
+  , Para
+    [ Str "So"
+    , Space
+    , Str "is"
+    , Space
+    , Strong
+      [ Emph [ Str "this" ] ]
+    , Space
+    , Str "word."
+    ]
+  , Para
+    [ Str "This"
+    , Space
+    , Str "is"
+    , Space
+    , Str "code:"
+    , Space
+    , Code
+      ( "", [], [] ) ">"
+    , Str ","
+    , Space
+    , Code
+      ( "", [], [] ) "$"
+    , Str ","
+    , Space
+    , Code
+      ( "", [], [] ) "\\"
+    , Str ","
+    , Space
+    , Code
+      ( "", [], [] ) "\\$"
+    , Str ","
+    , Space
+    , Code
+      ( "", [], [] ) ""
+    , Str "."
+    ]
+  , Para
+    [ Strikeout
+      [ Str "This", Space, Str "is", Space, Emph [ Str "strikeout" ], Str "." ]
+    ]
+  , Para
+    [ Str "Superscripts:"
+    , Space
+    , Str "a"
+    , Superscript
+      [ Str "bc" ]
+    , Str "d"
+    , Space
+    , Str "a"
+    , Superscript
+      [ Emph [ Str "hello" ] ]
+    , Space
+    , Str "a"
+    , Superscript
+      [ Str "hello\160there" ]
+    , Str "."
+    ]
+  , Para
+    [ Str "Subscripts:"
+    , Space
+    , Str "H"
+    , Subscript
+      [ Str "2" ]
+    , Str "O,"
+    , Space
+    , Str "H"
+    , Subscript
+      [ Str "23" ]
+    , Str "O,"
+    , Space
+    , Str "H"
+    , Subscript
+      [ Str "many\160of\160them" ]
+    , Str "O."
+    ]
+  , Para
+    [ Str "These"
+    , Space
+    , Str "should"
+    , Space
+    , Str "not"
+    , Space
+    , Str "be"
+    , Space
+    , Str "superscripts"
+    , Space
+    , Str "or"
+    , Space
+    , Str "subscripts,"
+    , SoftBreak
+    , Str "because"
+    , Space
+    , Str "of"
+    , Space
+    , Str "the"
+    , Space
+    , Str "unescaped"
+    , Space
+    , Str "spaces:"
+    , Space
+    , Str "a^b"
+    , Space
+    , Str "c^d,"
+    , Space
+    , Str "a~b"
+    , Space
+    , Str "c~d."
+    ]
+  , HorizontalRule
+  , Header 1
+    ( "smart-quotes-ellipses-dashes", [], [] )
+    [ Str "Smart"
+    , Space
+    , Str "quotes,"
+    , Space
+    , Str "ellipses,"
+    , Space
+    , Str "dashes"
+    ]
+  , Para
+    [ Quoted DoubleQuote
+      [ Str "Hello," ]
+    , Space
+    , Str "said"
+    , Space
+    , Str "the"
+    , Space
+    , Str "spider."
+    , Space
+    , Quoted DoubleQuote
+      [ Quoted SingleQuote
+        [ Str "Shelob" ]
+      , Space
+      , Str "is"
+      , Space
+      , Str "my"
+      , Space
+      , Str "name."
+      ]
+    ]
+  , Para
+    [ Quoted SingleQuote
+      [ Str "A" ]
+    , Str ","
+    , Space
+    , Quoted SingleQuote
+      [ Str "B" ]
+    , Str ","
+    , Space
+    , Str "and"
+    , Space
+    , Quoted SingleQuote
+      [ Str "C" ]
+    , Space
+    , Str "are"
+    , Space
+    , Str "letters."
+    ]
+  , Para
+    [ Quoted SingleQuote
+      [ Str "Oak," ]
+    , Space
+    , Quoted SingleQuote
+      [ Str "elm," ]
+    , Space
+    , Str "and"
+    , Space
+    , Quoted SingleQuote
+      [ Str "beech" ]
+    , Space
+    , Str "are"
+    , Space
+    , Str "names"
+    , Space
+    , Str "of"
+    , Space
+    , Str "trees."
+    , SoftBreak
+    , Str "So"
+    , Space
+    , Str "is"
+    , Space
+    , Quoted SingleQuote
+      [ Str "pine." ]
+    ]
+  , Para
+    [ Quoted SingleQuote
+      [ Str "He"
+      , Space
+      , Str "said,"
+      , Space
+      , Quoted DoubleQuote
+        [ Str "I", Space, Str "want", Space, Str "to", Space, Str "go." ]
+      ]
+    , Space
+    , Str "Were"
+    , Space
+    , Str "you"
+    , Space
+    , Str "alive"
+    , Space
+    , Str "in"
+    , Space
+    , Str "the"
+    , SoftBreak
+    , Str "70\8217s?"
+    ]
+  , Para
+    [ Str "Here"
+    , Space
+    , Str "is"
+    , Space
+    , Str "some"
+    , Space
+    , Str "quoted"
+    , Space
+    , Quoted SingleQuote
+      [ Code ( "", [], [] ) "code" ]
+    , Space
+    , Str "and"
+    , Space
+    , Str "a"
+    , Space
+    , Quoted DoubleQuote
+      [ Link
+        ( "", [], [] )
+        [ Str "quoted", Space, Str "link" ]
+        ( "http://example.com/?foo=1&bar=2", "" )
+      ]
+    , Str "."
+    ]
+  , Para
+    [ Str "Some"
+    , Space
+    , Str "dashes:"
+    , Space
+    , Str "one\8212two"
+    , Space
+    , Str "\8212"
+    , Space
+    , Str "three\8212four"
+    , Space
+    , Str "\8212"
+    , Space
+    , Str "five."
+    ]
+  , Para
+    [ Str "Dashes"
+    , Space
+    , Str "between"
+    , Space
+    , Str "numbers:"
+    , Space
+    , Str "5\8211\&7,"
+    , Space
+    , Str "255\8211\&66,"
+    , Space
+    , Str "1987\8211\&1999."
+    ]
+  , Para
+    [ Str "Ellipses\8230and\8230and\8230." ]
+  , HorizontalRule
+  , Header 1
+    ( "latex", [], [] )
+    [ Str "LaTeX" ]
+  , BulletList
+    [
+      [ Plain [ RawInline ( Format "tex" ) "\\cite[22-23]{smith.1899}" ] ]
+    ,
+      [ Plain [ Math InlineMath "2+2=4" ] ]
+    ,
+      [ Plain [ Math InlineMath "x \\in y" ] ]
+    ,
+      [ Plain [ Math InlineMath "\\alpha \\wedge \\omega" ] ]
+    ,
+      [ Plain [ Math InlineMath "223" ] ]
+    ,
+      [ Plain [ Math InlineMath "p", Str "-Tree" ] ]
+    ,
+      [ Plain
+        [ Str "Here\8217s"
+        , Space
+        , Str "some"
+        , Space
+        , Str "display"
+        , Space
+        , Str "math:"
+        , SoftBreak
+        , Math DisplayMath "\\frac{d}{dx}f(x)=\\lim_{h\\to 0}\\frac{f(x+h)-f(x)}{h}"
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "Here\8217s"
+        , Space
+        , Str "one"
+        , Space
+        , Str "that"
+        , Space
+        , Str "has"
+        , Space
+        , Str "a"
+        , Space
+        , Str "line"
+        , Space
+        , Str "break"
+        , Space
+        , Str "in"
+        , Space
+        , Str "it:"
+        , Space
+        , Math InlineMath "\\alpha + \\omega \\times x^2"
+        , Str "."
+        ]
+      ]
+    ]
+  , Para
+    [ Str "These"
+    , Space
+    , Str "shouldn\8217t"
+    , Space
+    , Str "be"
+    , Space
+    , Str "math:"
+    ]
+  , BulletList
+    [
+      [ Plain
+        [ Str "To"
+        , Space
+        , Str "get"
+        , Space
+        , Str "the"
+        , Space
+        , Str "famous"
+        , Space
+        , Str "equation,"
+        , Space
+        , Str "write"
+        , Space
+        , Code
+          ( "", [], [] ) "$e = mc^2$"
+        , Str "."
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "$22,000"
+        , Space
+        , Str "is"
+        , Space
+        , Str "a"
+        , Space
+        , Emph
+          [ Str "lot" ]
+        , Space
+        , Str "of"
+        , Space
+        , Str "money."
+        , Space
+        , Str "So"
+        , Space
+        , Str "is"
+        , Space
+        , Str "$34,000."
+        , SoftBreak
+        , Str "(It"
+        , Space
+        , Str "worked"
+        , Space
+        , Str "if"
+        , Space
+        , Quoted DoubleQuote
+          [ Str "lot" ]
+        , Space
+        , Str "is"
+        , Space
+        , Str "emphasized.)"
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "Shoes"
+        , Space
+        , Str "($20)"
+        , Space
+        , Str "and"
+        , Space
+        , Str "socks"
+        , Space
+        , Str "($5)."
+        ]
+      ]
+    ,
+      [ Plain
+        [ Str "Escaped"
+        , Space
+        , Code
+          ( "", [], [] ) "$"
+        , Str ":"
+        , Space
+        , Str "$73"
+        , Space
+        , Emph
+          [ Str "this"
+          , Space
+          , Str "should"
+          , Space
+          , Str "be"
+          , Space
+          , Str "emphasized"
+          ]
+        , Space
+        , Str "23$."
+        ]
+      ]
+    ]
+  , Para
+    [ Str "Here\8217s"
+    , Space
+    , Str "a"
+    , Space
+    , Str "LaTeX"
+    , Space
+    , Str "table:"
+    ]
+  , RawBlock
+    ( Format "tex" ) "\\begin{tabular}{|l|l|}\\hline\nAnimal & Number \\\\ \\hline\nDog    & 2      \\\\\nCat    & 1      \\\\ \\hline\n\\end{tabular}"
+  , HorizontalRule
+  , Header 1
+    ( "special-characters", [], [] )
+    [ Str "Special", Space, Str "Characters" ]
+  , Para
+    [ Str "Here", Space, Str "is", Space, Str "some", Space, Str "unicode:" ]
+  , BulletList
+    [
+      [ Plain [ Str "I", Space, Str "hat:", Space, Str "\206" ] ]
+    ,
+      [ Plain [ Str "o", Space, Str "umlaut:", Space, Str "\246" ] ]
+    ,
+      [ Plain [ Str "section:", Space, Str "\167" ] ]
+    ,
+      [ Plain [ Str "set", Space, Str "membership:", Space, Str "\8712" ] ]
+    ,
+      [ Plain [ Str "copyright:", Space, Str "\169" ] ]
+    ]
+  , Para
+    [ Str "AT&T"
+    , Space
+    , Str "has"
+    , Space
+    , Str "an"
+    , Space
+    , Str "ampersand"
+    , Space
+    , Str "in"
+    , Space
+    , Str "their"
+    , Space
+    , Str "name."
+    ]
+  , Para
+    [ Str "AT&T"
+    , Space
+    , Str "is"
+    , Space
+    , Str "another"
+    , Space
+    , Str "way"
+    , Space
+    , Str "to"
+    , Space
+    , Str "write"
+    , Space
+    , Str "it."
+    ]
+  , Para
+    [ Str "This", Space, Str "&", Space, Str "that." ]
+  , Para
+    [ Str "4", Space, Str "<", Space, Str "5." ]
+  , Para
+    [ Str "6", Space, Str ">", Space, Str "5." ]
+  , Para
+    [ Str "Backslash:", Space, Str "\\" ]
+  , Para
+    [ Str "Backtick:", Space, Str "`" ]
+  , Para
+    [ Str "Asterisk:", Space, Str "*" ]
+  , Para
+    [ Str "Underscore:", Space, Str "_" ]
+  , Para
+    [ Str "Left", Space, Str "brace:", Space, Str "{" ]
+  , Para
+    [ Str "Right", Space, Str "brace:", Space, Str "}" ]
+  , Para
+    [ Str "Left", Space, Str "bracket:", Space, Str "[" ]
+  , Para
+    [ Str "Right", Space, Str "bracket:", Space, Str "]" ]
+  , Para
+    [ Str "Left", Space, Str "paren:", Space, Str "(" ]
+  , Para
+    [ Str "Right", Space, Str "paren:", Space, Str ")" ]
+  , Para
+    [ Str "Greater-than:", Space, Str ">" ]
+  , Para
+    [ Str "Hash:", Space, Str "#" ]
+  , Para
+    [ Str "Period:", Space, Str "." ]
+  , Para
+    [ Str "Bang:", Space, Str "!" ]
+  , Para
+    [ Str "Plus:", Space, Str "+" ]
+  , Para
+    [ Str "Minus:", Space, Str "-" ]
+  , HorizontalRule
+  , Header 1
+    ( "links", [], [] )
+    [ Str "Links" ]
+  , Header 2
+    ( "explicit", [], [] )
+    [ Str "Explicit" ]
+  , Para
+    [ Str "Just"
+    , Space
+    , Str "a"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "URL" ]
+      ( "/url/", "" )
+    , Str "."
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "URL", Space, Str "and", Space, Str "title" ]
+      ( "/url/", "title" )
+    , Str "."
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "URL", Space, Str "and", Space, Str "title" ]
+      ( "/url/", "title preceded by two spaces" )
+    , Str "."
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "URL", Space, Str "and", Space, Str "title" ]
+      ( "/url/", "title preceded by a tab" )
+    , Str "."
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "URL", Space, Str "and", Space, Str "title" ]
+      ( "/url/", "title with \"quotes\" in it" )
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "URL", Space, Str "and", Space, Str "title" ]
+      ( "/url/", "title with single quotes" )
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "with_underscore" ]
+      ( "/url/with_underscore", "" )
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "Email", Space, Str "link" ]
+      ( "mailto:nobody@nowhere.net", "" )
+    ]
+  , Para
+    [ Link ( "", [], [] ) [ Str "Empty" ] ( "", "" ), Str "." ]
+  , Header 2
+    ( "reference", [], [] )
+    [ Str "Reference" ]
+  , Para
+    [ Str "Foo"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "bar" ]
+      ( "/url/", "" )
+    , Str "."
+    ]
+  , Para
+    [ Str "With"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "embedded", Space, Str "[brackets]" ]
+      ( "/url/", "" )
+    , Str "."
+    ]
+  , Para
+    [ Link
+      ( "", [], [] )
+      [ Str "b" ]
+      ( "/url/", "" )
+    , Space
+    , Str "by"
+    , Space
+    , Str "itself"
+    , Space
+    , Str "should"
+    , Space
+    , Str "be"
+    , Space
+    , Str "a"
+    , Space
+    , Str "link."
+    ]
+  , Para
+    [ Str "Indented"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "once" ]
+      ( "/url", "" )
+    , Str "."
+    ]
+  , Para
+    [ Str "Indented"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "twice" ]
+      ( "/url", "" )
+    , Str "."
+    ]
+  , Para
+    [ Str "Indented"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "thrice" ]
+      ( "/url", "" )
+    , Str "."
+    ]
+  , Para
+    [ Str "This"
+    , Space
+    , Str "should"
+    , Space
+    , Str "[not][]"
+    , Space
+    , Str "be"
+    , Space
+    , Str "a"
+    , Space
+    , Str "link."
+    ]
+  , CodeBlock
+    ( "", [], [] ) "[not]: /url"
+  , Para
+    [ Str "Foo"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "bar" ]
+      ( "/url/", "Title with \"quotes\" inside" )
+    , Str "."
+    ]
+  , Para
+    [ Str "Foo"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "biz" ]
+      ( "/url/", "Title with \"quote\" inside" )
+    , Str "."
+    ]
+  , Header 2
+    ( "with-ampersands", [], [] )
+    [ Str "With", Space, Str "ampersands" ]
+  , Para
+    [ Str "Here\8217s"
+    , Space
+    , Str "a"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "link"
+      , Space
+      , Str "with"
+      , Space
+      , Str "an"
+      , Space
+      , Str "ampersand"
+      , Space
+      , Str "in"
+      , Space
+      , Str "the"
+      , Space
+      , Str "URL"
+      ]
+      ( "http://example.com/?foo=1&bar=2", "" )
+    , Str "."
+    ]
+  , Para
+    [ Str "Here\8217s"
+    , Space
+    , Str "a"
+    , Space
+    , Str "link"
+    , Space
+    , Str "with"
+    , Space
+    , Str "an"
+    , Space
+    , Str "amersand"
+    , Space
+    , Str "in"
+    , Space
+    , Str "the"
+    , Space
+    , Str "link"
+    , Space
+    , Str "text:"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "AT&T" ]
+      ( "http://att.com/", "AT&T" )
+    , Str "."
+    ]
+  , Para
+    [ Str "Here\8217s"
+    , Space
+    , Str "an"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "inline", Space, Str "link" ]
+      ( "/script?foo=1&bar=2", "" )
+    , Str "."
+    ]
+  , Para
+    [ Str "Here\8217s"
+    , Space
+    , Str "an"
+    , Space
+    , Link
+      ( "", [], [] )
+      [ Str "inline"
+      , Space
+      , Str "link"
+      , Space
+      , Str "in"
+      , Space
+      , Str "pointy"
+      , Space
+      , Str "braces"
+      ]
+      ( "/script?foo=1&bar=2", "" )
+    , Str "."
+    ]
+  , Header 2
+    ( "autolinks", [], [] )
+    [ Str "Autolinks" ]
+  , Para
+    [ Str "With"
+    , Space
+    , Str "an"
+    , Space
+    , Str "ampersand:"
+    , Space
+    , Link
+      ( "", [ "uri" ], [] )
+      [ Str "http://example.com/?foo=1&bar=2" ]
+      ( "http://example.com/?foo=1&bar=2", "" )
+    ]
+  , BulletList
+    [
+      [ Plain [ Str "In", Space, Str "a", Space, Str "list?" ] ]
+    ,
+      [ Plain
+        [ Link
+          ( "", [ "uri" ], [] )
+          [ Str "http://example.com/" ]
+          ( "http://example.com/", "" )
+        ]
+      ]
+    ,
+      [ Plain [ Str "It", Space, Str "should." ] ]
+    ]
+  , Para
+    [ Str "An"
+    , Space
+    , Str "e-mail"
+    , Space
+    , Str "address:"
+    , Space
+    , Link
+      ( "", [ "email" ], [] )
+      [ Str "nobody@nowhere.net" ]
+      ( "mailto:nobody@nowhere.net", "" )
+    ]
+  , BlockQuote
+    [ Para
+      [ Str "Blockquoted:"
+      , Space
+      , Link
+        ( "", [ "uri" ], [] )
+        [ Str "http://example.com/" ]
+        ( "http://example.com/", "" )
+      ]
+    ]
+  , Para
+    [ Str "Auto-links"
+    , Space
+    , Str "should"
+    , Space
+    , Str "not"
+    , Space
+    , Str "occur"
+    , Space
+    , Str "here:"
+    , Space
+    , Code
+      ( "", [], [] ) ""
+    ]
+  , CodeBlock
+    ( "", [], [] ) "or here: "
+  , HorizontalRule
+  , Header 1
+    ( "images", [], [] )
+    [ Str "Images" ]
+  , Para
+    [ Str "From"
+    , Space
+    , Quoted DoubleQuote
+      [ Str "Voyage", Space, Str "dans", Space, Str "la", Space, Str "Lune" ]
+    , Space
+    , Str "by"
+    , Space
+    , Str "Georges"
+    , Space
+    , Str "Melies"
+    , Space
+    , Str "(1902):"
+    ]
+  , Para
+    [ Image
+      ( "", [], [] )
+      [ Str "lalune" ]
+      ( "lalune.jpg", "fig:Voyage dans la Lune" )
+    ]
+  , Para
+    [ Str "Here"
+    , Space
+    , Str "is"
+    , Space
+    , Str "a"
+    , Space
+    , Str "movie"
+    , Space
+    , Image
+      ( "", [], [] )
+      [ Str "movie" ]
+      ( "movie.jpg", "" )
+    , Space
+    , Str "icon."
+    ]
+  , HorizontalRule
+  , Header 1
+    ( "footnotes", [], [] )
+    [ Str "Footnotes" ]
+  , Para
+    [ Str "Here"
+    , Space
+    , Str "is"
+    , Space
+    , Str "a"
+    , Space
+    , Str "footnote"
+    , Space
+    , Str "reference,"
+    , Note
+      [ 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"
+        , SoftBreak
+        , 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."
+        ]
+      ]
+    , Space
+    , Str "and"
+    , Space
+    , Str "another."
+    , Note
+      [ Para
+        [ Str "Here\8217s"
+        , Space
+        , Str "the"
+        , Space
+        , Str "long"
+        , Space
+        , Str "note."
+        , Space
+        , Str "This"
+        , Space
+        , Str "one"
+        , Space
+        , Str "contains"
+        , Space
+        , Str "multiple"
+        , SoftBreak
+        , 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"
+        , SoftBreak
+        , 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"
+        , SoftBreak
+        , 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."
+        ]
+      ]
+    , SoftBreak
+    , 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"
+    , SoftBreak
+    , Str "contains"
+    , Space
+    , Str "a"
+    , Space
+    , Str "space.[^my"
+    , Space
+    , Str "note]"
+    , Space
+    , Str "Here"
+    , Space
+    , Str "is"
+    , Space
+    , Str "an"
+    , Space
+    , Str "inline"
+    , Space
+    , Str "note."
+    , Note
+      [ Para
+        [ Str "This"
+        , SoftBreak
+        , Str "is"
+        , Space
+        , Emph
+          [ Str "easier" ]
+        , Space
+        , Str "to"
+        , Space
+        , Str "type."
+        , Space
+        , Str "Inline"
+        , Space
+        , Str "notes"
+        , Space
+        , Str "may"
+        , Space
+        , Str "contain"
+        , SoftBreak
+        , Link
+          ( "", [], [] )
+          [ Str "links" ]
+          ( "http://google.com", "" )
+        , Space
+        , Str "and"
+        , Space
+        , Code
+          ( "", [], [] ) "]"
+        , Space
+        , Str "verbatim"
+        , Space
+        , Str "characters,"
+        , SoftBreak
+        , Str "as"
+        , Space
+        , Str "well"
+        , Space
+        , Str "as"
+        , Space
+        , Str "[bracketed"
+        , Space
+        , Str "text]."
+        ]
+      ]
+    ]
+  , BlockQuote
+    [ Para
+      [ Str "Notes"
+      , Space
+      , Str "can"
+      , Space
+      , Str "go"
+      , Space
+      , Str "in"
+      , Space
+      , Str "quotes."
+      , Note
+        [ Para [ Str "In", Space, Str "quote." ] ]
+      ]
+    ]
+  , OrderedList
+    ( 1, Decimal, Period )
+    [
+      [ Plain
+        [ Str "And"
+        , Space
+        , Str "in"
+        , Space
+        , Str "list"
+        , Space
+        , Str "items."
+        , Note
+          [ Para [ Str "In", Space, Str "list." ] ]
+        ]
+      ]
+    ]
+  , 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."
+    ]
+  ]
diff --git a/test/writer.opendocument b/test/writer.opendocument
index fa524eb26..9e6ef336e 100644
--- a/test/writer.opendocument
+++ b/test/writer.opendocument
@@ -1207,9 +1207,9 @@ linkParagraphs
 Here’s a regular
 paragraph.
-In Markdown 1.0.0 and earlier. Version
-8. This line turns into a list item. Because a hard-wrapped line in the middle
-of a paragraph looked like a list item.
+In Markdown 1.0.0 and earlier. Version 8.
+This line turns into a list item. Because a hard-wrapped line in the middle of a
+paragraph looked like a list item.
 Here’s one with a bullet. *
 criminey.
 There should be a hard line
@@ -1218,8 +1218,7 @@ breakhere.
 Block
 Quotes
 E-mail style:
-This is a block quote. It is pretty
-short.
+This is a block quote. It is pretty short.
 Code in a block quote:
 sub status {
 print "working";
@@ -1236,8 +1235,8 @@ short.
 Nested block quotes:
 nested
 nested
-This should not be a block quote:
-2 > 1.
+This should not be a block quote: 2
+> 1.
 And a following paragraph.
 
 Code
@@ -1464,12 +1463,12 @@ and spaces
     this is a list item indented with
     spaces
       
-        this is an example list item indented
-        with tabs
+        this is an example list item indented with
+        tabs
       
       
-        this is an example list item indented
-        with spaces
+        this is an example list item indented with
+        spaces
       
     
   
@@ -1485,8 +1484,8 @@ list markers
     with a continuation
     
       
-        sublist with roman numerals, starting
-        with 4
+        sublist with roman numerals, starting with
+        4
       
       
         more items
@@ -1537,8 +1536,7 @@ list markers
     
   
 
-Should not be a list
-item:
+Should not be a list item:
 M.A. 2007
 B. Williams
 
@@ -1573,8 +1571,8 @@ fruit
 italics:
 apple
 red
-fruitcontains
-seeds, crisp, pleasant to taste
+fruitcontains seeds,
+crisp, pleasant to taste
 orange
 orange
 fruit{ orange code block }orange
@@ -1613,15 +1611,12 @@ fruit
 
 HTML
 Blocks
-Simple block on one
-line:
+Simple block on one line:
 foo
-And nested without
-indentation:
+And nested without indentation:
 foo
 bar
-Interpreted markdown in a
-table:
+Interpreted markdown in a table:
 This is
 emphasized
 And this is
@@ -1689,13 +1684,13 @@ subscripts, because of the unescaped spaces: a^b c^d, a~b c~d.
 Smart
 quotes, ellipses,
 dashes
-“Hello,” said the spider.
-“‘Shelob’ is my name.”
+“Hello,” said the spider. “‘Shelob’
+is my name.”
 ‘A’, ‘B’, and ‘C’ are letters.
 ‘Oak,’ ‘elm,’ and ‘beech’ are names of
 trees. So is ‘pine.’
-‘He said, “I want to go.”’ Were you
-alive in the 70’s?
+‘He said, “I want to go.”’ Were you alive
+in the 70’s?
 Here is some quoted
 ‘code’ and a
 “quoted
@@ -1743,8 +1738,8 @@ five.
   
   
     $22,000 is a
-    lot of money. So is $34,000.
-    (It worked if “lot” is emphasized.)
+    lot of money. So is $34,000. (It
+    worked if “lot” is emphasized.)
   
   
     Shoes ($20) and socks ($5).
@@ -1778,8 +1773,8 @@ Characters
     copyright: ©
   
 
-AT&T has an ampersand in
-their name.
+AT&T has an ampersand in their
+name.
 AT&T is another way to write
 it.
 This & that.
@@ -1888,25 +1883,23 @@ icon.
 Footnotes
 Here is a footnote
 reference,1Here
-is the footnote. It can go anywhere after the footnote reference. It need not
-be placed at the end of the document.
-and
+is the footnote. It can go anywhere after the footnote reference. It need not be
+placed at the end of the document. and
 another.2Here’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
+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.3This
-is easier to type. Inline notes
-may contain
+is easier to type. Inline notes may
+contain
 links
-and ] verbatim
-characters, as well as [bracketed
-text].
+and ] verbatim characters,
+as well as [bracketed text].
 Notes can go in
 quotes.4In
 quote.
diff --git a/test/writer.org b/test/writer.org
index 38ec35a3e..604aca21d 100644
--- a/test/writer.org
+++ b/test/writer.org
@@ -566,8 +566,8 @@ Superscripts: a^{bc}d a^{/hello/} a^{hello there}.
 
 Subscripts: H_{2}O, H_{23}O, H_{many of them}O.
 
-These should not be superscripts or subscripts, because of the unescaped
-spaces: a^b c^d, a~b c~d.
+These should not be superscripts or subscripts, because of the unescaped spaces:
+a^b c^d, a~b c~d.
 
 --------------
 
@@ -739,8 +739,7 @@ Foo [[/url/][biz]].
    :PROPERTIES:
    :CUSTOM_ID: with-ampersands
    :END:
-Here's a [[http://example.com/?foo=1&bar=2][link with an ampersand in the
-URL]].
+Here's a [[http://example.com/?foo=1&bar=2][link with an ampersand in the URL]].
 
 Here's a link with an amersand in the link text: [[http://att.com/][AT&T]].
 
@@ -801,8 +800,8 @@ note.[fn:3]
 
 This paragraph should not be part of the note, as it is not indented.
 
-[fn:1] Here is the footnote. It can go anywhere after the footnote reference.
-       It need not be placed at the end of the document.
+[fn:1] Here is the footnote. It can go anywhere after the footnote reference. It
+       need not be placed at the end of the document.
 
 [fn:2] Here's the long note. This one contains multiple blocks.
 
@@ -813,8 +812,8 @@ This paragraph should not be part of the note, as it is not indented.
          {  }
        #+end_example
 
-       If you want, you can indent every line, but you can also be lazy and
-       just indent the first line of each block.
+       If you want, you can indent every line, but you can also be lazy and just
+       indent the first line of each block.
 
 [fn:3] This is /easier/ to type. Inline notes may contain
        [[http://google.com][links]] and =]= verbatim characters, as well as
diff --git a/test/writer.plain b/test/writer.plain
index b8767957f..b9425f9c0 100644
--- a/test/writer.plain
+++ b/test/writer.plain
@@ -5,7 +5,7 @@ July 17, 2006
 This is a set of tests for pandoc. Most of them are adapted from John Gruber’s
 markdown test suite.
 
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
 
 Headers
 
@@ -29,7 +29,7 @@ Level 2
 
 with no blank line
 
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
 
 Paragraphs
 
@@ -44,7 +44,7 @@ Here’s one with a bullet. * criminey.
 There should be a hard line break
 here.
 
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
 
 Block Quotes
 
@@ -73,7 +73,7 @@ This should not be a block quote: 2 > 1.
 
 And a following paragraph.
 
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
 
 Code Blocks
 
@@ -93,7 +93,7 @@ And:
 
     These should not be escaped:  \$ \\ \> \[ \{
 
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
 
 Lists
 
@@ -250,7 +250,7 @@ M.A. 2007
 
 B. Williams
 
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
 
 Definition Lists
 
@@ -395,7 +395,7 @@ Code:
 
 Hr’s:
 
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
 
 Inline Markup
 
@@ -421,10 +421,10 @@ Superscripts: a^(bc)d a^(hello) a^(hello there).
 
 Subscripts: H₂O, H₂₃O, H_(many of them)O.
 
-These should not be superscripts or subscripts, because of the unescaped
-spaces: a^b c^d, a~b c~d.
+These should not be superscripts or subscripts, because of the unescaped spaces:
+a^b c^d, a~b c~d.
 
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
 
 Smart quotes, ellipses, dashes
 
@@ -444,7 +444,7 @@ Dashes between numbers: 5–7, 255–66, 1987–1999.
 
 Ellipses…and…and….
 
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
 
 LaTeX
 
@@ -468,7 +468,7 @@ These shouldn’t be math:
 
 Here’s a LaTeX table:
 
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
 
 Special Characters
 
@@ -522,7 +522,7 @@ Plus: +
 
 Minus: -
 
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
 
 Links
 
@@ -594,7 +594,7 @@ Auto-links should not occur here: 
 
     or here: 
 
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
 
 Images
 
@@ -604,7 +604,7 @@ From “Voyage dans la Lune” by Georges Melies (1902):
 
 Here is a movie [movie] icon.
 
-------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
 
 Footnotes
 
@@ -622,13 +622,13 @@ 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).
+Subsequent blocks are indented to show that they belong to the 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.
+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, as well as [bracketed text].
diff --git a/test/writer.rst b/test/writer.rst
index 8d68f7ed5..0baaa670c 100644
--- a/test/writer.rst
+++ b/test/writer.rst
@@ -580,8 +580,8 @@ Superscripts: a\ :sup:`bc`\ d a\ :sup:`hello` a\ :sup:`hello there`.
 
 Subscripts: H\ :sub:`2`\ O, H\ :sub:`23`\ O, H\ :sub:`many of them`\ O.
 
-These should not be superscripts or subscripts, because of the unescaped
-spaces: a^b c^d, a~b c~d.
+These should not be superscripts or subscripts, because of the unescaped spaces:
+a^b c^d, a~b c~d.
 
 --------------
 
diff --git a/test/writer.tei b/test/writer.tei
index 587a6fcca..1ded37956 100644
--- a/test/writer.tei
+++ b/test/writer.tei
@@ -54,9 +54,9 @@ Gruber’s markdown test suite.
 
   Paragraphs
   Here’s a regular paragraph.
-  In Markdown 1.0.0 and earlier. Version 8. This line turns into a list
-  item. Because a hard-wrapped line in the middle of a paragraph looked like a
-  list item.
+  In Markdown 1.0.0 and earlier. Version 8. This line turns into a list item.
+  Because a hard-wrapped line in the middle of a paragraph looked like a list
+  item.
   Here’s one with a bullet. * criminey.
   There should be a hard line breakhere.
   
@@ -630,10 +630,10 @@ These should not be escaped:  \$ \\ \> \[ \{
   Hello, said the spider. Shelob is my
   name.
   A, B, and C are letters.
-  Oak, elm, and beech are
-  names of trees. So is pine.
-  He said, I want to go. Were you alive in
-  the 70’s?
+  Oak, elm, and beech are names
+  of trees. So is pine.
+  He said, I want to go. Were you alive in the
+  70’s?
   Here is some quoted code and a
   quoted
   link.
@@ -821,8 +821,8 @@ or here: <http://example.com/>
 
   Footnotes
   Here is a footnote reference,
-    
Here is the footnote. It can go anywhere after the footnote reference.
-    It need not be placed at the end of the document.
+    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
@@ -830,8 +830,8 @@ or here: <http://example.com/>
     
   { <code> }
 
-    
If you want, you can indent every line, but you can also be lazy and
-    just indent the first line of each block.
+    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.
diff --git a/test/writer.texinfo b/test/writer.texinfo
index 53a25d515..ca80f3245 100644
--- a/test/writer.texinfo
+++ b/test/writer.texinfo
@@ -732,8 +732,8 @@ Superscripts: a@sup{bc}d a@sup{@emph{hello}} a@sup{hello@ there}.
 
 Subscripts: H@sub{2}O, H@sub{23}O, H@sub{many@ of@ them}O.
 
-These should not be superscripts or subscripts, because of the unescaped
-spaces: a^b c^d, a~b c~d.
+These should not be superscripts or subscripts, because of the unescaped spaces:
+a^b c^d, a~b c~d.
 
 @iftex
 @bigskip@hrule@bigskip
@@ -1014,24 +1014,22 @@ Here is a movie @image{movie,,,movie,jpg} icon.
 @node Footnotes
 @chapter Footnotes
 @anchor{#footnotes}
-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.
+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).
+Subsequent blocks are indented to show that they belong to the footnote (as with
+list items).
 
 @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] Here is an inline
-note.@footnote{This is @emph{easier} to type. Inline notes may contain
-@uref{http://google.com,links} and @code{]} verbatim characters, as well as
-[bracketed text].}
+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 @uref{http://google.com,links}
+and @code{]} verbatim characters, as well as [bracketed text].}
 
 @quotation
 Notes can go in quotes.@footnote{In quote.}
-- 
cgit v1.2.3


From 83ebb85b640c9dffbc931a6aa84ecb0574c5693d Mon Sep 17 00:00:00 2001
From: John MacFarlane 
Date: Tue, 21 Sep 2021 16:42:33 -0700
Subject: Remove unused epub test file features.epub.

---
 test/epub/features.epub | Bin 66371 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 test/epub/features.epub

diff --git a/test/epub/features.epub b/test/epub/features.epub
deleted file mode 100644
index 0d50380ac..000000000
Binary files a/test/epub/features.epub and /dev/null differ
-- 
cgit v1.2.3


From a88b0098d6c92b7a37116a114a5c0b86fb888e91 Mon Sep 17 00:00:00 2001
From: John MacFarlane 
Date: Tue, 21 Sep 2021 16:49:58 -0700
Subject: Make test/epub/wasteland.epub valid.

---
 test/epub/wasteland.epub | Bin 35496 -> 34926 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/test/epub/wasteland.epub b/test/epub/wasteland.epub
index c958c5fc2..f6a849b47 100644
Binary files a/test/epub/wasteland.epub and b/test/epub/wasteland.epub differ
-- 
cgit v1.2.3


From c6fa0bc2711c9febc04e14b6006a69e224b6c920 Mon Sep 17 00:00:00 2001
From: John MacFarlane 
Date: Tue, 21 Sep 2021 17:03:25 -0700
Subject: Revert "Remove unused epub test file features.epub."

This reverts commit 83ebb85b640c9dffbc931a6aa84ecb0574c5693d.
---
 test/epub/features.epub | Bin 0 -> 66371 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 test/epub/features.epub

diff --git a/test/epub/features.epub b/test/epub/features.epub
new file mode 100644
index 000000000..0d50380ac
Binary files /dev/null and b/test/epub/features.epub differ
-- 
cgit v1.2.3


From 3de0d5a9778e5be02d47e1de607c642948cb02e9 Mon Sep 17 00:00:00 2001
From: John MacFarlane 
Date: Tue, 21 Sep 2021 18:54:42 -0700
Subject: test/epub: an excerpt from The Wasteland is enough!

Saves over 100K.
---
 test/epub/wasteland.epub   |  Bin 34926 -> 24352 bytes
 test/epub/wasteland.native | 7940 +-------------------------------------------
 2 files changed, 20 insertions(+), 7920 deletions(-)

diff --git a/test/epub/wasteland.epub b/test/epub/wasteland.epub
index f6a849b47..5eec66454 100644
Binary files a/test/epub/wasteland.epub and b/test/epub/wasteland.epub differ
diff --git a/test/epub/wasteland.native b/test/epub/wasteland.native
index fe4980e5d..17b2a875e 100644
--- a/test/epub/wasteland.native
+++ b/test/epub/wasteland.native
@@ -414,20 +414,7 @@
           , Str "of"
           , Space
           , Str "man,"
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "Line", Space, Str "20." ]
-                ( "#wasteland-content.xhtml#ln20", "" )
-              , Space
-              , Str "Cf."
-              , Space
-              , Str "Ezekiel"
-              , Space
-              , Str "2:1."
-              ]
-            ]
+          , Str ""
           , Span
             ( "", [ "lnum" ], [] )
             [ Str "20" ]
@@ -501,20 +488,7 @@
           , Str "no"
           , Space
           , Str "relief,"
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "23." ]
-                ( "#wasteland-content.xhtml#ln23", "" )
-              , Space
-              , Str "Cf."
-              , Space
-              , Str "Ecclesiastes"
-              , Space
-              , Str "12:5."
-              ]
-            ]
+          , Str ""
           ]
         ]
       , Div
@@ -681,28 +655,7 @@
               , Str "der"
               , Space
               , Str "Wind"
-              , Note
-                [ Para
-                  [ Link
-                    ( "", [], [] )
-                    [ Str "31." ]
-                    ( "#wasteland-content.xhtml#ln31", "" )
-                  , Space
-                  , Str "V."
-                  , Space
-                  , Str "Tristan"
-                  , Space
-                  , Str "und"
-                  , Space
-                  , Str "Isolde,"
-                  , Space
-                  , Str "i,"
-                  , Space
-                  , Str "verses"
-                  , Space
-                  , Str "5-8."
-                  ]
-                ]
+              , Str ""
               ]
             ]
           , Div
@@ -882,22 +835,7 @@
             , Str "Meer"
             ]
           , Str "."
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "42." ]
-                ( "#wasteland-content.xhtml#ln42", "" )
-              , Space
-              , Str "Id."
-              , Space
-              , Str "iii,"
-              , Space
-              , Str "verse"
-              , Space
-              , Str "24."
-              ]
-            ]
+          , Str ""
           ]
         ]
       ]
@@ -971,246 +909,7 @@
           , Str "said"
           , Space
           , Str "she,"
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "46." ]
-                ( "#wasteland-content.xhtml#ln46", "" )
-              , Space
-              , Str "I"
-              , Space
-              , Str "am"
-              , Space
-              , Str "not"
-              , Space
-              , Str "familiar"
-              , Space
-              , Str "with"
-              , Space
-              , Str "the"
-              , Space
-              , Str "exact"
-              , Space
-              , Str "constitution"
-              , Space
-              , Str "of"
-              , Space
-              , Str "the"
-              , Space
-              , Str "Tarot"
-              , Space
-              , Str "pack"
-              , Space
-              , Str "of"
-              , SoftBreak
-              , Str "cards,"
-              , Space
-              , Str "from"
-              , Space
-              , Str "which"
-              , Space
-              , Str "I"
-              , Space
-              , Str "have"
-              , Space
-              , Str "obviously"
-              , Space
-              , Str "departed"
-              , Space
-              , Str "to"
-              , Space
-              , Str "suit"
-              , Space
-              , Str "my"
-              , Space
-              , Str "own"
-              , Space
-              , Str "convenience."
-              , SoftBreak
-              , Str "The"
-              , Space
-              , Str "Hanged"
-              , Space
-              , Str "Man,"
-              , Space
-              , Str "a"
-              , Space
-              , Str "member"
-              , Space
-              , Str "of"
-              , Space
-              , Str "the"
-              , Space
-              , Str "traditional"
-              , Space
-              , Str "pack,"
-              , Space
-              , Str "fits"
-              , Space
-              , Str "my"
-              , Space
-              , Str "purpose"
-              , Space
-              , Str "in"
-              , Space
-              , Str "two"
-              , SoftBreak
-              , Str "ways:"
-              , Space
-              , Str "because"
-              , Space
-              , Str "he"
-              , Space
-              , Str "is"
-              , Space
-              , Str "associated"
-              , Space
-              , Str "in"
-              , Space
-              , Str "my"
-              , Space
-              , Str "mind"
-              , Space
-              , Str "with"
-              , Space
-              , Str "the"
-              , Space
-              , Str "Hanged"
-              , Space
-              , Str "God"
-              , Space
-              , Str "of"
-              , Space
-              , Str "Frazer,"
-              , SoftBreak
-              , Str "and"
-              , Space
-              , Str "because"
-              , Space
-              , Str "I"
-              , Space
-              , Str "associate"
-              , Space
-              , Str "him"
-              , Space
-              , Str "with"
-              , Space
-              , Str "the"
-              , Space
-              , Str "hooded"
-              , Space
-              , Str "figure"
-              , Space
-              , Str "in"
-              , Space
-              , Str "the"
-              , Space
-              , Str "passage"
-              , Space
-              , Str "of"
-              , Space
-              , Str "the"
-              , SoftBreak
-              , Str "disciples"
-              , Space
-              , Str "to"
-              , Space
-              , Str "Emmaus"
-              , Space
-              , Str "in"
-              , Space
-              , Str "Part"
-              , Space
-              , Str "V."
-              , Space
-              , Str "The"
-              , Space
-              , Str "Phoenician"
-              , Space
-              , Str "Sailor"
-              , Space
-              , Str "and"
-              , Space
-              , Str "the"
-              , Space
-              , Str "Merchant"
-              , SoftBreak
-              , Str "appear"
-              , Space
-              , Str "later;"
-              , Space
-              , Str "also"
-              , Space
-              , Str "the"
-              , Space
-              , Str "\"crowds"
-              , Space
-              , Str "of"
-              , Space
-              , Str "people,\""
-              , Space
-              , Str "and"
-              , Space
-              , Str "Death"
-              , Space
-              , Str "by"
-              , Space
-              , Str "Water"
-              , Space
-              , Str "is"
-              , SoftBreak
-              , Str "executed"
-              , Space
-              , Str "in"
-              , Space
-              , Str "Part"
-              , Space
-              , Str "IV."
-              , Space
-              , Str "The"
-              , Space
-              , Str "Man"
-              , Space
-              , Str "with"
-              , Space
-              , Str "Three"
-              , Space
-              , Str "Staves"
-              , Space
-              , Str "(an"
-              , Space
-              , Str "authentic"
-              , Space
-              , Str "member"
-              , Space
-              , Str "of"
-              , SoftBreak
-              , Str "the"
-              , Space
-              , Str "Tarot"
-              , Space
-              , Str "pack)"
-              , Space
-              , Str "I"
-              , Space
-              , Str "associate,"
-              , Space
-              , Str "quite"
-              , Space
-              , Str "arbitrarily,"
-              , Space
-              , Str "with"
-              , Space
-              , Str "the"
-              , Space
-              , Str "Fisher"
-              , Space
-              , Str "King"
-              , SoftBreak
-              , Str "himself."
-              ]
-            ]
+          , Str ""
           ]
         ]
       , Div
@@ -1489,51 +1188,7 @@
           [ Str "Unreal"
           , Space
           , Str "City,"
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "60." ]
-                ( "#wasteland-content.xhtml#ln60", "" )
-              , Space
-              , Str "Cf."
-              , Space
-              , Str "Baudelaire:"
-              ]
-            , BlockQuote
-              [ Para
-                [ Str "\"Fourmillante"
-                , Space
-                , Str "cite;,"
-                , Space
-                , Str "cite;"
-                , Space
-                , Str "pleine"
-                , Space
-                , Str "de"
-                , Space
-                , Str "reves,"
-                , LineBreak
-                , Str "Ou"
-                , Space
-                , Str "le"
-                , Space
-                , Str "spectre"
-                , Space
-                , Str "en"
-                , SoftBreak
-                , Str "plein"
-                , Space
-                , Str "jour"
-                , Space
-                , Str "raccroche"
-                , Space
-                , Str "le"
-                , Space
-                , Str "passant.\""
-                ]
-              ]
-            ]
+          , Str ""
           , Span
             ( "", [ "lnum" ], [] )
             [ Str "60" ]
@@ -1599,55 +1254,7 @@
           , Str "so"
           , Space
           , Str "many."
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "63." ]
-                ( "#wasteland-content.xhtml#ln63", "" )
-              , Space
-              , Str "Cf."
-              , Space
-              , Str "Inferno,"
-              , Space
-              , Str "iii."
-              , Space
-              , Str "55-7."
-              ]
-            , BlockQuote
-              [ Para
-                [ Str "\"si"
-                , Space
-                , Str "lunga"
-                , Space
-                , Str "tratta"
-                , LineBreak
-                , Str "di"
-                , Space
-                , Str "gente,"
-                , Space
-                , Str "ch'io"
-                , Space
-                , Str "non"
-                , Space
-                , Str "avrei"
-                , Space
-                , Str "mai"
-                , Space
-                , Str "creduto"
-                , LineBreak
-                , Str "che"
-                , SoftBreak
-                , Str "morte"
-                , Space
-                , Str "tanta"
-                , Space
-                , Str "n'avesse"
-                , Space
-                , Str "disfatta.\""
-                ]
-              ]
-            ]
+          , Str ""
           ]
         ]
       , Div
@@ -1664,59 +1271,7 @@
           , Str "were"
           , Space
           , Str "exhaled,"
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "64." ]
-                ( "#wasteland-content.xhtml#ln64", "" )
-              , Space
-              , Str "Cf."
-              , Space
-              , Str "Inferno,"
-              , Space
-              , Str "iv."
-              , Space
-              , Str "25-7:"
-              ]
-            , BlockQuote
-              [ Para
-                [ Str "\"Quivi,"
-                , Space
-                , Str "secondo"
-                , Space
-                , Str "che"
-                , Space
-                , Str "per"
-                , Space
-                , Str "ascoltahre,"
-                , LineBreak
-                , Str "\"non"
-                , Space
-                , Str "avea"
-                , Space
-                , Str "pianto,"
-                , Space
-                , Str "ma'"
-                , Space
-                , Str "che"
-                , Space
-                , Str "di"
-                , SoftBreak
-                , Str "sospiri,"
-                , LineBreak
-                , Str "\"che"
-                , Space
-                , Str "l'aura"
-                , Space
-                , Str "eterna"
-                , Space
-                , Str "facevan"
-                , Space
-                , Str "tremare.\""
-                ]
-              ]
-            ]
+          , Str ""
           ]
         ]
       , Div
@@ -1805,28 +1360,7 @@
           , Str "of"
           , Space
           , Str "nine."
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "68." ]
-                ( "#wasteland-content.xhtml#ln68", "" )
-              , Space
-              , Str "A"
-              , Space
-              , Str "phenomenon"
-              , Space
-              , Str "which"
-              , Space
-              , Str "I"
-              , Space
-              , Str "have"
-              , Space
-              , Str "often"
-              , Space
-              , Str "noticed."
-              ]
-            ]
+          , Str ""
           ]
         ]
       , Div
@@ -1973,30 +1507,7 @@
           , Str "to"
           , Space
           , Str "men,"
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "74." ]
-                ( "#wasteland-content.xhtml#ln74", "" )
-              , Space
-              , Str "Cf."
-              , Space
-              , Str "the"
-              , Space
-              , Str "Dirge"
-              , Space
-              , Str "in"
-              , Space
-              , Str "Webster's"
-              , Space
-              , Str "White"
-              , Space
-              , Str "Devil"
-              , Space
-              , Str "."
-              ]
-            ]
+          , Str ""
           ]
         ]
       , Div
@@ -2046,28 +1557,7 @@
             ]
           , Space
           , Str "!\""
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "76." ]
-                ( "#wasteland-content.xhtml#ln76", "" )
-              , Space
-              , Str "V."
-              , Space
-              , Str "Baudelaire,"
-              , Space
-              , Str "Preface"
-              , Space
-              , Str "to"
-              , Space
-              , Str "Fleurs"
-              , Space
-              , Str "du"
-              , Space
-              , Str "Mal."
-              ]
-            ]
+          , Str ""
           ]
         ]
       ]
@@ -2108,30 +1598,7 @@
           , Str "burnished"
           , Space
           , Str "throne,"
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "77." ]
-                ( "#wasteland-content.xhtml#ln77", "" )
-              , Space
-              , Str "Cf."
-              , Space
-              , Str "Antony"
-              , Space
-              , Str "and"
-              , Space
-              , Str "Cleopatra,"
-              , Space
-              , Str "II."
-              , Space
-              , Str "ii.,"
-              , Space
-              , Str "l."
-              , Space
-              , Str "190."
-              ]
-            ]
+          , Str ""
           ]
         ]
       , Div
@@ -2408,47 +1875,7 @@
           , Str "the"
           , Space
           , Str "laquearia,"
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "92." ]
-                ( "#wasteland-content.xhtml#ln92", "" )
-              , Space
-              , Str "Laquearia."
-              , Space
-              , Str "V."
-              , Space
-              , Str "Aeneid,"
-              , Space
-              , Str "I."
-              , Space
-              , Str "726:"
-              ]
-            , BlockQuote
-              [ Para
-                [ Str "dependent"
-                , Space
-                , Str "lychni"
-                , Space
-                , Str "laquearibus"
-                , Space
-                , Str "aureis"
-                , Space
-                , Str "incensi,"
-                , Space
-                , Str "et"
-                , Space
-                , Str "noctem"
-                , SoftBreak
-                , Str "flammis"
-                , LineBreak
-                , Str "funalia"
-                , Space
-                , Str "vincunt."
-                ]
-              ]
-            ]
+          , Str ""
           ]
         ]
       , Div
@@ -2561,30 +1988,7 @@
           , Str "sylvan"
           , Space
           , Str "scene"
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "98." ]
-                ( "#wasteland-content.xhtml#ln98", "" )
-              , Space
-              , Str "Sylvan"
-              , Space
-              , Str "scene."
-              , Space
-              , Str "V."
-              , Space
-              , Str "Milton,"
-              , Space
-              , Str "Paradise"
-              , Space
-              , Str "Lost,"
-              , Space
-              , Str "iv."
-              , Space
-              , Str "140."
-              ]
-            ]
+          , Str ""
           ]
         ]
       , Div
@@ -2605,24 +2009,7 @@
           , Str "barbarous"
           , Space
           , Str "king"
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "99." ]
-                ( "#wasteland-content.xhtml#ln99", "" )
-              , Space
-              , Str "V."
-              , Space
-              , Str "Ovid,"
-              , Space
-              , Str "Metamorphoses,"
-              , Space
-              , Str "vi,"
-              , Space
-              , Str "Philomela."
-              ]
-            ]
+          , Str ""
           ]
         ]
       , Div
@@ -2641,24 +2028,7 @@
           , Str "the"
           , Space
           , Str "nightingale"
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "100." ]
-                ( "#wasteland-content.xhtml#ln100", "" )
-              , Space
-              , Str "Cf."
-              , Space
-              , Str "Part"
-              , Space
-              , Str "III,"
-              , Space
-              , Str "l."
-              , Space
-              , Str "204."
-              ]
-            ]
+          , Str ""
           , SoftBreak
           , Span
             ( "", [ "lnum" ], [] )
@@ -2952,24 +2322,7 @@
             , Str "rats'"
             , Space
             , Str "alley"
-            , Note
-              [ Para
-                [ Link
-                  ( "", [], [] )
-                  [ Str "115." ]
-                  ( "#wasteland-content.xhtml#ln115", "" )
-                , Space
-                , Str "Cf."
-                , Space
-                , Str "Part"
-                , Space
-                , Str "III,"
-                , Space
-                , Str "l."
-                , Space
-                , Str "195."
-                ]
-              ]
+            , Str ""
             ]
           ]
         , Div
@@ -3018,35 +2371,7 @@
           , Str "the"
           , Space
           , Str "door."
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "118." ]
-                ( "#wasteland-content.xhtml#ln118", "" )
-              , Space
-              , Str "Cf."
-              , Space
-              , Str "Webster:"
-              ]
-            , BlockQuote
-              [ Para
-                [ Str "\"Is"
-                , Space
-                , Str "the"
-                , Space
-                , Str "wind"
-                , Space
-                , Str "in"
-                , Space
-                , Str "that"
-                , Space
-                , Str "door"
-                , Space
-                , Str "still?\""
-                ]
-              ]
-            ]
+          , Str ""
           ]
         ]
       , Div
@@ -3167,26 +2492,7 @@
           , Str "your"
           , Space
           , Str "head?\""
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "126." ]
-                ( "#wasteland-content.xhtml#ln126", "" )
-              , Space
-              , Str "Cf."
-              , Space
-              , Str "Part"
-              , Space
-              , Str "I,"
-              , Space
-              , Str "l."
-              , Space
-              , Str "37,"
-              , Space
-              , Str "48."
-              ]
-            ]
+          , Str ""
           ]
         ]
       , Div
@@ -3390,34 +2696,7 @@
           , Str "the"
           , Space
           , Str "door."
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "138." ]
-                ( "#wasteland-content.xhtml#ln138", "" )
-              , Space
-              , Str "Cf."
-              , Space
-              , Str "the"
-              , Space
-              , Str "game"
-              , Space
-              , Str "of"
-              , Space
-              , Str "chess"
-              , Space
-              , Str "in"
-              , Space
-              , Str "Middleton's"
-              , Space
-              , Str "Women"
-              , Space
-              , Str "beware"
-              , Space
-              , Str "Women."
-              ]
-            ]
+          , Str ""
           ]
         ]
       ]
@@ -4226,7184 +3505,5 @@
         ]
       ]
     ]
-  , Div
-    ( "wasteland-content.xhtml#ch3", [ "section" ], [] )
-    [ Header 2
-      ( "", [], [] )
-      [ Str "III."
-      , Space
-      , Str "THE"
-      , Space
-      , Str "FIRE"
-      , Space
-      , Str "SERMON"
-      ]
-    , Div
-      ( "", [ "linegroup" ], [] )
-      [ Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "The"
-          , Space
-          , Str "river's"
-          , Space
-          , Str "tent"
-          , Space
-          , Str "is"
-          , Space
-          , Str "broken:"
-          , Space
-          , Str "the"
-          , Space
-          , Str "last"
-          , Space
-          , Str "fingers"
-          , Space
-          , Str "of"
-          , Space
-          , Str "leaf"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Clutch"
-          , Space
-          , Str "and"
-          , Space
-          , Str "sink"
-          , Space
-          , Str "into"
-          , Space
-          , Str "the"
-          , Space
-          , Str "wet"
-          , Space
-          , Str "bank."
-          , Space
-          , Str "The"
-          , Space
-          , Str "wind"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Crosses"
-          , Space
-          , Str "the"
-          , Space
-          , Str "brown"
-          , Space
-          , Str "land,"
-          , Space
-          , Str "unheard."
-          , Space
-          , Str "The"
-          , Space
-          , Str "nymphs"
-          , Space
-          , Str "are"
-          , SoftBreak
-          , Str "departed."
-          ]
-        ]
-      , Div
-        ( "wasteland-content.xhtml#ln176", [], [] )
-        [ Plain
-          [ Str "Sweet"
-          , Space
-          , Str "Thames,"
-          , Space
-          , Str "run"
-          , Space
-          , Str "softly,"
-          , Space
-          , Str "till"
-          , Space
-          , Str "I"
-          , Space
-          , Str "end"
-          , Space
-          , Str "my"
-          , Space
-          , Str "song."
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "176." ]
-                ( "#wasteland-content.xhtml#ln176", "" )
-              , Space
-              , Str "V."
-              , Space
-              , Str "Spenser,"
-              , Space
-              , Str "Prothalamion."
-              ]
-            ]
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "The"
-          , Space
-          , Str "river"
-          , Space
-          , Str "bears"
-          , Space
-          , Str "no"
-          , Space
-          , Str "empty"
-          , Space
-          , Str "bottles,"
-          , Space
-          , Str "sandwich"
-          , Space
-          , Str "papers,"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Silk"
-          , Space
-          , Str "handkerchiefs,"
-          , Space
-          , Str "cardboard"
-          , Space
-          , Str "boxes,"
-          , Space
-          , Str "cigarette"
-          , Space
-          , Str "ends"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Or"
-          , Space
-          , Str "other"
-          , Space
-          , Str "testimony"
-          , Space
-          , Str "of"
-          , Space
-          , Str "summer"
-          , Space
-          , Str "nights."
-          , Space
-          , Str "The"
-          , Space
-          , Str "nymphs"
-          , Space
-          , Str "are"
-          , SoftBreak
-          , Str "departed."
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "And"
-          , Space
-          , Str "their"
-          , Space
-          , Str "friends,"
-          , Space
-          , Str "the"
-          , Space
-          , Str "loitering"
-          , Space
-          , Str "heirs"
-          , Space
-          , Str "of"
-          , Space
-          , Str "city"
-          , Space
-          , Str "directors;"
-          , Span
-            ( "", [ "lnum" ], [] )
-            [ Str "180" ]
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Departed,"
-          , Space
-          , Str "have"
-          , Space
-          , Str "left"
-          , Space
-          , Str "no"
-          , Space
-          , Str "addresses."
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "By"
-          , Space
-          , Str "the"
-          , Space
-          , Str "waters"
-          , Space
-          , Str "of"
-          , Space
-          , Str "Leman"
-          , Space
-          , Str "I"
-          , Space
-          , Str "sat"
-          , Space
-          , Str "down"
-          , Space
-          , Str "and"
-          , Space
-          , Str "wept"
-          , Space
-          , Str "."
-          , Space
-          , Str "."
-          , Space
-          , Str "."
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Sweet"
-          , Space
-          , Str "Thames,"
-          , Space
-          , Str "run"
-          , Space
-          , Str "softly"
-          , Space
-          , Str "till"
-          , Space
-          , Str "I"
-          , Space
-          , Str "end"
-          , Space
-          , Str "my"
-          , Space
-          , Str "song,"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Sweet"
-          , Space
-          , Str "Thames,"
-          , Space
-          , Str "run"
-          , Space
-          , Str "softly,"
-          , Space
-          , Str "for"
-          , Space
-          , Str "I"
-          , Space
-          , Str "speak"
-          , Space
-          , Str "not"
-          , Space
-          , Str "loud"
-          , Space
-          , Str "or"
-          , Space
-          , Str "long."
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "But"
-          , Space
-          , Str "at"
-          , Space
-          , Str "my"
-          , Space
-          , Str "back"
-          , Space
-          , Str "in"
-          , Space
-          , Str "a"
-          , Space
-          , Str "cold"
-          , Space
-          , Str "blast"
-          , Space
-          , Str "I"
-          , Space
-          , Str "hear"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "The"
-          , Space
-          , Str "rattle"
-          , Space
-          , Str "of"
-          , Space
-          , Str "the"
-          , Space
-          , Str "bones,"
-          , Space
-          , Str "and"
-          , Space
-          , Str "chuckle"
-          , Space
-          , Str "spread"
-          , Space
-          , Str "from"
-          , Space
-          , Str "ear"
-          , Space
-          , Str "to"
-          , SoftBreak
-          , Str "ear."
-          ]
-        ]
-      ]
-    , Div
-      ( "", [ "linegroup" ], [] )
-      [ Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "A"
-          , Space
-          , Str "rat"
-          , Space
-          , Str "crept"
-          , Space
-          , Str "softly"
-          , Space
-          , Str "through"
-          , Space
-          , Str "the"
-          , Space
-          , Str "vegetation"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Dragging"
-          , Space
-          , Str "its"
-          , Space
-          , Str "slimy"
-          , Space
-          , Str "belly"
-          , Space
-          , Str "on"
-          , Space
-          , Str "the"
-          , Space
-          , Str "bank"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "While"
-          , Space
-          , Str "I"
-          , Space
-          , Str "was"
-          , Space
-          , Str "fishing"
-          , Space
-          , Str "in"
-          , Space
-          , Str "the"
-          , Space
-          , Str "dull"
-          , Space
-          , Str "canal"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "On"
-          , Space
-          , Str "a"
-          , Space
-          , Str "winter"
-          , Space
-          , Str "evening"
-          , Space
-          , Str "round"
-          , Space
-          , Str "behind"
-          , Space
-          , Str "the"
-          , Space
-          , Str "gashouse"
-          , Span
-            ( "", [ "lnum" ], [] )
-            [ Str "190" ]
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Musing"
-          , Space
-          , Str "upon"
-          , Space
-          , Str "the"
-          , Space
-          , Str "king"
-          , Space
-          , Str "my"
-          , Space
-          , Str "brother's"
-          , Space
-          , Str "wreck"
-          ]
-        ]
-      , Div
-        ( "wasteland-content.xhtml#ln192", [], [] )
-        [ Plain
-          [ Str "And"
-          , Space
-          , Str "on"
-          , Space
-          , Str "the"
-          , Space
-          , Str "king"
-          , Space
-          , Str "my"
-          , Space
-          , Str "father's"
-          , Space
-          , Str "death"
-          , Space
-          , Str "before"
-          , Space
-          , Str "him."
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "192." ]
-                ( "#wasteland-content.xhtml#ln192", "" )
-              , Space
-              , Str "Cf."
-              , Space
-              , Str "The"
-              , Space
-              , Str "Tempest,"
-              , Space
-              , Str "I."
-              , Space
-              , Str "ii."
-              ]
-            ]
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "White"
-          , Space
-          , Str "bodies"
-          , Space
-          , Str "naked"
-          , Space
-          , Str "on"
-          , Space
-          , Str "the"
-          , Space
-          , Str "low"
-          , Space
-          , Str "damp"
-          , Space
-          , Str "ground"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "And"
-          , Space
-          , Str "bones"
-          , Space
-          , Str "cast"
-          , Space
-          , Str "in"
-          , Space
-          , Str "a"
-          , Space
-          , Str "little"
-          , Space
-          , Str "low"
-          , Space
-          , Str "dry"
-          , Space
-          , Str "garret,"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Rattled"
-          , Space
-          , Str "by"
-          , Space
-          , Str "the"
-          , Space
-          , Str "rat's"
-          , Space
-          , Str "foot"
-          , Space
-          , Str "only,"
-          , Space
-          , Str "year"
-          , Space
-          , Str "to"
-          , Space
-          , Str "year."
-          ]
-        ]
-      , Div
-        ( "wasteland-content.xhtml#ln196", [], [] )
-        [ Plain
-          [ Str "But"
-          , Space
-          , Str "at"
-          , Space
-          , Str "my"
-          , Space
-          , Str "back"
-          , Space
-          , Str "from"
-          , Space
-          , Str "time"
-          , Space
-          , Str "to"
-          , Space
-          , Str "time"
-          , Space
-          , Str "I"
-          , Space
-          , Str "hear"
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "196." ]
-                ( "#wasteland-content.xhtml#ln196", "" )
-              , Space
-              , Str "Cf."
-              , Space
-              , Str "Marvell,"
-              , Space
-              , Str "To"
-              , Space
-              , Str "His"
-              , Space
-              , Str "Coy"
-              , Space
-              , Str "Mistress."
-              ]
-            ]
-          ]
-        ]
-      , Div
-        ( "wasteland-content.xhtml#ln197", [], [] )
-        [ Plain
-          [ Str "The"
-          , Space
-          , Str "sound"
-          , Space
-          , Str "of"
-          , Space
-          , Str "horns"
-          , Space
-          , Str "and"
-          , Space
-          , Str "motors,"
-          , Space
-          , Str "which"
-          , Space
-          , Str "shall"
-          , Space
-          , Str "bring"
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "197." ]
-                ( "#wasteland-content.xhtml#ln197", "" )
-              , Space
-              , Str "Cf."
-              , Space
-              , Str "Day,"
-              , Space
-              , Str "Parliament"
-              , Space
-              , Str "of"
-              , Space
-              , Str "Bees:"
-              ]
-            , BlockQuote
-              [ Div
-                ( "", [], [] )
-                [ Div
-                  ( "", [], [] )
-                  [ Plain
-                    [ Str "\"When"
-                    , Space
-                    , Str "of"
-                    , Space
-                    , Str "the"
-                    , Space
-                    , Str "sudden,"
-                    , Space
-                    , Str "listening,"
-                    , Space
-                    , Str "you"
-                    , Space
-                    , Str "shall"
-                    , SoftBreak
-                    , Str "hear,"
-                    ]
-                  ]
-                , Div
-                  ( "", [], [] )
-                  [ Plain
-                    [ Str "\"A"
-                    , Space
-                    , Str "noise"
-                    , Space
-                    , Str "of"
-                    , Space
-                    , Str "horns"
-                    , Space
-                    , Str "and"
-                    , Space
-                    , Str "hunting,"
-                    , Space
-                    , Str "which"
-                    , Space
-                    , Str "shall"
-                    , SoftBreak
-                    , Str "bring"
-                    ]
-                  ]
-                , Div
-                  ( "", [], [] )
-                  [ Plain
-                    [ Str "\"Actaeon"
-                    , Space
-                    , Str "to"
-                    , Space
-                    , Str "Diana"
-                    , Space
-                    , Str "in"
-                    , Space
-                    , Str "the"
-                    , Space
-                    , Str "spring,"
-                    ]
-                  ]
-                , Div
-                  ( "", [], [] )
-                  [ Plain
-                    [ Str "\"Where"
-                    , Space
-                    , Str "all"
-                    , Space
-                    , Str "shall"
-                    , Space
-                    , Str "see"
-                    , Space
-                    , Str "her"
-                    , Space
-                    , Str "naked"
-                    , Space
-                    , Str "skin"
-                    , Space
-                    , Str "."
-                    , Space
-                    , Str "."
-                    , Space
-                    , Str ".\""
-                    ]
-                  ]
-                ]
-              ]
-            ]
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Sweeney"
-          , Space
-          , Str "to"
-          , Space
-          , Str "Mrs."
-          , Space
-          , Str "Porter"
-          , Space
-          , Str "in"
-          , Space
-          , Str "the"
-          , Space
-          , Str "spring."
-          ]
-        ]
-      , Div
-        ( "wasteland-content.xhtml#ln199", [], [] )
-        [ Plain
-          [ Str "O"
-          , Space
-          , Str "the"
-          , Space
-          , Str "moon"
-          , Space
-          , Str "shone"
-          , Space
-          , Str "bright"
-          , Space
-          , Str "on"
-          , Space
-          , Str "Mrs."
-          , Space
-          , Str "Porter"
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "199." ]
-                ( "#wasteland-content.xhtml#ln199", "" )
-              , Space
-              , Str "I"
-              , Space
-              , Str "do"
-              , Space
-              , Str "not"
-              , Space
-              , Str "know"
-              , Space
-              , Str "the"
-              , Space
-              , Str "origin"
-              , Space
-              , Str "of"
-              , Space
-              , Str "the"
-              , Space
-              , Str "ballad"
-              , Space
-              , Str "from"
-              , Space
-              , Str "which"
-              , Space
-              , Str "these"
-              , Space
-              , Str "lines"
-              , Space
-              , Str "are"
-              , SoftBreak
-              , Str "taken:"
-              , Space
-              , Str "it"
-              , Space
-              , Str "was"
-              , Space
-              , Str "reported"
-              , Space
-              , Str "to"
-              , Space
-              , Str "me"
-              , Space
-              , Str "from"
-              , Space
-              , Str "Sydney,"
-              , Space
-              , Str "Australia."
-              ]
-            ]
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "And"
-          , Space
-          , Str "on"
-          , Space
-          , Str "her"
-          , Space
-          , Str "daughter"
-          , Span
-            ( "", [ "lnum" ], [] )
-            [ Str "200" ]
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "They"
-          , Space
-          , Str "wash"
-          , Space
-          , Str "their"
-          , Space
-          , Str "feet"
-          , Space
-          , Str "in"
-          , Space
-          , Str "soda"
-          , Space
-          , Str "water"
-          ]
-        ]
-      , Div
-        ( "wasteland-content.xhtml#ln202", [], [ ( "lang", "fr" ) ] )
-        [ Plain
-          [ Emph
-            [ Str "Et"
-            , Space
-            , Str "O"
-            , Space
-            , Str "ces"
-            , Space
-            , Str "voix"
-            , Space
-            , Str "d'enfants,"
-            , Space
-            , Str "chantant"
-            , Space
-            , Str "dans"
-            , Space
-            , Str "la"
-            , Space
-            , Str "coupole"
-            ]
-          , Str "!"
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "202." ]
-                ( "#wasteland-content.xhtml#ln202", "" )
-              , Space
-              , Str "V."
-              , Space
-              , Str "Verlaine,"
-              , Space
-              , Str "Parsifal."
-              ]
-            ]
-          ]
-        ]
-      ]
-    , Div
-      ( "", [ "linegroup" ], [] )
-      [ Div
-        ( "", [], [] )
-        [ Plain [ Str "Twit", Space, Str "twit", Space, Str "twit" ] ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Jug"
-          , Space
-          , Str "jug"
-          , Space
-          , Str "jug"
-          , Space
-          , Str "jug"
-          , Space
-          , Str "jug"
-          , Space
-          , Str "jug"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "So", Space, Str "rudely", Space, Str "forc'd." ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain [ Str "Tereu" ] ]
-      ]
-    , Div
-      ( "", [ "linegroup" ], [] )
-      [ Div
-        ( "", [], [] )
-        [ Plain [ Str "Unreal", Space, Str "City" ] ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Under"
-          , Space
-          , Str "the"
-          , Space
-          , Str "brown"
-          , Space
-          , Str "fog"
-          , Space
-          , Str "of"
-          , Space
-          , Str "a"
-          , Space
-          , Str "winter"
-          , Space
-          , Str "noon"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Mr."
-          , Space
-          , Str "Eugenides,"
-          , Space
-          , Str "the"
-          , Space
-          , Str "Smyrna"
-          , Space
-          , Str "merchant"
-          ]
-        ]
-      , Div
-        ( "wasteland-content.xhtml#ln210", [], [] )
-        [ Plain
-          [ Str "Unshaven,"
-          , Space
-          , Str "with"
-          , Space
-          , Str "a"
-          , Space
-          , Str "pocket"
-          , Space
-          , Str "full"
-          , Space
-          , Str "of"
-          , Space
-          , Str "currants"
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "210." ]
-                ( "#wasteland-content.xhtml#ln210", "" )
-              , Space
-              , Str "The"
-              , Space
-              , Str "currants"
-              , Space
-              , Str "were"
-              , Space
-              , Str "quoted"
-              , Space
-              , Str "at"
-              , Space
-              , Str "a"
-              , Space
-              , Str "price"
-              , Space
-              , Str "\"cost"
-              , Space
-              , Str "insurance"
-              , Space
-              , Str "and"
-              , Space
-              , Str "freight"
-              , Space
-              , Str "to"
-              , SoftBreak
-              , Str "London\";"
-              , Space
-              , Str "and"
-              , Space
-              , Str "the"
-              , Space
-              , Str "Bill"
-              , Space
-              , Str "of"
-              , Space
-              , Str "Lading"
-              , Space
-              , Str "etc."
-              , Space
-              , Str "were"
-              , Space
-              , Str "to"
-              , Space
-              , Str "be"
-              , Space
-              , Str "handed"
-              , Space
-              , Str "to"
-              , Space
-              , Str "the"
-              , Space
-              , Str "buyer"
-              , Space
-              , Str "upon"
-              , SoftBreak
-              , Str "payment"
-              , Space
-              , Str "of"
-              , Space
-              , Str "the"
-              , Space
-              , Str "sight"
-              , Space
-              , Str "draft."
-              ]
-            ]
-          , SoftBreak
-          , Span
-            ( "", [ "lnum" ], [] )
-            [ Str "210" ]
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "C.i.f."
-          , Space
-          , Str "London:"
-          , Space
-          , Str "documents"
-          , Space
-          , Str "at"
-          , Space
-          , Str "sight,"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Asked"
-          , Space
-          , Str "me"
-          , Space
-          , Str "in"
-          , Space
-          , Str "demotic"
-          , Space
-          , Str "French"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "To"
-          , Space
-          , Str "luncheon"
-          , Space
-          , Str "at"
-          , Space
-          , Str "the"
-          , Space
-          , Str "Cannon"
-          , Space
-          , Str "Street"
-          , Space
-          , Str "Hotel"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Followed"
-          , Space
-          , Str "by"
-          , Space
-          , Str "a"
-          , Space
-          , Str "weekend"
-          , Space
-          , Str "at"
-          , Space
-          , Str "the"
-          , Space
-          , Str "Metropole."
-          ]
-        ]
-      ]
-    , Div
-      ( "", [ "linegroup" ], [] )
-      [ Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "At"
-          , Space
-          , Str "the"
-          , Space
-          , Str "violet"
-          , Space
-          , Str "hour,"
-          , Space
-          , Str "when"
-          , Space
-          , Str "the"
-          , Space
-          , Str "eyes"
-          , Space
-          , Str "and"
-          , Space
-          , Str "back"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Turn"
-          , Space
-          , Str "upward"
-          , Space
-          , Str "from"
-          , Space
-          , Str "the"
-          , Space
-          , Str "desk,"
-          , Space
-          , Str "when"
-          , Space
-          , Str "the"
-          , Space
-          , Str "human"
-          , Space
-          , Str "engine"
-          , Space
-          , Str "waits"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Like"
-          , Space
-          , Str "a"
-          , Space
-          , Str "taxi"
-          , Space
-          , Str "throbbing"
-          , Space
-          , Str "waiting,"
-          ]
-        ]
-      , Div
-        ( "wasteland-content.xhtml#ln218", [], [] )
-        [ Plain
-          [ Str "I"
-          , Space
-          , Str "Tiresias,"
-          , Space
-          , Str "though"
-          , Space
-          , Str "blind,"
-          , Space
-          , Str "throbbing"
-          , Space
-          , Str "between"
-          , Space
-          , Str "two"
-          , Space
-          , Str "lives,"
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "218." ]
-                ( "#wasteland-content.xhtml#ln218", "" )
-              , Space
-              , Str "Tiresias,"
-              , Space
-              , Str "although"
-              , Space
-              , Str "a"
-              , Space
-              , Str "mere"
-              , Space
-              , Str "spectator"
-              , Space
-              , Str "and"
-              , Space
-              , Str "not"
-              , Space
-              , Str "indeed"
-              , Space
-              , Str "a"
-              , Space
-              , Str "\"character,\""
-              , Space
-              , Str "is"
-              , SoftBreak
-              , Str "yet"
-              , Space
-              , Str "the"
-              , Space
-              , Str "most"
-              , Space
-              , Str "important"
-              , Space
-              , Str "personage"
-              , Space
-              , Str "in"
-              , Space
-              , Str "the"
-              , Space
-              , Str "poem,"
-              , Space
-              , Str "uniting"
-              , Space
-              , Str "all"
-              , Space
-              , Str "the"
-              , Space
-              , Str "rest."
-              , Space
-              , Str "Just"
-              , SoftBreak
-              , Str "as"
-              , Space
-              , Str "the"
-              , Space
-              , Str "one-eyed"
-              , Space
-              , Str "merchant,"
-              , Space
-              , Str "seller"
-              , Space
-              , Str "of"
-              , Space
-              , Str "currants,"
-              , Space
-              , Str "melts"
-              , Space
-              , Str "into"
-              , Space
-              , Str "the"
-              , Space
-              , Str "Phoenician"
-              , SoftBreak
-              , Str "Sailor,"
-              , Space
-              , Str "and"
-              , Space
-              , Str "the"
-              , Space
-              , Str "latter"
-              , Space
-              , Str "is"
-              , Space
-              , Str "not"
-              , Space
-              , Str "wholly"
-              , Space
-              , Str "distinct"
-              , Space
-              , Str "from"
-              , Space
-              , Str "Ferdinand"
-              , Space
-              , Str "Prince"
-              , Space
-              , Str "of"
-              , SoftBreak
-              , Str "Naples,"
-              , Space
-              , Str "so"
-              , Space
-              , Str "all"
-              , Space
-              , Str "the"
-              , Space
-              , Str "women"
-              , Space
-              , Str "are"
-              , Space
-              , Str "one"
-              , Space
-              , Str "woman,"
-              , Space
-              , Str "and"
-              , Space
-              , Str "the"
-              , Space
-              , Str "two"
-              , Space
-              , Str "sexes"
-              , Space
-              , Str "meet"
-              , Space
-              , Str "in"
-              , SoftBreak
-              , Str "Tiresias."
-              , Space
-              , Str "What"
-              , Space
-              , Str "Tiresias"
-              , Space
-              , Str "sees,"
-              , Space
-              , Str "in"
-              , Space
-              , Str "fact,"
-              , Space
-              , Str "is"
-              , Space
-              , Str "the"
-              , Space
-              , Str "substance"
-              , Space
-              , Str "of"
-              , Space
-              , Str "the"
-              , Space
-              , Str "poem."
-              , Space
-              , Str "The"
-              , SoftBreak
-              , Str "whole"
-              , Space
-              , Str "passage"
-              , Space
-              , Str "from"
-              , Space
-              , Str "Ovid"
-              , Space
-              , Str "is"
-              , Space
-              , Str "of"
-              , Space
-              , Str "great"
-              , Space
-              , Str "anthropological"
-              , Space
-              , Str "interest:"
-              ]
-            , BlockQuote
-              [ Para
-                [ Str "'."
-                , Space
-                , Str "."
-                , Space
-                , Str "."
-                , Space
-                , Str "Cum"
-                , Space
-                , Str "Iunone"
-                , Space
-                , Str "iocos"
-                , Space
-                , Str "et"
-                , Space
-                , Str "maior"
-                , Space
-                , Str "vestra"
-                , Space
-                , Str "profecto"
-                , Space
-                , Str "est"
-                , LineBreak
-                , Str "Quam,"
-                , Space
-                , Str "quae"
-                , SoftBreak
-                , Str "contingit"
-                , Space
-                , Str "maribus,'"
-                , Space
-                , Str "dixisse,"
-                , Space
-                , Str "'voluptas.'"
-                , LineBreak
-                , Str "Illa"
-                , Space
-                , Str "negat;"
-                , Space
-                , Str "placuit"
-                , SoftBreak
-                , Str "quae"
-                , Space
-                , Str "sit"
-                , Space
-                , Str "sententia"
-                , Space
-                , Str "docti"
-                , LineBreak
-                , Str "Quaerere"
-                , Space
-                , Str "Tiresiae:"
-                , Space
-                , Str "venus"
-                , Space
-                , Str "huic"
-                , Space
-                , Str "erat"
-                , SoftBreak
-                , Str "utraque"
-                , Space
-                , Str "nota."
-                , LineBreak
-                , Str "Nam"
-                , Space
-                , Str "duo"
-                , Space
-                , Str "magnorum"
-                , Space
-                , Str "viridi"
-                , Space
-                , Str "coeuntia"
-                , Space
-                , Str "silva"
-                , LineBreak
-                , Str "Corpora"
-                , Space
-                , Str "serpentum"
-                , Space
-                , Str "baculi"
-                , Space
-                , Str "violaverat"
-                , Space
-                , Str "ictu"
-                , LineBreak
-                , Str "Deque"
-                , Space
-                , Str "viro"
-                , Space
-                , Str "factus,"
-                , SoftBreak
-                , Str "mirabile,"
-                , Space
-                , Str "femina"
-                , Space
-                , Str "septem"
-                , LineBreak
-                , Str "Egerat"
-                , Space
-                , Str "autumnos;"
-                , Space
-                , Str "octavo"
-                , Space
-                , Str "rursus"
-                , SoftBreak
-                , Str "eosdem"
-                , LineBreak
-                , Str "Vidit"
-                , Space
-                , Str "et"
-                , Space
-                , Str "'est"
-                , Space
-                , Str "vestrae"
-                , Space
-                , Str "si"
-                , Space
-                , Str "tanta"
-                , Space
-                , Str "potentia"
-                , Space
-                , Str "plagae,'"
-                , LineBreak
-                , Str "Dixit"
-                , Space
-                , Str "'ut"
-                , Space
-                , Str "auctoris"
-                , Space
-                , Str "sortem"
-                , Space
-                , Str "in"
-                , Space
-                , Str "contraria"
-                , Space
-                , Str "mutet,"
-                , LineBreak
-                , Str "Nunc"
-                , Space
-                , Str "quoque"
-                , Space
-                , Str "vos"
-                , SoftBreak
-                , Str "feriam!'"
-                , Space
-                , Str "percussis"
-                , Space
-                , Str "anguibus"
-                , Space
-                , Str "isdem"
-                , LineBreak
-                , Str "Forma"
-                , Space
-                , Str "prior"
-                , Space
-                , Str "rediit"
-                , SoftBreak
-                , Str "genetivaque"
-                , Space
-                , Str "venit"
-                , Space
-                , Str "imago."
-                , LineBreak
-                , Str "Arbiter"
-                , Space
-                , Str "hic"
-                , Space
-                , Str "igitur"
-                , Space
-                , Str "sumptus"
-                , Space
-                , Str "de"
-                , Space
-                , Str "lite"
-                , SoftBreak
-                , Str "iocosa"
-                , LineBreak
-                , Str "Dicta"
-                , Space
-                , Str "Iovis"
-                , Space
-                , Str "firmat;"
-                , Space
-                , Str "gravius"
-                , Space
-                , Str "Saturnia"
-                , Space
-                , Str "iusto"
-                , LineBreak
-                , Str "Nec"
-                , SoftBreak
-                , Str "pro"
-                , Space
-                , Str "materia"
-                , Space
-                , Str "fertur"
-                , Space
-                , Str "doluisse"
-                , Space
-                , Str "suique"
-                , LineBreak
-                , Str "Iudicis"
-                , Space
-                , Str "aeterna"
-                , Space
-                , Str "damnavit"
-                , SoftBreak
-                , Str "lumina"
-                , Space
-                , Str "nocte,"
-                , LineBreak
-                , Str "At"
-                , Space
-                , Str "pater"
-                , Space
-                , Str "omnipotens"
-                , Space
-                , Str "(neque"
-                , Space
-                , Str "enim"
-                , Space
-                , Str "licet"
-                , Space
-                , Str "inrita"
-                , SoftBreak
-                , Str "cuiquam"
-                , LineBreak
-                , Str "Facta"
-                , Space
-                , Str "dei"
-                , Space
-                , Str "fecisse"
-                , Space
-                , Str "deo)"
-                , Space
-                , Str "pro"
-                , Space
-                , Str "lumine"
-                , Space
-                , Str "adempto"
-                , LineBreak
-                , Str "Scire"
-                , SoftBreak
-                , Str "futura"
-                , Space
-                , Str "dedit"
-                , Space
-                , Str "poenamque"
-                , Space
-                , Str "levavit"
-                , Space
-                , Str "honore."
-                , LineBreak
-                ]
-              ]
-            ]
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Old"
-          , Space
-          , Str "man"
-          , Space
-          , Str "with"
-          , Space
-          , Str "wrinkled"
-          , Space
-          , Str "female"
-          , Space
-          , Str "breasts,"
-          , Space
-          , Str "can"
-          , Space
-          , Str "see"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "At"
-          , Space
-          , Str "the"
-          , Space
-          , Str "violet"
-          , Space
-          , Str "hour,"
-          , Space
-          , Str "the"
-          , Space
-          , Str "evening"
-          , Space
-          , Str "hour"
-          , Space
-          , Str "that"
-          , Space
-          , Str "strives"
-          , Span
-            ( "", [ "lnum" ], [] )
-            [ Str "220" ]
-          ]
-        ]
-      , Div
-        ( "wasteland-content.xhtml#ln221", [], [] )
-        [ Plain
-          [ Str "Homeward,"
-          , Space
-          , Str "and"
-          , Space
-          , Str "brings"
-          , Space
-          , Str "the"
-          , Space
-          , Str "sailor"
-          , Space
-          , Str "home"
-          , Space
-          , Str "from"
-          , Space
-          , Str "sea,"
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "221." ]
-                ( "#wasteland-content.xhtml#ln221", "" )
-              , Space
-              , Str "This"
-              , Space
-              , Str "may"
-              , Space
-              , Str "not"
-              , Space
-              , Str "appear"
-              , Space
-              , Str "as"
-              , Space
-              , Str "exact"
-              , Space
-              , Str "as"
-              , Space
-              , Str "Sappho's"
-              , Space
-              , Str "lines,"
-              , Space
-              , Str "but"
-              , Space
-              , Str "I"
-              , Space
-              , Str "had"
-              , Space
-              , Str "in"
-              , Space
-              , Str "mind"
-              , SoftBreak
-              , Str "the"
-              , Space
-              , Str "\"longshore\""
-              , Space
-              , Str "or"
-              , Space
-              , Str "\"dory\""
-              , Space
-              , Str "fisherman,"
-              , Space
-              , Str "who"
-              , Space
-              , Str "returns"
-              , Space
-              , Str "at"
-              , Space
-              , Str "nightfall."
-              ]
-            ]
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "The"
-          , Space
-          , Str "typist"
-          , Space
-          , Str "home"
-          , Space
-          , Str "at"
-          , Space
-          , Str "teatime,"
-          , Space
-          , Str "clears"
-          , Space
-          , Str "her"
-          , Space
-          , Str "breakfast,"
-          , Space
-          , Str "lights"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Her"
-          , Space
-          , Str "stove,"
-          , Space
-          , Str "and"
-          , Space
-          , Str "lays"
-          , Space
-          , Str "out"
-          , Space
-          , Str "food"
-          , Space
-          , Str "in"
-          , Space
-          , Str "tins."
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Out"
-          , Space
-          , Str "of"
-          , Space
-          , Str "the"
-          , Space
-          , Str "window"
-          , Space
-          , Str "perilously"
-          , Space
-          , Str "spread"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Her"
-          , Space
-          , Str "drying"
-          , Space
-          , Str "combinations"
-          , Space
-          , Str "touched"
-          , Space
-          , Str "by"
-          , Space
-          , Str "the"
-          , Space
-          , Str "sun's"
-          , Space
-          , Str "last"
-          , Space
-          , Str "rays,"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "On"
-          , Space
-          , Str "the"
-          , Space
-          , Str "divan"
-          , Space
-          , Str "are"
-          , Space
-          , Str "piled"
-          , Space
-          , Str "(at"
-          , Space
-          , Str "night"
-          , Space
-          , Str "her"
-          , Space
-          , Str "bed)"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Stockings,"
-          , Space
-          , Str "slippers,"
-          , Space
-          , Str "camisoles,"
-          , Space
-          , Str "and"
-          , Space
-          , Str "stays."
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "I"
-          , Space
-          , Str "Tiresias,"
-          , Space
-          , Str "old"
-          , Space
-          , Str "man"
-          , Space
-          , Str "with"
-          , Space
-          , Str "wrinkled"
-          , Space
-          , Str "dugs"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Perceived"
-          , Space
-          , Str "the"
-          , Space
-          , Str "scene,"
-          , Space
-          , Str "and"
-          , Space
-          , Str "foretold"
-          , Space
-          , Str "the"
-          , Space
-          , Str "rest"
-          , Space
-          , Str "-"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "I"
-          , Space
-          , Str "too"
-          , Space
-          , Str "awaited"
-          , Space
-          , Str "the"
-          , Space
-          , Str "expected"
-          , Space
-          , Str "guest."
-          , Span
-            ( "", [ "lnum" ], [] )
-            [ Str "230" ]
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "He,"
-          , Space
-          , Str "the"
-          , Space
-          , Str "young"
-          , Space
-          , Str "man"
-          , Space
-          , Str "carbuncular,"
-          , Space
-          , Str "arrives,"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "A"
-          , Space
-          , Str "small"
-          , Space
-          , Str "house"
-          , Space
-          , Str "agent's"
-          , Space
-          , Str "clerk,"
-          , Space
-          , Str "with"
-          , Space
-          , Str "one"
-          , Space
-          , Str "bold"
-          , Space
-          , Str "stare,"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "One"
-          , Space
-          , Str "of"
-          , Space
-          , Str "the"
-          , Space
-          , Str "low"
-          , Space
-          , Str "on"
-          , Space
-          , Str "whom"
-          , Space
-          , Str "assurance"
-          , Space
-          , Str "sits"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "As"
-          , Space
-          , Str "a"
-          , Space
-          , Str "silk"
-          , Space
-          , Str "hat"
-          , Space
-          , Str "on"
-          , Space
-          , Str "a"
-          , Space
-          , Str "Bradford"
-          , Space
-          , Str "millionaire."
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "The"
-          , Space
-          , Str "time"
-          , Space
-          , Str "is"
-          , Space
-          , Str "now"
-          , Space
-          , Str "propitious,"
-          , Space
-          , Str "as"
-          , Space
-          , Str "he"
-          , Space
-          , Str "guesses,"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "The"
-          , Space
-          , Str "meal"
-          , Space
-          , Str "is"
-          , Space
-          , Str "ended,"
-          , Space
-          , Str "she"
-          , Space
-          , Str "is"
-          , Space
-          , Str "bored"
-          , Space
-          , Str "and"
-          , Space
-          , Str "tired,"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Endeavours"
-          , Space
-          , Str "to"
-          , Space
-          , Str "engage"
-          , Space
-          , Str "her"
-          , Space
-          , Str "in"
-          , Space
-          , Str "caresses"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Which"
-          , Space
-          , Str "still"
-          , Space
-          , Str "are"
-          , Space
-          , Str "unreproved,"
-          , Space
-          , Str "if"
-          , Space
-          , Str "undesired."
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Flushed"
-          , Space
-          , Str "and"
-          , Space
-          , Str "decided,"
-          , Space
-          , Str "he"
-          , Space
-          , Str "assaults"
-          , Space
-          , Str "at"
-          , Space
-          , Str "once;"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Exploring"
-          , Space
-          , Str "hands"
-          , Space
-          , Str "encounter"
-          , Space
-          , Str "no"
-          , Space
-          , Str "defence;"
-          , Span
-            ( "", [ "lnum" ], [] )
-            [ Str "240" ]
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "His"
-          , Space
-          , Str "vanity"
-          , Space
-          , Str "requires"
-          , Space
-          , Str "no"
-          , Space
-          , Str "response,"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "And"
-          , Space
-          , Str "makes"
-          , Space
-          , Str "a"
-          , Space
-          , Str "welcome"
-          , Space
-          , Str "of"
-          , Space
-          , Str "indifference."
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "(And"
-          , Space
-          , Str "I"
-          , Space
-          , Str "Tiresias"
-          , Space
-          , Str "have"
-          , Space
-          , Str "foresuffered"
-          , Space
-          , Str "all"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Enacted"
-          , Space
-          , Str "on"
-          , Space
-          , Str "this"
-          , Space
-          , Str "same"
-          , Space
-          , Str "divan"
-          , Space
-          , Str "or"
-          , Space
-          , Str "bed;"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "I"
-          , Space
-          , Str "who"
-          , Space
-          , Str "have"
-          , Space
-          , Str "sat"
-          , Space
-          , Str "by"
-          , Space
-          , Str "Thebes"
-          , Space
-          , Str "below"
-          , Space
-          , Str "the"
-          , Space
-          , Str "wall"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "And"
-          , Space
-          , Str "walked"
-          , Space
-          , Str "among"
-          , Space
-          , Str "the"
-          , Space
-          , Str "lowest"
-          , Space
-          , Str "of"
-          , Space
-          , Str "the"
-          , Space
-          , Str "dead.)"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Bestows"
-          , Space
-          , Str "one"
-          , Space
-          , Str "final"
-          , Space
-          , Str "patronising"
-          , Space
-          , Str "kiss,"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "And"
-          , Space
-          , Str "gropes"
-          , Space
-          , Str "his"
-          , Space
-          , Str "way,"
-          , Space
-          , Str "finding"
-          , Space
-          , Str "the"
-          , Space
-          , Str "stairs"
-          , Space
-          , Str "unlit"
-          , Space
-          , Str "."
-          , Space
-          , Str "."
-          , Space
-          , Str "."
-          ]
-        ]
-      ]
-    , Div
-      ( "", [ "linegroup" ], [] )
-      [ Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "She"
-          , Space
-          , Str "turns"
-          , Space
-          , Str "and"
-          , Space
-          , Str "looks"
-          , Space
-          , Str "a"
-          , Space
-          , Str "moment"
-          , Space
-          , Str "in"
-          , Space
-          , Str "the"
-          , Space
-          , Str "glass,"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Hardly"
-          , Space
-          , Str "aware"
-          , Space
-          , Str "of"
-          , Space
-          , Str "her"
-          , Space
-          , Str "departed"
-          , Space
-          , Str "lover;"
-          , Span
-            ( "", [ "lnum" ], [] )
-            [ Str "250" ]
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Her"
-          , Space
-          , Str "brain"
-          , Space
-          , Str "allows"
-          , Space
-          , Str "one"
-          , Space
-          , Str "half-formed"
-          , Space
-          , Str "thought"
-          , Space
-          , Str "to"
-          , Space
-          , Str "pass:"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "\"Well"
-          , Space
-          , Str "now"
-          , Space
-          , Str "that's"
-          , Space
-          , Str "done:"
-          , Space
-          , Str "and"
-          , Space
-          , Str "I'm"
-          , Space
-          , Str "glad"
-          , Space
-          , Str "it's"
-          , Space
-          , Str "over.\""
-          ]
-        ]
-      , Div
-        ( "wasteland-content.xhtml#ln253", [], [] )
-        [ Plain
-          [ Str "When"
-          , Space
-          , Str "lovely"
-          , Space
-          , Str "woman"
-          , Space
-          , Str "stoops"
-          , Space
-          , Str "to"
-          , Space
-          , Str "folly"
-          , Space
-          , Str "and"
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "253." ]
-                ( "#wasteland-content.xhtml#ln253", "" )
-              , Space
-              , Str "V."
-              , Space
-              , Str "Goldsmith,"
-              , Space
-              , Str "the"
-              , Space
-              , Str "song"
-              , Space
-              , Str "in"
-              , Space
-              , Str "The"
-              , Space
-              , Str "Vicar"
-              , Space
-              , Str "of"
-              , Space
-              , Str "Wakefield."
-              ]
-            ]
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Paces"
-          , Space
-          , Str "about"
-          , Space
-          , Str "her"
-          , Space
-          , Str "room"
-          , Space
-          , Str "again,"
-          , Space
-          , Str "alone,"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "She"
-          , Space
-          , Str "smoothes"
-          , Space
-          , Str "her"
-          , Space
-          , Str "hair"
-          , Space
-          , Str "with"
-          , Space
-          , Str "automatic"
-          , Space
-          , Str "hand,"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "And"
-          , Space
-          , Str "puts"
-          , Space
-          , Str "a"
-          , Space
-          , Str "record"
-          , Space
-          , Str "on"
-          , Space
-          , Str "the"
-          , Space
-          , Str "gramophone."
-          ]
-        ]
-      ]
-    , Div
-      ( "", [ "linegroup" ], [] )
-      [ Div
-        ( "wasteland-content.xhtml#ln257", [], [] )
-        [ Plain
-          [ Str "\"This"
-          , Space
-          , Str "music"
-          , Space
-          , Str "crept"
-          , Space
-          , Str "by"
-          , Space
-          , Str "me"
-          , Space
-          , Str "upon"
-          , Space
-          , Str "the"
-          , Space
-          , Str "waters\""
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "257." ]
-                ( "#wasteland-content.xhtml#ln257", "" )
-              , Space
-              , Str "V."
-              , Space
-              , Str "The"
-              , Space
-              , Str "Tempest,"
-              , Space
-              , Str "as"
-              , Space
-              , Str "above."
-              ]
-            ]
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "And"
-          , Space
-          , Str "along"
-          , Space
-          , Str "the"
-          , Space
-          , Str "Strand,"
-          , Space
-          , Str "up"
-          , Space
-          , Str "Queen"
-          , Space
-          , Str "Victoria"
-          , Space
-          , Str "Street."
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "O"
-          , Space
-          , Str "City"
-          , Space
-          , Str "city,"
-          , Space
-          , Str "I"
-          , Space
-          , Str "can"
-          , Space
-          , Str "sometimes"
-          , Space
-          , Str "hear"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Beside"
-          , Space
-          , Str "a"
-          , Space
-          , Str "public"
-          , Space
-          , Str "bar"
-          , Space
-          , Str "in"
-          , Space
-          , Str "Lower"
-          , Space
-          , Str "Thames"
-          , Space
-          , Str "Street,"
-          , Span
-            ( "", [ "lnum" ], [] )
-            [ Str "260" ]
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "The"
-          , Space
-          , Str "pleasant"
-          , Space
-          , Str "whining"
-          , Space
-          , Str "of"
-          , Space
-          , Str "a"
-          , Space
-          , Str "mandoline"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "And"
-          , Space
-          , Str "a"
-          , Space
-          , Str "clatter"
-          , Space
-          , Str "and"
-          , Space
-          , Str "a"
-          , Space
-          , Str "chatter"
-          , Space
-          , Str "from"
-          , Space
-          , Str "within"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Where"
-          , Space
-          , Str "fishmen"
-          , Space
-          , Str "lounge"
-          , Space
-          , Str "at"
-          , Space
-          , Str "noon:"
-          , Space
-          , Str "where"
-          , Space
-          , Str "the"
-          , Space
-          , Str "walls"
-          ]
-        ]
-      , Div
-        ( "wasteland-content.xhtml#ln264", [], [] )
-        [ Plain
-          [ Str "Of"
-          , Space
-          , Str "Magnus"
-          , Space
-          , Str "Martyr"
-          , Space
-          , Str "hold"
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "264." ]
-                ( "#wasteland-content.xhtml#ln264", "" )
-              , Space
-              , Str "The"
-              , Space
-              , Str "interior"
-              , Space
-              , Str "of"
-              , Space
-              , Str "St."
-              , Space
-              , Str "Magnus"
-              , Space
-              , Str "Martyr"
-              , Space
-              , Str "is"
-              , Space
-              , Str "to"
-              , Space
-              , Str "my"
-              , Space
-              , Str "mind"
-              , Space
-              , Str "one"
-              , Space
-              , Str "of"
-              , Space
-              , Str "the"
-              , Space
-              , Str "finest"
-              , SoftBreak
-              , Str "among"
-              , Space
-              , Str "Wren's"
-              , Space
-              , Str "interiors."
-              , Space
-              , Str "See"
-              , Space
-              , Str "The"
-              , Space
-              , Str "Proposed"
-              , Space
-              , Str "Demolition"
-              , Space
-              , Str "of"
-              , Space
-              , Str "Nineteen"
-              , Space
-              , Str "City"
-              , SoftBreak
-              , Str "Churches"
-              , Space
-              , Str "(P."
-              , Space
-              , Str "S."
-              , Space
-              , Str "King"
-              , Space
-              , Str "&"
-              , Space
-              , Str "Son,"
-              , Space
-              , Str "Ltd.)."
-              ]
-            ]
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Inexplicable"
-          , Space
-          , Str "splendour"
-          , Space
-          , Str "of"
-          , Space
-          , Str "Ionian"
-          , Space
-          , Str "white"
-          , Space
-          , Str "and"
-          , Space
-          , Str "gold."
-          ]
-        ]
-      ]
-    , Div
-      ( "", [ "linegroup", "indent" ], [] )
-      [ Div
-        ( "wasteland-content.xhtml#ln266", [], [] )
-        [ Plain
-          [ Str "The"
-          , Space
-          , Str "river"
-          , Space
-          , Str "sweats"
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "266." ]
-                ( "#wasteland-content.xhtml#ln266", "" )
-              , Space
-              , Str "The"
-              , Space
-              , Str "Song"
-              , Space
-              , Str "of"
-              , Space
-              , Str "the"
-              , Space
-              , Str "(three)"
-              , Space
-              , Str "Thames-daughters"
-              , Space
-              , Str "begins"
-              , Space
-              , Str "here."
-              , Space
-              , Str "From"
-              , Space
-              , Str "line"
-              , Space
-              , Str "292"
-              , SoftBreak
-              , Str "to"
-              , Space
-              , Str "306"
-              , Space
-              , Str "inclusive"
-              , Space
-              , Str "they"
-              , Space
-              , Str "speak"
-              , Space
-              , Str "in"
-              , Space
-              , Str "turn."
-              , Space
-              , Str "V."
-              , Space
-              , Str "Gutterdsammerung,"
-              , Space
-              , Str "III."
-              , Space
-              , Str "i:"
-              , Space
-              , Str "the"
-              , SoftBreak
-              , Str "Rhine-daughters."
-              ]
-            ]
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain [ Str "Oil", Space, Str "and", Space, Str "tar" ] ]
-      , Div
-        ( "", [], [] )
-        [ Plain [ Str "The", Space, Str "barges", Space, Str "drift" ] ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "With"
-          , Space
-          , Str "the"
-          , Space
-          , Str "turning"
-          , Space
-          , Str "tide"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Red"
-          , Space
-          , Str "sails"
-          , Span
-            ( "", [ "lnum" ], [] )
-            [ Str "270" ]
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain [ Str "Wide" ] ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "To"
-          , Space
-          , Str "leeward,"
-          , Space
-          , Str "swing"
-          , Space
-          , Str "on"
-          , Space
-          , Str "the"
-          , Space
-          , Str "heavy"
-          , Space
-          , Str "spar."
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain [ Str "The", Space, Str "barges", Space, Str "wash" ] ]
-      , Div
-        ( "", [], [] )
-        [ Plain [ Str "Drifting", Space, Str "logs" ] ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Down", Space, Str "Greenwich", Space, Str "reach" ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Past"
-          , Space
-          , Str "the"
-          , Space
-          , Str "Isle"
-          , Space
-          , Str "of"
-          , Space
-          , Str "Dogs."
-          ]
-        ]
-      , Div
-        ( "", [ "indent" ], [] )
-        [ Plain [ Str "Weialala", Space, Str "leia" ] ]
-      , Div
-        ( "", [ "indent" ], [] )
-        [ Plain [ Str "Wallala", Space, Str "leialala" ] ]
-      ]
-    , Div
-      ( "", [ "linegroup", "indent" ], [] )
-      [ Div
-        ( "wasteland-content.xhtml#ln279", [], [] )
-        [ Plain
-          [ Str "Elizabeth"
-          , Space
-          , Str "and"
-          , Space
-          , Str "Leicester"
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "279." ]
-                ( "#wasteland-content.xhtml#ln279", "" )
-              , Space
-              , Str "V."
-              , Space
-              , Str "Froude,"
-              , Space
-              , Str "Elizabeth,"
-              , Space
-              , Str "Vol."
-              , Space
-              , Str "I,"
-              , Space
-              , Str "ch."
-              , Space
-              , Str "iv,"
-              , Space
-              , Str "letter"
-              , Space
-              , Str "of"
-              , Space
-              , Str "De"
-              , Space
-              , Str "Quadra"
-              , Space
-              , Str "to"
-              , Space
-              , Str "Philip"
-              , SoftBreak
-              , Str "of"
-              , Space
-              , Str "Spain:"
-              ]
-            , BlockQuote
-              [ Div
-                ( "", [], [] )
-                [ Div
-                  ( "", [], [] )
-                  [ Plain
-                    [ Str "\"In"
-                    , Space
-                    , Str "the"
-                    , Space
-                    , Str "afternoon"
-                    , Space
-                    , Str "we"
-                    , Space
-                    , Str "were"
-                    , Space
-                    , Str "in"
-                    , Space
-                    , Str "a"
-                    , Space
-                    , Str "barge,"
-                    , Space
-                    , Str "watching"
-                    , Space
-                    , Str "the"
-                    , SoftBreak
-                    , Str "games"
-                    , Space
-                    , Str "on"
-                    , Space
-                    , Str "the"
-                    , Space
-                    , Str "river."
-                    ]
-                  ]
-                , Div
-                  ( "", [], [] )
-                  [ Plain
-                    [ Str "(The"
-                    , Space
-                    , Str "queen)"
-                    , Space
-                    , Str "was"
-                    , Space
-                    , Str "alone"
-                    , Space
-                    , Str "with"
-                    , Space
-                    , Str "Lord"
-                    , Space
-                    , Str "Robert"
-                    , Space
-                    , Str "and"
-                    , Space
-                    , Str "myself"
-                    , SoftBreak
-                    , Str "on"
-                    , Space
-                    , Str "the"
-                    , Space
-                    , Str "poop,"
-                    ]
-                  ]
-                , Div
-                  ( "", [], [] )
-                  [ Plain
-                    [ Str "when"
-                    , Space
-                    , Str "they"
-                    , Space
-                    , Str "began"
-                    , Space
-                    , Str "to"
-                    , Space
-                    , Str "talk"
-                    , Space
-                    , Str "nonsense,"
-                    , Space
-                    , Str "and"
-                    , Space
-                    , Str "went"
-                    , Space
-                    , Str "so"
-                    , Space
-                    , Str "far"
-                    , SoftBreak
-                    , Str "that"
-                    , Space
-                    , Str "Lord"
-                    , Space
-                    , Str "Robert"
-                    ]
-                  ]
-                , Div
-                  ( "", [], [] )
-                  [ Plain
-                    [ Str "at"
-                    , Space
-                    , Str "last"
-                    , Space
-                    , Str "said,"
-                    , Space
-                    , Str "as"
-                    , Space
-                    , Str "I"
-                    , Space
-                    , Str "was"
-                    , Space
-                    , Str "on"
-                    , Space
-                    , Str "the"
-                    , Space
-                    , Str "spot"
-                    , Space
-                    , Str "there"
-                    , Space
-                    , Str "was"
-                    , Space
-                    , Str "no"
-                    , SoftBreak
-                    , Str "reason"
-                    , Space
-                    , Str "why"
-                    , Space
-                    , Str "they"
-                    ]
-                  ]
-                , Div
-                  ( "", [], [] )
-                  [ Plain
-                    [ Str "should"
-                    , Space
-                    , Str "not"
-                    , Space
-                    , Str "be"
-                    , Space
-                    , Str "married"
-                    , Space
-                    , Str "if"
-                    , Space
-                    , Str "the"
-                    , Space
-                    , Str "queen"
-                    , Space
-                    , Str "pleased.\""
-                    ]
-                  ]
-                ]
-              ]
-            ]
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Beating"
-          , Space
-          , Str "oars"
-          , Span
-            ( "", [ "lnum" ], [] )
-            [ Str "280" ]
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "The"
-          , Space
-          , Str "stern"
-          , Space
-          , Str "was"
-          , Space
-          , Str "formed"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain [ Str "A", Space, Str "gilded", Space, Str "shell" ] ]
-      , Div
-        ( "", [], [] )
-        [ Plain [ Str "Red", Space, Str "and", Space, Str "gold" ] ]
-      , Div
-        ( "", [], [] )
-        [ Plain [ Str "The", Space, Str "brisk", Space, Str "swell" ] ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Rippled", Space, Str "both", Space, Str "shores" ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain [ Str "Southwest", Space, Str "wind" ] ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Carried", Space, Str "down", Space, Str "stream" ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "The"
-          , Space
-          , Str "peal"
-          , Space
-          , Str "of"
-          , Space
-          , Str "bells"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain [ Str "White", Space, Str "towers" ] ]
-      , Div
-        ( "", [ "indent" ], [] )
-        [ Plain
-          [ Str "Weialala"
-          , Space
-          , Str "leia"
-          , Span
-            ( "", [ "lnum" ], [] )
-            [ Str "290" ]
-          ]
-        ]
-      , Div
-        ( "", [ "indent" ], [] )
-        [ Plain [ Str "Wallala", Space, Str "leialala" ] ]
-      ]
-    , Div
-      ( "", [ "linegroup" ], [] )
-      [ Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "\"Trams"
-          , Space
-          , Str "and"
-          , Space
-          , Str "dusty"
-          , Space
-          , Str "trees."
-          ]
-        ]
-      , Div
-        ( "wasteland-content.xhtml#ln293", [], [] )
-        [ Plain
-          [ Str "Highbury"
-          , Space
-          , Str "bore"
-          , Space
-          , Str "me."
-          , Space
-          , Str "Richmond"
-          , Space
-          , Str "and"
-          , Space
-          , Str "Kew"
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "293." ]
-                ( "#wasteland-content.xhtml#ln293", "" )
-              , Space
-              , Str "Cf."
-              , Space
-              , Str "Purgatorio,"
-              , Space
-              , Str "v."
-              , Space
-              , Str "133:"
-              ]
-            , BlockQuote
-              [ Para
-                [ Str "\"Ricorditi"
-                , Space
-                , Str "di"
-                , Space
-                , Str "me,"
-                , Space
-                , Str "che"
-                , Space
-                , Str "son"
-                , Space
-                , Str "la"
-                , Space
-                , Str "Pia;"
-                , LineBreak
-                , Str "Siena"
-                , Space
-                , Str "mi"
-                , Space
-                , Str "fe',"
-                , Space
-                , Str "disfecemi"
-                , SoftBreak
-                , Str "Maremma.\""
-                ]
-              ]
-            ]
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Undid"
-          , Space
-          , Str "me."
-          , Space
-          , Str "By"
-          , Space
-          , Str "Richmond"
-          , Space
-          , Str "I"
-          , Space
-          , Str "raised"
-          , Space
-          , Str "my"
-          , Space
-          , Str "knees"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Supine"
-          , Space
-          , Str "on"
-          , Space
-          , Str "the"
-          , Space
-          , Str "floor"
-          , Space
-          , Str "of"
-          , Space
-          , Str "a"
-          , Space
-          , Str "narrow"
-          , Space
-          , Str "canoe.\""
-          ]
-        ]
-      ]
-    , Div
-      ( "", [ "linegroup" ], [] )
-      [ Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "\"My"
-          , Space
-          , Str "feet"
-          , Space
-          , Str "are"
-          , Space
-          , Str "at"
-          , Space
-          , Str "Moorgate,"
-          , Space
-          , Str "and"
-          , Space
-          , Str "my"
-          , Space
-          , Str "heart"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Under"
-          , Space
-          , Str "my"
-          , Space
-          , Str "feet."
-          , Space
-          , Str "After"
-          , Space
-          , Str "the"
-          , Space
-          , Str "event"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "He"
-          , Space
-          , Str "wept."
-          , Space
-          , Str "He"
-          , Space
-          , Str "promised"
-          , Space
-          , Str "'a"
-          , Space
-          , Str "new"
-          , Space
-          , Str "start'."
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "I"
-          , Space
-          , Str "made"
-          , Space
-          , Str "no"
-          , Space
-          , Str "comment."
-          , Space
-          , Str "What"
-          , Space
-          , Str "should"
-          , Space
-          , Str "I"
-          , Space
-          , Str "resent?\""
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "\"On"
-          , Space
-          , Str "Margate"
-          , Space
-          , Str "Sands."
-          , Span
-            ( "", [ "lnum" ], [] )
-            [ Str "300" ]
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain [ Str "I", Space, Str "can", Space, Str "connect" ] ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Nothing", Space, Str "with", Space, Str "nothing." ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "The"
-          , Space
-          , Str "broken"
-          , Space
-          , Str "fingernails"
-          , Space
-          , Str "of"
-          , Space
-          , Str "dirty"
-          , Space
-          , Str "hands."
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "My"
-          , Space
-          , Str "people"
-          , Space
-          , Str "humble"
-          , Space
-          , Str "people"
-          , Space
-          , Str "who"
-          , Space
-          , Str "expect"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain [ Str "Nothing.\"" ] ]
-      , Div
-        ( "", [ "indent" ], [] )
-        [ Plain [ Str "la", Space, Str "la" ] ]
-      ]
-    , Div
-      ( "", [ "linegroup" ], [] )
-      [ Div
-        ( "wasteland-content.xhtml#ln307", [], [] )
-        [ Plain
-          [ Str "To"
-          , Space
-          , Str "Carthage"
-          , Space
-          , Str "then"
-          , Space
-          , Str "I"
-          , Space
-          , Str "came"
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "307." ]
-                ( "#wasteland-content.xhtml#ln307", "" )
-              , Space
-              , Str "V."
-              , Space
-              , Str "St."
-              , Space
-              , Str "Augustine's"
-              , Space
-              , Str "Confessions:"
-              , Space
-              , Str "\"to"
-              , Space
-              , Str "Carthage"
-              , Space
-              , Str "then"
-              , Space
-              , Str "I"
-              , Space
-              , Str "came,"
-              , Space
-              , Str "where"
-              , Space
-              , Str "a"
-              , SoftBreak
-              , Str "cauldron"
-              , Space
-              , Str "of"
-              , Space
-              , Str "unholy"
-              , Space
-              , Str "loves"
-              , Space
-              , Str "sang"
-              , Space
-              , Str "all"
-              , Space
-              , Str "about"
-              , Space
-              , Str "mine"
-              , Space
-              , Str "ears.\""
-              ]
-            ]
-          ]
-        ]
-      ]
-    , Div
-      ( "", [ "linegroup" ], [] )
-      [ Div
-        ( "wasteland-content.xhtml#ln308", [], [] )
-        [ Plain
-          [ Str "Burning"
-          , Space
-          , Str "burning"
-          , Space
-          , Str "burning"
-          , Space
-          , Str "burning"
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "308." ]
-                ( "#wasteland-content.xhtml#ln308", "" )
-              , Space
-              , Str "The"
-              , Space
-              , Str "complete"
-              , Space
-              , Str "text"
-              , Space
-              , Str "of"
-              , Space
-              , Str "the"
-              , Space
-              , Str "Buddha's"
-              , Space
-              , Str "Fire"
-              , Space
-              , Str "Sermon"
-              , Space
-              , Str "(which"
-              , Space
-              , Str "corresponds"
-              , Space
-              , Str "in"
-              , SoftBreak
-              , Str "importance"
-              , Space
-              , Str "to"
-              , Space
-              , Str "the"
-              , Space
-              , Str "Sermon"
-              , Space
-              , Str "on"
-              , Space
-              , Str "the"
-              , Space
-              , Str "Mount)"
-              , Space
-              , Str "from"
-              , Space
-              , Str "which"
-              , Space
-              , Str "these"
-              , Space
-              , Str "words"
-              , Space
-              , Str "are"
-              , Space
-              , Str "taken,"
-              , SoftBreak
-              , Str "will"
-              , Space
-              , Str "be"
-              , Space
-              , Str "found"
-              , Space
-              , Str "translated"
-              , Space
-              , Str "in"
-              , Space
-              , Str "the"
-              , Space
-              , Str "late"
-              , Space
-              , Str "Henry"
-              , Space
-              , Str "Clarke"
-              , Space
-              , Str "Warren's"
-              , Space
-              , Str "Buddhism"
-              , Space
-              , Str "in"
-              , SoftBreak
-              , Str "Translation"
-              , Space
-              , Str "(Harvard"
-              , Space
-              , Str "Oriental"
-              , Space
-              , Str "Series)."
-              , Space
-              , Str "Mr."
-              , Space
-              , Str "Warren"
-              , Space
-              , Str "was"
-              , Space
-              , Str "one"
-              , Space
-              , Str "of"
-              , Space
-              , Str "the"
-              , Space
-              , Str "great"
-              , SoftBreak
-              , Str "pioneers"
-              , Space
-              , Str "of"
-              , Space
-              , Str "Buddhist"
-              , Space
-              , Str "studies"
-              , Space
-              , Str "in"
-              , Space
-              , Str "the"
-              , Space
-              , Str "Occident."
-              ]
-            ]
-          ]
-        ]
-      , Div
-        ( "wasteland-content.xhtml#ln309", [], [] )
-        [ Plain
-          [ Str "O"
-          , Space
-          , Str "Lord"
-          , Space
-          , Str "Thou"
-          , Space
-          , Str "pluckest"
-          , Space
-          , Str "me"
-          , Space
-          , Str "out"
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "309." ]
-                ( "#wasteland-content.xhtml#ln309", "" )
-              , Space
-              , Str "From"
-              , Space
-              , Str "St."
-              , Space
-              , Str "Augustine's"
-              , Space
-              , Str "Confessions"
-              , Space
-              , Str "again."
-              , Space
-              , Str "The"
-              , Space
-              , Str "collocation"
-              , Space
-              , Str "of"
-              , Space
-              , Str "these"
-              , Space
-              , Str "two"
-              , SoftBreak
-              , Str "representatives"
-              , Space
-              , Str "of"
-              , Space
-              , Str "eastern"
-              , Space
-              , Str "and"
-              , Space
-              , Str "western"
-              , Space
-              , Str "asceticism,"
-              , Space
-              , Str "as"
-              , Space
-              , Str "the"
-              , Space
-              , Str "culmination"
-              , Space
-              , Str "of"
-              , SoftBreak
-              , Str "this"
-              , Space
-              , Str "part"
-              , Space
-              , Str "of"
-              , Space
-              , Str "the"
-              , Space
-              , Str "poem,"
-              , Space
-              , Str "is"
-              , Space
-              , Str "not"
-              , Space
-              , Str "an"
-              , Space
-              , Str "accident."
-              ]
-            ]
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "O"
-          , Space
-          , Str "Lord"
-          , Space
-          , Str "Thou"
-          , Space
-          , Str "pluckest"
-          , Span
-            ( "", [ "lnum" ], [] )
-            [ Str "310" ]
-          ]
-        ]
-      ]
-    , Div
-      ( "", [ "linegroup" ], [] )
-      [ Div ( "", [], [] ) [ Plain [ Str "burning" ] ] ]
-    ]
-  , Div
-    ( "wasteland-content.xhtml#ch4", [ "section" ], [] )
-    [ Header 2
-      ( "", [], [] )
-      [ Str "IV."
-      , Space
-      , Str "DEATH"
-      , Space
-      , Str "BY"
-      , Space
-      , Str "WATER"
-      ]
-    , Div
-      ( "", [ "linegroup" ], [] )
-      [ Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Phlebas"
-          , Space
-          , Str "the"
-          , Space
-          , Str "Phoenician,"
-          , Space
-          , Str "a"
-          , Space
-          , Str "fortnight"
-          , Space
-          , Str "dead,"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Forgot"
-          , Space
-          , Str "the"
-          , Space
-          , Str "cry"
-          , Space
-          , Str "of"
-          , Space
-          , Str "gulls,"
-          , Space
-          , Str "and"
-          , Space
-          , Str "the"
-          , Space
-          , Str "deep"
-          , Space
-          , Str "sea"
-          , Space
-          , Str "swell"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "And"
-          , Space
-          , Str "the"
-          , Space
-          , Str "profit"
-          , Space
-          , Str "and"
-          , Space
-          , Str "loss."
-          ]
-        ]
-      ]
-    , Div
-      ( "", [ "linegroup" ], [] )
-      [ Div
-        ( "", [ "indent2" ], [] )
-        [ Plain
-          [ Str "A"
-          , Space
-          , Str "current"
-          , Space
-          , Str "under"
-          , Space
-          , Str "sea"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Picked"
-          , Space
-          , Str "his"
-          , Space
-          , Str "bones"
-          , Space
-          , Str "in"
-          , Space
-          , Str "whispers."
-          , Space
-          , Str "As"
-          , Space
-          , Str "he"
-          , Space
-          , Str "rose"
-          , Space
-          , Str "and"
-          , Space
-          , Str "fell"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "He"
-          , Space
-          , Str "passed"
-          , Space
-          , Str "the"
-          , Space
-          , Str "stages"
-          , Space
-          , Str "of"
-          , Space
-          , Str "his"
-          , Space
-          , Str "age"
-          , Space
-          , Str "and"
-          , Space
-          , Str "youth"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Entering", Space, Str "the", Space, Str "whirlpool." ]
-        ]
-      ]
-    , Div
-      ( "", [ "linegroup" ], [] )
-      [ Div
-        ( "", [ "indent2" ], [] )
-        [ Plain [ Str "Gentile", Space, Str "or", Space, Str "Jew" ] ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "O"
-          , Space
-          , Str "you"
-          , Space
-          , Str "who"
-          , Space
-          , Str "turn"
-          , Space
-          , Str "the"
-          , Space
-          , Str "wheel"
-          , Space
-          , Str "and"
-          , Space
-          , Str "look"
-          , Space
-          , Str "to"
-          , Space
-          , Str "windward,"
-          , Span
-            ( "", [ "lnum" ], [] )
-            [ Str "320" ]
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Consider"
-          , Space
-          , Str "Phlebas,"
-          , Space
-          , Str "who"
-          , Space
-          , Str "was"
-          , Space
-          , Str "once"
-          , Space
-          , Str "handsome"
-          , Space
-          , Str "and"
-          , Space
-          , Str "tall"
-          , Space
-          , Str "as"
-          , Space
-          , Str "you."
-          ]
-        ]
-      ]
-    ]
-  , Div
-    ( "wasteland-content.xhtml#ch5", [ "section" ], [] )
-    [ Header 2
-      ( "", [], [] )
-      [ Str "V."
-      , Space
-      , Str "WHAT"
-      , Space
-      , Str "THE"
-      , Space
-      , Str "THUNDER"
-      , Space
-      , Str "SAID"
-      ]
-    , Div
-      ( "", [ "linegroup" ], [] )
-      [ Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "After"
-          , Space
-          , Str "the"
-          , Space
-          , Str "torchlight"
-          , Space
-          , Str "red"
-          , Space
-          , Str "on"
-          , Space
-          , Str "sweaty"
-          , Space
-          , Str "faces"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "After"
-          , Space
-          , Str "the"
-          , Space
-          , Str "frosty"
-          , Space
-          , Str "silence"
-          , Space
-          , Str "in"
-          , Space
-          , Str "the"
-          , Space
-          , Str "gardens"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "After"
-          , Space
-          , Str "the"
-          , Space
-          , Str "agony"
-          , Space
-          , Str "in"
-          , Space
-          , Str "stony"
-          , Space
-          , Str "places"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "The"
-          , Space
-          , Str "shouting"
-          , Space
-          , Str "and"
-          , Space
-          , Str "the"
-          , Space
-          , Str "crying"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Prison"
-          , Space
-          , Str "and"
-          , Space
-          , Str "palace"
-          , Space
-          , Str "and"
-          , Space
-          , Str "reverberation"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Of"
-          , Space
-          , Str "thunder"
-          , Space
-          , Str "of"
-          , Space
-          , Str "spring"
-          , Space
-          , Str "over"
-          , Space
-          , Str "distant"
-          , Space
-          , Str "mountains"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "He"
-          , Space
-          , Str "who"
-          , Space
-          , Str "was"
-          , Space
-          , Str "living"
-          , Space
-          , Str "is"
-          , Space
-          , Str "now"
-          , Space
-          , Str "dead"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "We"
-          , Space
-          , Str "who"
-          , Space
-          , Str "were"
-          , Space
-          , Str "living"
-          , Space
-          , Str "are"
-          , Space
-          , Str "now"
-          , Space
-          , Str "dying"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "With"
-          , Space
-          , Str "a"
-          , Space
-          , Str "little"
-          , Space
-          , Str "patience"
-          , Span
-            ( "", [ "lnum" ], [] )
-            [ Str "330" ]
-          ]
-        ]
-      ]
-    , Div
-      ( "", [ "linegroup" ], [] )
-      [ Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Here"
-          , Space
-          , Str "is"
-          , Space
-          , Str "no"
-          , Space
-          , Str "water"
-          , Space
-          , Str "but"
-          , Space
-          , Str "only"
-          , Space
-          , Str "rock"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Rock"
-          , Space
-          , Str "and"
-          , Space
-          , Str "no"
-          , Space
-          , Str "water"
-          , Space
-          , Str "and"
-          , Space
-          , Str "the"
-          , Space
-          , Str "sandy"
-          , Space
-          , Str "road"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "The"
-          , Space
-          , Str "road"
-          , Space
-          , Str "winding"
-          , Space
-          , Str "above"
-          , Space
-          , Str "among"
-          , Space
-          , Str "the"
-          , Space
-          , Str "mountains"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Which"
-          , Space
-          , Str "are"
-          , Space
-          , Str "mountains"
-          , Space
-          , Str "of"
-          , Space
-          , Str "rock"
-          , Space
-          , Str "without"
-          , Space
-          , Str "water"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "If"
-          , Space
-          , Str "there"
-          , Space
-          , Str "were"
-          , Space
-          , Str "water"
-          , Space
-          , Str "we"
-          , Space
-          , Str "should"
-          , Space
-          , Str "stop"
-          , Space
-          , Str "and"
-          , Space
-          , Str "drink"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Amongst"
-          , Space
-          , Str "the"
-          , Space
-          , Str "rock"
-          , Space
-          , Str "one"
-          , Space
-          , Str "cannot"
-          , Space
-          , Str "stop"
-          , Space
-          , Str "or"
-          , Space
-          , Str "think"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Sweat"
-          , Space
-          , Str "is"
-          , Space
-          , Str "dry"
-          , Space
-          , Str "and"
-          , Space
-          , Str "feet"
-          , Space
-          , Str "are"
-          , Space
-          , Str "in"
-          , Space
-          , Str "the"
-          , Space
-          , Str "sand"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "If"
-          , Space
-          , Str "there"
-          , Space
-          , Str "were"
-          , Space
-          , Str "only"
-          , Space
-          , Str "water"
-          , Space
-          , Str "amongst"
-          , Space
-          , Str "the"
-          , Space
-          , Str "rock"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Dead"
-          , Space
-          , Str "mountain"
-          , Space
-          , Str "mouth"
-          , Space
-          , Str "of"
-          , Space
-          , Str "carious"
-          , Space
-          , Str "teeth"
-          , Space
-          , Str "that"
-          , Space
-          , Str "cannot"
-          , Space
-          , Str "spit"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Here"
-          , Space
-          , Str "one"
-          , Space
-          , Str "can"
-          , Space
-          , Str "neither"
-          , Space
-          , Str "stand"
-          , Space
-          , Str "nor"
-          , Space
-          , Str "lie"
-          , Space
-          , Str "nor"
-          , Space
-          , Str "sit"
-          , Span
-            ( "", [ "lnum" ], [] )
-            [ Str "340" ]
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "There"
-          , Space
-          , Str "is"
-          , Space
-          , Str "not"
-          , Space
-          , Str "even"
-          , Space
-          , Str "silence"
-          , Space
-          , Str "in"
-          , Space
-          , Str "the"
-          , Space
-          , Str "mountains"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "But"
-          , Space
-          , Str "dry"
-          , Space
-          , Str "sterile"
-          , Space
-          , Str "thunder"
-          , Space
-          , Str "without"
-          , Space
-          , Str "rain"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "There"
-          , Space
-          , Str "is"
-          , Space
-          , Str "not"
-          , Space
-          , Str "even"
-          , Space
-          , Str "solitude"
-          , Space
-          , Str "in"
-          , Space
-          , Str "the"
-          , Space
-          , Str "mountains"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "But"
-          , Space
-          , Str "red"
-          , Space
-          , Str "sullen"
-          , Space
-          , Str "faces"
-          , Space
-          , Str "sneer"
-          , Space
-          , Str "and"
-          , Space
-          , Str "snarl"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "From"
-          , Space
-          , Str "doors"
-          , Space
-          , Str "of"
-          , Space
-          , Str "mudcracked"
-          , Space
-          , Str "houses"
-          ]
-        ]
-      , Div
-        ( "", [ "linegroup" ], [] )
-        [ Div
-          ( "", [ "indent2" ], [] )
-          [ Plain
-            [ Str "If"
-            , Space
-            , Str "there"
-            , Space
-            , Str "were"
-            , Space
-            , Str "water"
-            ]
-          ]
-        , Div
-          ( "", [], [] )
-          [ Plain [ Str "And", Space, Str "no", Space, Str "rock" ] ]
-        , Div
-          ( "", [], [] )
-          [ Plain
-            [ Str "If"
-            , Space
-            , Str "there"
-            , Space
-            , Str "were"
-            , Space
-            , Str "rock"
-            ]
-          ]
-        , Div
-          ( "", [], [] )
-          [ Plain [ Str "And", Space, Str "also", Space, Str "water" ] ]
-        , Div
-          ( "", [], [] )
-          [ Plain
-            [ Str "And"
-            , Space
-            , Str "water"
-            , Span
-              ( "", [ "lnum" ], [] )
-              [ Str "350" ]
-            ]
-          ]
-        , Div
-          ( "", [], [] )
-          [ Plain [ Str "A", Space, Str "spring" ] ]
-        , Div
-          ( "", [], [] )
-          [ Plain
-            [ Str "A"
-            , Space
-            , Str "pool"
-            , Space
-            , Str "among"
-            , Space
-            , Str "the"
-            , Space
-            , Str "rock"
-            ]
-          ]
-        , Div
-          ( "", [], [] )
-          [ Plain
-            [ Str "If"
-            , Space
-            , Str "there"
-            , Space
-            , Str "were"
-            , Space
-            , Str "the"
-            , Space
-            , Str "sound"
-            , Space
-            , Str "of"
-            , Space
-            , Str "water"
-            , Space
-            , Str "only"
-            ]
-          ]
-        , Div
-          ( "", [], [] )
-          [ Plain [ Str "Not", Space, Str "the", Space, Str "cicada" ] ]
-        , Div
-          ( "", [], [] )
-          [ Plain
-            [ Str "And"
-            , Space
-            , Str "dry"
-            , Space
-            , Str "grass"
-            , Space
-            , Str "singing"
-            ]
-          ]
-        , Div
-          ( "", [], [] )
-          [ Plain
-            [ Str "But"
-            , Space
-            , Str "sound"
-            , Space
-            , Str "of"
-            , Space
-            , Str "water"
-            , Space
-            , Str "over"
-            , Space
-            , Str "a"
-            , Space
-            , Str "rock"
-            ]
-          ]
-        , Div
-          ( "wasteland-content.xhtml#ln357", [], [] )
-          [ Plain
-            [ Str "Where"
-            , Space
-            , Str "the"
-            , Space
-            , Str "hermit-thrush"
-            , Space
-            , Str "sings"
-            , Space
-            , Str "in"
-            , Space
-            , Str "the"
-            , Space
-            , Str "pine"
-            , Space
-            , Str "trees"
-            , Note
-              [ Para
-                [ Link
-                  ( "", [], [] )
-                  [ Str "357." ]
-                  ( "#wasteland-content.xhtml#ln357", "" )
-                , Space
-                , Str "This"
-                , Space
-                , Str "is"
-                , Space
-                , Str "Turdus"
-                , Space
-                , Str "aonalaschkae"
-                , Space
-                , Str "pallasii,"
-                , Space
-                , Str "the"
-                , Space
-                , Str "hermit-thrush"
-                , Space
-                , Str "which"
-                , Space
-                , Str "I"
-                , Space
-                , Str "have"
-                , SoftBreak
-                , Str "heard"
-                , Space
-                , Str "in"
-                , Space
-                , Str "Quebec"
-                , Space
-                , Str "County."
-                , Space
-                , Str "Chapman"
-                , Space
-                , Str "says"
-                , Space
-                , Str "(Handbook"
-                , Space
-                , Str "of"
-                , Space
-                , Str "Birds"
-                , Space
-                , Str "of"
-                , Space
-                , Str "Eastern"
-                , Space
-                , Str "North"
-                , SoftBreak
-                , Str "America)"
-                , Space
-                , Str "\"it"
-                , Space
-                , Str "is"
-                , Space
-                , Str "most"
-                , Space
-                , Str "at"
-                , Space
-                , Str "home"
-                , Space
-                , Str "in"
-                , Space
-                , Str "secluded"
-                , Space
-                , Str "woodland"
-                , Space
-                , Str "and"
-                , Space
-                , Str "thickety"
-                , Space
-                , Str "retreats."
-                , SoftBreak
-                , Str "."
-                , Space
-                , Str "."
-                , Space
-                , Str "."
-                , Space
-                , Str "Its"
-                , Space
-                , Str "notes"
-                , Space
-                , Str "are"
-                , Space
-                , Str "not"
-                , Space
-                , Str "remarkable"
-                , Space
-                , Str "for"
-                , Space
-                , Str "variety"
-                , Space
-                , Str "or"
-                , Space
-                , Str "volume,"
-                , Space
-                , Str "but"
-                , Space
-                , Str "in"
-                , Space
-                , Str "purity"
-                , SoftBreak
-                , Str "and"
-                , Space
-                , Str "sweetness"
-                , Space
-                , Str "of"
-                , Space
-                , Str "tone"
-                , Space
-                , Str "and"
-                , Space
-                , Str "exquisite"
-                , Space
-                , Str "modulation"
-                , Space
-                , Str "they"
-                , Space
-                , Str "are"
-                , Space
-                , Str "unequalled.\""
-                , Space
-                , Str "Its"
-                , SoftBreak
-                , Str "\"water-dripping"
-                , Space
-                , Str "song\""
-                , Space
-                , Str "is"
-                , Space
-                , Str "justly"
-                , Space
-                , Str "celebrated."
-                ]
-              ]
-            ]
-          ]
-        , Div
-          ( "", [], [] )
-          [ Plain
-            [ Str "Drip"
-            , Space
-            , Str "drop"
-            , Space
-            , Str "drip"
-            , Space
-            , Str "drop"
-            , Space
-            , Str "drop"
-            , Space
-            , Str "drop"
-            , Space
-            , Str "drop"
-            ]
-          ]
-        , Div
-          ( "", [], [] )
-          [ Plain
-            [ Str "But"
-            , Space
-            , Str "there"
-            , Space
-            , Str "is"
-            , Space
-            , Str "no"
-            , Space
-            , Str "water"
-            ]
-          ]
-        ]
-      ]
-    , Div
-      ( "", [ "linegroup" ], [] )
-      [ Div
-        ( "wasteland-content.xhtml#ln360", [], [] )
-        [ Plain
-          [ Str "Who"
-          , Space
-          , Str "is"
-          , Space
-          , Str "the"
-          , Space
-          , Str "third"
-          , Space
-          , Str "who"
-          , Space
-          , Str "walks"
-          , Space
-          , Str "always"
-          , Space
-          , Str "beside"
-          , Space
-          , Str "you?"
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "360." ]
-                ( "#wasteland-content.xhtml#ln360", "" )
-              , Space
-              , Str "The"
-              , Space
-              , Str "following"
-              , Space
-              , Str "lines"
-              , Space
-              , Str "were"
-              , Space
-              , Str "stimulated"
-              , Space
-              , Str "by"
-              , Space
-              , Str "the"
-              , Space
-              , Str "account"
-              , Space
-              , Str "of"
-              , Space
-              , Str "one"
-              , Space
-              , Str "of"
-              , Space
-              , Str "the"
-              , SoftBreak
-              , Str "Antarctic"
-              , Space
-              , Str "expeditions"
-              , Space
-              , Str "(I"
-              , Space
-              , Str "forget"
-              , Space
-              , Str "which,"
-              , Space
-              , Str "but"
-              , Space
-              , Str "I"
-              , Space
-              , Str "think"
-              , Space
-              , Str "one"
-              , Space
-              , Str "of"
-              , Space
-              , Str "Shackleton's):"
-              , SoftBreak
-              , Str "it"
-              , Space
-              , Str "was"
-              , Space
-              , Str "related"
-              , Space
-              , Str "that"
-              , Space
-              , Str "the"
-              , Space
-              , Str "party"
-              , Space
-              , Str "of"
-              , Space
-              , Str "explorers,"
-              , Space
-              , Str "at"
-              , Space
-              , Str "the"
-              , Space
-              , Str "extremity"
-              , Space
-              , Str "of"
-              , Space
-              , Str "their"
-              , SoftBreak
-              , Str "strength,"
-              , Space
-              , Str "had"
-              , Space
-              , Str "the"
-              , Space
-              , Str "constant"
-              , Space
-              , Str "delusion"
-              , Space
-              , Str "that"
-              , Space
-              , Str "there"
-              , Space
-              , Str "was"
-              , Space
-              , Str "one"
-              , Space
-              , Str "more"
-              , Space
-              , Str "member"
-              , Space
-              , Str "than"
-              , SoftBreak
-              , Str "could"
-              , Space
-              , Str "actually"
-              , Space
-              , Str "be"
-              , Space
-              , Str "counted."
-              ]
-            ]
-          , SoftBreak
-          , Span
-            ( "", [ "lnum" ], [] )
-            [ Str "360" ]
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "When"
-          , Space
-          , Str "I"
-          , Space
-          , Str "count,"
-          , Space
-          , Str "there"
-          , Space
-          , Str "are"
-          , Space
-          , Str "only"
-          , Space
-          , Str "you"
-          , Space
-          , Str "and"
-          , Space
-          , Str "I"
-          , Space
-          , Str "together"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "But"
-          , Space
-          , Str "when"
-          , Space
-          , Str "I"
-          , Space
-          , Str "look"
-          , Space
-          , Str "ahead"
-          , Space
-          , Str "up"
-          , Space
-          , Str "the"
-          , Space
-          , Str "white"
-          , Space
-          , Str "road"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "There"
-          , Space
-          , Str "is"
-          , Space
-          , Str "always"
-          , Space
-          , Str "another"
-          , Space
-          , Str "one"
-          , Space
-          , Str "walking"
-          , Space
-          , Str "beside"
-          , Space
-          , Str "you"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Gliding"
-          , Space
-          , Str "wrapt"
-          , Space
-          , Str "in"
-          , Space
-          , Str "a"
-          , Space
-          , Str "brown"
-          , Space
-          , Str "mantle,"
-          , Space
-          , Str "hooded"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "I"
-          , Space
-          , Str "do"
-          , Space
-          , Str "not"
-          , Space
-          , Str "know"
-          , Space
-          , Str "whether"
-          , Space
-          , Str "a"
-          , Space
-          , Str "man"
-          , Space
-          , Str "or"
-          , Space
-          , Str "a"
-          , Space
-          , Str "woman"
-          ]
-        ]
-      , Div
-        ( "wasteland-content.xhtml#ln367", [], [] )
-        [ Plain
-          [ Str "\8213But"
-          , Space
-          , Str "who"
-          , Space
-          , Str "is"
-          , Space
-          , Str "that"
-          , Space
-          , Str "on"
-          , Space
-          , Str "the"
-          , Space
-          , Str "other"
-          , Space
-          , Str "side"
-          , Space
-          , Str "of"
-          , Space
-          , Str "you?"
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "367-77." ]
-                ( "#wasteland-content.xhtml#ln367", "" )
-              , Space
-              , Str "Cf."
-              , Space
-              , Str "Hermann"
-              , Space
-              , Str "Hesse,"
-              , Space
-              , Str "Blick"
-              , Space
-              , Str "ins"
-              , Space
-              , Str "Chaos:"
-              ]
-            , BlockQuote
-              [ Para
-                [ Str "\"Schon"
-                , Space
-                , Str "ist"
-                , Space
-                , Str "halb"
-                , Space
-                , Str "Europa,"
-                , Space
-                , Str "schon"
-                , Space
-                , Str "ist"
-                , Space
-                , Str "zumindest"
-                , Space
-                , Str "der"
-                , Space
-                , Str "halbe"
-                , Space
-                , Str "Osten"
-                , Space
-                , Str "Europas"
-                , SoftBreak
-                , Str "auf"
-                , Space
-                , Str "dem"
-                , LineBreak
-                , Str "Wege"
-                , Space
-                , Str "zum"
-                , Space
-                , Str "Chaos,"
-                , Space
-                , Str "fhrt"
-                , Space
-                , Str "betrunken"
-                , Space
-                , Str "im"
-                , Space
-                , Str "heiligem"
-                , Space
-                , Str "Wahn"
-                , Space
-                , Str "am"
-                , SoftBreak
-                , Str "Abgrund"
-                , Space
-                , Str "entlang"
-                , LineBreak
-                , Str "und"
-                , Space
-                , Str "singt"
-                , Space
-                , Str "dazu,"
-                , Space
-                , Str "singt"
-                , Space
-                , Str "betrunken"
-                , Space
-                , Str "und"
-                , Space
-                , Str "hymnisch"
-                , SoftBreak
-                , Str "wie"
-                , Space
-                , Str "Dmitri"
-                , Space
-                , Str "Karamasoff"
-                , Space
-                , Str "sang."
-                , LineBreak
-                , Str "Ueber"
-                , Space
-                , Str "diese"
-                , Space
-                , Str "Lieder"
-                , Space
-                , Str "lacht"
-                , Space
-                , Str "der"
-                , SoftBreak
-                , Str "Bsrger"
-                , Space
-                , Str "beleidigt,"
-                , Space
-                , Str "der"
-                , Space
-                , Str "Heilige"
-                , LineBreak
-                , Str "und"
-                , Space
-                , Str "Seher"
-                , Space
-                , Str "hrt"
-                , Space
-                , Str "sie"
-                , Space
-                , Str "mit"
-                , SoftBreak
-                , Str "Trvnen.\""
-                ]
-              ]
-            ]
-          ]
-        ]
-      ]
-    , Div
-      ( "", [ "linegroup" ], [] )
-      [ Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "What"
-          , Space
-          , Str "is"
-          , Space
-          , Str "that"
-          , Space
-          , Str "sound"
-          , Space
-          , Str "high"
-          , Space
-          , Str "in"
-          , Space
-          , Str "the"
-          , Space
-          , Str "air"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Murmur"
-          , Space
-          , Str "of"
-          , Space
-          , Str "maternal"
-          , Space
-          , Str "lamentation"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Who"
-          , Space
-          , Str "are"
-          , Space
-          , Str "those"
-          , Space
-          , Str "hooded"
-          , Space
-          , Str "hordes"
-          , Space
-          , Str "swarming"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Over"
-          , Space
-          , Str "endless"
-          , Space
-          , Str "plains,"
-          , Space
-          , Str "stumbling"
-          , Space
-          , Str "in"
-          , Space
-          , Str "cracked"
-          , Space
-          , Str "earth"
-          , Span
-            ( "", [ "lnum" ], [] )
-            [ Str "370" ]
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Ringed"
-          , Space
-          , Str "by"
-          , Space
-          , Str "the"
-          , Space
-          , Str "flat"
-          , Space
-          , Str "horizon"
-          , Space
-          , Str "only"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "What"
-          , Space
-          , Str "is"
-          , Space
-          , Str "the"
-          , Space
-          , Str "city"
-          , Space
-          , Str "over"
-          , Space
-          , Str "the"
-          , Space
-          , Str "mountains"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Cracks"
-          , Space
-          , Str "and"
-          , Space
-          , Str "reforms"
-          , Space
-          , Str "and"
-          , Space
-          , Str "bursts"
-          , Space
-          , Str "in"
-          , Space
-          , Str "the"
-          , Space
-          , Str "violet"
-          , Space
-          , Str "air"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain [ Str "Falling", Space, Str "towers" ] ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Jerusalem"
-          , Space
-          , Str "Athens"
-          , Space
-          , Str "Alexandria"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain [ Str "Vienna", Space, Str "London" ] ]
-      , Div
-        ( "", [], [] )
-        [ Plain [ Str "Unreal" ] ]
-      ]
-    , Div
-      ( "", [ "linegroup" ], [] )
-      [ Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "A"
-          , Space
-          , Str "woman"
-          , Space
-          , Str "drew"
-          , Space
-          , Str "her"
-          , Space
-          , Str "long"
-          , Space
-          , Str "black"
-          , Space
-          , Str "hair"
-          , Space
-          , Str "out"
-          , Space
-          , Str "tight"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "And"
-          , Space
-          , Str "fiddled"
-          , Space
-          , Str "whisper"
-          , Space
-          , Str "music"
-          , Space
-          , Str "on"
-          , Space
-          , Str "those"
-          , Space
-          , Str "strings"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "And"
-          , Space
-          , Str "bats"
-          , Space
-          , Str "with"
-          , Space
-          , Str "baby"
-          , Space
-          , Str "faces"
-          , Space
-          , Str "in"
-          , Space
-          , Str "the"
-          , Space
-          , Str "violet"
-          , Space
-          , Str "light"
-          , Span
-            ( "", [ "lnum" ], [] )
-            [ Str "380" ]
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Whistled,"
-          , Space
-          , Str "and"
-          , Space
-          , Str "beat"
-          , Space
-          , Str "their"
-          , Space
-          , Str "wings"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "And"
-          , Space
-          , Str "crawled"
-          , Space
-          , Str "head"
-          , Space
-          , Str "downward"
-          , Space
-          , Str "down"
-          , Space
-          , Str "a"
-          , Space
-          , Str "blackened"
-          , Space
-          , Str "wall"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "And"
-          , Space
-          , Str "upside"
-          , Space
-          , Str "down"
-          , Space
-          , Str "in"
-          , Space
-          , Str "air"
-          , Space
-          , Str "were"
-          , Space
-          , Str "towers"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Tolling"
-          , Space
-          , Str "reminiscent"
-          , Space
-          , Str "bells,"
-          , Space
-          , Str "that"
-          , Space
-          , Str "kept"
-          , Space
-          , Str "the"
-          , Space
-          , Str "hours"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "And"
-          , Space
-          , Str "voices"
-          , Space
-          , Str "singing"
-          , Space
-          , Str "out"
-          , Space
-          , Str "of"
-          , Space
-          , Str "empty"
-          , Space
-          , Str "cisterns"
-          , Space
-          , Str "and"
-          , Space
-          , Str "exhausted"
-          , SoftBreak
-          , Str "wells."
-          ]
-        ]
-      ]
-    , Div
-      ( "", [ "linegroup" ], [] )
-      [ Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "In"
-          , Space
-          , Str "this"
-          , Space
-          , Str "decayed"
-          , Space
-          , Str "hole"
-          , Space
-          , Str "among"
-          , Space
-          , Str "the"
-          , Space
-          , Str "mountains"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "In"
-          , Space
-          , Str "the"
-          , Space
-          , Str "faint"
-          , Space
-          , Str "moonlight,"
-          , Space
-          , Str "the"
-          , Space
-          , Str "grass"
-          , Space
-          , Str "is"
-          , Space
-          , Str "singing"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Over"
-          , Space
-          , Str "the"
-          , Space
-          , Str "tumbled"
-          , Space
-          , Str "graves,"
-          , Space
-          , Str "about"
-          , Space
-          , Str "the"
-          , Space
-          , Str "chapel"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "There"
-          , Space
-          , Str "is"
-          , Space
-          , Str "the"
-          , Space
-          , Str "empty"
-          , Space
-          , Str "chapel,"
-          , Space
-          , Str "only"
-          , Space
-          , Str "the"
-          , Space
-          , Str "wind's"
-          , Space
-          , Str "home."
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "It"
-          , Space
-          , Str "has"
-          , Space
-          , Str "no"
-          , Space
-          , Str "windows,"
-          , Space
-          , Str "and"
-          , Space
-          , Str "the"
-          , Space
-          , Str "door"
-          , Space
-          , Str "swings,"
-          , Span
-            ( "", [ "lnum" ], [] )
-            [ Str "390" ]
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Dry"
-          , Space
-          , Str "bones"
-          , Space
-          , Str "can"
-          , Space
-          , Str "harm"
-          , Space
-          , Str "no"
-          , Space
-          , Str "one."
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Only"
-          , Space
-          , Str "a"
-          , Space
-          , Str "cock"
-          , Space
-          , Str "stood"
-          , Space
-          , Str "on"
-          , Space
-          , Str "the"
-          , Space
-          , Str "rooftree"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Co"
-          , Space
-          , Str "co"
-          , Space
-          , Str "rico"
-          , Space
-          , Str "co"
-          , Space
-          , Str "co"
-          , Space
-          , Str "rico"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "In"
-          , Space
-          , Str "a"
-          , Space
-          , Str "flash"
-          , Space
-          , Str "of"
-          , Space
-          , Str "lightning."
-          , Space
-          , Str "Then"
-          , Space
-          , Str "a"
-          , Space
-          , Str "damp"
-          , Space
-          , Str "gust"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain [ Str "Bringing", Space, Str "rain" ] ]
-      ]
-    , Div
-      ( "", [ "linegroup" ], [] )
-      [ Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Ganga"
-          , Space
-          , Str "was"
-          , Space
-          , Str "sunken,"
-          , Space
-          , Str "and"
-          , Space
-          , Str "the"
-          , Space
-          , Str "limp"
-          , Space
-          , Str "leaves"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Waited"
-          , Space
-          , Str "for"
-          , Space
-          , Str "rain,"
-          , Space
-          , Str "while"
-          , Space
-          , Str "the"
-          , Space
-          , Str "black"
-          , Space
-          , Str "clouds"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Gathered"
-          , Space
-          , Str "far"
-          , Space
-          , Str "distant,"
-          , Space
-          , Str "over"
-          , Space
-          , Str "Himavant."
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "The"
-          , Space
-          , Str "jungle"
-          , Space
-          , Str "crouched,"
-          , Space
-          , Str "humped"
-          , Space
-          , Str "in"
-          , Space
-          , Str "silence."
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Then"
-          , Space
-          , Str "spoke"
-          , Space
-          , Str "the"
-          , Space
-          , Str "thunder"
-          , Span
-            ( "", [ "lnum" ], [] )
-            [ Str "400" ]
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain [ Str "DA" ] ]
-      , Div
-        ( "wasteland-content.xhtml#ln402", [], [] )
-        [ Plain
-          [ Span
-            ( "", [], [ ( "lang", "sa" ) ] )
-            [ Str "Datta" ]
-          , Str ":"
-          , Space
-          , Str "what"
-          , Space
-          , Str "have"
-          , Space
-          , Str "we"
-          , Space
-          , Str "given?"
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "402." ]
-                ( "#wasteland-content.xhtml#ln402", "" )
-              , Space
-              , Quoted DoubleQuote
-                [ Str "\"Datta,"
-                , Space
-                , Str "dayadhvam,"
-                , Space
-                , Str "damyata\""
-                ]
-              , Space
-              , Str "(Give,"
-              , Space
-              , Str "sympathize,"
-              , SoftBreak
-              , Str "control)."
-              , Space
-              , Str "The"
-              , Space
-              , Str "fable"
-              , Space
-              , Str "of"
-              , Space
-              , Str "the"
-              , Space
-              , Str "meaning"
-              , Space
-              , Str "of"
-              , Space
-              , Str "the"
-              , Space
-              , Str "Thunder"
-              , Space
-              , Str "is"
-              , Space
-              , Str "found"
-              , Space
-              , Str "in"
-              , Space
-              , Str "the"
-              , SoftBreak
-              , Str "Brihadaranyaka-Upanishad,"
-              , Space
-              , Str "5,"
-              , Space
-              , Str "1."
-              , Space
-              , Str "A"
-              , Space
-              , Str "translation"
-              , Space
-              , Str "is"
-              , Space
-              , Str "found"
-              , Space
-              , Str "in"
-              , Space
-              , Str "Deussen's"
-              , SoftBreak
-              , Str "Sechzig"
-              , Space
-              , Str "Upanishads"
-              , Space
-              , Str "des"
-              , Space
-              , Str "Veda,"
-              , Space
-              , Str "p."
-              , Space
-              , Str "489."
-              ]
-            ]
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "My"
-          , Space
-          , Str "friend,"
-          , Space
-          , Str "blood"
-          , Space
-          , Str "shaking"
-          , Space
-          , Str "my"
-          , Space
-          , Str "heart"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "The"
-          , Space
-          , Str "awful"
-          , Space
-          , Str "daring"
-          , Space
-          , Str "of"
-          , Space
-          , Str "a"
-          , Space
-          , Str "moment's"
-          , Space
-          , Str "surrender"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Which"
-          , Space
-          , Str "an"
-          , Space
-          , Str "age"
-          , Space
-          , Str "of"
-          , Space
-          , Str "prudence"
-          , Space
-          , Str "can"
-          , Space
-          , Str "never"
-          , Space
-          , Str "retract"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "By"
-          , Space
-          , Str "this,"
-          , Space
-          , Str "and"
-          , Space
-          , Str "this"
-          , Space
-          , Str "only,"
-          , Space
-          , Str "we"
-          , Space
-          , Str "have"
-          , Space
-          , Str "existed"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Which"
-          , Space
-          , Str "is"
-          , Space
-          , Str "not"
-          , Space
-          , Str "to"
-          , Space
-          , Str "be"
-          , Space
-          , Str "found"
-          , Space
-          , Str "in"
-          , Space
-          , Str "our"
-          , Space
-          , Str "obituaries"
-          ]
-        ]
-      , Div
-        ( "wasteland-content.xhtml#ln408", [], [] )
-        [ Plain
-          [ Str "Or"
-          , Space
-          , Str "in"
-          , Space
-          , Str "memories"
-          , Space
-          , Str "draped"
-          , Space
-          , Str "by"
-          , Space
-          , Str "the"
-          , Space
-          , Str "beneficent"
-          , Space
-          , Str "spider"
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "408." ]
-                ( "#wasteland-content.xhtml#ln408", "" )
-              , Space
-              , Str "Cf."
-              , Space
-              , Str "Webster,"
-              , Space
-              , Str "The"
-              , Space
-              , Str "White"
-              , Space
-              , Str "Devil,"
-              , Space
-              , Str "v."
-              , Space
-              , Str "vi:"
-              ]
-            , BlockQuote
-              [ Para
-                [ Str "\"."
-                , Space
-                , Str "."
-                , Space
-                , Str "."
-                , Space
-                , Str "they'll"
-                , Space
-                , Str "remarry"
-                , LineBreak
-                , Str "Ere"
-                , Space
-                , Str "the"
-                , Space
-                , Str "worm"
-                , Space
-                , Str "pierce"
-                , Space
-                , Str "your"
-                , Space
-                , Str "winding-sheet,"
-                , SoftBreak
-                , Str "ere"
-                , Space
-                , Str "the"
-                , Space
-                , Str "spider"
-                , LineBreak
-                , Str "Make"
-                , Space
-                , Str "a"
-                , Space
-                , Str "thin"
-                , Space
-                , Str "curtain"
-                , Space
-                , Str "for"
-                , Space
-                , Str "your"
-                , Space
-                , Str "epitaphs.\""
-                ]
-              ]
-            ]
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Or"
-          , Space
-          , Str "under"
-          , Space
-          , Str "seals"
-          , Space
-          , Str "broken"
-          , Space
-          , Str "by"
-          , Space
-          , Str "the"
-          , Space
-          , Str "lean"
-          , Space
-          , Str "solicitor"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "In"
-          , Space
-          , Str "our"
-          , Space
-          , Str "empty"
-          , Space
-          , Str "rooms"
-          , Span
-            ( "", [ "lnum" ], [] )
-            [ Str "410" ]
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain [ Str "DA" ] ]
-      , Div
-        ( "wasteland-content.xhtml#ln412", [], [] )
-        [ Plain
-          [ Span
-            ( "", [], [ ( "lang", "sa" ) ] )
-            [ Str "Dayadhvam" ]
-          , Str ":"
-          , Space
-          , Str "I"
-          , Space
-          , Str "have"
-          , Space
-          , Str "heard"
-          , Space
-          , Str "the"
-          , Space
-          , Str "key"
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "412." ]
-                ( "#wasteland-content.xhtml#ln412", "" )
-              , Space
-              , Str "Cf."
-              , Space
-              , Str "Inferno,"
-              , Space
-              , Str "xxxiii."
-              , Space
-              , Str "46:"
-              ]
-            , BlockQuote
-              [ Para
-                [ Str "\"ed"
-                , Space
-                , Str "io"
-                , Space
-                , Str "sentii"
-                , Space
-                , Str "chiavar"
-                , Space
-                , Str "l'uscio"
-                , Space
-                , Str "di"
-                , Space
-                , Str "sotto"
-                , LineBreak
-                , Str "all'orribile"
-                , Space
-                , Str "torre.\""
-                ]
-              ]
-            , Para
-              [ Str "Also"
-              , Space
-              , Str "F."
-              , Space
-              , Str "H."
-              , Space
-              , Str "Bradley,"
-              , Space
-              , Str "Appearance"
-              , Space
-              , Str "and"
-              , Space
-              , Str "Reality,"
-              , Space
-              , Str "p."
-              , Space
-              , Str "346:"
-              ]
-            , BlockQuote
-              [ Para
-                [ Str "\"My"
-                , Space
-                , Str "external"
-                , Space
-                , Str "sensations"
-                , Space
-                , Str "are"
-                , Space
-                , Str "no"
-                , Space
-                , Str "less"
-                , Space
-                , Str "private"
-                , Space
-                , Str "to"
-                , Space
-                , Str "myself"
-                , Space
-                , Str "than"
-                , Space
-                , Str "are"
-                , Space
-                , Str "my"
-                , SoftBreak
-                , Str "thoughts"
-                , Space
-                , Str "or"
-                , Space
-                , Str "my"
-                , Space
-                , Str "feelings."
-                , Space
-                , Str "In"
-                , Space
-                , Str "either"
-                , Space
-                , Str "case"
-                , Space
-                , Str "my"
-                , Space
-                , Str "experience"
-                , Space
-                , Str "falls"
-                , Space
-                , Str "within"
-                , SoftBreak
-                , Str "my"
-                , Space
-                , Str "own"
-                , Space
-                , Str "circle,"
-                , Space
-                , Str "a"
-                , Space
-                , Str "circle"
-                , Space
-                , Str "closed"
-                , Space
-                , Str "on"
-                , Space
-                , Str "the"
-                , Space
-                , Str "outside;"
-                , Space
-                , Str "and,"
-                , Space
-                , Str "with"
-                , Space
-                , Str "all"
-                , Space
-                , Str "its"
-                , SoftBreak
-                , Str "elements"
-                , Space
-                , Str "alike,"
-                , Space
-                , Str "every"
-                , Space
-                , Str "sphere"
-                , Space
-                , Str "is"
-                , Space
-                , Str "opaque"
-                , Space
-                , Str "to"
-                , Space
-                , Str "the"
-                , Space
-                , Str "others"
-                , Space
-                , Str "which"
-                , Space
-                , Str "surround"
-                , SoftBreak
-                , Str "it."
-                , Space
-                , Str "."
-                , Space
-                , Str "."
-                , Space
-                , Str "."
-                , Space
-                , Str "In"
-                , Space
-                , Str "brief,"
-                , Space
-                , Str "regarded"
-                , Space
-                , Str "as"
-                , Space
-                , Str "an"
-                , Space
-                , Str "existence"
-                , Space
-                , Str "which"
-                , Space
-                , Str "appears"
-                , Space
-                , Str "in"
-                , Space
-                , Str "a"
-                , SoftBreak
-                , Str "soul,"
-                , Space
-                , Str "the"
-                , Space
-                , Str "whole"
-                , Space
-                , Str "world"
-                , Space
-                , Str "for"
-                , Space
-                , Str "each"
-                , Space
-                , Str "is"
-                , Space
-                , Str "peculiar"
-                , Space
-                , Str "and"
-                , Space
-                , Str "private"
-                , Space
-                , Str "to"
-                , Space
-                , Str "that"
-                , SoftBreak
-                , Str "soul.\""
-                ]
-              ]
-            ]
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Turn"
-          , Space
-          , Str "in"
-          , Space
-          , Str "the"
-          , Space
-          , Str "door"
-          , Space
-          , Str "once"
-          , Space
-          , Str "and"
-          , Space
-          , Str "turn"
-          , Space
-          , Str "once"
-          , Space
-          , Str "only"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "We"
-          , Space
-          , Str "think"
-          , Space
-          , Str "of"
-          , Space
-          , Str "the"
-          , Space
-          , Str "key,"
-          , Space
-          , Str "each"
-          , Space
-          , Str "in"
-          , Space
-          , Str "his"
-          , Space
-          , Str "prison"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Thinking"
-          , Space
-          , Str "of"
-          , Space
-          , Str "the"
-          , Space
-          , Str "key,"
-          , Space
-          , Str "each"
-          , Space
-          , Str "confirms"
-          , Space
-          , Str "a"
-          , Space
-          , Str "prison"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Only"
-          , Space
-          , Str "at"
-          , Space
-          , Str "nightfall,"
-          , Space
-          , Str "aetherial"
-          , Space
-          , Str "rumours"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Revive"
-          , Space
-          , Str "for"
-          , Space
-          , Str "a"
-          , Space
-          , Str "moment"
-          , Space
-          , Str "a"
-          , Space
-          , Str "broken"
-          , Space
-          , Str "Coriolanus"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain [ Str "DA" ] ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Span
-            ( "", [], [ ( "lang", "sa" ) ] )
-            [ Str "Damyata" ]
-          , Str ":"
-          , Space
-          , Str "The"
-          , Space
-          , Str "boat"
-          , Space
-          , Str "responded"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Gaily,"
-          , Space
-          , Str "to"
-          , Space
-          , Str "the"
-          , Space
-          , Str "hand"
-          , Space
-          , Str "expert"
-          , Space
-          , Str "with"
-          , Space
-          , Str "sail"
-          , Space
-          , Str "and"
-          , Space
-          , Str "oar"
-          , Span
-            ( "", [ "lnum" ], [] )
-            [ Str "420" ]
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "The"
-          , Space
-          , Str "sea"
-          , Space
-          , Str "was"
-          , Space
-          , Str "calm,"
-          , Space
-          , Str "your"
-          , Space
-          , Str "heart"
-          , Space
-          , Str "would"
-          , Space
-          , Str "have"
-          , Space
-          , Str "responded"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Gaily,"
-          , Space
-          , Str "when"
-          , Space
-          , Str "invited,"
-          , Space
-          , Str "beating"
-          , Space
-          , Str "obedient"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "To", Space, Str "controlling", Space, Str "hands" ]
-        ]
-      ]
-    , Div
-      ( "", [ "linegroup" ], [] )
-      [ Div
-        ( "", [ "indent" ], [] )
-        [ Plain
-          [ Str "I"
-          , Space
-          , Str "sat"
-          , Space
-          , Str "upon"
-          , Space
-          , Str "the"
-          , Space
-          , Str "shore"
-          ]
-        ]
-      , Div
-        ( "wasteland-content.xhtml#ln425", [], [] )
-        [ Plain
-          [ Str "Fishing,"
-          , Space
-          , Str "with"
-          , Space
-          , Str "the"
-          , Space
-          , Str "arid"
-          , Space
-          , Str "plain"
-          , Space
-          , Str "behind"
-          , Space
-          , Str "me"
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "425." ]
-                ( "#wasteland-content.xhtml#ln425", "" )
-              , Space
-              , Str "V."
-              , Space
-              , Str "Weston,"
-              , Space
-              , Str "From"
-              , Space
-              , Str "Ritual"
-              , Space
-              , Str "to"
-              , Space
-              , Str "Romance;"
-              , Space
-              , Str "chapter"
-              , Space
-              , Str "on"
-              , Space
-              , Str "the"
-              , Space
-              , Str "Fisher"
-              , Space
-              , Str "King."
-              ]
-            ]
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "Shall"
-          , Space
-          , Str "I"
-          , Space
-          , Str "at"
-          , Space
-          , Str "least"
-          , Space
-          , Str "set"
-          , Space
-          , Str "my"
-          , Space
-          , Str "lands"
-          , Space
-          , Str "in"
-          , Space
-          , Str "order?"
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "London"
-          , Space
-          , Str "Bridge"
-          , Space
-          , Str "is"
-          , Space
-          , Str "falling"
-          , Space
-          , Str "down"
-          , Space
-          , Str "falling"
-          , Space
-          , Str "down"
-          , Space
-          , Str "falling"
-          , Space
-          , Str "down"
-          ]
-        ]
-      , Div
-        ( "wasteland-content.xhtml#ln428", [], [ ( "lang", "it" ) ] )
-        [ Plain
-          [ Emph
-            [ Str "Poi"
-            , Space
-            , Str "s'ascose"
-            , Space
-            , Str "nel"
-            , Space
-            , Str "foco"
-            , Space
-            , Str "che"
-            , Space
-            , Str "gli"
-            , Space
-            , Str "affina"
-            ]
-          , SoftBreak
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "428." ]
-                ( "#wasteland-content.xhtml#ln428", "" )
-              , Space
-              , Str "V."
-              , Space
-              , Str "Purgatorio,"
-              , Space
-              , Str "xxvi."
-              , Space
-              , Str "148."
-              ]
-            , BlockQuote
-              [ Para
-                [ Str "\"'Ara"
-                , Space
-                , Str "vos"
-                , Space
-                , Str "prec"
-                , Space
-                , Str "per"
-                , Space
-                , Str "aquella"
-                , Space
-                , Str "valor"
-                , LineBreak
-                , Str "'que"
-                , Space
-                , Str "vos"
-                , Space
-                , Str "guida"
-                , Space
-                , Str "al"
-                , Space
-                , Str "som"
-                , Space
-                , Str "de"
-                , SoftBreak
-                , Str "l'escalina,"
-                , LineBreak
-                , Str "'sovegna"
-                , Space
-                , Str "vos"
-                , Space
-                , Str "a"
-                , Space
-                , Str "temps"
-                , Space
-                , Str "de"
-                , Space
-                , Str "ma"
-                , Space
-                , Str "dolor.'"
-                , LineBreak
-                , Str "Poi"
-                , SoftBreak
-                , Str "s'ascose"
-                , Space
-                , Str "nel"
-                , Space
-                , Str "foco"
-                , Space
-                , Str "che"
-                , Space
-                , Str "gli"
-                , Space
-                , Str "affina.\""
-                ]
-              ]
-            ]
-          ]
-        ]
-      , Div
-        ( "wasteland-content.xhtml#ln429", [], [] )
-        [ Plain
-          [ Span
-            ( "", [], [ ( "lang", "it" ) ] )
-            [ SoftBreak
-            , Emph
-              [ Str "Quando"
-              , Space
-              , Str "fiam"
-              , Space
-              , Str "ceu"
-              , Space
-              , Str "chelidon"
-              ]
-            , SoftBreak
-            ]
-          , Space
-          , Str "-"
-          , Space
-          , Str "O"
-          , Space
-          , Str "swallow"
-          , Space
-          , Str "swallow"
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "429." ]
-                ( "#wasteland-content.xhtml#ln429", "" )
-              , Space
-              , Str "V."
-              , Space
-              , Str "Pervigilium"
-              , Space
-              , Str "Veneris."
-              , Space
-              , Str "Cf."
-              , Space
-              , Str "Philomela"
-              , Space
-              , Str "in"
-              , Space
-              , Str "Parts"
-              , Space
-              , Str "II"
-              , Space
-              , Str "and"
-              , Space
-              , Str "III."
-              ]
-            ]
-          ]
-        ]
-      , Div
-        ( "wasteland-content.xhtml#ln430", [], [ ( "lang", "fr" ) ] )
-        [ Plain
-          [ Emph
-            [ Str "Le"
-            , Space
-            , Str "Prince"
-            , Space
-            , Str "d'Aquitaine"
-            , Space
-            , Str "a"
-            , Space
-            , Str "la"
-            , Space
-            , Str "tour"
-            , Space
-            , Str "abolie"
-            ]
-          , SoftBreak
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "430." ]
-                ( "#wasteland-content.xhtml#ln430", "" )
-              , Space
-              , Str "V."
-              , Space
-              , Str "Gerard"
-              , Space
-              , Str "de"
-              , Space
-              , Str "Nerval,"
-              , Space
-              , Str "Sonnet"
-              , Space
-              , Str "El"
-              , Space
-              , Str "Desdichado."
-              ]
-            ]
-          , SoftBreak
-          , Span
-            ( "", [ "lnum" ], [] )
-            [ Str "430" ]
-          ]
-        ]
-      , Div
-        ( "", [], [] )
-        [ Plain
-          [ Str "These"
-          , Space
-          , Str "fragments"
-          , Space
-          , Str "I"
-          , Space
-          , Str "have"
-          , Space
-          , Str "shored"
-          , Space
-          , Str "against"
-          , Space
-          , Str "my"
-          , Space
-          , Str "ruins"
-          ]
-        ]
-      , Div
-        ( "wasteland-content.xhtml#ln432", [], [] )
-        [ Plain
-          [ Str "Why"
-          , Space
-          , Str "then"
-          , Space
-          , Str "Ile"
-          , Space
-          , Str "fit"
-          , Space
-          , Str "you."
-          , Space
-          , Str "Hieronymo's"
-          , Space
-          , Str "mad"
-          , Space
-          , Str "againe."
-          , Note
-            [ Para
-              [ Link
-                ( "", [], [] )
-                [ Str "432." ]
-                ( "#wasteland-content.xhtml#ln432", "" )
-              , Space
-              , Str "V."
-              , Space
-              , Str "Kyd's"
-              , Space
-              , Str "Spanish"
-              , Space
-              , Str "Tragedy."
-              ]
-            ]
-          ]
-        ]
-      , Div
-        ( "", [], [ ( "lang", "sa" ) ] )
-        [ Plain
-          [ Str "Datta."
-          , Space
-          , Str "Dayadhvam."
-          , Space
-          , Str "Damyata."
-          ]
-        ]
-      , Div
-        ( "wasteland-content.xhtml#ln434"
-        ,
-          [ "linegroup", "indent" ]
-        , []
-        )
-        [ Plain
-          [ Span
-            ( "", [], [ ( "lang", "sa" ) ] )
-            [ Str "Shantih"
-            , Space
-            , Str "shantih"
-            , Space
-            , Str "shantih"
-            , Note
-              [ Para
-                [ Link
-                  ( "", [], [] )
-                  [ Str "434." ]
-                  ( "#wasteland-content.xhtml#ln434", "" )
-                , Space
-                , Str "Shantih."
-                , Space
-                , Str "Repeated"
-                , Space
-                , Str "as"
-                , Space
-                , Str "here,"
-                , Space
-                , Str "a"
-                , Space
-                , Str "formal"
-                , Space
-                , Str "ending"
-                , Space
-                , Str "to"
-                , Space
-                , Str "an"
-                , Space
-                , Str "Upanishad."
-                , Space
-                , Str "'The"
-                , SoftBreak
-                , Str "Peace"
-                , Space
-                , Str "which"
-                , Space
-                , Str "passeth"
-                , Space
-                , Str "understanding'"
-                , Space
-                , Str "is"
-                , Space
-                , Str "a"
-                , Space
-                , Str "feeble"
-                , Space
-                , Str "translation"
-                , Space
-                , Str "of"
-                , Space
-                , Str "the"
-                , SoftBreak
-                , Str "content"
-                , Space
-                , Str "of"
-                , Space
-                , Str "this"
-                , Space
-                , Str "word."
-                ]
-              ]
-            , SoftBreak
-            ]
-          ]
-        ]
-      ]
-    ]
-  ]
-, Div
-  ( "wasteland-content.xhtml#backmatter"
-  ,
-    [ "section", "backmatter" ]
-  , []
-  )
-  [ Div
-    ( "wasteland-content.xhtml#rearnotes"
-    ,
-      [ "section", "rearnotes" ]
-    , []
-    )
-    [ Header 2
-      ( "", [], [] )
-      [ Str "NOTES"
-      , Space
-      , Str "ON"
-      , Space
-      , Str "\"THE"
-      , Space
-      , Str "WASTE"
-      , Space
-      , Str "LAND\""
-      ]
-    , Para
-      [ Str "Not"
-      , Space
-      , Str "only"
-      , Space
-      , Str "the"
-      , Space
-      , Str "title,"
-      , Space
-      , Str "but"
-      , Space
-      , Str "the"
-      , Space
-      , Str "plan"
-      , Space
-      , Str "and"
-      , Space
-      , Str "a"
-      , Space
-      , Str "good"
-      , Space
-      , Str "deal"
-      , Space
-      , Str "of"
-      , Space
-      , Str "the"
-      , Space
-      , Str "incidental"
-      , Space
-      , Str "symbolism"
-      , Space
-      , Str "of"
-      , SoftBreak
-      , Str "the"
-      , Space
-      , Str "poem"
-      , Space
-      , Str "were"
-      , Space
-      , Str "suggested"
-      , Space
-      , Str "by"
-      , Space
-      , Str "Miss"
-      , Space
-      , Str "Jessie"
-      , Space
-      , Str "L."
-      , Space
-      , Str "Weston's"
-      , Space
-      , Str "book"
-      , Space
-      , Str "on"
-      , Space
-      , Str "the"
-      , Space
-      , Str "Grail"
-      , Space
-      , Str "legend:"
-      , SoftBreak
-      , Str "From"
-      , Space
-      , Str "Ritual"
-      , Space
-      , Str "to"
-      , Space
-      , Str "Romance"
-      ]
-    , Para
-      [ Str "Indeed,"
-      , Space
-      , Str "so"
-      , Space
-      , Str "deeply"
-      , Space
-      , Str "am"
-      , Space
-      , Str "I"
-      , Space
-      , Str "indebted,"
-      , Space
-      , Str "Miss"
-      , Space
-      , Str "Weston's"
-      , Space
-      , Str "book"
-      , Space
-      , Str "will"
-      , Space
-      , Str "elucidate"
-      , Space
-      , Str "the"
-      , SoftBreak
-      , Str "difficulties"
-      , Space
-      , Str "of"
-      , Space
-      , Str "the"
-      , Space
-      , Str "poem"
-      , Space
-      , Str "much"
-      , Space
-      , Str "better"
-      , Space
-      , Str "than"
-      , Space
-      , Str "my"
-      , Space
-      , Str "notes"
-      , Space
-      , Str "can"
-      , Space
-      , Str "do;"
-      , Space
-      , Str "and"
-      , Space
-      , Str "I"
-      , Space
-      , Str "recommend"
-      , Space
-      , Str "it"
-      , SoftBreak
-      , Str "(apart"
-      , Space
-      , Str "from"
-      , Space
-      , Str "the"
-      , Space
-      , Str "great"
-      , Space
-      , Str "interest"
-      , Space
-      , Str "of"
-      , Space
-      , Str "the"
-      , Space
-      , Str "book"
-      , Space
-      , Str "itself)"
-      , Space
-      , Str "to"
-      , Space
-      , Str "any"
-      , Space
-      , Str "who"
-      , Space
-      , Str "think"
-      , Space
-      , Str "such"
-      , SoftBreak
-      , Str "elucidation"
-      , Space
-      , Str "of"
-      , Space
-      , Str "the"
-      , Space
-      , Str "poem"
-      , Space
-      , Str "worth"
-      , Space
-      , Str "the"
-      , Space
-      , Str "trouble."
-      , Space
-      , Str "To"
-      , Space
-      , Str "another"
-      , Space
-      , Str "work"
-      , Space
-      , Str "of"
-      , Space
-      , Str "anthropology"
-      , Space
-      , Str "I"
-      , Space
-      , Str "am"
-      , SoftBreak
-      , Str "indebted"
-      , Space
-      , Str "in"
-      , Space
-      , Str "general,"
-      , Space
-      , Str "one"
-      , Space
-      , Str "which"
-      , Space
-      , Str "has"
-      , Space
-      , Str "influenced"
-      , Space
-      , Str "our"
-      , Space
-      , Str "generation"
-      , Space
-      , Str "profoundly;"
-      , Space
-      , Str "I"
-      , Space
-      , Str "mean"
-      , SoftBreak
-      , Str "The"
-      , Space
-      , Str "Golden"
-      , Space
-      , Str "Bough;"
-      , Space
-      , Str "I"
-      , Space
-      , Str "have"
-      , Space
-      , Str "used"
-      , Space
-      , Str "especially"
-      , Space
-      , Str "the"
-      , Space
-      , Str "two"
-      , Space
-      , Str "volumes"
-      , Space
-      , Str "Adonis,"
-      , Space
-      , Str "Attis,"
-      , Space
-      , Str "Osiris."
-      , SoftBreak
-      , Str "Anyone"
-      , Space
-      , Str "who"
-      , Space
-      , Str "is"
-      , Space
-      , Str "acquainted"
-      , Space
-      , Str "with"
-      , Space
-      , Str "these"
-      , Space
-      , Str "works"
-      , Space
-      , Str "will"
-      , Space
-      , Str "immediately"
-      , Space
-      , Str "recognise"
-      , Space
-      , Str "in"
-      , Space
-      , Str "the"
-      , Space
-      , Str "poem"
-      , SoftBreak
-      , Str "certain"
-      , Space
-      , Str "references"
-      , Space
-      , Str "to"
-      , Space
-      , Str "vegetation"
-      , Space
-      , Str "ceremonies."
-      ]
-    , Div
-      ( "", [ "section" ], [] )
-      [ Header 3
-        ( "", [], [] )
-        [ Str "I."
-        , Space
-        , Str "THE"
-        , Space
-        , Str "BURIAL"
-        , Space
-        , Str "OF"
-        , Space
-        , Str "THE"
-        , Space
-        , Str "DEAD"
-        ]
-      ]
-    , Div
-      ( "", [ "section" ], [] )
-      [ Header 3
-        ( "", [], [] )
-        [ Str "II."
-        , Space
-        , Str "A"
-        , Space
-        , Str "GAME"
-        , Space
-        , Str "OF"
-        , Space
-        , Str "CHESS"
-        ]
-      ]
-    , Div
-      ( "", [ "section" ], [] )
-      [ Header 3
-        ( "", [], [] )
-        [ Str "III."
-        , Space
-        , Str "THE"
-        , Space
-        , Str "FIRE"
-        , Space
-        , Str "SERMON"
-        ]
-      ]
-    , Div
-      ( "", [ "section" ], [] )
-      [ Header 3
-        ( "", [], [] )
-        [ Str "V."
-        , Space
-        , Str "WHAT"
-        , Space
-        , Str "THE"
-        , Space
-        , Str "THUNDER"
-        , Space
-        , Str "SAID"
-        ]
-      , Para
-        [ Str "In"
-        , Space
-        , Str "the"
-        , Space
-        , Str "first"
-        , Space
-        , Str "part"
-        , Space
-        , Str "of"
-        , Space
-        , Str "Part"
-        , Space
-        , Str "V"
-        , Space
-        , Str "three"
-        , Space
-        , Str "themes"
-        , Space
-        , Str "are"
-        , Space
-        , Str "employed:"
-        , Space
-        , Str "the"
-        , Space
-        , Str "journey"
-        , Space
-        , Str "to"
-        , Space
-        , Str "Emmaus,"
-        , SoftBreak
-        , Str "the"
-        , Space
-        , Str "approach"
-        , Space
-        , Str "to"
-        , Space
-        , Str "the"
-        , Space
-        , Str "Chapel"
-        , Space
-        , Str "Perilous"
-        , Space
-        , Str "(see"
-        , Space
-        , Str "Miss"
-        , Space
-        , Str "Weston's"
-        , Space
-        , Str "book)"
-        , Space
-        , Str "and"
-        , Space
-        , Str "the"
-        , Space
-        , Str "present"
-        , SoftBreak
-        , Str "decay"
-        , Space
-        , Str "of"
-        , Space
-        , Str "eastern"
-        , Space
-        , Str "Europe."
-        ]
-      ]
-    ]
   ]
 ]
-- 
cgit v1.2.3


From d6dbbb89d071b5e3b377467c924bde61879589f2 Mon Sep 17 00:00:00 2001
From: John MacFarlane 
Date: Wed, 22 Sep 2021 13:21:56 -0700
Subject: Use latest citeproc.

---
 stack.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stack.yaml b/stack.yaml
index 5343c52be..40704814b 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -13,7 +13,7 @@ extra-deps:
 - git: https://github.com/jgm/texmath.git
   commit: 19700530733707284bb41f24add757f19ca23430
 - git: https://github.com/jgm/citeproc.git
-  commit: b27201c3ac48ffd2853f77152df19b6e2cf36987
+  commit: 4a7b98afabebd7a074489ba500d68ee6aa75d3a8
 ghc-options:
    "$locals": -fhide-source-paths -Wno-missing-home-modules
 resolver: lts-18.10
-- 
cgit v1.2.3


From 7ab2f4a61d43928f597cad4916d25a94a5bde0e8 Mon Sep 17 00:00:00 2001
From: John MacFarlane 
Date: Wed, 22 Sep 2021 22:18:38 -0700
Subject: HTML writer: pass through inline math environments with KaTeX.

---
 src/Text/Pandoc/Writers/HTML.hs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Text/Pandoc/Writers/HTML.hs b/src/Text/Pandoc/Writers/HTML.hs
index 3592bd2d4..03d182f5e 100644
--- a/src/Text/Pandoc/Writers/HTML.hs
+++ b/src/Text/Pandoc/Writers/HTML.hs
@@ -1636,6 +1636,7 @@ isMathEnvironment s = "\\begin{" `T.isPrefixOf` s &&
 
 allowsMathEnvironments :: HTMLMathMethod -> Bool
 allowsMathEnvironments (MathJax _) = True
+allowsMathEnvironments (KaTeX _)   = True
 allowsMathEnvironments MathML      = True
 allowsMathEnvironments (WebTeX _)  = True
 allowsMathEnvironments _           = False
-- 
cgit v1.2.3


From 0afb48cd384ea1663f88bda32d0d149dc9a6f6c5 Mon Sep 17 00:00:00 2001
From: John MacFarlane 
Date: Wed, 22 Sep 2021 22:33:00 -0700
Subject: HTML writer: pass through `\ref` and `\eqref`...

if MathJax is used.

Closes #7587.
---
 src/Text/Pandoc/Writers/HTML.hs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/Text/Pandoc/Writers/HTML.hs b/src/Text/Pandoc/Writers/HTML.hs
index 03d182f5e..f883bd6d8 100644
--- a/src/Text/Pandoc/Writers/HTML.hs
+++ b/src/Text/Pandoc/Writers/HTML.hs
@@ -1469,8 +1469,9 @@ inlineToHtml opts inline = do
       if ishtml
          then return $ preEscapedText str
          else if (f == Format "latex" || f == Format "tex") &&
-                allowsMathEnvironments (writerHTMLMathMethod opts) &&
-                isMathEnvironment str
+                 ((allowsMathEnvironments (writerHTMLMathMethod opts) &&
+                   isMathEnvironment str) ||
+                  (allowsRef (writerHTMLMathMethod opts) && isRef str))
                 then inlineToHtml opts $ Math DisplayMath str
                 else do
                   report $ InlineNotRendered inline
@@ -1602,6 +1603,9 @@ inDiv cls x = do
     (if html5 then H5.div else H.div)
                 x ! A.class_ (toValue cls)
 
+isRef :: Text -> Bool
+isRef t = "\\ref{" `T.isPrefixOf` t || "\\eqref{" `T.isPrefixOf` t
+
 isMathEnvironment :: Text -> Bool
 isMathEnvironment s = "\\begin{" `T.isPrefixOf` s &&
                          envName `elem` mathmlenvs
@@ -1641,6 +1645,10 @@ allowsMathEnvironments MathML      = True
 allowsMathEnvironments (WebTeX _)  = True
 allowsMathEnvironments _           = False
 
+allowsRef :: HTMLMathMethod -> Bool
+allowsRef (MathJax _) = True
+allowsRef _           = False
+
 -- | List of intrinsic event attributes allowed on all elements in HTML4.
 intrinsicEventsHTML4 :: [Text]
 intrinsicEventsHTML4 =
-- 
cgit v1.2.3


From f0a6eb913d7ace9de720539efb8984ea00ac82db Mon Sep 17 00:00:00 2001
From: John MacFarlane 
Date: Thu, 23 Sep 2021 08:49:52 -0700
Subject: HTML writer: render `\ref` and `\eqref` as inline math...

not display.  See #7589.
---
 src/Text/Pandoc/Writers/HTML.hs | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/Text/Pandoc/Writers/HTML.hs b/src/Text/Pandoc/Writers/HTML.hs
index f883bd6d8..8fc81ed24 100644
--- a/src/Text/Pandoc/Writers/HTML.hs
+++ b/src/Text/Pandoc/Writers/HTML.hs
@@ -1468,14 +1468,17 @@ inlineToHtml opts inline = do
       ishtml <- isRawHtml f
       if ishtml
          then return $ preEscapedText str
-         else if (f == Format "latex" || f == Format "tex") &&
-                 ((allowsMathEnvironments (writerHTMLMathMethod opts) &&
-                   isMathEnvironment str) ||
-                  (allowsRef (writerHTMLMathMethod opts) && isRef str))
-                then inlineToHtml opts $ Math DisplayMath str
-                else do
-                  report $ InlineNotRendered inline
-                  return mempty
+         else do
+           let istex = f == Format "latex" || f == Format "tex"
+           let mm = writerHTMLMathMethod opts
+           case istex of
+             True
+               | allowsMathEnvironments mm && isMathEnvironment str
+                 -> inlineToHtml opts $ Math DisplayMath str
+               | allowsRef mm && isRef str
+                 -> inlineToHtml opts $ Math InlineMath str
+             _ -> do report $ InlineNotRendered inline
+                     return mempty
     (Link attr txt (s,_)) | "mailto:" `T.isPrefixOf` s -> do
                         linkText <- inlineListToHtml opts txt
                         obfuscateLink opts attr linkText s
-- 
cgit v1.2.3


From aa89f6be186e2a442920860e5bf53149aabdac55 Mon Sep 17 00:00:00 2001
From: John MacFarlane 
Date: Thu, 23 Sep 2021 09:25:37 -0700
Subject: HTML reader: handle empty tbody element in table.

Closes #7589.
---
 src/Text/Pandoc/Readers/HTML/Table.hs | 13 ++++---
 test/command/7589.md                  | 73 +++++++++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+), 5 deletions(-)
 create mode 100644 test/command/7589.md

diff --git a/src/Text/Pandoc/Readers/HTML/Table.hs b/src/Text/Pandoc/Readers/HTML/Table.hs
index 6e62e12f5..b23a2abc8 100644
--- a/src/Text/Pandoc/Readers/HTML/Table.hs
+++ b/src/Text/Pandoc/Readers/HTML/Table.hs
@@ -16,7 +16,7 @@ HTML table parser.
 module Text.Pandoc.Readers.HTML.Table (pTable) where
 
 import Control.Applicative ((<|>))
-import Data.Maybe (fromMaybe)
+import Data.Maybe (fromMaybe, isJust)
 import Data.Either (lefts, rights)
 import Data.List.NonEmpty (nonEmpty)
 import Data.Text (Text)
@@ -27,12 +27,13 @@ import Text.Pandoc.Definition
 import Text.Pandoc.Class.PandocMonad (PandocMonad (..))
 import Text.Pandoc.Parsing
   ( eof, lookAhead, many, many1, manyTill, option, optional
-  , optionMaybe, skipMany, try)
+  , optionMaybe, skipMany, try )
 import Text.Pandoc.Readers.HTML.Parsing
 import Text.Pandoc.Readers.HTML.Types (TagParser)
 import Text.Pandoc.Shared (onlySimpleTableCells, safeRead)
 import qualified Data.Text as T
 import qualified Text.Pandoc.Builder as B
+import Control.Monad (guard)
 
 -- | Parses a @

aaaaaaaaaaaa	bbbbb	ccccccccccc
		cccccccccc cccccccccc cccccccccc cccccccccc cccccccccc cccccccccc

This.¹

Has a footnote.↩︎
Has a footnote.↩︎

``` diff --git a/test/command/4639.md b/test/command/4639.md index c35df1749..31ac3a5d9 100644 --- a/test/command/4639.md +++ b/test/command/4639.md @@ -5,6 +5,6 @@ \end{equation} ^D

\[\begin{equation} - E=mc^2 +E=mc^2 \end{equation}\]

``` diff --git a/test/command/4677.md b/test/command/4677.md index 2694624b9..64c436005 100644 --- a/test/command/4677.md +++ b/test/command/4677.md @@ -3,6 +3,7 @@ ![Caption](img.png){#img:1} ^D

``` diff --git a/test/command/4743.md b/test/command/4743.md index 582540736..a75ec1078 100644 --- a/test/command/4743.md +++ b/test/command/4743.md @@ -41,5 +41,7 @@ My:thumbsup:emoji:heart: My:thumbsup:emoji:heart:x :hearts: xyz ^D

0️⃣ header

My👍emoji❤️x ♥️ xyz

``` diff --git a/test/command/512.md b/test/command/512.md index b95921309..21b3ea9a7 100644 --- a/test/command/512.md +++ b/test/command/512.md @@ -8,7 +8,8 @@ __ link1_ __ link2_ ^D -

click here or click here

``` Multiple indirection: diff --git a/test/command/5121.md b/test/command/5121.md index 1ee6bda77..f1b972fb4 100644 --- a/test/command/5121.md +++ b/test/command/5121.md @@ -5,7 +5,8 @@ ## Header 2 ^D

## Header 2 diff --git a/test/command/5627.md b/test/command/5627.md index 9910e76c5..dde4c99d6 100644 --- a/test/command/5627.md +++ b/test/command/5627.md @@ -20,8 +20,10 @@ Something

Two -->something<!--

Three

Here is the footnote. It can go anywhere after the footnote reference. It need not be placed at the end of the document.↩︎
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).
+
Here is the footnote. It can go anywhere +after the footnote reference. It need not be placed at the end of the +document.↩︎
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 is easier to type. Inline notes may contain links and ] verbatim characters, as well as [bracketed text].↩︎
In quote.↩︎
In list.↩︎

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

This is easier to type. Inline notes +may contain links and ] verbatim +characters, as well as [bracketed text].↩︎
In quote.↩︎
In list.↩︎

" + , "

Down here.↩︎
The second note.↩︎

" + , "

Down here.↩︎

" + , "

The second note.↩︎

" + , "

Down here.↩︎
The second note.↩︎

" + , "

Down here.↩︎
The second note.↩︎

" + , "

Last N + credits	Average grade
140	17.06571429
84	17.95595238
64	18.9734375
36	19.12777778
29	19.18275862
19	19.00526316

Autolinks

Page title

First section

Second section

Page title

First section

Second section

Page title

First section

Second section

Page title

First section

Second section

Chapter one

Chapter two

Chapter one

Chapter two

0️⃣ header

Jekyll Plugins & Gems 💎

Jekyll Plugins & Gems 💎

Math

Math

Math

Math

Anonymous

July 17, 2006

Headers

Level 2 with an embedded link

Level 2 with an embedded +link

Level 3 with emphasis

Level 4

Level 5

Paragraphs

Smart quotes, ellipses, dashes

With ampersands

Autolinks

Images

Footnotes

Headers

Level 2 with an embedded link

Level 2 with an embedded +link

Level 3 with emphasis

Level 4

Level 5

Paragraphs

Smart quotes, ellipses, dashes

With ampersands

Autolinks

Images

Footnotes

Page title

First section

Second section

Page title

First section

Second section

Page title

First section

Second section

Page title

First section

Second section

Second section