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

Also in the tokenizer

Browse Source
This commit is contained in:
Veronica K. B. Olsen
2020-06-13 10:08:35 +02:00
parent 49049e19d8
commit 31ca1718a0
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nw/core/tokenizer.py
+6 -12
View File
@@ -34,7 +34,7 @@ from PyQt5.QtCore import QRegularExpression
from nw.core.document import NWDoc from nw.core.document import NWDoc
from nw.core.tools import numberToWord from nw.core.tools import numberToWord
from nw.constants import nwItemLayout, nwItemType from nw.constants import nwItemLayout, nwItemType, nwRegEx
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -298,17 +298,11 @@ class Tokenizer():
""" """
# RegExes for adding formatting tags within text lines # RegExes for adding formatting tags within text lines
# Keep in sync with the DocHighlighter class rxFormats = [
rxFormats = [( (QRegularExpression(nwRegEx.FMT_BI), [None, self.FMT_S_B, None, self.FMT_S_E]),
QRegularExpression(r"(?<![\w|\*|\\])([\*]{3})(?!\s|\*)(.+?)(?<![\s|\\])(\1)(?!\w)"), (QRegularExpression(nwRegEx.FMT_B), [None, self.FMT_B_B, None, self.FMT_B_E]),
[None, self.FMT_S_B, None, self.FMT_S_E] (QRegularExpression(nwRegEx.FMT_I), [None, self.FMT_I_B, None, self.FMT_I_E]),
),( ]
QRegularExpression(r"(?<![\w|\*|\\])([\*]{2})(?!\s|\*)(.+?)(?<![\s|\\])(\1)(?!\w)"),
[None, self.FMT_B_B, None, self.FMT_B_E]
),(
QRegularExpression(r"(?<![\w|\*|\\])([\*])(?!\s|\1)(.+?)(?<![\s|\\])(\1)(?!\w)"),
[None, self.FMT_I_B, None, self.FMT_I_E]
)]
self.theTokens = [] self.theTokens = []
self.theMarkdown = "" self.theMarkdown = ""