aboutsummaryrefslogtreecommitdiff
path: root/haddock-api/src/Haddock.hs
diff options
context:
space:
mode:
authorDominic Steinitz <dominic@steinitz.org>2015-05-16 13:53:14 +0100
committerDominic Steinitz <dominic@steinitz.org>2015-12-21 08:07:11 +0000
commit3f50b955324bd4b42f88a421f0203bc46a3ccf64 (patch)
tree822a3c2e5779e87712552959b6b4987f1286e0ba /haddock-api/src/Haddock.hs
parente01e4790402204af02ab0127ef5b633fb7748cd4 (diff)
Fix the documentation for haddock itself.
Change notation and add support for inline math. Allow newlines in display math. Add a command line option for the mathjax url (you might want to use a locally installed version). Rebase tests because of extra url and version change. Respond to (some of the) comments. Fix warnings in InterfaceFile.hs
Diffstat (limited to 'haddock-api/src/Haddock.hs')
-rw-r--r--haddock-api/src/Haddock.hs5
1 files changed, 3 insertions, 2 deletions
diff --git a/haddock-api/src/Haddock.hs b/haddock-api/src/Haddock.hs
index 70cdf8a3..72a6cc92 100644
--- a/haddock-api/src/Haddock.hs
+++ b/haddock-api/src/Haddock.hs
@@ -247,6 +247,7 @@ render dflags flags qual ifaces installedIfaces extSrcMap = do
odir = outputDir flags
opt_latex_style = optLaTeXStyle flags
opt_source_css = optSourceCssFile flags
+ opt_mathjax = optMathjax flags
visibleIfaces = [ i | i <- ifaces, OptHide `notElem` ifaceOptions i ]
@@ -297,7 +298,7 @@ render dflags flags qual ifaces installedIfaces extSrcMap = do
when (Flag_GenContents `elem` flags) $ do
ppHtmlContents dflags odir title pkgStr
- themes opt_index_url sourceUrls' opt_wiki_urls
+ themes opt_mathjax opt_index_url sourceUrls' opt_wiki_urls
allVisibleIfaces True prologue pretty
(makeContentsQual qual)
copyHtmlBits odir libDir themes
@@ -305,7 +306,7 @@ render dflags flags qual ifaces installedIfaces extSrcMap = do
when (Flag_Html `elem` flags) $ do
ppHtml dflags title pkgStr visibleIfaces odir
prologue
- themes sourceUrls' opt_wiki_urls
+ themes opt_mathjax sourceUrls' opt_wiki_urls
opt_contents_url opt_index_url unicode qual
pretty
copyHtmlBits odir libDir themes