diff options
author | John MacFarlane <jgm@berkeley.edu> | 2014-04-27 20:38:15 -0700 |
---|---|---|
committer | John MacFarlane <jgm@berkeley.edu> | 2014-04-27 20:38:15 -0700 |
commit | f80678df7f003c2e1c4f226fab39cea55f3907a8 (patch) | |
tree | 054b7e7956b1b8377d1f143ed85b4c4f6d1693cc /pandoc.hs | |
parent | f81fc6c3bdfcb439892f92b69c02b77342277cc8 (diff) | |
download | pandoc-f80678df7f003c2e1c4f226fab39cea55f3907a8.tar.gz |
A bit of refactoring that shouldn't change any semantics.
In preparation for a fix to #1267.
Diffstat (limited to 'pandoc.hs')
-rw-r--r-- | pandoc.hs | 19 |
1 files changed, 9 insertions, 10 deletions
@@ -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" |