From bcd1f9fbd91762bfdbdda6886b5a0fb92dfcf797 Mon Sep 17 00:00:00 2001
From: Andrew Hamilton <and_hamilton@yahoo.com>
Date: Thu, 31 May 2018 17:24:36 +1000
Subject: [PATCH] tools: Combined pandoc variants into one.

---
 README.md        |  7 +++----
 vigil/tools.toml | 21 ++++-----------------
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index 33e5c93..855b12e 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ then to run:
 
     # vigil <directory_path>
 
-### Tools (50 in total)
+### Tools (48 in total)
 
 Extensions | Tools
 ---------- | -----
@@ -34,7 +34,7 @@ Extensions | Tools
 .o | [objdump_headers](https://en.wikipedia.org/wiki/Objdump) • [objdump_disassemble](https://en.wikipedia.org/wiki/Objdump) • [readelf](https://en.wikipedia.org/wiki/Objdump)
 .cc .cpp .hpp | [cpp_syntax_gcc](https://gcc.gnu.org/) • bcpp • [uncrustify](https://github.com/uncrustify/uncrustify) • [cppcheck](http://sourceforge.net/p/cppcheck/wiki/Home/)
 .pdf | [pdf2txt](http://www.unixuser.org/~euske/python/pdfminer/)
-.html | [html_syntax](http://www.html-tidy.org/) • [tidy](http://www.html-tidy.org/) • [html2text](http://www.mbayer.de/html2text/) • [pandoc_html](https://pandoc.org/)
+.html | [html_syntax](http://www.html-tidy.org/) • [tidy](http://www.html-tidy.org/) • [html2text](http://www.mbayer.de/html2text/) • [pandoc](https://pandoc.org/)
 .php | [php7_syntax](https://en.wikipedia.org/wiki/PHP)
 .zip | [unzip](http://www.info-zip.org/UnZip.html)
 .tar.gz .tgz | [tar_gz](http://www.gnu.org/software/tar/manual/tar.html)
@@ -44,5 +44,4 @@ Extensions | Tools
 .bash .sh .dash .ksh | [shellcheck](http://hackage.haskell.org/package/ShellCheck)
 .go | [gofmt](https://golang.org) • [go_vet](https://golang.org) • [golint](https://github.com/golang/lint) • [godoc](http://golang.org/x/tools)
 .yaml .yml | [yamllint](https://github.com/adrienverge/yamllint)
-.md | [pandoc_md](https://pandoc.org/)
-.epub | [pandoc_epub](https://pandoc.org/)
+.md .epub | [pandoc](https://pandoc.org/)
diff --git a/vigil/tools.toml b/vigil/tools.toml
index 9ef1150..50aa4cf 100644
--- a/vigil/tools.toml
+++ b/vigil/tools.toml
@@ -12,7 +12,7 @@ tools_for_extensions = [
    [["cc", "cpp", "hpp"], ["cpp_syntax_gcc", "bcpp", "uncrustify",
                            "cppcheck"]],
    [["pdf"], ["pdf2txt"]],
-   [["html"], ["html_syntax", "tidy", "html2text", "pandoc_html"]],
+   [["html"], ["html_syntax", "tidy", "html2text", "pandoc"]],
    [["php"], ["php7_syntax"]],
    [["zip"], ["unzip"]],
    [["tar.gz", "tgz"],["tar_gz"]],
@@ -22,8 +22,7 @@ tools_for_extensions = [
    [["bash", "sh", "dash", "ksh"], ["shellcheck"]],
    [["go"], ["gofmt", "go_vet", "golint", "godoc"]],
    [["yaml", "yml"], ["yamllint"]],
-   [["md"], ["pandoc_md"]],
-   [["epub"], ["pandoc_epub"]]]
+   [["md", "epub"], ["pandoc"]]]
 
 
 # Tool template:
@@ -88,10 +87,10 @@ tools_for_extensions = [
   command = "html2text"
   success_status = "normal"
 
-[pandoc_html]
+[pandoc]
   dependencies = ["pandoc"]
   url = "pandoc"
-  command = "pandoc -f html -t plain"
+  command = "pandoc -t plain"
   success_status = "normal"
 
 [c_syntax_gcc]
@@ -141,15 +140,3 @@ tools_for_extensions = [
   dependencies = ["yamllint"]
   url = "yamllint"
   command = "yamllint"
-
-[pandoc_md]
-  dependencies = ["pandoc"]
-  url = "pandoc"
-  command = "pandoc -f markdown -t plain"
-  success_status = "normal"
-
-[pandoc_epub]
-  dependencies = ["pandoc"]
-  url = "pandoc"
-  command = "pandoc -f epub -t plain"
-  success_status = "normal"