Skip to content

Commit c684985

Browse files
authored
Merge commit from fork
* Fix regex pattern inefficiencies: BetterEm, Tilde, Caret, and MagicLink Reported by @seankohjs * Use non-capturing groups * Formatting fix
1 parent 6d0097b commit c684985

6 files changed

Lines changed: 16 additions & 9 deletions

File tree

‎docs/src/markdown/about/changelog.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@ icon: lucide/scroll-text
33
---
44
# Changelog
55

6+
## 11.0.1
7+
8+
- **FIX**: BetterEm: Fix regex pattern inefficiencies.
9+
- **FIX**: Tilde: Fix regex pattern inefficiencies.
10+
- **FIX**: Caret: Fix regex pattern inefficiencies.
11+
- **FIX**: MagicLink: Fix regex pattern inefficiencies.
12+
613
## 11.0
714

815
- **BREAK**: B64: Restricts relative links to `base_path` by default. Can be disabled by setting new `restrict_path`

‎pymdownx/__meta__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,5 +193,5 @@ def parse_version(ver: str) -> Version:
193193
return Version(major, minor, micro, release, pre, post, dev)
194194

195195

196-
__version_info__ = Version(11, 0, 0, "final")
196+
__version_info__ = Version(11, 0, 1, "final")
197197
__version__ = __version_info__._get_canonical()

‎pymdownx/betterem.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@
6464
# _em __strong___
6565
UNDER_EM_STRONG2 = r'(?<!_)(_)(?![_\s]){}_{{2}}{}_{{3}}'.format(UNDER_CONTENT, UNDER_CONTENT)
6666
# Prioritize *value* when **value** is nested within
67-
STAR_EM2 = r'(?<!\*)(\*)(?![\*\s])((?:[^\*]|\*{2,})+?)(?<![\*\s])(\*)(?!\*)'
67+
STAR_EM2 = r'(?<!\*)(\*)(?![\*\s])((?:[^\*]|\*{2,}(?!\*))+?)(?<![\*\s])(\*)(?!\*)'
6868
# Prioritize _value_ when __value__ is nested within
69-
UNDER_EM2 = r'(?<!_)(_)(?![_\s])((?:[^_]|_{2,})+?)(?<![_\s])(_)(?!_)'
69+
UNDER_EM2 = r'(?<!_)(_)(?![_\s])((?:[^_]|_{2,}(?!_))+?)(?<![_\s])(_)(?!_)'
7070
# *emphasis*
7171
STAR_EM = r'(\*)(?!\s){}(?<!\s)\1'.format(STAR_CONTENT)
7272
# _emphasis_
@@ -90,7 +90,7 @@
9090
# SMART: _em_
9191
SMART_UNDER_EM = r'(?<!\w)(_)(?![\s_]){}(?<!\s)\1(?!\w)'.format(SMART_UNDER_CONTENT)
9292
# SMART: Prioritize _value_ when __value__ is nested within
93-
SMART_UNDER_EM2 = r'(?<![\w_])(_)(?![_\s])((?:[^_]|_{2,})+?)(?<![_\s])(_)(?!\w)'
93+
SMART_UNDER_EM2 = r'(?<![\w_])(_)(?![_\s])((?:[^_]|_{2,}(?!_))+?)(?<![_\s])(_)(?!\w)'
9494
# SMART: _em __strong___
9595
SMART_UNDER_EM_STRONG2 = \
9696
r'(?<!\w)(_)(?![\s_]){}(?<!\w)_{{2}}(?![\s_]){}(?<!\s)_{{3}}(?!\w)'.format(
@@ -123,7 +123,7 @@
123123
# SMART: *em*
124124
SMART_STAR_EM = r'(?:(?<=_)|(?<![\w\*]))(\*)(?![\s\*]){}(?<!\s)\1(?:(?=_)|(?![\w\*]))'.format(SMART_STAR_CONTENT)
125125
# SMART: Prioritize *value* when **value** is nested within
126-
SMART_STAR_EM2 = r'(?:(?<=_)|(?<![\w\*]))(\*)(?![\*\s])((?:[^\*]|\*{2,})+?)(?<![\*\s])(\*)(?:(?=_)|(?![\w\*]))'
126+
SMART_STAR_EM2 = r'(?:(?<=_)|(?<![\w\*]))(\*)(?![\*\s])((?:[^\*]|\*{2,}(?!\*))+?)(?<![\*\s])(\*)(?:(?=_)|(?![\w\*]))'
127127
# SMART: *em **strong***
128128
SMART_STAR_EM_STRONG2 = \
129129
r'(?:(?<=_)|(?<![\w\*]))(\*)(?![\s\*]){}(?:(?<=_)|(?<![\w\*]))\*{{2}}(?![\s\*]){}(?<!\s)\*{{3}}(?:(?=_)|(?![\w\*]))'.format(

‎pymdownx/caret.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
# `^sup ^^sup,ins^^^`
5454
SUP_INS2 = r'(?<!\^)(\^)(?![\^\s]){}\^{{2}}{}\^{{3}}'.format(CONTENT, CONTENT)
5555
# Prioritize ^value^ when ^^value^^ is nested within
56-
SUP2 = r'(?<!\^)(\^)(?![\^\s])((?:[^\^\s]|\^{2,})+?)(?<![\^\s])(\^)(?!\^)'
56+
SUP2 = r'(?<!\^)(\^)(?![\^\s])((?:[^\^\s]|\^{2,}(?!\^))+?)(?<![\^\s])(\^)(?!\^)'
5757

5858
# Smart rules for when "smart caret" is enabled
5959
# SMART: `^^^ins,sup^^^`

‎pymdownx/magiclink.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656
RE_LINK = r'''(?xi)
5757
(?P<link>
5858
(?:(?<=\b)|(?<=_))(?:
59-
(?:ht|f)tps?://[^_\W][-\w]*(?:\.[-\w.]+)*| # (http|ftp)://
60-
(?P<www>w{3}\.)[^_\W][-\w]*(?:\.[-\w.]+)* # www.
59+
(?:ht|f)tps?://[^_\W](?:[-\w]|\.(?!=$))*| # (http|ftp)://host.name
60+
(?P<www>w{3}\.)[^_\W](?:[-\w]|\.(?!=$))* # www.host.name
6161
)
6262
/?[-\w.?,!'(){}\[\]/+&@%$#=:"|~;]* # url path, fragments, and query stuff
6363
(?:[^_\W]|[-/#@$+=]) # allowed end chars

‎pymdownx/tilde.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
# `~sub ~~sub,del~~~`
5353
SUB_DEL2 = r'(?<!~)(~)(?![~\s]){}~{{2}}{}~{{3}}'.format(CONTENT, CONTENT)
5454
# Prioritize ~value~ when ~~value~~ is nested within
55-
SUB2 = r'(?<!~)(~)(?![~\s])((?:[^\s~]|~{2,})+?)(?<![~\s])(~)(?!~)'
55+
SUB2 = r'(?<!~)(~)(?![~\s])((?:[^\s~]|~{2,}(?!~))+?)(?<![~\s])(~)(?!~)'
5656

5757
# Smart rules for when "smart tilde" is enabled
5858
# SMART: `~~~del,sub~~~`

0 commit comments

Comments
 (0)