Dominique.Fournier/DomFramework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

markdown : BUG : Correct the "code" section : don't allow ul/li in codes, print */- normally

Browse Source 
git-svn-id: https://svn.fournier38.fr/svn/ProgSVN/trunk@1508 bf3deb0d-5f1a-0410-827f-c0cc1f45334c
This commit is contained in:
Dominique Fournier
2014-06-30 12:11:52 +00:00
parent 9ef7095303
commit 18fe0913ae
1 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
markdown.php
View File

@@ -149,27 +149,36 @@ class markdown
$type = $this->paragraphType ($line);
$this->debugMKD ("DEBUT: Type='$type'");
$matches = array ();
switch ($type)
$indent = strspn ($line, " ");
if (end ($typeStack) === "code" && $indent >= end ($indentStack))
{
case "ol" :
preg_match ("/^( *)[0-9]+\. +(.*)/", $line, $matches);
if (!isset ($matches[2]))
$lineTxt = $line;
else
$lineTxt = $matches[2];
break ;
case "ul" :
preg_match ("/^( *)[-+*] +(.*)/", $line, $matches);
if (!isset ($matches[2]))
$lineTxt = $line;
else
$lineTxt = $matches[2];
break ;
default:
$this->debugMKD ("DEBUT: Force type=CODE");
$type = "code";
$lineTxt = $line;
}
else
{
switch ($type)
{
case "ol" :
preg_match ("/^( *)[0-9]+\. +(.*)/", $line, $matches);
if (!isset ($matches[2]))
$lineTxt = $line;
else
$lineTxt = $matches[2];
break ;
case "ul" :
preg_match ("/^( *)[-+*] +(.*)/", $line, $matches);
if (!isset ($matches[2]))
$lineTxt = $line;
else
$lineTxt = $matches[2];
break ;
default:
$lineTxt = $line;
}
}
$indent = strspn ($line, " ");
$this->debugMKD ("DEBUT: Indent='$indent'");
$this->debugMKD ("DEBUT: indentStack=".print_r ($indentStack, TRUE));
$this->debugMKD ("DEBUT: typeStack=".print_r ($typeStack, TRUE));