ff1df24 · typeable/pandoc

src/Text/Pandoc/App.hs+1−1

compare with master

unifiedsplit

@@ -136,7 +136,7 @@ convertWithOpts opts = do

136 setOutputFile (optOutputFile opts)

137

138 -- assign reader and writer based on options and filenames

139− readerName <- case optReader opts of

139+ readerName <- case optFrom opts of

140 Just f -> return f

141 Nothing -> case formatFromFilePaths sources of

142 Just f' -> return f'

src/Text/Pandoc/App/CommandLineOptions.hs+2−2

@@ -131,14 +131,14 @@ options =

131

132 , Option "fr" ["from","read"]

133 (ReqArg

134− (\arg opt -> return opt { optReader =

134+ (\arg opt -> return opt { optFrom =

135 Just (map toLower arg) })

136 "FORMAT")

137 ""

138

139 , Option "tw" ["to","write"]

140 (ReqArg

141− (\arg opt -> return opt { optWriter = Just arg })

141+ (\arg opt -> return opt { optTo = Just arg })

142 "FORMAT")

143 ""

144

src/Text/Pandoc/App/Opt.hs+4−4

@@ -45,8 +45,8 @@ data Opt = Opt

45 { optTabStop :: Int -- ^ Number of spaces per tab

46 , optPreserveTabs :: Bool -- ^ Preserve tabs instead of converting to spaces

47 , optStandalone :: Bool -- ^ Include header, footer

48− , optReader :: Maybe String -- ^ Reader format

48+ , optFrom :: Maybe String -- ^ Reader format

49− , optWriter :: Maybe String -- ^ Writer format

49+ , optTo :: Maybe String -- ^ Writer format

50 , optTableOfContents :: Bool -- ^ Include table of contents

51 , optShiftHeadingLevelBy :: Int -- ^ Shift heading level by

52 , optTemplate :: Maybe FilePath -- ^ Custom template

@@ -119,8 +119,8 @@ defaultOpts = Opt

119 { optTabStop = 4

120 , optPreserveTabs = False

121 , optStandalone = False

122− , optReader = Nothing

122+ , optFrom = Nothing

123− , optWriter = Nothing

123+ , optTo = Nothing

124 , optTableOfContents = False

125 , optShiftHeadingLevelBy = 0

126 , optTemplate = Nothing

src/Text/Pandoc/App/OutputSettings.hs+2−2

@@ -68,8 +68,8 @@ optToOutputSettings opts = do

68 let pdfOutput = map toLower (takeExtension outputFile) == ".pdf"

69 (writerName, maybePdfProg) <-

70 if pdfOutput

71− then liftIO $ pdfWriterAndProg (optWriter opts) (optPdfEngine opts)

71+ then liftIO $ pdfWriterAndProg (optTo opts) (optPdfEngine opts)

72− else case optWriter opts of

72+ else case optTo opts of

73 Nothing

74 | outputFile == "-" -> return ("html", Nothing)

75 | otherwise ->