diff options
| author | John MacFarlane <fiddlosopher@gmail.com> | 2013-01-28 10:50:58 -0800 |
|---|---|---|
| committer | John MacFarlane <fiddlosopher@gmail.com> | 2013-01-28 10:50:58 -0800 |
| commit | 8c55023d188bb159b5309d817ba6d834a69e7b9c (patch) | |
| tree | aad2e98afb4bd7df6e506a19c1a6f7ef0f955491 /src/Text/Pandoc/Readers | |
| parent | cc17c794a1ec7242241d67c8a6fd36d242d62782 (diff) | |
| download | pandoc-8c55023d188bb159b5309d817ba6d834a69e7b9c.tar.gz | |
Fixed latex macro parsing.
Now latex macro definitions are preserved when output is latex,
and applied when it is another format, as originally intended.
Partially addresses #730.
\providecommand is still not supported. For this we need changes
to texmath.
Diffstat (limited to 'src/Text/Pandoc/Readers')
| -rw-r--r-- | src/Text/Pandoc/Readers/LaTeX.hs | 2 | ||||
| -rw-r--r-- | src/Text/Pandoc/Readers/Markdown.hs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Text/Pandoc/Readers/LaTeX.hs b/src/Text/Pandoc/Readers/LaTeX.hs index 05a71bd2b..253e50ef2 100644 --- a/src/Text/Pandoc/Readers/LaTeX.hs +++ b/src/Text/Pandoc/Readers/LaTeX.hs @@ -204,7 +204,7 @@ block :: LP Blocks block = (mempty <$ comment) <|> (mempty <$ ((spaceChar <|> newline) *> spaces)) <|> environment - <|> mempty <$ macro + <|> macro <|> blockCommand <|> paragraph <|> grouped block diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs index 9113cb75e..b67a30853 100644 --- a/src/Text/Pandoc/Readers/Markdown.hs +++ b/src/Text/Pandoc/Readers/Markdown.hs @@ -355,7 +355,7 @@ parseBlocks = mconcat <$> manyTill block eof block :: MarkdownParser (F Blocks) block = choice [ codeBlockFenced - , guardEnabled Ext_latex_macros *> (mempty <$ macro) + , guardEnabled Ext_latex_macros *> (macro >>= return . return) , header , lhsCodeBlock , rawTeXBlock |