@@ -72,6 +72,8 @@ import Control.Applicative ((<$>), (<|>))
7272import Text.Pandoc.Readers.Txt2Tags (getT2TMeta)
7373import Data.Monoid
7474
75+import Text.Pandoc.Error
76+
7577type Transform = Pandoc -> Pandoc
7678
7779copyrightMessage :: String
@@ -1262,17 +1264,17 @@ main = do
12621264 then 0
12631265 else tabStop)
12641266
1265− let handleIncludes' = if readerName' == "latex" ||
1266− readerName' == "latex+lhs"
1267+ let handleIncludes' :: String -> IO (Either PandocError String)
1268+ handleIncludes' = if readerName' `elem` ["latex", "latex+lhs"]
12671269 then handleIncludes
1268− else return
1269−
1270− (doc, media) <-
1271− case reader of
1272− StringReader r-> (, mempty) <$>
1273− ( readSources >=>
1274− handleIncludes' . convertTabs . intercalate "\n" >=>
1275− r readerOpts ) sources
1270+ else return . Right
1271+
1272+ (doc, media) <- fmap handleError $
1273+ case reader of
1274+ StringReader r-> do
1275+ srcs <- convertTabs . intercalate "\n" <$> readSources sources
1276+ doc <- handleIncludes' srcs
1277+ either (return . Left) (\s -> fmap (,mempty) <$> r readerOpts s) doc
12761278 ByteStringReader r -> readFiles sources >>= r readerOpts
12771279
12781280 let writerOptions = def { writerStandalone = standalone',