update parsedown

1 files changed, 122 insertions, 0 deletions

diff --git a/lib/ext/MyParsedown.php b/lib/ext/MyParsedown.php
index 71dfa7f..1aac33a 100644
--- a/lib/ext/MyParsedown.php
+++ b/lib/ext/MyParsedown.php
@@ -215,4 +215,126 @@ class MyParsedown extends ParsedownExtended {
         return new SkinContext('\\skin\\markdown');
     }
 
+    protected function blockTableComplete(array $Block)
+    {
+        if ( ! isset($Block))
+        {
+            return null;
+        }
+
+        $HeaderElements =& $Block['element']['elements'][0]['elements'][0]['elements'];
+
+        for ($index = count($HeaderElements) - 1; $index >= 0; --$index)
+        {
+            $colspan = 1;
+            $HeaderElement =& $HeaderElements[$index];
+
+            while ($index && $HeaderElements[$index - 1]['handler']['argument'] === '>')
+            {
+                $colspan++;
+                $PreviousHeaderElement =& $HeaderElements[--$index];
+                $PreviousHeaderElement['merged'] = true;
+                if (isset($PreviousHeaderElement['attributes']))
+                {
+                    $HeaderElement['attributes'] = $PreviousHeaderElement['attributes'];
+                }
+            }
+
+            if ($colspan > 1)
+            {
+                if ( ! isset($HeaderElement['attributes']))
+                {
+                    $HeaderElement['attributes'] = array();
+                }
+                $HeaderElement['attributes']['colspan'] = $colspan;
+            }
+        }
+
+        for ($index = count($HeaderElements) - 1; $index >= 0; --$index)
+        {
+            if (isset($HeaderElements[$index]['merged']))
+            {
+                array_splice($HeaderElements, $index, 1);
+            }
+        }
+
+        $Rows =& $Block['element']['elements'][1]['elements'];
+
+        foreach ($Rows as $RowNo => &$Row)
+        {
+            $Elements =& $Row['elements'];
+
+            for ($index = count($Elements) - 1; $index >= 0; --$index)
+            {
+                $colspan = 1;
+                $Element =& $Elements[$index];
+
+                while ($index && $Elements[$index - 1]['handler']['argument'] === '>')
+                {
+                    $colspan++;
+                    $PreviousElement =& $Elements[--$index];
+                    $PreviousElement['merged'] = true;
+                    if (isset($PreviousElement['attributes']))
+                    {
+                        $Element['attributes'] = $PreviousElement['attributes'];
+                    }
+                }
+
+                if ($colspan > 1)
+                {
+                    if ( ! isset($Element['attributes']))
+                    {
+                        $Element['attributes'] = array();
+                    }
+                    $Element['attributes']['colspan'] = $colspan;
+                }
+            }
+        }
+
+        foreach ($Rows as $RowNo => &$Row)
+        {
+            $Elements =& $Row['elements'];
+
+            foreach ($Elements as $index => &$Element)
+            {
+                $rowspan = 1;
+
+                if (isset($Element['merged']))
+                {
+                    continue;
+                }
+
+                while ($RowNo + $rowspan < count($Rows) && $index < count($Rows[$RowNo + $rowspan]['elements']) && $Rows[$RowNo + $rowspan]['elements'][$index]['handler']['argument'] === '^' && (@$Element['attributes']['colspan'] ?: null) === (@$Rows[$RowNo + $rowspan]['elements'][$index]['attributes']['colspan'] ?: null))
+                {
+                    $Rows[$RowNo + $rowspan]['elements'][$index]['merged'] = true;
+                    $rowspan++;
+                }
+
+                if ($rowspan > 1)
+                {
+                    if ( ! isset($Element['attributes']))
+                    {
+                        $Element['attributes'] = array();
+                    }
+                    $Element['attributes']['rowspan'] = $rowspan;
+                }
+            }
+        }
+
+        foreach ($Rows as $RowNo => &$Row)
+        {
+            $Elements =& $Row['elements'];
+
+            for ($index = count($Elements) - 1; $index >= 0; --$index)
+            {
+                if (isset($Elements[$index]['merged']))
+                {
+                    array_splice($Elements, $index, 1);
+                }
+            }
+        }
+
+        return $Block;
+    }
+
 }