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

EPUB writer: Fix regression with `--css option.

Browse source 
Closes #5937.
This commit is contained in:
John MacFarlane 2019-11-25 17:50:27 -08:00
parent ce0a4f8c47
commit 421ae44cdf
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/Text/Pandoc/Writers/EPUB.hs
View file

@ -357,8 +357,12 @@ metadataFromMeta opts meta = EPUBMetadata{
`mplus` (metaValueToString <$> lookupMeta "cover-image" meta) `mplus` (metaValueToString <$> lookupMeta "cover-image" meta)
mCss = lookupMeta "css" meta <|> lookupMeta "stylesheet" meta mCss = lookupMeta "css" meta <|> lookupMeta "stylesheet" meta
stylesheets = fromMaybe [] (metaValueToPaths <$> mCss) ++ stylesheets = fromMaybe [] (metaValueToPaths <$> mCss) ++
maybe [] (\t -> [TS.unpack t]) case lookupContext "css" (writerVariables opts) of
(lookupContext "css" (writerVariables opts)) Just xs -> map TS.unpack xs
Nothing ->
case lookupContext "css" (writerVariables opts) of
Just x -> [TS.unpack x]
Nothing -> []
pageDirection = case map toLower . metaValueToString <$> pageDirection = case map toLower . metaValueToString <$>
lookupMeta "page-progression-direction" meta of lookupMeta "page-progression-direction" meta of
Just "ltr" -> Just LTR Just "ltr" -> Just LTR
@ -440,13 +444,13 @@ pandocToEPUB version opts doc = do
M.insert "lang" (toVal' $ epubLanguage metadata) M.insert "lang" (toVal' $ epubLanguage metadata)
$ unContext $ writerVariables opts $ unContext $ writerVariables opts
let cssvars useprefix = Context $ M.fromList $ map let cssvars useprefix = Context $ M.insert "css"
(\e -> ("css", toVal' $ (ListVal $ map
(if useprefix (\e -> toVal' $
then "../" (if useprefix then "../" else "") <>
else "") makeRelative epubSubdir (eRelativePath e))
++ makeRelative epubSubdir (eRelativePath e))) stylesheetEntries)
stylesheetEntries mempty
let opts' = opts{ writerEmailObfuscation = NoObfuscation let opts' = opts{ writerEmailObfuscation = NoObfuscation
, writerSectionDivs = True , writerSectionDivs = True