Markdown: restored ATX headers

See be3b39bf42.
It works again, but it requires putting a space after hash.
This commit is contained in:
Marcin Kurczewski 2014-02-02 19:23:52 +01:00
parent 35cdc0cf3a
commit 0b55dfad04

View file

@ -27,10 +27,12 @@ class CustomMarkdown extends \Michelf\Markdown
parent::__construct(); parent::__construct();
} }
//disable atx-style headers //make atx-style headers require space after hash
protected function _doHeaders_callback_atx($matches) protected function doHeaders($text)
{ {
return $matches[0]; $text = preg_replace_callback('{ ^(.+?)[ ]*\n(=+|-+)[ ]*\n+ }mx', [&$this, '_doHeaders_callback_setext'], $text);
$text = preg_replace_callback('{^(\#{1,6})[ ]+(.+?)[ ]*\#*\n+}xm', [&$this, '_doHeaders_callback_atx'], $text);
return $text;
} }
//disable paragraph forming when using simple markdown //disable paragraph forming when using simple markdown
@ -85,7 +87,8 @@ class CustomMarkdown extends \Michelf\Markdown
//handle white characters inside code blocks //handle white characters inside code blocks
//so that they won't be optimized away by prettifying HTML //so that they won't be optimized away by prettifying HTML
protected function _doCodeBlocks_callback($matches) { protected function _doCodeBlocks_callback($matches)
{
$codeblock = $matches[1]; $codeblock = $matches[1];
$codeblock = $this->outdent($codeblock); $codeblock = $this->outdent($codeblock);