diff --git a/AUTHORS.md b/AUTHORS.md
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -179,7 +179,6 @@
- bumper314
- csforste
- d-dorazio
-- hftf
- iandol
- infinity0x
- lwolfsonkin
diff --git a/changelog b/changelog
--- a/changelog
+++ b/changelog
@@ -1,3 +1,27 @@
+pandoc (2.0.0.1)
+
+ * EPUB writer:
+
+ + Fixed filepaths for nonstandard epub-subdirectory values.
+ + Ensure that epub2 is recognized as a non-text format,
+ so that a template is used.
+ + Don't include "prefix" attribute for ibooks for epub2.
+ It doesn't validate.
+ + Fix stylesheet paths; previously we had an incorrect
+ stylesheet path for the cover page and nav page.
+
+ * LaTeX reader:
+
+ + Insert space when needed in macro expansion (#4007).
+ Sometimes we need to insert a space after a control sequence
+ to prevent it merging with a following letter.
+ + Allow unbraced arguments for macros (#4007).
+ + Allow body of macro definition to be unbraced (#4007).
+
+ * Linux package build: ensure that pandoc-citeproc is statically linked.
+
+ * trypandoc: add native, ms.
+
pandoc (2.0)
[new features]
diff --git a/pandoc.cabal b/pandoc.cabal
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -1,5 +1,5 @@
name: pandoc
-version: 2.0
+version: 2.0.0.1
cabal-version: >= 1.10
build-type: Custom
license: GPL
diff --git a/src/Text/Pandoc/App.hs b/src/Text/Pandoc/App.hs
--- a/src/Text/Pandoc/App.hs
+++ b/src/Text/Pandoc/App.hs
@@ -535,7 +535,7 @@
type Transform = Pandoc -> Pandoc
isTextFormat :: String -> Bool
-isTextFormat s = s `notElem` ["odt","docx","epub","epub3"]
+isTextFormat s = s `notElem` ["odt","docx","epub2","epub3","epub"]
externalFilter :: MonadIO m
=> ReaderOptions -> FilePath -> [String] -> Pandoc -> m Pandoc
diff --git a/src/Text/Pandoc/Readers/LaTeX.hs b/src/Text/Pandoc/Readers/LaTeX.hs
--- a/src/Text/Pandoc/Readers/LaTeX.hs
+++ b/src/Text/Pandoc/Readers/LaTeX.hs
@@ -430,7 +430,7 @@
Nothing -> return ()
Just (Macro expansionPoint numargs optarg newtoks) -> do
setInput ts
- let getarg = spaces >> braced
+ let getarg = try $ spaces >> bracedOrToken
args <- case optarg of
Nothing -> count numargs getarg
Just o ->
@@ -438,7 +438,14 @@
<*> count (numargs - 1) getarg
let addTok (Tok _ (Arg i) _) acc | i > 0
, i <= numargs =
- map (setpos spos) (args !! (i - 1)) ++ acc
+ foldr addTok acc (args !! (i - 1))
+ -- add space if needed after control sequence
+ -- see #4007
+ addTok (Tok _ (CtrlSeq x) txt)
+ acc@(Tok _ Word _ : _)
+ | not (T.null txt) &&
+ (isLetter (T.last txt)) =
+ Tok spos (CtrlSeq x) (txt <> " ") : acc
addTok t acc = setpos spos t : acc
ts' <- getInput
setInput $ foldr addTok ts' newtoks
@@ -1824,7 +1831,7 @@
Tok _ (CtrlSeq name) _ <- anyControlSeq
optional $ symbol '='
spaces
- contents <- braced <|> ((:[]) <$> (anyControlSeq <|> singleChar))
+ contents <- bracedOrToken
return (name, Macro ExpandWhenDefined 0 Nothing contents)
defmacro :: PandocMonad m => LP m (Text, Macro)
@@ -1832,7 +1839,9 @@
controlSeq "def"
Tok _ (CtrlSeq name) _ <- anyControlSeq
numargs <- option 0 $ argSeq 1
- contents <- withVerbatimMode braced
+ -- we use withVerbatimMode, because macros are to be expanded
+ -- at point of use, not point of definition
+ contents <- withVerbatimMode bracedOrToken
return (name, Macro ExpandWhenUsed numargs Nothing contents)
-- Note: we don't yet support fancy things like #1.#2
@@ -1846,6 +1855,9 @@
isArgTok (Tok _ (Arg _) _) = True
isArgTok _ = False
+bracedOrToken :: PandocMonad m => LP m [Tok]
+bracedOrToken = braced <|> ((:[]) <$> (anyControlSeq <|> singleChar))
+
newcommand :: PandocMonad m => LP m (Text, Macro)
newcommand = do
pos <- getPosition
@@ -1861,9 +1873,7 @@
spaces
optarg <- option Nothing $ Just <$> try bracketedToks
spaces
- contents <- withVerbatimMode braced
- -- we use withVerbatimMode, because macros are to be expanded
- -- at point of use, not point of definition
+ contents <- withVerbatimMode bracedOrToken
when (mtype == "newcommand") $ do
macros <- sMacros <$> getState
case M.lookup name macros of
@@ -1885,9 +1895,9 @@
spaces
optarg <- option Nothing $ Just <$> try bracketedToks
spaces
- startcontents <- withVerbatimMode braced
+ startcontents <- withVerbatimMode bracedOrToken
spaces
- endcontents <- withVerbatimMode braced
+ endcontents <- withVerbatimMode bracedOrToken
when (mtype == "newenvironment") $ do
macros <- sMacros <$> getState
case M.lookup name macros of
diff --git a/src/Text/Pandoc/Writers/EPUB.hs b/src/Text/Pandoc/Writers/EPUB.hs
--- a/src/Text/Pandoc/Writers/EPUB.hs
+++ b/src/Text/Pandoc/Writers/EPUB.hs
@@ -43,7 +43,7 @@
import Data.Char (isAlphaNum, isAscii, isDigit, toLower)
import Data.List (intercalate, isInfixOf, isPrefixOf)
import qualified Data.Map as M
-import Data.Maybe (fromMaybe, isNothing, mapMaybe)
+import Data.Maybe (fromMaybe, isNothing, mapMaybe, isJust)
import qualified Data.Set as Set
import qualified Data.Text as TS
import qualified Data.Text.Lazy as TL
@@ -382,6 +382,10 @@
-- sanity check on epubSubdir
unless (all (\c -> isAscii c && isAlphaNum c) epubSubdir) $
throwError $ PandocEpubSubdirectoryError epubSubdir
+ let inSubdir f = if null epubSubdir
+ then f
+ else epubSubdir ++ "/" ++ f
+
let epub3 = version == EPUB3
let writeHtml o = fmap (UTF8.fromTextLazy . TL.fromStrict) .
writeHtmlStringForEPUB version o
@@ -399,8 +403,15 @@
stylesheets [(1 :: Int)..]
let vars = ("epub3", if epub3 then "true" else "false")
- : map (\e -> ("css", "../" ++ eRelativePath e)) stylesheetEntries
- ++ [(x,y) | (x,y) <- writerVariables opts, x /= "css"]
+ : [(x,y) | (x,y) <- writerVariables opts, x /= "css"]
+
+ let cssvars useprefix = map (\e -> ("css",
+ (if useprefix && not (null epubSubdir)
+ then "../"
+ else "")
+ ++ eRelativePath e))
+ stylesheetEntries
+
let opts' = opts{ writerEmailObfuscation = NoObfuscation
, writerSectionDivs = True
, writerVariables = vars
@@ -417,7 +428,9 @@
Just img -> do
let coverImage = "media/" ++ takeFileName img
cpContent <- lift $ writeHtml
- opts'{ writerVariables = ("coverpage","true"):vars }
+ opts'{ writerVariables =
+ ("coverpage","true"):
+ cssvars False ++ vars }
(Pandoc meta [RawBlock (Format "html") $ "\n
![\"cover](\"")
\n