From 9d764697cadca180ec975870dcd14704c1188e0a Mon Sep 17 00:00:00 2001 From: un-pogaz <46523284+un-pogaz@users.noreply.github.com> Date: Sun, 30 Apr 2023 17:14:15 +0200 Subject: [PATCH] regex tweak --- .../gui2/markdown_syntax_highlighter.py | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/calibre/gui2/markdown_syntax_highlighter.py b/src/calibre/gui2/markdown_syntax_highlighter.py index b131c8ddf4..9e7faa2ca0 100644 --- a/src/calibre/gui2/markdown_syntax_highlighter.py +++ b/src/calibre/gui2/markdown_syntax_highlighter.py @@ -14,14 +14,14 @@ from calibre.gui2.palette import dark_link_color, light_link_color class MarkdownHighlighter(QSyntaxHighlighter): MARKDOWN_KEYS_REGEX = { - 'Bold' : re.compile(r'(?P\*\*)(?P.+?)(?P=delim)'), - 'uBold': re.compile('(?P__)(?P.+?)(?P=delim)'), - 'Italic': re.compile(r'(?P\*)(?P([^*]{2,}?|[^*]))(?P=delim)'), - 'uItalic': re.compile('(?P_)(?P([^_]{2,}?|[^_]))(?P=delim)'), - 'BoldItalic': re.compile(r'(?P\*\*\*)(?P([^*]{2,}?|[^*]))(?P=delim)'), - 'uBoldItalic': re.compile(r'(?P___)(?P([^_]{2,}?|[^_]))(?P=delim)'), - 'Link': re.compile(r'(?u)(?\*\*)(?P.+?)(?P=delim)'), + 'uBold': re.compile(r'(?__)(?P.+?)(?P=delim)'), + 'Italic': re.compile(r'(?\*)(?P([^*]{2,}?|[^*]))(?P=delim)'), + 'uItalic': re.compile(r'(?_)(?P([^_]{2,}?|[^_]))(?P=delim)'), + 'BoldItalic': re.compile(r'(?\*\*\*)(?P([^*]{2,}?|[^*]))(?P=delim)'), + 'uBoldItalic': re.compile(r'(?___)(?P([^_]{2,}?|[^_]))(?P=delim)'), + 'Link': re.compile(r'(?u)(?+\s*'), - 'BlockQuoteCount': re.compile('^[ \t]*>[ \t]?'), - 'CodeSpan': re.compile('(?P`+).+?(?P=delim)'), + 'BlockQuote': re.compile(r'(?u)^([ ]{0,3}>)+\s*'), + 'BlockQuoteCount': re.compile(r'^[ ]{0,3}>[ \t]?'), + 'CodeSpan': re.compile(r'(?`+).+?(?P=delim)'), 'HeaderLine': re.compile(r'(?u)^(-|=)+\s*$'), 'HR': re.compile(r'(?u)^(\s*(\*|-|_)\s*){3,}$'), - 'Html': re.compile('<.+?>') + 'Html': re.compile(r'<.+?(?') } key_theme_maps = {