git.iko.soy/typeable/pandoc
on master help sign in
Don't lowercase custom writer filename
3d766b5Alexander Krotov
src/Text/Pandoc/App.hs+3−5
@@ -223,17 +223,16 @@ convertWithOpts opts = do
223 then pdfWriterAndProg (optWriter opts) (optPdfEngine opts)
223 then pdfWriterAndProg (optWriter opts) (optPdfEngine opts)
224 else return (nonPdfWriterName $ optWriter opts, Nothing)
224 else return (nonPdfWriterName $ optWriter opts, Nothing)
225
225
226− let format = baseWriterName
226+ let format = map toLower $ baseWriterName
227 $ takeFileName writerName -- in case path to lua script
227 $ takeFileName writerName -- in case path to lua script
228
228
229 -- disabling the custom writer for now
229 -- disabling the custom writer for now
230 (writer, writerExts) <-
230 (writer, writerExts) <-
231 if ".lua" `isSuffixOf` format
231 if ".lua" `isSuffixOf` format
232− -- note: use non-lowercased version writerName
233 then return (TextWriter
232 then return (TextWriter
234 (\o d -> writeCustom writerName o d)
233 (\o d -> writeCustom writerName o d)
235 :: Writer PandocIO, mempty)
234 :: Writer PandocIO, mempty)
236− else case getWriter writerName of
235+ else case getWriter (map toLower writerName) of
237 Left e -> E.throwIO $ PandocAppError $
236 Left e -> E.throwIO $ PandocAppError $
238 if format == "pdf"
237 if format == "pdf"
239 then e ++
238 then e ++
@@ -844,8 +843,7 @@ options =
844
843
845 , Option "tw" ["to","write"]
844 , Option "tw" ["to","write"]
846 (ReqArg
845 (ReqArg
847− (\arg opt -> return opt { optWriter =
846+ (\arg opt -> return opt { optWriter = Just arg })
848− Just (map toLower arg) })
849 "FORMAT")
847 "FORMAT")
850 ""
848 ""
851
849