aboutsummaryrefslogtreecommitdiff
path: root/src/Text
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2014-12-15 20:27:42 -0800
committerJohn MacFarlane <jgm@berkeley.edu>2014-12-15 20:27:42 -0800
commit8a3363a269cda134a60d5061e93d09363b5586af (patch)
treedd942bd44b59cad1ea9af629c38383665f412e21 /src/Text
parentd5c7d66735006070fd1bfd1289d526380ea10d14 (diff)
parent678aa315610e3d4e03d06dc39d79e99b587b35b5 (diff)
downloadpandoc-8a3363a269cda134a60d5061e93d09363b5586af.tar.gz
Merge branch 'patch-1' of https://github.com/Wikiwide/pandoc into Wikiwide-patch-1
Conflicts: src/Text/Pandoc/Readers/LaTeX.hs
Diffstat (limited to 'src/Text')
-rw-r--r--src/Text/Pandoc/Readers/LaTeX.hs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/Text/Pandoc/Readers/LaTeX.hs b/src/Text/Pandoc/Readers/LaTeX.hs
index d55f29e8f..5a3ba4808 100644
--- a/src/Text/Pandoc/Readers/LaTeX.hs
+++ b/src/Text/Pandoc/Readers/LaTeX.hs
@@ -416,6 +416,8 @@ inlineCommands = M.fromList $
, ("ref", unlessParseRaw >> (inBrackets <$> tok))
, ("noindent", unlessParseRaw >> return mempty)
, ("textgreek", tok)
+ , ("sep", lit ",")
+ , ("cref", unlessParseRaw >> (inBrackets <$> tok)) -- from cleveref.sty
, ("(", mathInline $ manyTill anyChar (try $ string "\\)"))
, ("[", mathDisplay $ manyTill anyChar (try $ string "\\]"))
, ("ensuremath", mathInline $ braced)