aboutsummaryrefslogtreecommitdiff
path: root/src/Text/Pandoc/Readers/Textile.hs
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2015-03-28 12:15:09 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2015-03-28 12:15:09 -0700
commitb74af6762d4a3c98be741af50fd3f3ac4344bef0 (patch)
treef7d27a6338824283957213438099b6a1269e4667 /src/Text/Pandoc/Readers/Textile.hs
parent6f4018f8d36ce641a5a67a6dff14de99e662a08f (diff)
parent6a3a04c4280817df39519bf1d73eee3b9e0b3841 (diff)
downloadpandoc-b74af6762d4a3c98be741af50fd3f3ac4344bef0.tar.gz
Merge branch 'mpickering-errortype'
Diffstat (limited to 'src/Text/Pandoc/Readers/Textile.hs')
-rw-r--r--src/Text/Pandoc/Readers/Textile.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Text/Pandoc/Readers/Textile.hs b/src/Text/Pandoc/Readers/Textile.hs
index 63ab80eb9..4565b26a1 100644
--- a/src/Text/Pandoc/Readers/Textile.hs
+++ b/src/Text/Pandoc/Readers/Textile.hs
@@ -68,11 +68,12 @@ import Text.Printf
import Control.Applicative ((<$>), (*>), (<*), (<$))
import Data.Monoid
import Debug.Trace (trace)
+import Text.Pandoc.Error
-- | Parse a Textile text and return a Pandoc document.
readTextile :: ReaderOptions -- ^ Reader options
-> String -- ^ String to parse (assuming @'\n'@ line endings)
- -> Pandoc
+ -> Either PandocError Pandoc
readTextile opts s =
(readWith parseTextile) def{ stateOptions = opts } (s ++ "\n\n")