diff options
author | John MacFarlane <fiddlosopher@gmail.com> | 2013-12-13 11:10:04 -0800 |
---|---|---|
committer | John MacFarlane <fiddlosopher@gmail.com> | 2013-12-13 11:10:04 -0800 |
commit | ca3c292f30c04bd24287d554f08a7911c808a4e2 (patch) | |
tree | cd6abfd27497d04f40e00587a03c19a183865f64 /src/Text/Pandoc/Writers | |
parent | 6d0cd9203ce968b96ffa8fc2fbae5a50c99b125b (diff) | |
download | pandoc-ca3c292f30c04bd24287d554f08a7911c808a4e2.tar.gz |
EPUB writer: Fixed bug with `--epub-stylesheet`.
Now the contents of `writerEpubStylesheet` (set by `--epub-stylesheet`)
should again work, and take precedence over a stylesheet specified
in the metadata.
Diffstat (limited to 'src/Text/Pandoc/Writers')
-rw-r--r-- | src/Text/Pandoc/Writers/EPUB.hs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/Text/Pandoc/Writers/EPUB.hs b/src/Text/Pandoc/Writers/EPUB.hs index 32b0c3c32..36ead0b8f 100644 --- a/src/Text/Pandoc/Writers/EPUB.hs +++ b/src/Text/Pandoc/Writers/EPUB.hs @@ -288,8 +288,7 @@ metadataFromMeta opts meta = EPUBMetadata{ rights = metaValueToString <$> lookupMeta "rights" meta coverImage = lookup "epub-cover-image" (writerVariables opts) `mplus` (metaValueToString <$> lookupMeta "cover-image" meta) - stylesheet = (StylesheetContents <$> - lookup "epub-stylesheet" (writerVariables opts)) `mplus` + stylesheet = (StylesheetContents <$> writerEpubStylesheet opts) `mplus` ((StylesheetPath . metaValueToString) <$> lookupMeta "stylesheet" meta) |