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

Process escapes in docx and qdoc classes (#2410)

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2025-06-16 18:50:21 +02:00
parent 8c38bece3a
commit 5bc39d29eb
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
novelwriter/formats/todocx.py
+2 -2
View File
@@ -37,7 +37,7 @@ from PyQt6.QtCore import QMargins, QSize
from novelwriter import __version__ from novelwriter import __version__
from novelwriter.common import firstFloat, xmlElement, xmlSubElem from novelwriter.common import firstFloat, xmlElement, xmlSubElem
from novelwriter.constants import nwHeadFmt, nwStyles from novelwriter.constants import nwHeadFmt, nwStyles
from novelwriter.formats.shared import BlockFmt, BlockTyp, T_Formats, TextFmt from novelwriter.formats.shared import BlockFmt, BlockTyp, T_Formats, TextFmt, stripEscape
from novelwriter.formats.tokenizer import Tokenizer from novelwriter.formats.tokenizer import Tokenizer
from novelwriter.types import QtHexRgb from novelwriter.types import QtHexRgb
@@ -480,7 +480,7 @@ class ToDocX(Tokenizer):
xmlSubElem(rPr, _wTag("color"), attrib={W_VAL: _docXCol(color)}) xmlSubElem(rPr, _wTag("color"), attrib={W_VAL: _docXCol(color)})
if isinstance(text, str): if isinstance(text, str):
for segment in RX_TEXT.split(text): for segment in RX_TEXT.split(stripEscape(text)):
if segment == "\n": if segment == "\n":
xmlSubElem(xR, _wTag("br")) xmlSubElem(xR, _wTag("br"))
elif segment == "\t": elif segment == "\t":
novelwriter/formats/toqdoc.py
+3 -4
View File
@@ -36,7 +36,7 @@ from PyQt6.QtPrintSupport import QPrinter
from novelwriter import __version__ from novelwriter import __version__
from novelwriter.constants import nwStyles, nwUnicode from novelwriter.constants import nwStyles, nwUnicode
from novelwriter.formats.shared import BlockFmt, BlockTyp, T_Formats, TextFmt from novelwriter.formats.shared import BlockFmt, BlockTyp, T_Formats, TextFmt, stripEscape
from novelwriter.formats.tokenizer import HEADINGS, Tokenizer from novelwriter.formats.tokenizer import HEADINGS, Tokenizer
from novelwriter.types import ( from novelwriter.types import (
QtAlignAbsolute, QtAlignCenter, QtAlignJustify, QtAlignLeft, QtAlignRight, QtAlignAbsolute, QtAlignCenter, QtAlignJustify, QtAlignLeft, QtAlignRight,
@@ -343,7 +343,7 @@ class ToQTextDocument(Tokenizer):
for pos, fmt, data in tFmt: for pos, fmt, data in tFmt:
# Insert buffer with previous format # Insert buffer with previous format
cursor.insertText(temp[start:pos], cFmt) cursor.insertText(stripEscape(temp[start:pos]), cFmt)
# Construct next format # Construct next format
if fmt == TextFmt.B_B: if fmt == TextFmt.B_B:
@@ -425,13 +425,12 @@ class ToQTextDocument(Tokenizer):
if field := data.partition(":")[2]: if field := data.partition(":")[2]:
self._usedFields.append((cursor.position(), field)) self._usedFields.append((cursor.position(), field))
cursor.insertText("0", cFmt) cursor.insertText("0", cFmt)
pass
# Move pos for next pass # Move pos for next pass
start = pos start = pos
# Insert whatever is left in the buffer # Insert whatever is left in the buffer
cursor.insertText(temp[start:], cFmt) cursor.insertText(stripEscape(temp[start:]), cFmt)
return return