From f80678df7f003c2e1c4f226fab39cea55f3907a8 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sun, 27 Apr 2014 20:38:15 -0700 Subject: A bit of refactoring that shouldn't change any semantics. In preparation for a fix to #1267. --- pandoc.hs | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'pandoc.hs') diff --git a/pandoc.hs b/pandoc.hs index d23fa79f3..d39ed3a59 100644 --- a/pandoc.hs +++ b/pandoc.hs @@ -243,13 +243,13 @@ options :: [OptDescr (Opt -> IO Opt)] options = [ Option "fr" ["from","read"] (ReqArg - (\arg opt -> return opt { optReader = map toLower arg }) + (\arg opt -> return opt { optReader = arg }) "FORMAT") "" , Option "tw" ["to","write"] (ReqArg - (\arg opt -> return opt { optWriter = map toLower arg }) + (\arg opt -> return opt { optWriter = arg }) "FORMAT") "" @@ -1008,14 +1008,13 @@ main = do then "html" else "markdown" in defaultReaderName fallback sources - else readerName - - let writerName' = if null writerName - then defaultWriterName outputFile - else case writerName of - "epub2" -> "epub" - "html4" -> "html" - x -> x + else map toLower readerName + + let writerName' = case map toLower writerName of + [] -> defaultWriterName outputFile + "epub2" -> "epub" + "html4" -> "html" + x -> x let pdfOutput = map toLower (takeExtension outputFile) == ".pdf" -- cgit v1.2.3