Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename the regex constants

Browse Source
This commit is contained in:
Veronica K. B. Olsen
2020-10-14 18:13:42 +02:00
parent 366d601983
commit 1a0f37fa45
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nw/constants/constants.py
+2 -2
View File
@@ -41,8 +41,8 @@ class nwConst():
class nwRegEx(): class nwRegEx():
FMT_I = r"(?<![\w\\])(_)(?![\s_])(.+?)(?<![\s\\])(\1)(?!\w)" FMT_EI = r"(?<![\w\\])(_)(?![\s_])(.+?)(?<![\s\\])(\1)(?!\w)"
FMT_B = r"(?<![\w\\])([\*]{2})(?![\s\*])(.+?)(?<![\s\\])(\1)(?!\w)" FMT_EB = r"(?<![\w\\])([\*]{2})(?![\s\*])(.+?)(?<![\s\\])(\1)(?!\w)"
FMT_ST = r"(?<![\w\\])([~]{2})(?![\s~])(.+?)(?<![\s\\])(\1)(?!\w)" FMT_ST = r"(?<![\w\\])([~]{2})(?![\s~])(.+?)(?<![\s\\])(\1)(?!\w)"
# END Class nwRegEx # END Class nwRegEx
nw/core/tokenizer.py
+2 -2
View File
@@ -297,8 +297,8 @@ class Tokenizer():
""" """
# RegExes for adding formatting tags within text lines # RegExes for adding formatting tags within text lines
rxFormats = [ rxFormats = [
(QRegularExpression(nwRegEx.FMT_I), [None, self.FMT_I_B, None, self.FMT_I_E]), (QRegularExpression(nwRegEx.FMT_EI), [None, self.FMT_I_B, None, self.FMT_I_E]),
(QRegularExpression(nwRegEx.FMT_B), [None, self.FMT_B_B, None, self.FMT_B_E]), (QRegularExpression(nwRegEx.FMT_EB), [None, self.FMT_B_B, None, self.FMT_B_E]),
(QRegularExpression(nwRegEx.FMT_ST), [None, self.FMT_D_B, None, self.FMT_D_E]), (QRegularExpression(nwRegEx.FMT_ST), [None, self.FMT_D_B, None, self.FMT_D_E]),
] ]
nw/gui/dochighlight.py
+2 -2
View File
@@ -167,14 +167,14 @@ class GuiDocHighlighter(QSyntaxHighlighter):
# Markdown # Markdown
self.hRules.append(( self.hRules.append((
nwRegEx.FMT_I, { nwRegEx.FMT_EI, {
1 : self.hStyles["hidden"], 1 : self.hStyles["hidden"],
2 : self.hStyles["italic"], 2 : self.hStyles["italic"],
3 : self.hStyles["hidden"], 3 : self.hStyles["hidden"],
} }
)) ))
self.hRules.append(( self.hRules.append((
nwRegEx.FMT_B, { nwRegEx.FMT_EB, {
1 : self.hStyles["hidden"], 1 : self.hStyles["hidden"],
2 : self.hStyles["bold"], 2 : self.hStyles["bold"],
3 : self.hStyles["hidden"], 3 : self.hStyles["hidden"],