parsedown 1.2

Author: erusev

ParsedownExtra.php

@@ -28,7 +28,7 @@ function __construct()
         array_unshift($this->DefinitionTypes['['], 'Footnote');
 
         # identify footnote markers before before links
-        array_unshift($this->SpanTypes['['], 'FootnoteMarker');
+        array_unshift($this->InlineTypes['['], 'FootnoteMarker');
     }
 
     #
@@ -61,9 +61,9 @@ function text($text)
     #
     # Atx
 
-    protected function identifyAtx($Line)
+    protected function blockHeader($Line)
     {
-        $Block = parent::identifyAtx($Line);
+        $Block = parent::blockHeader($Line);
 
         if (preg_match('/[ #]*'.$this->attributesPattern.'[ ]*$/', $Block['element']['text'], $matches, PREG_OFFSET_CAPTURE))
         {
@@ -80,7 +80,7 @@ protected function identifyAtx($Line)
     #
     # Definition List
 
-    protected function identifyDefinitionList($Line, $Block)
+    protected function blockDefinitionList($Line, $Block)
     {
         if (isset($Block['type']))
         {
@@ -115,7 +115,7 @@ protected function identifyDefinitionList($Line, $Block)
         return $Block;
     }
 
-    protected function addToDefinitionList($Line, array $Block)
+    protected function blockDefinitionListContinue($Line, array $Block)
     {
         if ($Line['text'][0] === ':')
         {
@@ -143,9 +143,9 @@ protected function addToDefinitionList($Line, array $Block)
     #
     # Setext
 
-    protected function identifySetext($Line, array $Block = null)
+    protected function blockSetextHeader($Line, array $Block = null)
     {
-        $Block = parent::identifySetext($Line, $Block);
+        $Block = parent::blockSetextHeader($Line, $Block);
 
         if (preg_match('/[ ]*'.$this->attributesPattern.'[ ]*$/', $Block['element']['text'], $matches, PREG_OFFSET_CAPTURE))
         {
@@ -162,64 +162,16 @@ protected function identifySetext($Line, array $Block = null)
     #
     # Markup
 
-    protected function completeMarkup($Block)
+    protected function blockMarkupComplete($Block)
     {
-        $DOMDocument = new DOMDocument;
-
-        $DOMDocument->loadXML($Block['element'], LIBXML_NOERROR | LIBXML_NOWARNING);
-
-        if ($DOMDocument->documentElement === null)
-        {
-            return $Block;
-        }
-
-        $result = $DOMDocument->documentElement->getAttribute('markdown');
-
-        if ($result !== '1')
+        if ( ! isset($Block['element']['attributes']['markdown']) or $Block['element']['attributes']['markdown'] !== '1')
         {
             return $Block;
         }
 
-        $DOMDocument->documentElement->removeAttribute('markdown');
-
-        $index = 0;
-        $nestedElements = array();
-
-        $markdown = '';
-
-        foreach ($DOMDocument->documentElement->childNodes as $Node)
-        {
-            if ($Node instanceof DOMText)
-            {
-                $markdown .= $Node->nodeValue;
-            }
-            elseif ($Node instanceof DOMNode)
-            {
-                $nestedElements []= $DOMDocument->saveXML($Node);
-
-                # replace nested elements with placeholders
-                $markdown .= '\x1A'.$index ++.'/';
-            }
-            else
-            {
-                continue;
-            }
-        }
-
-        foreach ($nestedElements as $index => $nestedElement)
-        {
-            $markdown = str_replace('\x1A'.$index.'/', $nestedElement, $markdown);
-        }
-
-        $text = $this->text($markdown);
-
-        # because we don't want markup to get encoded
-        $DOMDocument->documentElement->nodeValue = "\n".'placeholder'."\n";
-
-        $markup = $DOMDocument->saveXML($DOMDocument->documentElement);
-        $markup = str_replace('placeholder', $text, $markup);
+        unset($Block['element']['attributes']['markdown']);
 
-        $Block['element'] = $markup;
+        $Block['element']['text'] = "\n".$this->text($Block['element']['text'])."\n";
 
         return $Block;
     }
@@ -231,7 +183,7 @@ protected function completeMarkup($Block)
     #
     # Abbreviation
 
-    protected function identifyAbbreviation($Line)
+    protected function definitionAbbreviation($Line)
     {
         if (preg_match('/^\*\[(.+?)\]:[ ]*(.+?)[ ]*$/', $Line['text'], $matches))
         {
@@ -247,7 +199,7 @@ protected function identifyAbbreviation($Line)
     #
     # Footnote
 
-    protected function identifyFootnote($Line)
+    protected function definitionFootnote($Line)
     {
         if (preg_match('/^\[\^(.+?)\]:[ ]?(.+)$/', $Line['text'], $matches))
         {
@@ -265,15 +217,15 @@ protected function identifyFootnote($Line)
     }
 
     #
-    # Spans
+    # Inline Elements
     #
 
     #
     # Footnote Marker
 
-    protected function identifyFootnoteMarker($Excerpt)
+    protected function inlineFootnoteMarker($excerpt)
     {
-        if (preg_match('/^\[\^(.+?)\]/', $Excerpt['text'], $matches))
+        if (preg_match('/^\[\^(.+?)\]/', $excerpt, $matches))
         {
             $name = $matches[1];
 
@@ -312,11 +264,11 @@ protected function identifyFootnoteMarker($Excerpt)
     #
     # Link
 
-    protected function identifyLink($Excerpt)
+    protected function inlineLink($excerpt)
     {
-        $Span = parent::identifyLink($Excerpt);
+        $Span = parent::inlineLink($excerpt);
 
-        $remainder = substr($Excerpt['text'], $Span['extent']);
+        $remainder = substr($excerpt, $Span['extent']);
 
         if (preg_match('/^[ ]*'.$this->attributesPattern.'/', $remainder, $matches))
         {
@@ -331,9 +283,9 @@ protected function identifyLink($Excerpt)
     #
     # ~
 
-    protected function readPlainText($text)
+    protected function unmarkedText($text)
     {
-        $text = parent::readPlainText($text);
+        $text = parent::unmarkedText($text);
 
         if (isset($this->Definitions['Abbreviation']))
         {

composer.json

@@ -13,7 +13,7 @@
         }
     ],
     "require": {
-        "erusev/parsedown": "~1.1"
+        "erusev/parsedown": "~1.2"
     },
     "autoload": {
         "psr-0": {"ParsedownExtra": ""}

test/data/markdown_inside_markup.html

@@ -4,4 +4,11 @@
 <div>
 This is block-level markup. No *markdown* here.
 </div>
+</div>
+<hr />
+<div>
+<p><em>markdown</em></p>
+<div>
+<p><em>markdown</em></p>
+</div>
 </div>

test/data/markdown_inside_markup.md

@@ -6,4 +6,13 @@ This is another paragraph. It contains <em>inline markup</em>.
 <div>
 This is block-level markup. No *markdown* here.
 </div>
+</div>
+
+---
+
+<div markdown="1">
+*markdown*
+<div markdown="1">
+_markdown_
+</div>
 </div>