Skip to content

Commit c44cf32

Browse files
committed
Simplified strong/emphasis regexps
(?<=\S|^) becomes (?<!\s) (?=\S|$) becomes (?!\s) (?<!\s)(?<!\*) becomes (?<![\s*]) (?<!\s)(?<!_) becomes (?<![\s_]) (?!\s)(?![\.,:;]\s) becomes (?![\.,:;]?\s)
1 parent 6f952ee commit c44cf32

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

Michelf/Markdown.php

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -979,19 +979,19 @@ protected function makeCodeSpan($code) {
979979

980980

981981
protected $em_relist = array(
982-
'' => '(?:(?<!\*)\*(?!\*)|(?<!_)_(?!_))(?=\S|$)(?![\.,:;]\s)',
983-
'*' => '(?<=\S|^)(?<!\*)\*(?!\*)',
984-
'_' => '(?<=\S|^)(?<!_)_(?!_)',
982+
'' => '(?:(?<!\*)\*(?!\*)|(?<!_)_(?!_))(?![\.,:;]?\s)',
983+
'*' => '(?<![\s*])\*(?!\*)',
984+
'_' => '(?<![\s_])_(?!_)',
985985
);
986986
protected $strong_relist = array(
987-
'' => '(?:(?<!\*)\*\*(?!\*)|(?<!_)__(?!_))(?=\S|$)(?![\.,:;]\s)',
988-
'**' => '(?<=\S|^)(?<!\*)\*\*(?!\*)',
989-
'__' => '(?<=\S|^)(?<!_)__(?!_)',
987+
'' => '(?:(?<!\*)\*\*(?!\*)|(?<!_)__(?!_))(?![\.,:;]?\s)',
988+
'**' => '(?<![\s*])\*\*(?!\*)',
989+
'__' => '(?<![\s_])__(?!_)',
990990
);
991991
protected $em_strong_relist = array(
992-
'' => '(?:(?<!\*)\*\*\*(?!\*)|(?<!_)___(?!_))(?=\S|$)(?![\.,:;]\s)',
993-
'***' => '(?<=\S|^)(?<!\*)\*\*\*(?!\*)',
994-
'___' => '(?<=\S|^)(?<!_)___(?!_)',
992+
'' => '(?:(?<!\*)\*\*\*(?!\*)|(?<!_)___(?!_))(?![\.,:;]?\s)',
993+
'***' => '(?<![\s*])\*\*\*(?!\*)',
994+
'___' => '(?<![\s_])___(?!_)',
995995
);
996996
protected $em_strong_prepared_relist;
997997

@@ -2837,19 +2837,19 @@ protected function _doFencedCodeBlocks_newlines($matches) {
28372837
# work in the middle of a word.
28382838
#
28392839
protected $em_relist = array(
2840-
'' => '(?:(?<!\*)\*(?!\*)|(?<![a-zA-Z0-9_])_(?!_))(?=\S|$)(?![\.,:;]\s)',
2841-
'*' => '(?<=\S|^)(?<!\*)\*(?!\*)',
2842-
'_' => '(?<=\S|^)(?<!_)_(?![a-zA-Z0-9_])',
2840+
'' => '(?:(?<!\*)\*(?!\*)|(?<![a-zA-Z0-9_])_(?!_))(?![\.,:;]?\s)',
2841+
'*' => '(?<![\s*])\*(?!\*)',
2842+
'_' => '(?<![\s_])_(?![a-zA-Z0-9_])',
28432843
);
28442844
protected $strong_relist = array(
2845-
'' => '(?:(?<!\*)\*\*(?!\*)|(?<![a-zA-Z0-9_])__(?!_))(?=\S|$)(?![\.,:;]\s)',
2846-
'**' => '(?<=\S|^)(?<!\*)\*\*(?!\*)',
2847-
'__' => '(?<=\S|^)(?<!_)__(?![a-zA-Z0-9_])',
2845+
'' => '(?:(?<!\*)\*\*(?!\*)|(?<![a-zA-Z0-9_])__(?!_))(?![\.,:;]?\s)',
2846+
'**' => '(?<![\s*])\*\*(?!\*)',
2847+
'__' => '(?<![\s_])__(?![a-zA-Z0-9_])',
28482848
);
28492849
protected $em_strong_relist = array(
2850-
'' => '(?:(?<!\*)\*\*\*(?!\*)|(?<![a-zA-Z0-9_])___(?!_))(?=\S|$)(?![\.,:;]\s)',
2851-
'***' => '(?<=\S|^)(?<!\*)\*\*\*(?!\*)',
2852-
'___' => '(?<=\S|^)(?<!_)___(?![a-zA-Z0-9_])',
2850+
'' => '(?:(?<!\*)\*\*\*(?!\*)|(?<![a-zA-Z0-9_])___(?!_))(?![\.,:;]?\s)',
2851+
'***' => '(?<![\s*])\*\*\*(?!\*)',
2852+
'___' => '(?<![\s_])___(?![a-zA-Z0-9_])',
28532853
);
28542854

28552855

0 commit comments

Comments
 (0)