Fix #135, rendering code blocks enclosed in brackets

fixes #135
close #152

Author: cebe

CHANGELOG.md

@@ -5,6 +5,7 @@ Version 1.2.0 work in progress
 ------------------------------
 
 - #89 Lists should be separated by a HR (@bieleckim)
+- #135 GithubMarkdown was not parsing inline code when there are square brackets around it.
 - #151 Fixed table rendering for lines begining with | for GFM (@GenaBitu)
 - Improved table rendering, allow single column tables.
 

MarkdownExtra.php

@@ -223,6 +223,9 @@ protected function renderLink($block)
 			if (($ref = $this->lookupReference($block['refkey'])) !== false) {
 				$block = array_merge($block, $ref);
 			} else {
+				if (strncmp($block['orig'], '[', 1) === 0) {
+					return '[' . $this->renderAbsy($this->parseInline(substr($block['orig'], 1)));
+				}
 				return $block['orig'];
 			}
 		}
@@ -238,6 +241,9 @@ protected function renderImage($block)
 			if (($ref = $this->lookupReference($block['refkey'])) !== false) {
 				$block = array_merge($block, $ref);
 			} else {
+				if (strncmp($block['orig'], '![', 2) === 0) {
+					return '![' . $this->renderAbsy($this->parseInline(substr($block['orig'], 2)));
+				}
 				return $block['orig'];
 			}
 		}

inline/LinkTrait.php

@@ -79,7 +79,7 @@ protected function parseLink($markdown)
 			// remove all starting [ markers to avoid next one to be parsed as link
 			$result = '[';
 			$i = 1;
-			while (isset($markdown[$i]) && $markdown[$i] == '[') {
+			while (isset($markdown[$i]) && $markdown[$i] === '[') {
 				$result .= '[';
 				$i++;
 			}
@@ -111,7 +111,7 @@ protected function parseImage($markdown)
 			// remove all starting [ markers to avoid next one to be parsed as link
 			$result = '!';
 			$i = 1;
-			while (isset($markdown[$i]) && $markdown[$i] == '[') {
+			while (isset($markdown[$i]) && $markdown[$i] === '[') {
 				$result .= '[';
 				$i++;
 			}
@@ -221,6 +221,9 @@ protected function renderLink($block)
 			if (($ref = $this->lookupReference($block['refkey'])) !== false) {
 				$block = array_merge($block, $ref);
 			} else {
+				if (strncmp($block['orig'], '[', 1) === 0) {
+					return '[' . $this->renderAbsy($this->parseInline(substr($block['orig'], 1)));
+				}
 				return $block['orig'];
 			}
 		}
@@ -235,6 +238,9 @@ protected function renderImage($block)
 			if (($ref = $this->lookupReference($block['refkey'])) !== false) {
 				$block = array_merge($block, $ref);
 			} else {
+				if (strncmp($block['orig'], '![', 2) === 0) {
+					return '![' . $this->renderAbsy($this->parseInline(substr($block['orig'], 2)));
+				}
 				return $block['orig'];
 			}
 		}
@@ -275,4 +281,7 @@ protected function consumeReference($lines, $current)
 		}
 		return [false, --$current];
 	}
+
+	abstract protected function parseInline($text);
+	abstract protected function renderAbsy($blocks);
 }

tests/markdown-data/code.html

@@ -10,3 +10,8 @@
 <p>this is code too: <code> co
 ooo
 de </code></p>
+<p>A code block enclosed in brackets: [<code>somecode</code>].</p>
+<p>A code block enclosed in brackets: [ <code>somecode</code> ].</p>
+<p>A code block enclosed in a link: <a href="./url.md"><code>somecode</code></a>.</p>
+<p>A code block enclosed in image brackets: ![<code>somecode</code>].</p>
+<p>A code block enclosed in image brackets: ![ <code>somecode</code> ].</p>

tests/markdown-data/code.md

@@ -14,4 +14,14 @@ this is ``` inline `` code ```
 
 this is code too: ` co
 ooo
-de `
+de `
+
+A code block enclosed in brackets: [`somecode`].
+
+A code block enclosed in brackets: [ `somecode` ].
+
+A code block enclosed in a link: [`somecode`](./url.md).
+
+A code block enclosed in image brackets: ![`somecode`].
+
+A code block enclosed in image brackets: ![ `somecode` ].