Merge pull request #50 from thephpleague/spec-0.15

Spec 0.15
thephpleague · Jan 6, 2015 · 2376df8 · 2376df8 · GrahamCampbell · Jan 6, 2015
2 parents 3c0a3bc + f3566b1
commit 2376df8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
     },
     "require-dev": {
         "erusev/parsedown": "~1.0",
-        "jgm/CommonMark": "0.13",
+        "jgm/CommonMark": "0.15",
         "michelf/php-markdown": "~1.4",
         "phpunit/phpunit": "~4.3"
     },
@@ -31,9 +31,9 @@
             "type": "package",
             "package": {
                 "name": "jgm/CommonMark",
-                "version": "0.13",
+                "version": "0.15",
                 "dist": {
-                    "url": "http://spec.commonmark.org/0.13/spec.txt",
+                    "url": "http://spec.commonmark.org/0.15/spec.txt",
                     "type": "file"
                 }
             }

diff --git a/src/Inline/Parser/EmphasisParser.php b/src/Inline/Parser/EmphasisParser.php
@@ -18,6 +18,7 @@
 use League\CommonMark\Delimiter\Delimiter;
 use League\CommonMark\InlineParserContext;
 use League\CommonMark\Inline\Element\Text;
+use League\CommonMark\Util\RegexHelper;
 
 class EmphasisParser extends AbstractInlineParser
 {
@@ -55,8 +56,16 @@ public function parse(ContextInterface $context, InlineParserContext $inlineCont
 
         $charAfter = $cursor->getCharacter() ?: "\n";
 
-        $canOpen = $numDelims > 0 && !preg_match('/\s/', $charAfter);
-        $canClose = $numDelims > 0 && !preg_match('/\s/', $charBefore);
+        $canOpen = $numDelims > 0 && !preg_match('/\pZ|\s/u', $charAfter) &&
+            !(preg_match(RegexHelper::REGEX_PUNCTUATION, $charAfter) &&
+            !preg_match('/\pZ|\s/u', $charBefore) &&
+            !(preg_match(RegexHelper::REGEX_PUNCTUATION, $charBefore)));
+
+        $canClose = $numDelims > 0 && !preg_match('/\pZ|\s/u', $charBefore) &&
+            !(preg_match(RegexHelper::REGEX_PUNCTUATION, $charBefore) &&
+            !preg_match('/\pZ|\s/u', $charAfter) &&
+            !(preg_match(RegexHelper::REGEX_PUNCTUATION, $charAfter)));
+
         if ($character === '_') {
             $canOpen = $canOpen && !preg_match('/[a-z0-9]/i', $charBefore);
             $canClose = $canClose && !preg_match('/[a-z0-9]/i', $charAfter);

diff --git a/src/Util/RegexHelper.php b/src/Util/RegexHelper.php
@@ -51,6 +51,7 @@ class RegexHelper
 
     const REGEX_ESCAPABLE = '[!"#$%&\'()*+,.\/:;<=>?@[\\\\\]^_`{|}~-]';
     const REGEX_ENTITY = '/&(?:#x[a-f0-9]{1,8}|#[0-9]{1,8}|[a-z][a-z0-9]{1,31});/i';
+    const REGEX_PUNCTUATION = '/^[\x{2000}-\x{206F}\x{2E00}-\x{2E7F}\\\\\'!"#\$%&\(\)\*\+,\-\.\\/:;<=>\?@\[\]\^_`\{\|\}~]/u';
 
     protected $regex = array();