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

Separate single and double quoted dialogue

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2024-11-03 21:14:36 +01:00
parent 2754f78083
commit 837d3060b8
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
novelwriter/text/patterns.py
+12 -12
View File
@@ -86,26 +86,26 @@ 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:
symO = "" end = "|$" if CONFIG.allowOpenDial else ""
symC = "" rx = []
if CONFIG.dialogStyle in (1, 3): if CONFIG.dialogStyle in (1, 3):
symO += CONFIG.fmtSQuoteOpen.strip()[:1] qO = CONFIG.fmtSQuoteOpen.strip()[:1]
symC += CONFIG.fmtSQuoteClose.strip()[:1] qC = CONFIG.fmtSQuoteClose.strip()[:1]
rx.append(f"(\\B{qO}.*?(?:{qC}\\B{end}))")
if CONFIG.dialogStyle in (2, 3): if CONFIG.dialogStyle in (2, 3):
symO += CONFIG.fmtDQuoteOpen.strip()[:1] qO = CONFIG.fmtDQuoteOpen.strip()[:1]
symC += CONFIG.fmtDQuoteClose.strip()[:1] qC = CONFIG.fmtDQuoteClose.strip()[:1]
rx.append(f"(\\B{qO}.*?(?:{qC}\\B{end}))")
rxEnd = "|$" if CONFIG.allowOpenDial else "" return re.compile("|".join(rx), re.UNICODE)
return re.compile(f"\\B[{symO}].*?(?:[{symC}]\\B{rxEnd})", re.UNICODE)
return None return None
@property @property
def altDialogStyle(self) -> re.Pattern | None: def altDialogStyle(self) -> re.Pattern | None:
"""Dialogue alternative rule based on user settings.""" """Dialogue alternative rule based on user settings."""
if CONFIG.altDialogOpen and CONFIG.altDialogClose: if CONFIG.altDialogOpen and CONFIG.altDialogClose:
symO = re.escape(compact(CONFIG.altDialogOpen)) qO = re.escape(compact(CONFIG.altDialogOpen))
symC = re.escape(compact(CONFIG.altDialogClose)) qC = re.escape(compact(CONFIG.altDialogClose))
return re.compile(f"\\B{symO}.*?{symC}\\B", re.UNICODE) return re.compile(f"\\B{qO}.*?{qC}\\B", re.UNICODE)
return None return None