Merge branch '1.0'

src/Ciconia/Extension/Gfm/UrlAutoLinkExtension.php

@@ -29,7 +29,22 @@ public function register(Markdown $markdown)
      */
     public function processStandardUrl(Text $text)
     {
-        $text->replace('{(?<!]\(|"|<|>|\[)((?:https?|ftp)://[^\'">\s]+)(?!>|<|\"|\])}', '<\1>');
+        $hashes = array();
+
+        // escape <code>
+        $text->replace('{<code>.*?</code>}m', function (Text $w) use (&$hashes) {
+            $md5 = md5($w);
+            $hashes[$md5] = $w;
+
+            return "{gfm-extraction-$md5}";
+        });
+
+        $text->replace('{(?<!]\(|"|<|\[)((?:https?|ftp)://[^\'">\s]+)(?!>|\"|\])}', '<\1>');
+
+        /** @noinspection PhpUnusedParameterInspection */
+        $text->replace('/\{gfm-extraction-([0-9a-f]{32})\}/m', function (Text $w, Text $md5) use (&$hashes) {
+            return $hashes[(string)$md5];
+        });
     }
 
     /**

test/Ciconia/Resources/gfm/link-in-code-span.md

@@ -1 +1,3 @@
-Look at: `http://someurl.com` and text.
+Look at: `http://someurl.com` and text.
+
+Look at: `url: http://someurl.com` and text.

test/Ciconia/Resources/gfm/link-in-code-span.out

@@ -1 +1,3 @@
-<p>Look at: <code>http://someurl.com</code> and text.</p>
+<p>Look at: <code>http://someurl.com</code> and text.</p>
+
+<p>Look at: <code>url: http://someurl.com</code> and text.</p>

test/Ciconia/Resources/gfm/link-in-codeblock.md

@@ -0,0 +1,3 @@
+``` php
+$validator->validate('http://www.example.com/');
+```

test/Ciconia/Resources/gfm/link-in-codeblock.out

@@ -0,0 +1,2 @@
+<pre class="prettyprint lang-php"><code>$validator-&gt;validate('http://www.example.com/');
+</code></pre>