159d31e · typeable/pandoc

git.iko.soy/typeable/pandoc

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.

commit159d31e80ff2430e09b3084c5cea85fae46652a9 authorJohn MacFarlane <jgm@berkeley.edu> dateSun 23 Jul 2017, 21:02 (9 years ago) parentbe14e2b

2 files changed+2−11

compare with master

unifiedsplit

src/Text/Pandoc/Readers/LaTeX.hs−1 src/Text/Pandoc/Readers/Markdown.hs+2−10

src/Text/Pandoc/Readers/LaTeX.hs−1

@@ -37,7 +37,6 @@ module Text.Pandoc.Readers.LaTeX ( readLaTeX,

3737 applyMacros,

3838 rawLaTeXInline,

3939 rawLaTeXBlock,

40− macro,

4140 inlineCommand

4241 ) where

4342

src/Text/Pandoc/Readers/Markdown.hs+2−10

@@ -61,8 +61,8 @@ import Text.Pandoc.Options

6161import Text.Pandoc.Parsing hiding (tableWith)

6262import Text.Pandoc.Readers.HTML (htmlInBalanced, htmlTag, isBlockTag,

6363 isCommentTag, isInlineTag, isTextTag)

64−import Text.Pandoc.Readers.LaTeX (rawLaTeXBlock, rawLaTeXInline, applyMacros,

65− macro)

64+import Text.Pandoc.Readers.LaTeX (rawLaTeXBlock,

65+ rawLaTeXInline, applyMacros)

6666import Text.Pandoc.Shared

6767import qualified Text.Pandoc.UTF8 as UTF8

6868import Text.Pandoc.XML (fromEntities)

@@ -507,7 +507,6 @@ block = do

507507 , htmlBlock

508508 , table

509509 , codeBlockIndented

510− , latexMacro

511510 , rawTeXBlock

512511 , lineBlock

513512 , blockQuote

@@ -1096,13 +1095,6 @@ rawVerbatimBlock = htmlInBalanced isVerbTag

10961095 isVerbTag (TagOpen "script" _) = True

10971096 isVerbTag _ = False

10981097

1099−latexMacro :: PandocMonad m => MarkdownParser m (F Blocks)

1100−latexMacro = try $ do

1101− guardEnabled Ext_latex_macros

1102− skipNonindentSpaces

1103− res <- macro

1104− return $ return res

1105−

11061098rawTeXBlock :: PandocMonad m => MarkdownParser m (F Blocks)

11071099rawTeXBlock = do

11081100 guardEnabled Ext_raw_tex