From 31ca1718a07f9352c483e7cf1f6eeaaec6c13e88 Mon Sep 17 00:00:00 2001
From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com>
Date: Sat, 13 Jun 2020 10:08:35 +0200
Subject: [PATCH] Also in the tokenizer

---
 nw/core/tokenizer.py | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/nw/core/tokenizer.py b/nw/core/tokenizer.py
index 1335ed23..b9c283cc 100644
--- a/nw/core/tokenizer.py
+++ b/nw/core/tokenizer.py
@@ -34,7 +34,7 @@ from PyQt5.QtCore import QRegularExpression
 
 from nw.core.document import NWDoc
 from nw.core.tools import numberToWord
-from nw.constants import nwItemLayout, nwItemType
+from nw.constants import nwItemLayout, nwItemType, nwRegEx
 
 logger = logging.getLogger(__name__)
 
@@ -298,17 +298,11 @@ class Tokenizer():
         """
 
         # RegExes for adding formatting tags within text lines
-        # Keep in sync with the DocHighlighter class
-        rxFormats = [(
-            QRegularExpression(r"(?<![\w|\*|\\])([\*]{3})(?!\s|\*)(.+?)(?<![\s|\\])(\1)(?!\w)"),
-            [None, self.FMT_S_B, None, self.FMT_S_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]
-        )]
+        rxFormats = [
+            (QRegularExpression(nwRegEx.FMT_BI), [None, self.FMT_S_B, None, self.FMT_S_E]),
+            (QRegularExpression(nwRegEx.FMT_B),  [None, self.FMT_B_B, None, self.FMT_B_E]),
+            (QRegularExpression(nwRegEx.FMT_I),  [None, self.FMT_I_B, None, self.FMT_I_E]),
+        ]
 
         self.theTokens = []
         self.theMarkdown = ""