Improve single quote dialogue highlighting (#2300)

novelwriter/gui/dochighlight.py

@@ -505,7 +505,7 @@ class TextBlockData(QTextBlockUserData):
                     text = f"{text[:s]}{pad}{text[e:]}"
                     self._metaData.append((s, e, res.group(0), "url"))
 
-        self._text = text
+        self._text = text.replace("\u02bc", "'")
         self._offset = offset
 
         return

novelwriter/text/patterns.py

@@ -93,7 +93,7 @@ class RegExPatterns:
             if CONFIG.dialogStyle in (1, 3):
                 qO = CONFIG.fmtSQuoteOpen.strip()[:1]
                 qC = CONFIG.fmtSQuoteClose.strip()[:1]
-                if qO == qC:
+                if qO == qC or qC in self.AMBIGUOUS:
                     rx.append(f"(?:\\B{qO}.+?{qC}\\B)")
                 else:
                     rx.append(f"(?:{qO}[^{qO}]+{qC})")
@@ -102,7 +102,7 @@ class RegExPatterns:
             if CONFIG.dialogStyle in (2, 3):
                 qO = CONFIG.fmtDQuoteOpen.strip()[:1]
                 qC = CONFIG.fmtDQuoteClose.strip()[:1]
-                if qO == qC:
+                if qO == qC or qC in self.AMBIGUOUS:
                     rx.append(f"(?:\\B{qO}.+?{qC}\\B)")
                 else:
                     rx.append(f"(?:{qO}[^{qO}]+{qC})")

tests/test_text/test_text_patterns.py

@@ -310,11 +310,11 @@ def testTextPatterns_DialogueStyle():
     assert allMatches(regEx, 'one "two" three') == []
 
     # Check with no whitespace, single quote
-    assert allMatches(regEx, "one\u2018two\u2019three") == [
-        [("\u2018two\u2019", 3, 8)]
-    ]
-    assert allMatches(regEx, "one\u2018two\u2019 three") == [
-        [("\u2018two\u2019", 3, 8)]
+    # The apostrophe ambiguity rule should kick in here
+    assert allMatches(regEx, "one\u2018two\u2019three") == []
+    assert allMatches(regEx, "one\u2018two\u2019 three") == []
+    assert allMatches(regEx, "one \u2018two\u02bc three\u2019 four") == [
+        [("\u2018two\u02bc three\u2019", 4, 16)],
     ]
 
     # Check with no whitespace, double quote