markdown : BUG in Sharp Titles (if not ending by #, the title is not discovered)

git-svn-id: https://svn.fournier38.fr/svn/ProgSVN/trunk@1507 bf3deb0d-5f1a-0410-827f-c0cc1f45334c
This commit is contained in:
2014-06-30 11:24:57 +00:00
parent 980d68d2f1
commit 9ef7095303

View File

@@ -97,22 +97,22 @@ class markdown
// TITLES // TITLES
// Titles ATX (Optionnal sharp at the end) // Titles ATX (Optionnal sharp at the end)
// ###### Title6 // ###### Title6
$search[] = "/^###### (.+)( +#*)$/Um"; $search[] = "/^###### (.+)( +#+)?$/Um";
$replace[] = "</p><h6>\\1</h6><p>"; $replace[] = "</p><h6>\\1</h6><p>";
// ##### Title5 // ##### Title5
$search[] = "/^##### (.+)( +#*)$/Um"; $search[] = "/^##### (.+)( +#+)?$/Um";
$replace[] = "</p><h5>\\1</h5><p>"; $replace[] = "</p><h5>\\1</h5><p>";
// #### Title4 // #### Title4
$search[] = "/^#### (.+)( +#*)$/Um"; $search[] = "/^#### (.+)( +#+)?$/Um";
$replace[] = "</p><h4>\\1</h4><p>"; $replace[] = "</p><h4>\\1</h4><p>";
// ### Title3 // ### Title3
$search[] = "/^### (.+)( +#*)$/Um"; $search[] = "/^### (.+)( +#+)?$/Um";
$replace[] = "</p><h3>\\1</h3><p>"; $replace[] = "</p><h3>\\1</h3><p>";
// ## Title2 // ## Title2
$search[] = "/^## (.+)( +#*)$/Um"; $search[] = "/^## (.+)( +#+)?$/Um";
$replace[] = "</p><h2>\\1</h2><p>"; $replace[] = "</p><h2>\\1</h2><p>";
// # Title1 // # Title1
$search[] = "/^# (.+)( +#*)$/Um"; $search[] = "/^# (.+)( +#+)?$/Um";
$replace[] = "</p><h1>\\1</h1><p>"; $replace[] = "</p><h1>\\1</h1><p>";
// End of line with double space : <br/> // End of line with double space : <br/>
$search[] = "/( )$/Um"; $replace[] = "<br/>"; $search[] = "/( )$/Um"; $replace[] = "<br/>";
@@ -294,8 +294,6 @@ class markdown
if (end ($typeStack)) if (end ($typeStack))
{ {
$this->debugMKD ("DEB2 : CODE : Close older HTML"); $this->debugMKD ("DEB2 : CODE : Close older HTML");
// Remove last \n to put closing tag at the end of line
$res = substr ($res, 0, -1);
$oldType = array_pop ($typeStack); $oldType = array_pop ($typeStack);
$this->debugMKD (str_repeat (" ", end ($indentStack))."</$oldType>"); $this->debugMKD (str_repeat (" ", end ($indentStack))."</$oldType>");
$res .= str_repeat (" ", end ($indentStack))."</$oldType>"; $res .= str_repeat (" ", end ($indentStack))."</$oldType>";