diff options
author | John MacFarlane <jgm@berkeley.edu> | 2012-08-21 19:21:51 -0700 |
---|---|---|
committer | John MacFarlane <jgm@berkeley.edu> | 2012-08-21 19:21:51 -0700 |
commit | b985d334064da3df9c340175d75f259cf9f1d4d2 (patch) | |
tree | dfbc0c33420027cc77266eb9266ea5b8bf337133 /src/Text/Pandoc/Readers | |
parent | 7b34dd8dd1cf991807c84fc2900e19869885995d (diff) | |
download | pandoc-b985d334064da3df9c340175d75f259cf9f1d4d2.tar.gz |
Changed nomenclature, delimited -> fenced code blocks.
Diffstat (limited to 'src/Text/Pandoc/Readers')
-rw-r--r-- | src/Text/Pandoc/Readers/Markdown.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs index 792c0269a..551abd357 100644 --- a/src/Text/Pandoc/Readers/Markdown.hs +++ b/src/Text/Pandoc/Readers/Markdown.hs @@ -306,7 +306,7 @@ parseBlocks :: Parser [Char] ParserState (F Blocks) parseBlocks = mconcat <$> manyTill block eof block :: Parser [Char] ParserState (F Blocks) -block = choice [ codeBlockDelimited +block = choice [ codeBlockFenced , guardEnabled Ext_latex_macros *> (mempty <$ macro) , header , rawTeXBlock @@ -435,9 +435,9 @@ keyValAttr = try $ do <|> many nonspaceChar return ("",[],[(key,val)]) -codeBlockDelimited :: Parser [Char] ParserState (F Blocks) -codeBlockDelimited = try $ do - guardEnabled Ext_delimited_code_blocks +codeBlockFenced :: Parser [Char] ParserState (F Blocks) +codeBlockFenced = try $ do + guardEnabled Ext_fenced_code_blocks (size, attr, c) <- blockDelimiter (\c -> c == '~' || c == '`') Nothing contents <- manyTill anyLine (blockDelimiter (== c) (Just size)) blanklines |