dc8e597 · typeable/pandoc

git.iko.soy/typeable/pandoc

Implemented Ext_backtick_code_blocks.

This is the variant github prefers.

commitdc8e5970bfeb6bc760bf57b87b5d99f1a2c2ad38 authorJohn MacFarlane <jgm@berkeley.edu> dateTue 21 Aug 2012, 20:11 (14 years ago) parentdc6a133

3 files changed+39−21

compare with master

unifiedsplit

src/Text/Pandoc/Options.hs+2 src/Text/Pandoc/Readers/Markdown.hs+23−15 src/Text/Pandoc/Writers/Markdown.hs+14−6

src/Text/Pandoc/Options.hs+2

@@ -66,6 +66,7 @@ data Extension =

6666 | Ext_latex_macros -- ^ Parse LaTeX macro definitions (for math only)

6767 | Ext_fenced_code_blocks -- ^ Parse fenced code blocks

6868 | Ext_fenced_code_attributes -- ^ Allow attributes on fenced code blocks

69+ | Ext_backtick_code_blocks -- ^ Github style ``` code blocks

6970 | Ext_inline_code_attributes -- ^ Allow attributes on inline code

7071 | Ext_markdown_in_html_blocks -- ^ Interpret as markdown inside HTML blocks

7172 | Ext_markdown_attribute -- ^ Interpret text inside HTML as markdown

@@ -107,6 +108,7 @@ pandocExtensions = Set.fromList

107108 , Ext_latex_macros

108109 , Ext_fenced_code_blocks

109110 , Ext_fenced_code_attributes

111+ , Ext_backtick_code_blocks

110112 , Ext_inline_code_attributes

111113 , Ext_markdown_in_html_blocks

112114 , Ext_escaped_line_breaks

src/Text/Pandoc/Readers/Markdown.hs+23−15

@@ -307,6 +307,7 @@ parseBlocks = mconcat <$> manyTill block eof

307307

308308block :: Parser [Char] ParserState (F Blocks)

309309block = choice [ codeBlockFenced

310+ , codeBlockBackticks

310311 , guardEnabled Ext_latex_macros *> (mempty <$ macro)

311312 , header

312313 , rawTeXBlock

@@ -379,21 +380,13 @@ indentedLine = indentSpaces >> manyTill anyChar newline >>= return . (++ "\n")

379380

380381blockDelimiter :: (Char -> Bool)

381382 -> Maybe Int

382− -> Parser [Char] ParserState (Int, (String, [String], [(String, String)]), Char)

383+ -> Parser [Char] st Int

383384blockDelimiter f len = try $ do

384385 c <- lookAhead (satisfy f)

385− size <- case len of

386− Just l -> count l (char c) >> many (char c) >> return l

387− Nothing -> count 3 (char c) >> many (char c) >>=

388− return . (+ 3) . length

389− many spaceChar

390− attr <- option ([],[],[]) $ do

391− guardEnabled Ext_fenced_code_attributes

392− attributes -- ~~~ {.ruby}

393− <|> (many1 alphaNum >>= \x ->

394− return ([],[x],[])) -- github variant ```ruby

395− blankline

396− return (size, attr, c)

386+ case len of

387+ Just l -> count l (char c) >> many (char c) >> return l

388+ Nothing -> count 3 (char c) >> many (char c) >>=

389+ return . (+ 3) . length

397390

398391attributes :: Parser [Char] st (String, [String], [(String, String)])

399392attributes = try $ do

@@ -440,11 +433,26 @@ keyValAttr = try $ do

440433codeBlockFenced :: Parser [Char] ParserState (F Blocks)

441434codeBlockFenced = try $ do

442435 guardEnabled Ext_fenced_code_blocks

443− (size, attr, c) <- blockDelimiter (\c -> c == '~' || c == '`') Nothing

444− contents <- manyTill anyLine (blockDelimiter (== c) (Just size))

436+ size <- blockDelimiter (=='~') Nothing

437+ skipMany spaceChar

438+ attr <- option ([],[],[]) $

439+ guardEnabled Ext_fenced_code_attributes >> attributes

440+ blankline

441+ contents <- manyTill anyLine (blockDelimiter (=='~') (Just size))

445442 blanklines

446443 return $ return $ B.codeBlockWith attr $ intercalate "\n" contents

447444

445+codeBlockBackticks :: Parser [Char] ParserState (F Blocks)

446+codeBlockBackticks = try $ do

447+ guardEnabled Ext_backtick_code_blocks

448+ blockDelimiter (=='`') (Just 3)

449+ skipMany spaceChar

450+ cls <- many1 alphaNum

451+ blankline

452+ contents <- manyTill anyLine $ blockDelimiter (=='`') (Just 3)

453+ blanklines

454+ return $ return $ B.codeBlockWith ("",[cls],[]) $ intercalate "\n" contents

455+

448456codeBlockIndented :: Parser [Char] ParserState (F Blocks)

449457codeBlockIndented = do

450458 contents <- many1 (indentedLine <|>

src/Text/Pandoc/Writers/Markdown.hs+14−6

@@ -292,12 +292,20 @@ blockToMarkdown opts (CodeBlock (_,classes,_) str)

292292 isEnabled Ext_literate_haskell opts =

293293 return $ prefixed "> " (text str) <> blankline

294294blockToMarkdown opts (CodeBlock attribs str) = return $

295− if isEnabled Ext_fenced_code_blocks opts && attribs /= nullAttr

296− then -- use fenced code block

297− (tildes <> space <> attrs <> cr <> text str <>

298− cr <> tildes) <> blankline

299− else nest (writerTabStop opts) (text str) <> blankline

300− where tildes = text "~~~~"

295+ case attribs of

296+ x | x /= nullAttr && isEnabled Ext_fenced_code_blocks opts ->

297+ tildes <> space <> attrs <> cr <> text str <>

298+ cr <> tildes <> blankline

299+ (_,(cls:_),_) | isEnabled Ext_backtick_code_blocks opts ->

300+ backticks <> space <> text cls <> cr <> text str <>

301+ cr <> backticks <> blankline

302+ _ -> nest (writerTabStop opts) (text str) <> blankline

303+ where tildes = text $ case [ln | ln <- lines str, all (=='~') ln] of

304+ [] -> "~~~~"

305+ xs -> case maximum $ map length xs of

306+ n | n < 3 -> "~~~~"

307+ | otherwise -> replicate (n+1) '~'

308+ backticks = text "```"

301309 attrs = if isEnabled Ext_fenced_code_attributes opts

302310 then attrsToMarkdown attribs

303311 else empty