summaryrefslogtreecommitdiff
path: root/pandoc.hs
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2015-05-09 00:07:27 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2015-05-09 00:07:27 -0700
commit7920a1a46987c8d57e12ffc134a9da9a9a4e9ecb (patch)
tree27e01aa9e25840227e961519a2763e5b2cd5699c /pandoc.hs
parent1c2951dfd9ee72e5270cb974a06098adb9178f89 (diff)
Revert "EPUB writer: stylesheet changes. Closes #2040."
This reverts commit 1c2951dfd9ee72e5270cb974a06098adb9178f89. See #2040. The semantics was too squishy. `--css` takes a URL, but for EPUB we need files that we can read. I prefer keeping the old system for now, with `--epub-stylesheet`.
Diffstat (limited to 'pandoc.hs')
-rw-r--r--pandoc.hs6
1 files changed, 2 insertions, 4 deletions
diff --git a/pandoc.hs b/pandoc.hs
index 45e5de5f2..9023b2625 100644
--- a/pandoc.hs
+++ b/pandoc.hs
@@ -689,10 +689,8 @@ options =
, Option "" ["epub-stylesheet"]
(ReqArg
(\arg opt -> do
- warn "--epub-stylesheet is deprecated. Use --css or stylesheet in metadata."
- let newvars = optVariables opt ++ [("css",arg)]
- return opt { optVariables = newvars,
- optStandalone = True })
+ text <- UTF8.readFile arg
+ return opt { optEpubStylesheet = Just text })
"FILENAME")
"" -- "Path of epub.css"