LaTeX reader: Removed 'macro'.

It is no longer necessary, since the rawLaTeXBlock parser
will parse macro definitions.

This also avoids the need for a separate latexMacro parser
in the Markdown reader.
This commit is contained in:
John MacFarlane 2017-07-23 21:02:58 +02:00
parent be14e2b501
commit 159d31e80f
2 changed files with 2 additions and 11 deletions

View file

@ -37,7 +37,6 @@ module Text.Pandoc.Readers.LaTeX ( readLaTeX,
applyMacros,
rawLaTeXInline,
rawLaTeXBlock,
macro,
inlineCommand
) where

View file

@ -61,8 +61,8 @@ import Text.Pandoc.Options
import Text.Pandoc.Parsing hiding (tableWith)
import Text.Pandoc.Readers.HTML (htmlInBalanced, htmlTag, isBlockTag,
isCommentTag, isInlineTag, isTextTag)
import Text.Pandoc.Readers.LaTeX (rawLaTeXBlock, rawLaTeXInline, applyMacros,
macro)
import Text.Pandoc.Readers.LaTeX (rawLaTeXBlock,
rawLaTeXInline, applyMacros)
import Text.Pandoc.Shared
import qualified Text.Pandoc.UTF8 as UTF8
import Text.Pandoc.XML (fromEntities)
@ -507,7 +507,6 @@ block = do
, htmlBlock
, table
, codeBlockIndented
, latexMacro
, rawTeXBlock
, lineBlock
, blockQuote
@ -1096,13 +1095,6 @@ rawVerbatimBlock = htmlInBalanced isVerbTag
isVerbTag (TagOpen "script" _) = True
isVerbTag _ = False
latexMacro :: PandocMonad m => MarkdownParser m (F Blocks)
latexMacro = try $ do
guardEnabled Ext_latex_macros
skipNonindentSpaces
res <- macro
return $ return res
rawTeXBlock :: PandocMonad m => MarkdownParser m (F Blocks)
rawTeXBlock = do
guardEnabled Ext_raw_tex