diff --git a/pandoc.cabal b/pandoc.cabal
index 80fd994e6..0b6c71919 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -40,44 +40,44 @@ Description: Pandoc is a Haskell library for converting from one markup
only adding a reader or writer.
Data-Files:
-- templates
- data/templates/default.html,
- data/templates/default.html5,
- data/templates/default.docbook,
- data/templates/default.beamer,
- data/templates/default.opendocument,
- data/templates/default.icml,
- data/templates/default.opml,
- data/templates/default.latex,
- data/templates/default.context,
- data/templates/default.texinfo,
- data/templates/default.man,
- data/templates/default.markdown,
- data/templates/default.rst,
- data/templates/default.plain,
- data/templates/default.mediawiki,
- data/templates/default.rtf,
- data/templates/default.s5,
- data/templates/default.slidy,
- data/templates/default.slideous,
- data/templates/default.revealjs,
- data/templates/default.dzslides,
- data/templates/default.asciidoc,
- data/templates/default.haddock,
- data/templates/default.textile,
- data/templates/default.org,
- data/templates/default.epub,
- data/templates/default.epub3,
+ data/templates/default.html
+ data/templates/default.html5
+ data/templates/default.docbook
+ data/templates/default.beamer
+ data/templates/default.opendocument
+ data/templates/default.icml
+ data/templates/default.opml
+ data/templates/default.latex
+ data/templates/default.context
+ data/templates/default.texinfo
+ data/templates/default.man
+ data/templates/default.markdown
+ data/templates/default.rst
+ data/templates/default.plain
+ data/templates/default.mediawiki
+ data/templates/default.rtf
+ data/templates/default.s5
+ data/templates/default.slidy
+ data/templates/default.slideous
+ data/templates/default.revealjs
+ data/templates/default.dzslides
+ data/templates/default.asciidoc
+ data/templates/default.haddock
+ data/templates/default.textile
+ data/templates/default.org
+ data/templates/default.epub
+ data/templates/default.epub3
-- data for ODT writer
- data/reference.odt,
+ data/reference.odt
-- data for docx writer
- data/reference.docx,
+ data/reference.docx
-- stylesheet for EPUB writer
- data/epub.css,
+ data/epub.css
-- data for LaTeXMathML writer
- data/LaTeXMathML.js,
- data/MathMLinHTML.js,
+ data/LaTeXMathML.js
+ data/MathMLinHTML.js
-- data for dzslides writer
- data/dzslides/template.html,
+ data/dzslides/template.html
-- sample lua custom writer
data/sample.lua
-- documentation
@@ -86,118 +86,94 @@ Extra-Source-Files:
-- documentation
INSTALL, BUGS, CONTRIBUTING.md, changelog
-- code to create pandoc.1 man page
- man/man1/pandoc.1.template,
- man/man5/pandoc_markdown.5.template,
+ man/man1/pandoc.1.template
+ man/man5/pandoc_markdown.5.template
-- generated man pages (produced post-build)
- man/man1/pandoc.1,
- man/man5/pandoc_markdown.5,
+ man/man1/pandoc.1
+ man/man5/pandoc_markdown.5
-- tests
- tests/bodybg.gif,
+ tests/bodybg.gif
+ tests/*.native
tests/docbook-reader.docbook
- tests/html-reader.html,
- tests/opml-reader.opml,
- tests/haddock-reader.haddock,
- tests/insert,
- tests/lalune.jpg,
- tests/movie.jpg,
- tests/latex-reader.latex,
- tests/textile-reader.textile,
- tests/markdown-reader-more.txt,
- tests/markdown-citations.txt,
- tests/textile-reader.textile,
- tests/mediawiki-reader.wiki,
- tests/rst-reader.rst,
- tests/s5.basic.html,
- tests/s5.fancy.html,
- tests/s5.fragment.html,
- tests/s5.inserts.html,
- tests/tables.context,
- tests/tables.docbook,
- tests/tables.html,
- tests/tables.latex,
- tests/tables.man,
- tests/tables.plain,
- tests/tables.markdown,
- tests/tables.mediawiki,
- tests/tables.textile,
- tests/tables.opendocument,
- tests/tables.org,
- tests/tables.asciidoc,
- tests/tables.haddock,
- tests/tables.texinfo,
- tests/tables.rst,
- tests/tables.rtf,
- tests/tables.txt,
- tests/tables.fb2,
- tests/testsuite.txt,
- tests/writer.latex,
- tests/writer.context,
- tests/writer.docbook,
- tests/writer.html,
- tests/writer.man,
- tests/writer.markdown,
- tests/writer.plain,
- tests/writer.mediawiki,
- tests/writer.textile,
- tests/writer.opendocument,
- tests/writer.org,
- tests/writer.asciidoc,
- tests/writer.haddock,
- tests/writer.rst,
- tests/writer.rtf,
- tests/writer.texinfo,
- tests/writer.fb2,
- tests/writer.opml,
- tests/lhs-test.markdown,
- tests/lhs-test.markdown+lhs,
- tests/lhs-test.rst,
- tests/lhs-test.rst+lhs,
- tests/lhs-test.latex,
- tests/lhs-test.latex+lhs,
- tests/lhs-test.html,
- tests/lhs-test.html+lhs,
- tests/lhs-test.fragment.html+lhs,
- tests/pipe-tables.txt,
- tests/*.epub
- tests/fb2.basic.markdown,
- tests/fb2.basic.fb2,
- tests/fb2.titles.markdown,
- tests/fb2.titles.fb2,
- tests/fb2.images.markdown,
- tests/fb2.images.fb2,
- tests/fb2.images-embedded.html,
- tests/fb2.images-embedded.fb2,
- tests/fb2.math.markdown,
- tests/fb2.math.fb2,
- tests/fb2.test-small.png,
- tests/fb2.test.jpg,
- tests/docx.already_auto_ident.docx,
- tests/docx.block_quotes.docx,
- tests/docx.codeblock.docx,
- tests/docx.deep_normalize.docx,
- tests/docx.definition_list.docx,
- tests/docx.drop_cap.docx,
- tests/docx.hanging_indent.docx,
- tests/docx.headers.docx,
- tests/docx.image.docx,
- tests/docx.inline_images.docx,
- tests/docx.inline_code.docx,
- tests/docx.inline_formatting.docx,
- tests/docx.links.docx,
- tests/docx.lists.docx,
- tests/docx.metadata.docx,
- tests/docx.metadata_after_normal.docx,
- tests/docx.normalize.docx,
- tests/docx.notes.docx,
- tests/docx.tables.docx,
- tests/docx.tabs.docx,
- tests/docx.track_changes_deletion.docx,
- tests/docx.track_changes_insertion.docx,
- tests/docx.trailing_spaces_in_formatting.docx,
- tests/docx.unicode.docx,
- tests/*.native,
+ tests/html-reader.html
+ tests/opml-reader.opml
+ tests/haddock-reader.haddock
+ tests/insert
+ tests/lalune.jpg
+ tests/movie.jpg
+ tests/latex-reader.latex
+ tests/textile-reader.textile
+ tests/markdown-reader-more.txt
+ tests/markdown-citations.txt
+ tests/textile-reader.textile
+ tests/mediawiki-reader.wiki
+ tests/rst-reader.rst
+ tests/s5-basic.html
+ tests/s5-fancy.html
+ tests/s5-fragment.html
+ tests/s5-inserts.html
+ tests/tables.context
+ tests/tables.docbook
+ tests/tables.html
+ tests/tables.latex
+ tests/tables.man
+ tests/tables.plain
+ tests/tables.markdown
+ tests/tables.mediawiki
+ tests/tables.textile
+ tests/tables.opendocument
+ tests/tables.org
+ tests/tables.asciidoc
+ tests/tables.haddock
+ tests/tables.texinfo
+ tests/tables.rst
+ tests/tables.rtf
+ tests/tables.txt
+ tests/tables.fb2
+ tests/testsuite.txt
+ tests/writer.latex
+ tests/writer.context
+ tests/writer.docbook
+ tests/writer.html
+ tests/writer.man
+ tests/writer.markdown
+ tests/writer.plain
+ tests/writer.mediawiki
+ tests/writer.textile
+ tests/writer.opendocument
+ tests/writer.org
+ tests/writer.asciidoc
+ tests/writer.haddock
+ tests/writer.rst
+ tests/writer.icml
+ tests/writer.rtf
+ tests/writer.texinfo
+ tests/writer.fb2
+ tests/writer.opml
+ tests/writer.dokuwiki
+ tests/dokuwiki_inline_formatting.dokuwiki
+ tests/lhs-test.markdown
+ tests/lhs-test.markdown+lhs
+ tests/lhs-test.rst
+ tests/lhs-test.rst+lhs
+ tests/lhs-test.latex
+ tests/lhs-test.latex+lhs
+ tests/lhs-test.html
+ tests/lhs-test.html+lhs
+ tests/lhs-test.fragment.html+lhs
+ tests/pipe-tables.txt
+ tests/fb2/*.markdown
+ tests/fb2/*.fb2
+ tests/fb2/images-embedded.html
+ tests/fb2/images-embedded.fb2
+ tests/fb2/test-small.png
+ tests/fb2/test.jpg
+ tests/docx/*.docx
+ tests/docx/*.native
+ tests/epub/*.epub
+ tests/epub/*.native
tests/txt2tags.t2t
-Extra-Tmp-Files: man/man1/pandoc.1,
+Extra-Tmp-Files: man/man1/pandoc.1
man/man5/pandoc_markdown.5
Source-repository head
diff --git a/tests/Tests/Old.hs b/tests/Tests/Old.hs
index 8ecbdbbba..19461f74f 100644
--- a/tests/Tests/Old.hs
+++ b/tests/Tests/Old.hs
@@ -111,12 +111,12 @@ tests = [ testGroup "markdown"
"testsuite.native" "testsuite.native"
]
, testGroup "fb2"
- [ fb2WriterTest "basic" [] "fb2.basic.markdown" "fb2.basic.fb2"
- , fb2WriterTest "titles" [] "fb2.titles.markdown" "fb2.titles.fb2"
- , fb2WriterTest "images" [] "fb2.images.markdown" "fb2.images.fb2"
- , fb2WriterTest "images-embedded" [] "fb2.images-embedded.html" "fb2.images-embedded.fb2"
+ [ fb2WriterTest "basic" [] "fb2/basic.markdown" "fb2/basic.fb2"
+ , fb2WriterTest "titles" [] "fb2/titles.markdown" "fb2/titles.fb2"
+ , fb2WriterTest "images" [] "fb2/images.markdown" "fb2/images.fb2"
+ , fb2WriterTest "images-embedded" [] "fb2/images-embedded.html" "fb2/images-embedded.fb2"
+ , fb2WriterTest "math" [] "fb2/math.markdown" "fb2/math.fb2"
, fb2WriterTest "tables" [] "tables.native" "tables.fb2"
- , fb2WriterTest "math" [] "fb2.math.markdown" "fb2.math.fb2"
, fb2WriterTest "testsuite" [] "testsuite.native" "writer.fb2"
]
, testGroup "mediawiki"
@@ -126,10 +126,8 @@ tests = [ testGroup "markdown"
]
, testGroup "dokuwiki"
[ testGroup "writer" $ writerTests "dokuwiki"
- , test "writer-more" ["-r", "native", "-w", "dokuwiki", "-s"]
- "dokuwiki-writer.native" "dokuwiki-writer.dokuwiki"
- , test "writer-inline_formatting" ["-r", "native", "-w", "dokuwiki", "-s"]
- "dokuwiki.inline_formatting.native" "dokuwiki.inline_formatting.dokuwiki"
+ , test "inline_formatting" ["-r", "native", "-w", "dokuwiki", "-s"]
+ "dokuwiki_inline_formatting.native" "dokuwiki_inline_formatting.dokuwiki"
]
, testGroup "opml"
[ test "basic" ["-r", "native", "-w", "opml", "--columns=78", "-s"]
@@ -147,11 +145,11 @@ tests = [ testGroup "markdown"
"txt2tags.t2t" "txt2tags.native" ]
, testGroup "epub" [
test "features" ["-r", "epub", "-w", "native"]
- "epub.features.epub" "epub.features.native"
+ "epub/features.epub" "epub/features.native"
, test "wasteland" ["-r", "epub", "-w", "native"]
- "epub.wasteland.epub" "epub.wasteland.native"
+ "epub/wasteland.epub" "epub/wasteland.native"
, test "formatting" ["-r", "epub", "-w", "native"]
- "epub.formatting.epub" "epub.formatting.native"
+ "epub/formatting.epub" "epub/formatting.native"
]
, testGroup "other writers" $ map (\f -> testGroup f $ writerTests f)
[ "opendocument" , "context" , "texinfo", "icml"
@@ -194,7 +192,7 @@ s5WriterTest :: String -> [String] -> String -> Test
s5WriterTest modifier opts format
= test (format ++ " writer (" ++ modifier ++ ")")
(["-r", "native", "-w", format] ++ opts)
- "s5.native" ("s5." ++ modifier <.> "html")
+ "s5.native" ("s5-" ++ modifier <.> "html")
fb2WriterTest :: String -> [String] -> String -> String -> Test
fb2WriterTest title opts inputfile normfile =
diff --git a/tests/Tests/Readers/Docx.hs b/tests/Tests/Readers/Docx.hs
index 65fdd4a55..0e0f6c2c5 100644
--- a/tests/Tests/Readers/Docx.hs
+++ b/tests/Tests/Readers/Docx.hs
@@ -100,135 +100,135 @@ tests :: [Test]
tests = [ testGroup "inlines"
[ testCompare
"font formatting"
- "docx.inline_formatting.docx"
- "docx.inline_formatting.native"
+ "docx/inline_formatting.docx"
+ "docx/inline_formatting.native"
, testCompare
"hyperlinks"
- "docx.links.docx"
- "docx.links.native"
+ "docx/links.docx"
+ "docx/links.native"
, testCompare
"inline image"
- "docx.image.docx"
- "docx.image_no_embed.native"
+ "docx/image.docx"
+ "docx/image_no_embed.native"
, testCompare
"inline image in links"
- "docx.inline_images.docx"
- "docx.inline_images.native"
+ "docx/inline_images.docx"
+ "docx/inline_images.native"
, testCompare
"handling unicode input"
- "docx.unicode.docx"
- "docx.unicode.native"
+ "docx/unicode.docx"
+ "docx/unicode.native"
, testCompare
"literal tabs"
- "docx.tabs.docx"
- "docx.tabs.native"
+ "docx/tabs.docx"
+ "docx/tabs.native"
, testCompare
"normalizing inlines"
- "docx.normalize.docx"
- "docx.normalize.native"
+ "docx/normalize.docx"
+ "docx/normalize.native"
, testCompare
"normalizing inlines deep inside blocks"
- "docx.deep_normalize.docx"
- "docx.deep_normalize.native"
+ "docx/deep_normalize.docx"
+ "docx/deep_normalize.native"
, testCompare
"move trailing spaces outside of formatting"
- "docx.trailing_spaces_in_formatting.docx"
- "docx.trailing_spaces_in_formatting.native"
+ "docx/trailing_spaces_in_formatting.docx"
+ "docx/trailing_spaces_in_formatting.native"
, testCompare
"inline code (with VerbatimChar style)"
- "docx.inline_code.docx"
- "docx.inline_code.native"
+ "docx/inline_code.docx"
+ "docx/inline_code.native"
]
, testGroup "blocks"
[ testCompare
"headers"
- "docx.headers.docx"
- "docx.headers.native"
+ "docx/headers.docx"
+ "docx/headers.native"
, testCompare
"headers already having auto identifiers"
- "docx.already_auto_ident.docx"
- "docx.already_auto_ident.native"
+ "docx/already_auto_ident.docx"
+ "docx/already_auto_ident.native"
, testCompare
"lists"
- "docx.lists.docx"
- "docx.lists.native"
+ "docx/lists.docx"
+ "docx/lists.native"
, testCompare
"definition lists"
- "docx.definition_list.docx"
- "docx.definition_list.native"
+ "docx/definition_list.docx"
+ "docx/definition_list.native"
, testCompare
"footnotes and endnotes"
- "docx.notes.docx"
- "docx.notes.native"
+ "docx/notes.docx"
+ "docx/notes.native"
, testCompare
"blockquotes (parsing indent as blockquote)"
- "docx.block_quotes.docx"
- "docx.block_quotes_parse_indent.native"
+ "docx/block_quotes.docx"
+ "docx/block_quotes_parse_indent.native"
, testCompare
"hanging indents"
- "docx.hanging_indent.docx"
- "docx.hanging_indent.native"
+ "docx/hanging_indent.docx"
+ "docx/hanging_indent.native"
, testCompare
"tables"
- "docx.tables.docx"
- "docx.tables.native"
+ "docx/tables.docx"
+ "docx/tables.native"
, testCompare
"code block"
- "docx.codeblock.docx"
- "docx.codeblock.native"
+ "docx/codeblock.docx"
+ "docx/codeblock.native"
, testCompare
"dropcap paragraphs"
- "docx.drop_cap.docx"
- "docx.drop_cap.native"
+ "docx/drop_cap.docx"
+ "docx/drop_cap.native"
]
, testGroup "track changes"
[ testCompare
"insertion (default)"
- "docx.track_changes_insertion.docx"
- "docx.track_changes_insertion_accept.native"
+ "docx/track_changes_insertion.docx"
+ "docx/track_changes_insertion_accept.native"
, testCompareWithOpts def{readerTrackChanges=AcceptChanges}
"insert insertion (accept)"
- "docx.track_changes_insertion.docx"
- "docx.track_changes_insertion_accept.native"
+ "docx/track_changes_insertion.docx"
+ "docx/track_changes_insertion_accept.native"
, testCompareWithOpts def{readerTrackChanges=RejectChanges}
"remove insertion (reject)"
- "docx.track_changes_insertion.docx"
- "docx.track_changes_insertion_reject.native"
+ "docx/track_changes_insertion.docx"
+ "docx/track_changes_insertion_reject.native"
, testCompare
"deletion (default)"
- "docx.track_changes_deletion.docx"
- "docx.track_changes_deletion_accept.native"
+ "docx/track_changes_deletion.docx"
+ "docx/track_changes_deletion_accept.native"
, testCompareWithOpts def{readerTrackChanges=AcceptChanges}
"remove deletion (accept)"
- "docx.track_changes_deletion.docx"
- "docx.track_changes_deletion_accept.native"
+ "docx/track_changes_deletion.docx"
+ "docx/track_changes_deletion_accept.native"
, testCompareWithOpts def{readerTrackChanges=RejectChanges}
"insert deletion (reject)"
- "docx.track_changes_deletion.docx"
- "docx.track_changes_deletion_reject.native"
+ "docx/track_changes_deletion.docx"
+ "docx/track_changes_deletion_reject.native"
, testCompareWithOpts def{readerTrackChanges=AllChanges}
"keep insertion (all)"
- "docx.track_changes_deletion.docx"
- "docx.track_changes_deletion_all.native"
+ "docx/track_changes_deletion.docx"
+ "docx/track_changes_deletion_all.native"
, testCompareWithOpts def{readerTrackChanges=AllChanges}
"keep deletion (all)"
- "docx.track_changes_deletion.docx"
- "docx.track_changes_deletion_all.native"
+ "docx/track_changes_deletion.docx"
+ "docx/track_changes_deletion_all.native"
]
, testGroup "media"
[ testMediaBag
"image extraction"
- "docx.image.docx"
+ "docx/image.docx"
]
, testGroup "metadata"
[ testCompareWithOpts def{readerStandalone=True}
"metadata fields"
- "docx.metadata.docx"
- "docx.metadata.native"
+ "docx/metadata.docx"
+ "docx/metadata.native"
, testCompareWithOpts def{readerStandalone=True}
"stop recording metadata with normal text"
- "docx.metadata_after_normal.docx"
- "docx.metadata_after_normal.native"
+ "docx/metadata_after_normal.docx"
+ "docx/metadata_after_normal.native"
]
]
diff --git a/tests/Tests/Readers/EPUB.hs b/tests/Tests/Readers/EPUB.hs
index 01b68082b..f27ea979f 100644
--- a/tests/Tests/Readers/EPUB.hs
+++ b/tests/Tests/Readers/EPUB.hs
@@ -28,6 +28,6 @@ tests :: [Test]
tests =
[ testGroup "EPUB Mediabag"
[ testCase "features bag"
- (testMediaBag "epub.features.epub" featuresBag)
+ (testMediaBag "epub/features.epub" featuresBag)
]
]
diff --git a/tests/docx.already_auto_ident.docx b/tests/docx/already_auto_ident.docx
similarity index 100%
rename from tests/docx.already_auto_ident.docx
rename to tests/docx/already_auto_ident.docx
diff --git a/tests/docx.already_auto_ident.native b/tests/docx/already_auto_ident.native
similarity index 100%
rename from tests/docx.already_auto_ident.native
rename to tests/docx/already_auto_ident.native
diff --git a/tests/docx.block_quotes.docx b/tests/docx/block_quotes.docx
similarity index 100%
rename from tests/docx.block_quotes.docx
rename to tests/docx/block_quotes.docx
diff --git a/tests/docx.block_quotes_parse_indent.native b/tests/docx/block_quotes_parse_indent.native
similarity index 100%
rename from tests/docx.block_quotes_parse_indent.native
rename to tests/docx/block_quotes_parse_indent.native
diff --git a/tests/docx.codeblock.docx b/tests/docx/codeblock.docx
similarity index 100%
rename from tests/docx.codeblock.docx
rename to tests/docx/codeblock.docx
diff --git a/tests/docx.codeblock.native b/tests/docx/codeblock.native
similarity index 100%
rename from tests/docx.codeblock.native
rename to tests/docx/codeblock.native
diff --git a/tests/docx.deep_normalize.docx b/tests/docx/deep_normalize.docx
similarity index 100%
rename from tests/docx.deep_normalize.docx
rename to tests/docx/deep_normalize.docx
diff --git a/tests/docx.deep_normalize.native b/tests/docx/deep_normalize.native
similarity index 100%
rename from tests/docx.deep_normalize.native
rename to tests/docx/deep_normalize.native
diff --git a/tests/docx.definition_list.docx b/tests/docx/definition_list.docx
similarity index 100%
rename from tests/docx.definition_list.docx
rename to tests/docx/definition_list.docx
diff --git a/tests/docx.definition_list.native b/tests/docx/definition_list.native
similarity index 100%
rename from tests/docx.definition_list.native
rename to tests/docx/definition_list.native
diff --git a/tests/docx.drop_cap.docx b/tests/docx/drop_cap.docx
similarity index 100%
rename from tests/docx.drop_cap.docx
rename to tests/docx/drop_cap.docx
diff --git a/tests/docx.drop_cap.native b/tests/docx/drop_cap.native
similarity index 100%
rename from tests/docx.drop_cap.native
rename to tests/docx/drop_cap.native
diff --git a/tests/docx.hanging_indent.docx b/tests/docx/hanging_indent.docx
similarity index 100%
rename from tests/docx.hanging_indent.docx
rename to tests/docx/hanging_indent.docx
diff --git a/tests/docx.hanging_indent.native b/tests/docx/hanging_indent.native
similarity index 100%
rename from tests/docx.hanging_indent.native
rename to tests/docx/hanging_indent.native
diff --git a/tests/docx.headers.docx b/tests/docx/headers.docx
similarity index 100%
rename from tests/docx.headers.docx
rename to tests/docx/headers.docx
diff --git a/tests/docx.headers.native b/tests/docx/headers.native
similarity index 100%
rename from tests/docx.headers.native
rename to tests/docx/headers.native
diff --git a/tests/docx.image.docx b/tests/docx/image.docx
similarity index 100%
rename from tests/docx.image.docx
rename to tests/docx/image.docx
diff --git a/tests/docx.image_no_embed.native b/tests/docx/image_no_embed.native
similarity index 100%
rename from tests/docx.image_no_embed.native
rename to tests/docx/image_no_embed.native
diff --git a/tests/docx.inline_code.docx b/tests/docx/inline_code.docx
similarity index 100%
rename from tests/docx.inline_code.docx
rename to tests/docx/inline_code.docx
diff --git a/tests/docx.inline_code.native b/tests/docx/inline_code.native
similarity index 100%
rename from tests/docx.inline_code.native
rename to tests/docx/inline_code.native
diff --git a/tests/docx.inline_formatting.docx b/tests/docx/inline_formatting.docx
similarity index 100%
rename from tests/docx.inline_formatting.docx
rename to tests/docx/inline_formatting.docx
diff --git a/tests/docx.inline_formatting.native b/tests/docx/inline_formatting.native
similarity index 100%
rename from tests/docx.inline_formatting.native
rename to tests/docx/inline_formatting.native
diff --git a/tests/docx.inline_images.docx b/tests/docx/inline_images.docx
similarity index 100%
rename from tests/docx.inline_images.docx
rename to tests/docx/inline_images.docx
diff --git a/tests/docx.inline_images.native b/tests/docx/inline_images.native
similarity index 100%
rename from tests/docx.inline_images.native
rename to tests/docx/inline_images.native
diff --git a/tests/docx.links.docx b/tests/docx/links.docx
similarity index 100%
rename from tests/docx.links.docx
rename to tests/docx/links.docx
diff --git a/tests/docx.links.native b/tests/docx/links.native
similarity index 100%
rename from tests/docx.links.native
rename to tests/docx/links.native
diff --git a/tests/docx.lists.docx b/tests/docx/lists.docx
similarity index 100%
rename from tests/docx.lists.docx
rename to tests/docx/lists.docx
diff --git a/tests/docx.lists.native b/tests/docx/lists.native
similarity index 100%
rename from tests/docx.lists.native
rename to tests/docx/lists.native
diff --git a/tests/docx.metadata.docx b/tests/docx/metadata.docx
similarity index 100%
rename from tests/docx.metadata.docx
rename to tests/docx/metadata.docx
diff --git a/tests/docx.metadata.native b/tests/docx/metadata.native
similarity index 100%
rename from tests/docx.metadata.native
rename to tests/docx/metadata.native
diff --git a/tests/docx.metadata_after_normal.docx b/tests/docx/metadata_after_normal.docx
similarity index 100%
rename from tests/docx.metadata_after_normal.docx
rename to tests/docx/metadata_after_normal.docx
diff --git a/tests/docx.metadata_after_normal.native b/tests/docx/metadata_after_normal.native
similarity index 100%
rename from tests/docx.metadata_after_normal.native
rename to tests/docx/metadata_after_normal.native
diff --git a/tests/docx.normalize.docx b/tests/docx/normalize.docx
similarity index 100%
rename from tests/docx.normalize.docx
rename to tests/docx/normalize.docx
diff --git a/tests/docx.normalize.native b/tests/docx/normalize.native
similarity index 100%
rename from tests/docx.normalize.native
rename to tests/docx/normalize.native
diff --git a/tests/docx.notes.docx b/tests/docx/notes.docx
similarity index 100%
rename from tests/docx.notes.docx
rename to tests/docx/notes.docx
diff --git a/tests/docx.notes.native b/tests/docx/notes.native
similarity index 100%
rename from tests/docx.notes.native
rename to tests/docx/notes.native
diff --git a/tests/docx.tables.docx b/tests/docx/tables.docx
similarity index 100%
rename from tests/docx.tables.docx
rename to tests/docx/tables.docx
diff --git a/tests/docx.tables.native b/tests/docx/tables.native
similarity index 100%
rename from tests/docx.tables.native
rename to tests/docx/tables.native
diff --git a/tests/docx.tabs.docx b/tests/docx/tabs.docx
similarity index 100%
rename from tests/docx.tabs.docx
rename to tests/docx/tabs.docx
diff --git a/tests/docx.tabs.native b/tests/docx/tabs.native
similarity index 100%
rename from tests/docx.tabs.native
rename to tests/docx/tabs.native
diff --git a/tests/docx.track_changes_deletion.docx b/tests/docx/track_changes_deletion.docx
similarity index 100%
rename from tests/docx.track_changes_deletion.docx
rename to tests/docx/track_changes_deletion.docx
diff --git a/tests/docx.track_changes_deletion_accept.native b/tests/docx/track_changes_deletion_accept.native
similarity index 100%
rename from tests/docx.track_changes_deletion_accept.native
rename to tests/docx/track_changes_deletion_accept.native
diff --git a/tests/docx.track_changes_deletion_all.native b/tests/docx/track_changes_deletion_all.native
similarity index 100%
rename from tests/docx.track_changes_deletion_all.native
rename to tests/docx/track_changes_deletion_all.native
diff --git a/tests/docx.track_changes_deletion_reject.native b/tests/docx/track_changes_deletion_reject.native
similarity index 100%
rename from tests/docx.track_changes_deletion_reject.native
rename to tests/docx/track_changes_deletion_reject.native
diff --git a/tests/docx.track_changes_insertion.docx b/tests/docx/track_changes_insertion.docx
similarity index 100%
rename from tests/docx.track_changes_insertion.docx
rename to tests/docx/track_changes_insertion.docx
diff --git a/tests/docx.track_changes_insertion_accept.native b/tests/docx/track_changes_insertion_accept.native
similarity index 100%
rename from tests/docx.track_changes_insertion_accept.native
rename to tests/docx/track_changes_insertion_accept.native
diff --git a/tests/docx.track_changes_insertion_all.native b/tests/docx/track_changes_insertion_all.native
similarity index 100%
rename from tests/docx.track_changes_insertion_all.native
rename to tests/docx/track_changes_insertion_all.native
diff --git a/tests/docx.track_changes_insertion_reject.native b/tests/docx/track_changes_insertion_reject.native
similarity index 100%
rename from tests/docx.track_changes_insertion_reject.native
rename to tests/docx/track_changes_insertion_reject.native
diff --git a/tests/docx.trailing_spaces_in_formatting.docx b/tests/docx/trailing_spaces_in_formatting.docx
similarity index 100%
rename from tests/docx.trailing_spaces_in_formatting.docx
rename to tests/docx/trailing_spaces_in_formatting.docx
diff --git a/tests/docx.trailing_spaces_in_formatting.native b/tests/docx/trailing_spaces_in_formatting.native
similarity index 100%
rename from tests/docx.trailing_spaces_in_formatting.native
rename to tests/docx/trailing_spaces_in_formatting.native
diff --git a/tests/docx.unicode.docx b/tests/docx/unicode.docx
similarity index 100%
rename from tests/docx.unicode.docx
rename to tests/docx/unicode.docx
diff --git a/tests/docx.unicode.native b/tests/docx/unicode.native
similarity index 100%
rename from tests/docx.unicode.native
rename to tests/docx/unicode.native
diff --git a/tests/dokuwiki-writer.dokuwiki b/tests/dokuwiki-writer.dokuwiki
deleted file mode 100644
index 6ddacc480..000000000
--- a/tests/dokuwiki-writer.dokuwiki
+++ /dev/null
@@ -1,3 +0,0 @@
-hello %%//%% world %%**%% from %%__%% me
-
-''%%hello // world ** from __ me%%''
diff --git a/tests/dokuwiki-writer.native b/tests/dokuwiki-writer.native
deleted file mode 100644
index fc24451bc..000000000
--- a/tests/dokuwiki-writer.native
+++ /dev/null
@@ -1,2 +0,0 @@
-[Para [Str "hello",Space,Str "//",Space,Str "world",Space,Str "**",Space,Str "from",Space,Str "__",Space,Str "me"]
-,Para [Code ("",[],[]) "hello // world ** from __ me"]]
diff --git a/tests/dokuwiki.inline_formatting.dokuwiki b/tests/dokuwiki_inline_formatting.dokuwiki
similarity index 76%
rename from tests/dokuwiki.inline_formatting.dokuwiki
rename to tests/dokuwiki_inline_formatting.dokuwiki
index e02596e6c..dd5cb52b4 100644
--- a/tests/dokuwiki.inline_formatting.dokuwiki
+++ b/tests/dokuwiki_inline_formatting.dokuwiki
@@ -7,3 +7,7 @@ Some people use single underlines for //emphasis//.
Above the line is superscript and below the line is subscript.
A line\\ break.
+
+hello %%//%% world %%**%% from %%__%% me
+
+''%%hello // world ** from __ me%%''
diff --git a/tests/dokuwiki.inline_formatting.native b/tests/dokuwiki_inline_formatting.native
similarity index 76%
rename from tests/dokuwiki.inline_formatting.native
rename to tests/dokuwiki_inline_formatting.native
index dc8a3d19a..63e85889f 100644
--- a/tests/dokuwiki.inline_formatting.native
+++ b/tests/dokuwiki_inline_formatting.native
@@ -2,4 +2,6 @@
,Para [Str "This",Space,Str "is",Space,SmallCaps [Str "Small",Space,Str "Caps"],Str ",",Space,Str "and",Space,Str "this",Space,Str "is",Space,Strikeout [Str "strikethrough"],Str "."]
,Para [Str "Some",Space,Str "people",Space,Str "use",Space,Span ("",[],[("underline","single")]) [Str "single",Space,Str "underlines",Space,Str "for",Space,Emph [Str "emphasis"]],Str "."]
,Para [Str "Above",Space,Str "the",Space,Str "line",Space,Str "is",Space,Superscript [Str "superscript"],Space,Str "and",Space,Str "below",Space,Str "the",Space,Str "line",Space,Str "is",Space,Subscript [Str "subscript"],Str "."]
-,Para [Str "A",Space,Str "line",LineBreak,Str "break."]]
+,Para [Str "A",Space,Str "line",LineBreak,Str "break."]
+,Para [Str "hello",Space,Str "//",Space,Str "world",Space,Str "**",Space,Str "from",Space,Str "__",Space,Str "me"]
+,Para [Code ("",[],[]) "hello // world ** from __ me"]]
diff --git a/tests/epub.features.epub b/tests/epub/features.epub
similarity index 100%
rename from tests/epub.features.epub
rename to tests/epub/features.epub
diff --git a/tests/epub.features.native b/tests/epub/features.native
similarity index 100%
rename from tests/epub.features.native
rename to tests/epub/features.native
diff --git a/tests/epub.formatting.epub b/tests/epub/formatting.epub
similarity index 100%
rename from tests/epub.formatting.epub
rename to tests/epub/formatting.epub
diff --git a/tests/epub.formatting.native b/tests/epub/formatting.native
similarity index 100%
rename from tests/epub.formatting.native
rename to tests/epub/formatting.native
diff --git a/tests/epub.wasteland.epub b/tests/epub/wasteland.epub
similarity index 100%
rename from tests/epub.wasteland.epub
rename to tests/epub/wasteland.epub
diff --git a/tests/epub.wasteland.native b/tests/epub/wasteland.native
similarity index 100%
rename from tests/epub.wasteland.native
rename to tests/epub/wasteland.native
diff --git a/tests/fb2.basic.fb2 b/tests/fb2/basic.fb2
similarity index 100%
rename from tests/fb2.basic.fb2
rename to tests/fb2/basic.fb2
diff --git a/tests/fb2.basic.markdown b/tests/fb2/basic.markdown
similarity index 100%
rename from tests/fb2.basic.markdown
rename to tests/fb2/basic.markdown
diff --git a/tests/fb2.images-embedded.fb2 b/tests/fb2/images-embedded.fb2
similarity index 100%
rename from tests/fb2.images-embedded.fb2
rename to tests/fb2/images-embedded.fb2
diff --git a/tests/fb2.images-embedded.html b/tests/fb2/images-embedded.html
similarity index 100%
rename from tests/fb2.images-embedded.html
rename to tests/fb2/images-embedded.html
diff --git a/tests/fb2.images.fb2 b/tests/fb2/images.fb2
similarity index 100%
rename from tests/fb2.images.fb2
rename to tests/fb2/images.fb2
diff --git a/tests/fb2.images.markdown b/tests/fb2/images.markdown
similarity index 73%
rename from tests/fb2.images.markdown
rename to tests/fb2/images.markdown
index 419be7c44..e7d3cc1e6 100644
--- a/tests/fb2.images.markdown
+++ b/tests/fb2/images.markdown
@@ -4,10 +4,10 @@ Small inline image: ![alt text a small PNG image][inline-image].
Paragraph image:
-
+
A missing image inline: .
-[inline-image]: fb2.test-small.png
+[inline-image]: fb2/test-small.png
diff --git a/tests/fb2.math.fb2 b/tests/fb2/math.fb2
similarity index 100%
rename from tests/fb2.math.fb2
rename to tests/fb2/math.fb2
diff --git a/tests/fb2.math.markdown b/tests/fb2/math.markdown
similarity index 100%
rename from tests/fb2.math.markdown
rename to tests/fb2/math.markdown
diff --git a/tests/fb2.test-small.png b/tests/fb2/test-small.png
similarity index 100%
rename from tests/fb2.test-small.png
rename to tests/fb2/test-small.png
diff --git a/tests/fb2.test.jpg b/tests/fb2/test.jpg
similarity index 100%
rename from tests/fb2.test.jpg
rename to tests/fb2/test.jpg
diff --git a/tests/fb2.titles.fb2 b/tests/fb2/titles.fb2
similarity index 100%
rename from tests/fb2.titles.fb2
rename to tests/fb2/titles.fb2
diff --git a/tests/fb2.titles.markdown b/tests/fb2/titles.markdown
similarity index 100%
rename from tests/fb2.titles.markdown
rename to tests/fb2/titles.markdown
diff --git a/tests/s5.basic.html b/tests/s5-basic.html
similarity index 100%
rename from tests/s5.basic.html
rename to tests/s5-basic.html
diff --git a/tests/s5.fancy.html b/tests/s5-fancy.html
similarity index 100%
rename from tests/s5.fancy.html
rename to tests/s5-fancy.html
diff --git a/tests/s5.fragment.html b/tests/s5-fragment.html
similarity index 100%
rename from tests/s5.fragment.html
rename to tests/s5-fragment.html
diff --git a/tests/s5.inserts.html b/tests/s5-inserts.html
similarity index 100%
rename from tests/s5.inserts.html
rename to tests/s5-inserts.html