421ae44 · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

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

421ae44John MacFarlane7 years ago

src/Text/Pandoc/Writers/EPUB.hs+13−9

compare with master

unifiedsplit

@@ -357,8 +357,12 @@ metadataFromMeta opts meta = EPUBMetadata{

357 `mplus` (metaValueToString <$> lookupMeta "cover-image" meta)

358 mCss = lookupMeta "css" meta <|> lookupMeta "stylesheet" meta

359 stylesheets = fromMaybe [] (metaValueToPaths <$> mCss) ++

360+ case lookupContext "css" (writerVariables opts) of

360− maybe [] (\t -> [TS.unpack t])

361+ Just xs -> map TS.unpack xs

362+ Nothing ->

361− (lookupContext "css" (writerVariables opts))

363+ case lookupContext "css" (writerVariables opts) of

364+ Just x -> [TS.unpack x]

365+ Nothing -> []

362 pageDirection = case map toLower . metaValueToString <$>

366 pageDirection = case map toLower . metaValueToString <$>

363 lookupMeta "page-progression-direction" meta of

367 lookupMeta "page-progression-direction" meta of

364 Just "ltr" -> Just LTR

368 Just "ltr" -> Just LTR

@@ -440,13 +444,13 @@ pandocToEPUB version opts doc = do

440 M.insert "lang" (toVal' $ epubLanguage metadata)

444 M.insert "lang" (toVal' $ epubLanguage metadata)

441 $ unContext $ writerVariables opts

445 $ unContext $ writerVariables opts

442

446

443− let cssvars useprefix = Context $ M.fromList $ map

447+ let cssvars useprefix = Context $ M.insert "css"

448+ (ListVal $ map

444− (\e -> ("css", toVal' $

449+ (\e -> toVal' $

445− (if useprefix

450+ (if useprefix then "../" else "") <>

446− then "../"

447− else "")

448− ++ makeRelative epubSubdir (eRelativePath e)))

451+ makeRelative epubSubdir (eRelativePath e))

449− stylesheetEntries

452+ stylesheetEntries)

453+ mempty

450

454

451 let opts' = opts{ writerEmailObfuscation = NoObfuscation

455 let opts' = opts{ writerEmailObfuscation = NoObfuscation

452 , writerSectionDivs = True

456 , writerSectionDivs = True