git.iko.soy/typeable/pandoc
on master help sign in
A bit of refactoring that shouldn't change any semantics.

In preparation for a fix to #1267.

commitf80678df7f003c2e1c4f226fab39cea55f3907a8 authorJohn MacFarlane <jgm@berkeley.edu> dateSun 27 Apr 2014, 20:38 (12 years ago) parentf81fc6c
1 file changed+9−10
pandoc.hs+9−10
pandoc.hs+9−10
@@ -243,13 +243,13 @@ options :: [OptDescr (Opt -> IO Opt)]
243243options =
244244 [ Option "fr" ["from","read"]
245245 (ReqArg
246− (\arg opt -> return opt { optReader = map toLower arg })
246+ (\arg opt -> return opt { optReader = arg })
247247 "FORMAT")
248248 ""
249249
250250 , Option "tw" ["to","write"]
251251 (ReqArg
252− (\arg opt -> return opt { optWriter = map toLower arg })
252+ (\arg opt -> return opt { optWriter = arg })
253253 "FORMAT")
254254 ""
255255
@@ -1008,14 +1008,13 @@ main = do
10081008 then "html"
10091009 else "markdown"
10101010 in defaultReaderName fallback sources
1011− else readerName
1012−
1013− let writerName' = if null writerName
1014− then defaultWriterName outputFile
1015− else case writerName of
1016− "epub2" -> "epub"
1017− "html4" -> "html"
1018− x -> x
1011+ else map toLower readerName
1012+
1013+ let writerName' = case map toLower writerName of
1014+ [] -> defaultWriterName outputFile
1015+ "epub2" -> "epub"
1016+ "html4" -> "html"
1017+ x -> x
10191018
10201019 let pdfOutput = map toLower (takeExtension outputFile) == ".pdf"
10211020