regex tweak

This commit is contained in:
un-pogaz 2023-04-30 17:14:15 +02:00
parent c67cdd02bc
commit 9d764697ca

View File

@ -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<delim>\*\*)(?P<text>.+?)(?P=delim)'),
'uBold': re.compile('(?P<delim>__)(?P<text>.+?)(?P=delim)'),
'Italic': re.compile(r'(?P<delim>\*)(?P<text>([^*]{2,}?|[^*]))(?P=delim)'),
'uItalic': re.compile('(?P<delim>_)(?P<text>([^_]{2,}?|[^_]))(?P=delim)'),
'BoldItalic': re.compile(r'(?P<delim>\*\*\*)(?P<text>([^*]{2,}?|[^*]))(?P=delim)'),
'uBoldItalic': re.compile(r'(?P<delim>___)(?P<text>([^_]{2,}?|[^_]))(?P=delim)'),
'Link': re.compile(r'(?u)(?<!!)\[.*?\](\[.+?\]|\(.+?\))'),
'Image': re.compile(r'(?u)!\[.*?\](\[.+?\]|\(.+?\))'),
'Bold' : re.compile(r'(?<!\\)(?P<delim>\*\*)(?P<text>.+?)(?P=delim)'),
'uBold': re.compile(r'(?<!\\)(?P<delim>__)(?P<text>.+?)(?P=delim)'),
'Italic': re.compile(r'(?<!\\)(?P<delim>\*)(?P<text>([^*]{2,}?|[^*]))(?P=delim)'),
'uItalic': re.compile(r'(?<!\\)(?P<delim>_)(?P<text>([^_]{2,}?|[^_]))(?P=delim)'),
'BoldItalic': re.compile(r'(?<!\\)(?P<delim>\*\*\*)(?P<text>([^*]{2,}?|[^*]))(?P=delim)'),
'uBoldItalic': re.compile(r'(?<!\\)(?P<delim>___)(?P<text>([^_]{2,}?|[^_]))(?P=delim)'),
'Link': re.compile(r'(?u)(?<![!\\]])\[.*?(?<!\\)\](\[.+?(?<!\\)\]|\(.+?(?<!\\)\))'),
'Image': re.compile(r'(?u)(?<!\\)!\[.*?(?<!\\)\](\[.+?(?<!\\)\]|\(.+?(?<!\\)\))'),
'LinkRef': re.compile(r'(?u)^ *\[.*?\]:[ \t]*.*$'),
'HeaderAtx': re.compile(r'(?u)^\#{1,6}(.*?)\#*(''\n|$)'),
'Header': re.compile('^(.+)[ \t]*\n(=+|-+)[ \t]*\n+'),
@ -29,12 +29,12 @@ class MarkdownHighlighter(QSyntaxHighlighter):
'UnorderedList': re.compile(r'(?u)^\s*(\* |\+ |- )+\s*'),
'UnorderedListStar': re.compile(r'^\s*(\* )+\s*'),
'OrderedList': re.compile(r'(?u)^\s*(\d+\. )\s*'),
'BlockQuote': re.compile(r'(?u)^\s*>+\s*'),
'BlockQuoteCount': re.compile('^[ \t]*>[ \t]?'),
'CodeSpan': re.compile('(?P<delim>`+).+?(?P=delim)'),
'BlockQuote': re.compile(r'(?u)^([ ]{0,3}>)+\s*'),
'BlockQuoteCount': re.compile(r'^[ ]{0,3}>[ \t]?'),
'CodeSpan': re.compile(r'(?<!\\)(?P<delim>`+).+?(?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 = {