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

Restructure dialogue detection from quotes

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2024-12-23 14:19:47 +01:00
parent 3d858ed9ab
commit 97903993c8
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
novelwriter/text/patterns.py
+15 -8
View File
@@ -30,11 +30,11 @@ from novelwriter import CONFIG
from novelwriter.common import compact, uniqueCompact from novelwriter.common import compact, uniqueCompact
from novelwriter.constants import nwRegEx, nwUnicode from novelwriter.constants import nwRegEx, nwUnicode
AMBIGUOUS = (nwUnicode.U_APOS, nwUnicode.U_RSQUO)
class RegExPatterns: class RegExPatterns:
AMBIGUOUS = (nwUnicode.U_APOS, nwUnicode.U_RSQUO)
# Static RegExes # Static RegExes
_rxUrl = re.compile(nwRegEx.URL, re.ASCII) _rxUrl = re.compile(nwRegEx.URL, re.ASCII)
_rxWords = re.compile(nwRegEx.WORDS, re.UNICODE) _rxWords = re.compile(nwRegEx.WORDS, re.UNICODE)
@@ -89,18 +89,25 @@ class RegExPatterns:
def dialogStyle(self) -> re.Pattern | None: def dialogStyle(self) -> re.Pattern | None:
"""Dialogue detection rule based on user settings.""" """Dialogue detection rule based on user settings."""
if CONFIG.dialogStyle > 0: if CONFIG.dialogStyle > 0:
end = "|$" if CONFIG.allowOpenDial else ""
rx = [] rx = []
if CONFIG.dialogStyle in (1, 3): if CONFIG.dialogStyle in (1, 3):
qO = CONFIG.fmtSQuoteOpen.strip()[:1] qO = CONFIG.fmtSQuoteOpen.strip()[:1]
qC = CONFIG.fmtSQuoteClose.strip()[:1] qC = CONFIG.fmtSQuoteClose.strip()[:1]
qB = r"\B" if (qO == qC or qC in AMBIGUOUS) else "" if qO == qC:
rx.append(f"(?:{qO}.*?(?:{qC}{qB}{end}))") rx.append(f"(?:\\B{qO}.+?{qC}\\B)")
else:
rx.append(f"(?:{qO}[^{qO}]+{qC})")
if CONFIG.allowOpenDial:
rx.append(f"(?:{qO}.+?$)")
if CONFIG.dialogStyle in (2, 3): if CONFIG.dialogStyle in (2, 3):
qO = CONFIG.fmtDQuoteOpen.strip()[:1] qO = CONFIG.fmtDQuoteOpen.strip()[:1]
qC = CONFIG.fmtDQuoteClose.strip()[:1] qC = CONFIG.fmtDQuoteClose.strip()[:1]
qB = r"\B" if (qO == qC or qC in AMBIGUOUS) else "" if qO == qC:
rx.append(f"(?:{qO}.*?(?:{qC}{qB}{end}))") rx.append(f"(?:\\B{qO}.+?{qC}\\B)")
else:
rx.append(f"(?:{qO}[^{qO}]+{qC})")
if CONFIG.allowOpenDial:
rx.append(f"(?:{qO}.+?$)")
return re.compile("|".join(rx), re.UNICODE) return re.compile("|".join(rx), re.UNICODE)
return None return None
@@ -110,7 +117,7 @@ class RegExPatterns:
if CONFIG.altDialogOpen and CONFIG.altDialogClose: if CONFIG.altDialogOpen and CONFIG.altDialogClose:
qO = re.escape(compact(CONFIG.altDialogOpen)) qO = re.escape(compact(CONFIG.altDialogOpen))
qC = re.escape(compact(CONFIG.altDialogClose)) qC = re.escape(compact(CONFIG.altDialogClose))
qB = r"\B" if (qO == qC or qC in AMBIGUOUS) else "" qB = r"\B" if (qO == qC or qC in self.AMBIGUOUS) else ""
return re.compile(f"{qO}.*?{qC}{qB}", re.UNICODE) return re.compile(f"{qO}.*?{qC}{qB}", re.UNICODE)
return None return None