Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Slight code rearrangement in preparation for...

Browse source 
...passing mediabag in the PandocIO monad.
This commit is contained in:
John MacFarlane 2016-12-10 10:55:03 +01:00
parent f1ef0e3645
commit 8beba65977
1 changed files with 47 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
pandoc.hs
View file

@ -1353,6 +1353,48 @@ convertWithOpts opts args = do
, readerFileScope = fileScope , readerFileScope = fileScope
} }
let writerOptions = def { writerTemplate = templ,
writerVariables = variables'',
writerTabStop = tabStop,
writerTableOfContents = toc,
writerHTMLMathMethod = mathMethod,
writerIncremental = incremental,
writerCiteMethod = citeMethod,
writerIgnoreNotes = False,
writerNumberSections = numberSections,
writerNumberOffset = numberFrom,
writerSectionDivs = sectionDivs,
writerReferenceLinks = referenceLinks,
writerReferenceLocation = referenceLocation,
writerDpi = dpi,
writerWrapText = wrap,
writerColumns = columns,
writerEmailObfuscation = obfuscationMethod,
writerIdentifierPrefix = idPrefix,
writerSourceURL = sourceURL,
writerUserDataDir = datadir,
writerHtml5 = html5,
writerHtmlQTags = htmlQTags,
writerTopLevelDivision = topLevelDivision,
writerListings = listings,
writerBeamer = False,
writerSlideLevel = slideLevel,
writerHighlight = highlight,
writerHighlightStyle = highlightStyle,
writerSetextHeaders = setextHeaders,
writerTeXLigatures = texLigatures,
writerEpubMetadata = epubMetadata,
writerEpubStylesheet = epubStylesheet,
writerEpubFonts = epubFonts,
writerEpubChapterLevel = epubChapterLevel,
writerTOCDepth = epubTOCDepth,
writerReferenceDoc = referenceDoc,
writerMediaBag = mempty,
writerVerbose = verbose,
writerLaTeXArgs = latexEngineArgs
}
#ifdef _WINDOWS #ifdef _WINDOWS
let istty = True let istty = True
#else #else
@ -1426,47 +1468,6 @@ convertWithOpts opts args = do
_ -> do pairs <- mapM (\s -> sourceToDoc [s]) sources _ -> do pairs <- mapM (\s -> sourceToDoc [s]) sources
return (mconcat $ map fst pairs, mconcat $ map snd pairs) return (mconcat $ map fst pairs, mconcat $ map snd pairs)
let writerOptions = def { writerTemplate = templ,
writerVariables = variables'',
writerTabStop = tabStop,
writerTableOfContents = toc,
writerHTMLMathMethod = mathMethod,
writerIncremental = incremental,
writerCiteMethod = citeMethod,
writerIgnoreNotes = False,
writerNumberSections = numberSections,
writerNumberOffset = numberFrom,
writerSectionDivs = sectionDivs,
writerReferenceLinks = referenceLinks,
writerReferenceLocation = referenceLocation,
writerDpi = dpi,
writerWrapText = wrap,
writerColumns = columns,
writerEmailObfuscation = obfuscationMethod,
writerIdentifierPrefix = idPrefix,
writerSourceURL = sourceURL,
writerUserDataDir = datadir,
writerHtml5 = html5,
writerHtmlQTags = htmlQTags,
writerTopLevelDivision = topLevelDivision,
writerListings = listings,
writerBeamer = False,
writerSlideLevel = slideLevel,
writerHighlight = highlight,
writerHighlightStyle = highlightStyle,
writerSetextHeaders = setextHeaders,
writerTeXLigatures = texLigatures,
writerEpubMetadata = epubMetadata,
writerEpubStylesheet = epubStylesheet,
writerEpubFonts = epubFonts,
writerEpubChapterLevel = epubChapterLevel,
writerTOCDepth = epubTOCDepth,
writerReferenceDoc = referenceDoc,
writerMediaBag = media,
writerVerbose = verbose,
writerLaTeXArgs = latexEngineArgs
}
doc' <- (maybe return (extractMedia media) mbExtractMedia >=> doc' <- (maybe return (extractMedia media) mbExtractMedia >=>
adjustMetadata metadata >=> adjustMetadata metadata >=>
@ -1481,9 +1482,10 @@ convertWithOpts opts args = do
writerFn "-" = UTF8.putStr writerFn "-" = UTF8.putStr
writerFn f = UTF8.writeFile f writerFn f = UTF8.writeFile f
let writerOptions' = writerOptions{ writerMediaBag = media }
case writer of case writer of
-- StringWriter f -> f writerOptions doc' >>= writerFn outputFile -- StringWriter f -> f writerOptions doc' >>= writerFn outputFile
ByteStringWriter f -> (runIO' $ f writerOptions doc') ByteStringWriter f -> (runIO' $ f writerOptions' doc')
>>= writeFnBinary outputFile >>= writeFnBinary outputFile
StringWriter f StringWriter f
| pdfOutput -> do | pdfOutput -> do
@ -1502,7 +1504,7 @@ convertWithOpts opts args = do
err 41 $ pdfprog ++ " not found. " ++ err 41 $ pdfprog ++ " not found. " ++
pdfprog ++ " is needed for pdf output." pdfprog ++ " is needed for pdf output."
res <- makePDF pdfprog f writerOptions doc' res <- makePDF pdfprog f writerOptions' doc'
case res of case res of
Right pdf -> writeFnBinary outputFile pdf Right pdf -> writeFnBinary outputFile pdf
Left err' -> do Left err' -> do
@ -1513,10 +1515,10 @@ convertWithOpts opts args = do
let htmlFormat = format `elem` let htmlFormat = format `elem`
["html","html5","s5","slidy","slideous","dzslides","revealjs"] ["html","html5","s5","slidy","slideous","dzslides","revealjs"]
selfcontain = if selfContained && htmlFormat selfcontain = if selfContained && htmlFormat
then makeSelfContained writerOptions then makeSelfContained writerOptions'
else return else return
handleEntities = if htmlFormat && ascii handleEntities = if htmlFormat && ascii
then toEntities then toEntities
else id else id
output <- runIO' $ f writerOptions doc' output <- runIO' $ f writerOptions' doc'
selfcontain (output ++ ['\n' | not standalone']) >>= writerFn outputFile . handleEntities selfcontain (output ++ ['\n' | not standalone']) >>= writerFn outputFile . handleEntities