Revised tests directory.

Renamed some tests, introducing subsidiary directories
for fb2, docx, epub.

Cleaned up tests in cabal file.

Combined dokuwiki-writer and dokuwiki_inline_formatting tests.

1 files changed, 117 insertions, 141 deletions

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