Make epub an alias for epub3, not epub2.

This commit is contained in:
John MacFarlane 2017-01-30 10:19:30 +01:00
parent 25c1f58d18
commit 5e2754f515
3 changed files with 4 additions and 4 deletions

View file

@ -281,8 +281,8 @@ General options
`texinfo` (GNU Texinfo), `opml` (OPML), `docbook` or `docbook4`
(DocBook 4), `docbook5` (DocBook 5), `opendocument` (OpenDocument),
`odt` (OpenOffice text document), `docx` (Word docx), `haddock`
(Haddock markup), `rtf` (rich text format), `epub` or `epub2` (EPUB v2
book), `epub3` (EPUB v3), `fb2` (FictionBook2 e-book),
(Haddock markup), `rtf` (rich text format), `epub2` (EPUB v2 book),
`epub` or `epub3` (EPUB v3), `fb2` (FictionBook2 e-book),
`asciidoc` (AsciiDoc), `icml` (InDesign ICML), `tei` (TEI
Simple), `slidy` (Slidy HTML and JavaScript slide show),
`slideous` (Slideous HTML and JavaScript slide show),

View file

@ -261,7 +261,7 @@ writers = [
,("json" , StringWriter $ \o d -> return $ writeJSON o d)
,("docx" , ByteStringWriter writeDocx)
,("odt" , ByteStringWriter writeODT)
,("epub" , ByteStringWriter writeEPUB2)
,("epub" , ByteStringWriter writeEPUB3)
,("epub2" , ByteStringWriter writeEPUB2)
,("epub3" , ByteStringWriter writeEPUB3)
,("fb2" , StringWriter writeFB2)

View file

@ -62,7 +62,7 @@ getDefaultTemplate user writer = do
"odt" -> getDefaultTemplate user "opendocument"
"html" -> getDefaultTemplate user "html5"
"docbook" -> getDefaultTemplate user "docbook5"
"epub" -> getDefaultTemplate user "epub2"
"epub" -> getDefaultTemplate user "epub3"
"markdown_strict" -> getDefaultTemplate user "markdown"
"multimarkdown" -> getDefaultTemplate user "markdown"
"markdown_github" -> getDefaultTemplate user "markdown"