diff options
| author | Jasper Van der Jeugt <jaspervdj@gmail.com> | 2014-05-12 10:54:19 +0200 |
|---|---|---|
| committer | Jasper Van der Jeugt <jaspervdj@gmail.com> | 2014-05-12 10:54:19 +0200 |
| commit | 2200516241af1b049c33dd8f2de2ae5122874eb4 (patch) | |
| tree | 604104f1390e1603faf5cdf9fa4b4ca814576b9d | |
| parent | 4d2b031ee2e8adbcd3864c9c3737d53c06ed2292 (diff) | |
| parent | 75b3bc0a16a72b3de4308652e8c78affecf9c47a (diff) | |
| download | hakyll-2200516241af1b049c33dd8f2de2ae5122874eb4.tar.gz | |
Merge pull request #254 from tarleb/org
Allow Emacs org-mode as markup-language in *.org files
| -rw-r--r-- | hakyll.cabal | 2 | ||||
| -rw-r--r-- | src/Hakyll/Web/Pandoc.hs | 1 |
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 $ |