0283616 · typeable/pandoc

git.iko.soy/typeable/pandoc

Remove writerUserDataDir from WriterOptions.

It is now carried in CommonState in PandocMonad instances. (And thus it can be used by readers too.)

commit0283616a4a4e5c9770a9bf2247efad96dcf984f8 authorJohn MacFarlane <jgm@berkeley.edu> dateThu 10 Aug 2017, 23:45 (9 years ago) parent737d09e

3 files changed−4

unifiedsplit

src/Text/Pandoc/App.hs−1

@@ -355,7 +355,6 @@ convertWithOpts opts = do

355355 writerEmailObfuscation = optEmailObfuscation opts,

356356 writerIdentifierPrefix = optIdentifierPrefix opts,

357357 writerSourceURL = sourceURL,

358− writerUserDataDir = datadir,

359358 writerHtmlQTags = optHtmlQTags opts,

360359 writerTopLevelDivision = optTopLevelDivision opts,

361360 writerListings = optListings opts,

src/Text/Pandoc/Options.hs−2

@@ -202,7 +202,6 @@ data WriterOptions = WriterOptions

202202 , writerIdentifierPrefix :: String -- ^ Prefix for section & note ids in HTML

203203 -- and for footnote marks in markdown

204204 , writerSourceURL :: Maybe String -- ^ Absolute URL + directory of 1st source file

205− , writerUserDataDir :: Maybe FilePath -- ^ Path of user data directory

206205 , writerCiteMethod :: CiteMethod -- ^ How to print cites

207206 , writerHtmlQTags :: Bool -- ^ Use @<q>@ tags for quotes in HTML

208207 , writerSlideLevel :: Maybe Int -- ^ Force header level of slides

@@ -240,7 +239,6 @@ instance Default WriterOptions where

240239 , writerEmailObfuscation = NoObfuscation

241240 , writerIdentifierPrefix = ""

242241 , writerSourceURL = Nothing

243− , writerUserDataDir = Nothing

244242 , writerCiteMethod = Citeproc

245243 , writerHtmlQTags = False

246244 , writerSlideLevel = Nothing

src/Text/Pandoc/Writers/Docx.hs−1

@@ -226,7 +226,6 @@ writeDocx :: (PandocMonad m)

226226 -> Pandoc -- ^ Document to convert

227227 -> m BL.ByteString

228228writeDocx opts doc@(Pandoc meta _) = do

229− let datadir = writerUserDataDir opts

230229 let doc' = walk fixDisplayMath $ doc

231230 username <- P.lookupEnv "USERNAME"

232231 utctime <- P.getCurrentTime