summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert Krewinkel <tarleb@moltkeplatz.de>2014-02-27 18:50:10 +0100
committerAlbert Krewinkel <tarleb@moltkeplatz.de>2014-05-10 12:32:34 +0200
commit75b3bc0a16a72b3de4308652e8c78affecf9c47a (patch)
tree4ed7ed93c1e7f096bd0cc72ac587b38362c56502
parentd89fadcdb97c2acd9aeaa58c830d30ad755f31d7 (diff)
downloadhakyll-75b3bc0a16a72b3de4308652e8c78affecf9c47a.tar.gz
Allow Emacs org-mode as markup-language in *.org files
This closes #231.
-rw-r--r--hakyll.cabal2
-rw-r--r--src/Hakyll/Web/Pandoc.hs1
2 files changed, 2 insertions, 1 deletions
diff --git a/hakyll.cabal b/hakyll.cabal
index b4a6d8a..ced7601 100644
--- a/hakyll.cabal
+++ b/hakyll.cabal
@@ -157,7 +157,7 @@ Library
network >= 2.4 && < 2.5,
old-locale >= 1.0 && < 1.1,
old-time >= 1.0 && < 1.2,
- pandoc >= 1.12 && < 1.13,
+ pandoc >= 1.12.4 && < 1.13,
pandoc-citeproc >= 0.1 && < 0.4,
parsec >= 3.0 && < 3.2,
process >= 1.0 && < 1.3,
diff --git a/src/Hakyll/Web/Pandoc.hs b/src/Hakyll/Web/Pandoc.hs
index 1615167..78df1df 100644
--- a/src/Hakyll/Web/Pandoc.hs
+++ b/src/Hakyll/Web/Pandoc.hs
@@ -53,6 +53,7 @@ readPandocWith ropt item = fmap (reader ropt (itemFileType item)) item
LaTeX -> readLaTeX ro
LiterateHaskell t' -> reader (addExt ro Ext_literate_haskell) t'
Markdown -> readMarkdown ro
+ OrgMode -> readOrg ro
Rst -> readRST ro
Textile -> readTextile ro
_ -> error $