novelWriter 2.7.1__py3-none-any.whl → 2.7.2__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- novelwriter/__init__.py +3 -3
- novelwriter/assets/manual.pdf +0 -0
- novelwriter/assets/manual_fr.pdf +0 -0
- novelwriter/assets/sample.zip +0 -0
- novelwriter/config.py +2 -2
- novelwriter/constants.py +12 -19
- novelwriter/core/index.py +8 -6
- novelwriter/core/indexdata.py +9 -3
- novelwriter/formats/todocx.py +2 -2
- novelwriter/formats/tokenizer.py +45 -39
- novelwriter/formats/toqdoc.py +10 -8
- novelwriter/gui/docviewer.py +2 -0
- novelwriter/gui/noveltree.py +1 -0
- novelwriter/tools/manuscript.py +4 -7
- novelwriter/tools/manussettings.py +19 -15
- novelwriter/types.py +1 -0
- {novelwriter-2.7.1.dist-info → novelwriter-2.7.2.dist-info}/METADATA +2 -3
- {novelwriter-2.7.1.dist-info → novelwriter-2.7.2.dist-info}/RECORD +22 -22
- {novelwriter-2.7.1.dist-info → novelwriter-2.7.2.dist-info}/WHEEL +0 -0
- {novelwriter-2.7.1.dist-info → novelwriter-2.7.2.dist-info}/entry_points.txt +0 -0
- {novelwriter-2.7.1.dist-info → novelwriter-2.7.2.dist-info}/licenses/LICENSE.md +0 -0
- {novelwriter-2.7.1.dist-info → novelwriter-2.7.2.dist-info}/top_level.txt +0 -0
novelwriter/__init__.py
CHANGED
@@ -49,9 +49,9 @@ __license__ = "GPLv3"
|
|
49
49
|
__author__ = "Veronica Berglyd Olsen"
|
50
50
|
__maintainer__ = "Veronica Berglyd Olsen"
|
51
51
|
__email__ = "code@vkbo.net"
|
52
|
-
__version__ = "2.7.
|
53
|
-
__hexversion__ = "
|
54
|
-
__date__ = "2025-06-
|
52
|
+
__version__ = "2.7.2"
|
53
|
+
__hexversion__ = "0x020702f0"
|
54
|
+
__date__ = "2025-06-24"
|
55
55
|
__status__ = "Stable"
|
56
56
|
__domain__ = "novelwriter.io"
|
57
57
|
|
novelwriter/assets/manual.pdf
CHANGED
Binary file
|
novelwriter/assets/manual_fr.pdf
CHANGED
Binary file
|
novelwriter/assets/sample.zip
CHANGED
Binary file
|
novelwriter/config.py
CHANGED
@@ -44,7 +44,7 @@ from novelwriter.common import (
|
|
44
44
|
NWConfigParser, checkInt, checkPath, describeFont, fontMatcher,
|
45
45
|
formatTimeStamp, processDialogSymbols, simplified
|
46
46
|
)
|
47
|
-
from novelwriter.constants import nwFiles,
|
47
|
+
from novelwriter.constants import nwFiles, nwQuotes, nwUnicode
|
48
48
|
from novelwriter.error import formatException, logException
|
49
49
|
|
50
50
|
if TYPE_CHECKING:
|
@@ -892,7 +892,7 @@ class Config:
|
|
892
892
|
"""
|
893
893
|
self.splashMessage(f"Initialising {kind} font: {font.family()}")
|
894
894
|
metrics = QFontMetrics(font)
|
895
|
-
for char in
|
895
|
+
for char in nwUnicode.UI_SYMBOLS:
|
896
896
|
if not metrics.inFont(char): # type: ignore
|
897
897
|
logger.warning("No glyph U+%04x in font", ord(char)) # pragma: no cover
|
898
898
|
return
|
novelwriter/constants.py
CHANGED
@@ -586,21 +586,14 @@ class nwUnicode:
|
|
586
586
|
U_TIMES = "\u00d7" # Multiplication sign
|
587
587
|
U_DIVIDE = "\u00f7" # Division sign
|
588
588
|
|
589
|
-
# Arrows
|
590
|
-
U_UTRI = "\u25b2" # Up-pointing triangle
|
591
|
-
U_UTRIS = "\u25b4" # Up-pointing triangle, small
|
592
|
-
U_RTRI = "\u25b6" # Right-pointing triangle
|
593
|
-
U_RTRIS = "\u25b8" # Right-pointing triangle, small
|
594
|
-
U_DTRI = "\u25bc" # Down-pointing triangle
|
595
|
-
U_DTRIS = "\u25be" # Down-pointing triangle, small
|
596
|
-
U_LTRI = "\u25c0" # Left-pointing triangle
|
597
|
-
U_LTRIS = "\u25c2" # Left-pointing triangle, small
|
598
|
-
|
599
589
|
# Special
|
600
590
|
U_UNKN = "\ufffd" # Unknown character
|
601
591
|
U_NAC1 = "\ufffe" # Not a character
|
602
592
|
U_NAC2 = "\uffff" # Not a character
|
603
593
|
|
594
|
+
# Placeholders
|
595
|
+
U_LBREAK = "\u21b2" # Downwards Arrow With Tip Leftwards
|
596
|
+
|
604
597
|
# HTML Equivalents
|
605
598
|
# ================
|
606
599
|
|
@@ -655,15 +648,15 @@ class nwUnicode:
|
|
655
648
|
H_TIMES = "×"
|
656
649
|
H_DIVIDE = "÷"
|
657
650
|
|
658
|
-
#
|
659
|
-
|
660
|
-
|
661
|
-
|
662
|
-
|
663
|
-
|
664
|
-
|
665
|
-
|
666
|
-
|
651
|
+
# Unicode symbols expected to be used on the UI
|
652
|
+
UI_SYMBOLS: Final[list[str]] = [
|
653
|
+
U_QUOT, U_APOS, U_LAQUO, U_RAQUO, U_LSQUO, U_RSQUO, U_SBQUO, U_SUQUO,
|
654
|
+
U_LDQUO, U_RDQUO, U_BDQUO, U_UDQUO, U_LSAQUO, U_RSAQUO, U_BDRQUO,
|
655
|
+
U_LCQUO, U_RCQUO, U_LWCQUO, U_RWCQUO, U_FGDASH, U_ENDASH, U_EMDASH,
|
656
|
+
U_HBAR, U_HELLIP, U_MAPOS, U_PRIME, U_DPRIME, U_NBSP, U_THSP, U_THNBSP,
|
657
|
+
U_ENSP, U_EMSP, U_MMSP, U_CHECK, U_CROSS, U_BULL, U_TRBULL, U_HYBULL,
|
658
|
+
U_FLOWER, U_PERMIL, U_DEGREE, U_MINUS, U_TIMES, U_DIVIDE, U_LBREAK,
|
659
|
+
]
|
667
660
|
|
668
661
|
|
669
662
|
class nwHtmlUnicode:
|
novelwriter/core/index.py
CHANGED
@@ -708,17 +708,19 @@ class Index:
|
|
708
708
|
return 0, 0, 0
|
709
709
|
|
710
710
|
def getReferences(self, tHandle: str, sTitle: str | None = None) -> dict[str, list[str]]:
|
711
|
-
"""Extract all references made in a file, and
|
712
|
-
section.
|
711
|
+
"""Extract all tags and references made in a file, and
|
712
|
+
optionally title section.
|
713
713
|
"""
|
714
|
-
|
714
|
+
refs = {x: [] for x in nwKeyWords.VALID_KEYS}
|
715
715
|
for rTitle, hItem in self._itemIndex.iterItemHeaders(tHandle):
|
716
716
|
if sTitle is None or sTitle == rTitle:
|
717
717
|
for aTag, refTypes in hItem.references.items():
|
718
718
|
for refType in refTypes:
|
719
|
-
if refType in
|
720
|
-
|
721
|
-
|
719
|
+
if refType in refs:
|
720
|
+
refs[refType].append(self._tagsIndex.tagName(aTag))
|
721
|
+
if tag := hItem.tag:
|
722
|
+
refs[nwKeyWords.TAG_KEY] = [self._tagsIndex.tagName(tag)]
|
723
|
+
return refs
|
722
724
|
|
723
725
|
def getReferenceForHeader(self, tHandle: str, nHead: int, keyClass: str) -> list[str]:
|
724
726
|
"""Get the display names for a tags class for insertion into a
|
novelwriter/core/indexdata.py
CHANGED
@@ -342,20 +342,26 @@ class IndexHeading:
|
|
342
342
|
##
|
343
343
|
|
344
344
|
def getReferences(self) -> dict[str, list[str]]:
|
345
|
-
"""Extract all references for this heading."""
|
345
|
+
"""Extract all tags and references for this heading."""
|
346
346
|
refs = {x: [] for x in nwKeyWords.VALID_KEYS}
|
347
347
|
for tag, types in self._refs.items():
|
348
348
|
for keyword in types:
|
349
349
|
if keyword in refs and (name := self._cache.tags.tagName(tag)):
|
350
350
|
refs[keyword].append(name)
|
351
|
+
if name := self._cache.tags.tagName(self._tag):
|
352
|
+
refs[nwKeyWords.TAG_KEY] = [name]
|
351
353
|
return refs
|
352
354
|
|
353
355
|
def getReferencesByKeyword(self, keyword: str) -> list[str]:
|
354
356
|
"""Extract all references for this heading."""
|
355
357
|
refs = []
|
356
|
-
|
357
|
-
if
|
358
|
+
if keyword == nwKeyWords.TAG_KEY:
|
359
|
+
if name := self._cache.tags.tagName(self._tag):
|
358
360
|
refs.append(name)
|
361
|
+
else:
|
362
|
+
for tag, types in self._refs.items():
|
363
|
+
if keyword in types and (name := self._cache.tags.tagName(tag)):
|
364
|
+
refs.append(name)
|
359
365
|
return refs
|
360
366
|
|
361
367
|
##
|
novelwriter/formats/todocx.py
CHANGED
@@ -37,7 +37,7 @@ from PyQt6.QtCore import QMargins, QSize
|
|
37
37
|
from novelwriter import __version__
|
38
38
|
from novelwriter.common import firstFloat, xmlElement, xmlSubElem
|
39
39
|
from novelwriter.constants import nwHeadFmt, nwStyles
|
40
|
-
from novelwriter.formats.shared import BlockFmt, BlockTyp, T_Formats, TextFmt
|
40
|
+
from novelwriter.formats.shared import BlockFmt, BlockTyp, T_Formats, TextFmt, stripEscape
|
41
41
|
from novelwriter.formats.tokenizer import Tokenizer
|
42
42
|
from novelwriter.types import QtHexRgb
|
43
43
|
|
@@ -480,7 +480,7 @@ class ToDocX(Tokenizer):
|
|
480
480
|
xmlSubElem(rPr, _wTag("color"), attrib={W_VAL: _docXCol(color)})
|
481
481
|
|
482
482
|
if isinstance(text, str):
|
483
|
-
for segment in RX_TEXT.split(text):
|
483
|
+
for segment in RX_TEXT.split(stripEscape(text)):
|
484
484
|
if segment == "\n":
|
485
485
|
xmlSubElem(xR, _wTag("br"))
|
486
486
|
elif segment == "\t":
|
novelwriter/formats/tokenizer.py
CHANGED
@@ -495,12 +495,10 @@ class Tokenizer(ABC):
|
|
495
495
|
def doPreProcessing(self) -> None:
|
496
496
|
"""Run pre-processing jobs before the text is tokenized."""
|
497
497
|
# Process the user's auto-replace dictionary
|
498
|
-
if
|
499
|
-
|
500
|
-
for
|
501
|
-
|
502
|
-
xRep = re.compile("|".join([re.escape(k) for k in repDict.keys()]), flags=re.DOTALL)
|
503
|
-
self._text = xRep.sub(lambda x: repDict[x.group(0)], self._text)
|
498
|
+
if entry := self._project.data.autoReplace:
|
499
|
+
replace = {f"<{k}>": v for k, v in entry.items()}
|
500
|
+
rxRep = re.compile("|".join([re.escape(k) for k in replace]), flags=re.DOTALL)
|
501
|
+
self._text = rxRep.sub(lambda x: replace[x.group(0)], self._text)
|
504
502
|
return
|
505
503
|
|
506
504
|
def tokenizeText(self) -> None:
|
@@ -882,31 +880,21 @@ class Tokenizer(ABC):
|
|
882
880
|
if nBlock[0] != BlockTyp.TEXT:
|
883
881
|
# Next block is not text, so we add the buffer to blocks
|
884
882
|
nLines = len(pLines)
|
885
|
-
|
886
|
-
|
887
|
-
|
888
|
-
# turned off, and the block is not aligned, we add the
|
889
|
-
# text indentation flag
|
890
|
-
cStyle |= BlockFmt.IND_T
|
883
|
+
tFmt: T_Formats = []
|
884
|
+
pTxt = ""
|
885
|
+
cStyle = BlockFmt.NONE
|
891
886
|
|
892
887
|
if nLines == 1:
|
893
|
-
# The paragraph contains a single line
|
894
|
-
|
895
|
-
# enabled, and there is no alignment, we apply it.
|
896
|
-
if doJustify and not cStyle & BlockFmt.ALIGNED:
|
897
|
-
cStyle |= BlockFmt.JUSTIFY
|
898
|
-
|
888
|
+
# The paragraph contains a single line
|
889
|
+
tFmt = pLines[0][3]
|
899
890
|
pTxt = pLines[0][2].translate(transMapB)
|
900
|
-
|
901
|
-
BlockTyp.TEXT, pLines[0][1], pTxt, pLines[0][3], cStyle
|
902
|
-
))
|
891
|
+
cStyle = pLines[0][4]
|
903
892
|
|
904
893
|
elif nLines > 1:
|
905
894
|
# The paragraph contains multiple lines, so we need to
|
906
895
|
# join them according to the line break policy, and
|
907
896
|
# recompute all the formatting markers
|
908
897
|
tTxt = ""
|
909
|
-
tFmt: T_Formats = []
|
910
898
|
for aBlock in pLines:
|
911
899
|
tLen = len(tTxt)
|
912
900
|
tTxt += f"{aBlock[2]}{lineSep}"
|
@@ -914,6 +902,18 @@ class Tokenizer(ABC):
|
|
914
902
|
cStyle |= aBlock[4]
|
915
903
|
|
916
904
|
pTxt = tTxt[:-1].translate(transMapB)
|
905
|
+
|
906
|
+
if nLines:
|
907
|
+
isAligned = cStyle & BlockFmt.ALIGNED
|
908
|
+
if firstIndent and not (self._noIndent or isAligned):
|
909
|
+
# If paragraph indentation is enabled, not temporarily
|
910
|
+
# turned off, and the block is not aligned, we add the
|
911
|
+
# text indentation flag
|
912
|
+
cStyle |= BlockFmt.IND_T
|
913
|
+
|
914
|
+
if doJustify and not isAligned:
|
915
|
+
cStyle |= BlockFmt.JUSTIFY
|
916
|
+
|
917
917
|
sBlocks.append((
|
918
918
|
BlockTyp.TEXT, pLines[0][1], pTxt, tFmt, cStyle
|
919
919
|
))
|
@@ -1170,12 +1170,18 @@ class Tokenizer(ABC):
|
|
1170
1170
|
|
1171
1171
|
class HeadingFormatter:
|
1172
1172
|
|
1173
|
-
def __init__(
|
1173
|
+
def __init__(
|
1174
|
+
self,
|
1175
|
+
project: NWProject,
|
1176
|
+
chapter: int = 0,
|
1177
|
+
scene: int = 0,
|
1178
|
+
absolute: int = 0,
|
1179
|
+
) -> None:
|
1174
1180
|
self._project = project
|
1175
1181
|
self._handle = None
|
1176
|
-
self.
|
1177
|
-
self.
|
1178
|
-
self.
|
1182
|
+
self._chapter = chapter
|
1183
|
+
self._scene = scene
|
1184
|
+
self._absolute = absolute
|
1179
1185
|
return
|
1180
1186
|
|
1181
1187
|
def setHandle(self, tHandle: str | None) -> None:
|
@@ -1185,42 +1191,42 @@ class HeadingFormatter:
|
|
1185
1191
|
|
1186
1192
|
def incChapter(self) -> None:
|
1187
1193
|
"""Increment the chapter counter."""
|
1188
|
-
self.
|
1194
|
+
self._chapter += 1
|
1189
1195
|
return
|
1190
1196
|
|
1191
1197
|
def incScene(self) -> None:
|
1192
1198
|
"""Increment the scene counters."""
|
1193
|
-
self.
|
1194
|
-
self.
|
1199
|
+
self._scene += 1
|
1200
|
+
self._absolute += 1
|
1195
1201
|
return
|
1196
1202
|
|
1197
1203
|
def resetAll(self) -> None:
|
1198
1204
|
"""Reset all counters."""
|
1199
|
-
self.
|
1200
|
-
self.
|
1201
|
-
self.
|
1205
|
+
self._chapter = 0
|
1206
|
+
self._scene = 0
|
1207
|
+
self._absolute = 0
|
1202
1208
|
return
|
1203
1209
|
|
1204
1210
|
def resetScene(self) -> None:
|
1205
1211
|
"""Reset the chapter scene counter."""
|
1206
|
-
self.
|
1212
|
+
self._scene = 0
|
1207
1213
|
return
|
1208
1214
|
|
1209
1215
|
def apply(self, hFormat: str, text: str, nHead: int) -> str:
|
1210
1216
|
"""Apply formatting to a specific heading."""
|
1211
1217
|
hFormat = hFormat.replace(nwHeadFmt.TITLE, text)
|
1212
1218
|
hFormat = hFormat.replace(nwHeadFmt.BR, "\n")
|
1213
|
-
hFormat = hFormat.replace(nwHeadFmt.CH_NUM, str(self.
|
1214
|
-
hFormat = hFormat.replace(nwHeadFmt.SC_NUM, str(self.
|
1215
|
-
hFormat = hFormat.replace(nwHeadFmt.SC_ABS, str(self.
|
1219
|
+
hFormat = hFormat.replace(nwHeadFmt.CH_NUM, str(self._chapter))
|
1220
|
+
hFormat = hFormat.replace(nwHeadFmt.SC_NUM, str(self._scene))
|
1221
|
+
hFormat = hFormat.replace(nwHeadFmt.SC_ABS, str(self._absolute))
|
1216
1222
|
if nwHeadFmt.CH_WORD in hFormat:
|
1217
|
-
chWord = self._project.localLookup(self.
|
1223
|
+
chWord = self._project.localLookup(self._chapter)
|
1218
1224
|
hFormat = hFormat.replace(nwHeadFmt.CH_WORD, chWord)
|
1219
1225
|
if nwHeadFmt.CH_ROML in hFormat:
|
1220
|
-
chRom = numberToRoman(self.
|
1226
|
+
chRom = numberToRoman(self._chapter, toLower=True)
|
1221
1227
|
hFormat = hFormat.replace(nwHeadFmt.CH_ROML, chRom)
|
1222
1228
|
if nwHeadFmt.CH_ROMU in hFormat:
|
1223
|
-
chRom = numberToRoman(self.
|
1229
|
+
chRom = numberToRoman(self._chapter, toLower=False)
|
1224
1230
|
hFormat = hFormat.replace(nwHeadFmt.CH_ROMU, chRom)
|
1225
1231
|
|
1226
1232
|
if nwHeadFmt.CHAR_POV in hFormat or nwHeadFmt.CHAR_FOCUS in hFormat:
|
novelwriter/formats/toqdoc.py
CHANGED
@@ -36,12 +36,13 @@ from PyQt6.QtPrintSupport import QPrinter
|
|
36
36
|
|
37
37
|
from novelwriter import __version__
|
38
38
|
from novelwriter.constants import nwStyles, nwUnicode
|
39
|
-
from novelwriter.formats.shared import BlockFmt, BlockTyp, T_Formats, TextFmt
|
39
|
+
from novelwriter.formats.shared import BlockFmt, BlockTyp, T_Formats, TextFmt, stripEscape
|
40
40
|
from novelwriter.formats.tokenizer import HEADINGS, Tokenizer
|
41
41
|
from novelwriter.types import (
|
42
42
|
QtAlignAbsolute, QtAlignCenter, QtAlignJustify, QtAlignLeft, QtAlignRight,
|
43
|
-
QtKeepAnchor, QtMoveAnchor, QtPageBreakAfter,
|
44
|
-
QtPropLineHeight, QtTransparent, QtVAlignNormal,
|
43
|
+
QtKeepAnchor, QtMoveAnchor, QtPageBreakAfter, QtPageBreakAuto,
|
44
|
+
QtPageBreakBefore, QtPropLineHeight, QtTransparent, QtVAlignNormal,
|
45
|
+
QtVAlignSub, QtVAlignSuper
|
45
46
|
)
|
46
47
|
|
47
48
|
if TYPE_CHECKING:
|
@@ -253,8 +254,10 @@ class ToQTextDocument(Tokenizer):
|
|
253
254
|
|
254
255
|
elif tType in HEADINGS:
|
255
256
|
bFmt, cFmt = self._genHeadStyle(tType, tMeta, bFmt)
|
256
|
-
|
257
|
-
|
257
|
+
for tPart in tText.split("\n"):
|
258
|
+
newBlock(cursor, bFmt)
|
259
|
+
cursor.insertText(tPart, cFmt)
|
260
|
+
bFmt.setPageBreakPolicy(QtPageBreakAuto)
|
258
261
|
|
259
262
|
elif tType == BlockTyp.SEP:
|
260
263
|
newBlock(cursor, bFmt)
|
@@ -343,7 +346,7 @@ class ToQTextDocument(Tokenizer):
|
|
343
346
|
for pos, fmt, data in tFmt:
|
344
347
|
|
345
348
|
# Insert buffer with previous format
|
346
|
-
cursor.insertText(temp[start:pos], cFmt)
|
349
|
+
cursor.insertText(stripEscape(temp[start:pos]), cFmt)
|
347
350
|
|
348
351
|
# Construct next format
|
349
352
|
if fmt == TextFmt.B_B:
|
@@ -425,13 +428,12 @@ class ToQTextDocument(Tokenizer):
|
|
425
428
|
if field := data.partition(":")[2]:
|
426
429
|
self._usedFields.append((cursor.position(), field))
|
427
430
|
cursor.insertText("0", cFmt)
|
428
|
-
pass
|
429
431
|
|
430
432
|
# Move pos for next pass
|
431
433
|
start = pos
|
432
434
|
|
433
435
|
# Insert whatever is left in the buffer
|
434
|
-
cursor.insertText(temp[start:], cFmt)
|
436
|
+
cursor.insertText(stripEscape(temp[start:]), cFmt)
|
435
437
|
|
436
438
|
return
|
437
439
|
|
novelwriter/gui/docviewer.py
CHANGED
@@ -228,6 +228,8 @@ class GuiDocViewer(QTextBrowser):
|
|
228
228
|
qDoc.setTheme(self._docTheme)
|
229
229
|
qDoc.initDocument()
|
230
230
|
qDoc.setKeywords(True)
|
231
|
+
qDoc.setCommentType(nwComment.NOTE, CONFIG.viewComments)
|
232
|
+
qDoc.setCommentType(nwComment.STORY, CONFIG.viewComments)
|
231
233
|
qDoc.setCommentType(nwComment.PLAIN, CONFIG.viewComments)
|
232
234
|
qDoc.setCommentType(nwComment.SYNOPSIS, CONFIG.viewSynopsis)
|
233
235
|
qDoc.setCommentType(nwComment.SHORT, CONFIG.viewSynopsis)
|
novelwriter/gui/noveltree.py
CHANGED
@@ -593,6 +593,7 @@ class GuiNovelTree(NTreeView):
|
|
593
593
|
lines = []
|
594
594
|
if head := SHARED.project.index.getItemHeading(tHandle, sTitle):
|
595
595
|
tags = head.getReferences()
|
596
|
+
appendTags(tags, nwKeyWords.TAG_KEY, lines)
|
596
597
|
appendTags(tags, nwKeyWords.POV_KEY, lines)
|
597
598
|
appendTags(tags, nwKeyWords.FOCUS_KEY, lines)
|
598
599
|
appendTags(tags, nwKeyWords.CHAR_KEY, lines)
|
novelwriter/tools/manuscript.py
CHANGED
@@ -43,7 +43,7 @@ from PyQt6.QtWidgets import (
|
|
43
43
|
|
44
44
|
from novelwriter import CONFIG, SHARED
|
45
45
|
from novelwriter.common import fuzzyTime, qtLambda
|
46
|
-
from novelwriter.constants import nwLabels, nwStats, trStats
|
46
|
+
from novelwriter.constants import nwHeadFmt, nwLabels, nwStats, nwUnicode, trStats
|
47
47
|
from novelwriter.core.buildsettings import BuildCollection, BuildSettings
|
48
48
|
from novelwriter.core.docbuild import NWBuildDocument
|
49
49
|
from novelwriter.extensions.modified import NIconToggleButton, NIconToolButton, NToolDialog
|
@@ -595,11 +595,7 @@ class _DetailsWidget(QWidget):
|
|
595
595
|
item.addChild(sub)
|
596
596
|
|
597
597
|
# Headings
|
598
|
-
hFmt = HeadingFormatter(SHARED.project)
|
599
|
-
hFmt.incChapter()
|
600
|
-
hFmt.incScene()
|
601
|
-
hFmt.resetScene()
|
602
|
-
hFmt.incScene()
|
598
|
+
hFmt = HeadingFormatter(SHARED.project, 7, 5, 23)
|
603
599
|
title = self.tr("Title")
|
604
600
|
hidden = self.tr("Hidden")
|
605
601
|
|
@@ -620,7 +616,8 @@ class _DetailsWidget(QWidget):
|
|
620
616
|
if build.getBool(hHide):
|
621
617
|
sub.setText(1, f"[{hidden}]")
|
622
618
|
else:
|
623
|
-
|
619
|
+
preview = build.getStr(hFormat).replace(nwHeadFmt.BR, nwUnicode.U_LBREAK)
|
620
|
+
sub.setText(1, hFmt.apply(preview, title, 0))
|
624
621
|
item.addChild(sub)
|
625
622
|
|
626
623
|
# Text Content
|
@@ -38,7 +38,7 @@ from PyQt6.QtWidgets import (
|
|
38
38
|
|
39
39
|
from novelwriter import CONFIG, SHARED
|
40
40
|
from novelwriter.common import describeFont, fontMatcher, qtAddAction, qtLambda
|
41
|
-
from novelwriter.constants import nwHeadFmt, nwKeyWords, nwLabels, trConst
|
41
|
+
from novelwriter.constants import nwHeadFmt, nwKeyWords, nwLabels, nwUnicode, trConst
|
42
42
|
from novelwriter.core.buildsettings import BuildSettings, FilterMode
|
43
43
|
from novelwriter.extensions.configlayout import (
|
44
44
|
NColorLabel, NFixedPage, NScrollableForm, NScrollablePage
|
@@ -795,12 +795,15 @@ class _HeadingsTab(NScrollablePage):
|
|
795
795
|
|
796
796
|
def loadContent(self) -> None:
|
797
797
|
"""Populate the widgets."""
|
798
|
-
|
799
|
-
|
800
|
-
|
801
|
-
self.
|
802
|
-
self.
|
803
|
-
self.
|
798
|
+
def fmtBreak(text: str) -> str:
|
799
|
+
return text.replace(nwHeadFmt.BR, nwUnicode.U_LBREAK)
|
800
|
+
|
801
|
+
self.fmtPart.setText(fmtBreak(self._build.getStr("headings.fmtPart")))
|
802
|
+
self.fmtChapter.setText(fmtBreak(self._build.getStr("headings.fmtChapter")))
|
803
|
+
self.fmtUnnumbered.setText(fmtBreak(self._build.getStr("headings.fmtUnnumbered")))
|
804
|
+
self.fmtScene.setText(fmtBreak(self._build.getStr("headings.fmtScene")))
|
805
|
+
self.fmtAScene.setText(fmtBreak(self._build.getStr("headings.fmtAltScene")))
|
806
|
+
self.fmtSection.setText(fmtBreak(self._build.getStr("headings.fmtSection")))
|
804
807
|
|
805
808
|
self.swtPart.setChecked(self._build.getBool("headings.hidePart"))
|
806
809
|
self.swtChapter.setChecked(self._build.getBool("headings.hideChapter"))
|
@@ -880,7 +883,7 @@ class _HeadingsTab(NScrollablePage):
|
|
880
883
|
text = ""
|
881
884
|
label = self.tr("None")
|
882
885
|
|
883
|
-
self.editTextBox.setPlainText(text.replace(
|
886
|
+
self.editTextBox.setPlainText(text.replace(nwUnicode.U_LBREAK, "\n"))
|
884
887
|
self.lblEditForm.setText(self.tr("Editing: {0}").format(label))
|
885
888
|
|
886
889
|
return
|
@@ -893,25 +896,26 @@ class _HeadingsTab(NScrollablePage):
|
|
893
896
|
def _saveFormat(self) -> None:
|
894
897
|
"""Save the format from the edit text box."""
|
895
898
|
heading = self._editing
|
896
|
-
text = self.editTextBox.toPlainText().strip().replace("\n",
|
899
|
+
text = self.editTextBox.toPlainText().strip().replace("\n", nwUnicode.U_LBREAK)
|
900
|
+
value = text.replace(nwUnicode.U_LBREAK, nwHeadFmt.BR)
|
897
901
|
if heading == self.EDIT_TITLE:
|
898
902
|
self.fmtPart.setText(text)
|
899
|
-
self._build.setValue("headings.fmtPart",
|
903
|
+
self._build.setValue("headings.fmtPart", value)
|
900
904
|
elif heading == self.EDIT_CHAPTER:
|
901
905
|
self.fmtChapter.setText(text)
|
902
|
-
self._build.setValue("headings.fmtChapter",
|
906
|
+
self._build.setValue("headings.fmtChapter", value)
|
903
907
|
elif heading == self.EDIT_UNNUM:
|
904
908
|
self.fmtUnnumbered.setText(text)
|
905
|
-
self._build.setValue("headings.fmtUnnumbered",
|
909
|
+
self._build.setValue("headings.fmtUnnumbered", value)
|
906
910
|
elif heading == self.EDIT_SCENE:
|
907
911
|
self.fmtScene.setText(text)
|
908
|
-
self._build.setValue("headings.fmtScene",
|
912
|
+
self._build.setValue("headings.fmtScene", value)
|
909
913
|
elif heading == self.EDIT_HSCENE:
|
910
914
|
self.fmtAScene.setText(text)
|
911
|
-
self._build.setValue("headings.fmtAltScene",
|
915
|
+
self._build.setValue("headings.fmtAltScene", value)
|
912
916
|
elif heading == self.EDIT_SECTION:
|
913
917
|
self.fmtSection.setText(text)
|
914
|
-
self._build.setValue("headings.fmtSection",
|
918
|
+
self._build.setValue("headings.fmtSection", value)
|
915
919
|
else:
|
916
920
|
return
|
917
921
|
|
novelwriter/types.py
CHANGED
@@ -52,6 +52,7 @@ QtVAlignSuper = QTextCharFormat.VerticalAlignment.AlignSuperScript
|
|
52
52
|
|
53
53
|
QtPageBreakBefore = QTextFormat.PageBreakFlag.PageBreak_AlwaysBefore
|
54
54
|
QtPageBreakAfter = QTextFormat.PageBreakFlag.PageBreak_AlwaysAfter
|
55
|
+
QtPageBreakAuto = QTextFormat.PageBreakFlag.PageBreak_Auto
|
55
56
|
|
56
57
|
QtPropLineHeight = 1 # QTextBlockFormat.LineHeightTypes.ProportionalHeight
|
57
58
|
|
@@ -1,9 +1,9 @@
|
|
1
1
|
Metadata-Version: 2.4
|
2
2
|
Name: novelWriter
|
3
|
-
Version: 2.7.
|
3
|
+
Version: 2.7.2
|
4
4
|
Summary: A plain text editor for planning and writing novels
|
5
5
|
Author-email: Veronica Berglyd Olsen <code@vkbo.net>
|
6
|
-
License:
|
6
|
+
License-Expression: GPL-3.0
|
7
7
|
Project-URL: Homepage, https://novelwriter.io
|
8
8
|
Project-URL: Documentation, https://docs.novelwriter.io
|
9
9
|
Project-URL: Repository, https://github.com/vkbo/novelWriter
|
@@ -14,7 +14,6 @@ Classifier: Programming Language :: Python :: 3.11
|
|
14
14
|
Classifier: Programming Language :: Python :: 3.12
|
15
15
|
Classifier: Programming Language :: Python :: 3.13
|
16
16
|
Classifier: Programming Language :: Python :: Implementation :: CPython
|
17
|
-
Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
|
18
17
|
Classifier: Development Status :: 5 - Production/Stable
|
19
18
|
Classifier: Operating System :: OS Independent
|
20
19
|
Classifier: Intended Audience :: End Users/Desktop
|
@@ -1,16 +1,16 @@
|
|
1
|
-
novelwriter/__init__.py,sha256=
|
1
|
+
novelwriter/__init__.py,sha256=o6wvJgoXi9r4JQio7x0dg0lOAy1teJSjQB9DOz6PGkI,9566
|
2
2
|
novelwriter/common.py,sha256=Z2n4CNZMotBYNNOqGPzXFfyAALh5eHtV3VtSyJaeBIU,22135
|
3
|
-
novelwriter/config.py,sha256=
|
4
|
-
novelwriter/constants.py,sha256=
|
3
|
+
novelwriter/config.py,sha256=PXzcruFnFuqS4zH9RJ0hf0oUs9Vndo-i6aPOBzadsp0,44643
|
4
|
+
novelwriter/constants.py,sha256=j_Z3cb-_wW7_cxzTdoRVR9JvmYbioLAp8Dh9TluFJSQ,28827
|
5
5
|
novelwriter/enum.py,sha256=_T1Un3H1SmpfHUw1CEPZuXSKJNT6RQWeN6N5p8yBx8E,3724
|
6
6
|
novelwriter/error.py,sha256=HPKDJb0NPTyVRsrPNG_I1-XfLXlvYAJuE2Xi7maWvXM,6828
|
7
7
|
novelwriter/guimain.py,sha256=luIw3434s92wEuU4gKkerp0MQGtD_hDlCVY6ioZu0LQ,50293
|
8
8
|
novelwriter/shared.py,sha256=8JTkFi7QXmQddGNVaSBIvKPfDXLaJ9XWNmUJblpfXvs,17795
|
9
9
|
novelwriter/splash.py,sha256=rK71vO7NG2NETTf1vvQiWRHfkHonf2Z0xhLj_LF_wj8,2237
|
10
|
-
novelwriter/types.py,sha256=
|
11
|
-
novelwriter/assets/manual.pdf,sha256=
|
12
|
-
novelwriter/assets/manual_fr.pdf,sha256=
|
13
|
-
novelwriter/assets/sample.zip,sha256=
|
10
|
+
novelwriter/types.py,sha256=OKugWeCJfxo2JHE_HGA-742nav-ucSPYRI33c9NJqsg,5170
|
11
|
+
novelwriter/assets/manual.pdf,sha256=6Mk9l9LH3cXyIa2j2n5ijD8Z8rV9_dLU4TDJuKl6zWs,2130791
|
12
|
+
novelwriter/assets/manual_fr.pdf,sha256=loUjnjQBX8ivzoq9bhmQoY7vkG9ozosJ-on7duvByqU,2189719
|
13
|
+
novelwriter/assets/sample.zip,sha256=NxXcUM6EHjhhix4No9-7GTl64_JEGXph_KQmZYmKQak,13987
|
14
14
|
novelwriter/assets/i18n/nw_cs_CZ.qm,sha256=EHgCgH3OY_NM1zEnLy3wO7kxARpWk7daTALcBtzuEKw,100334
|
15
15
|
novelwriter/assets/i18n/nw_de_DE.qm,sha256=VwyhNBVst94jlAsdsyUbzj4_ucGX6QLp16wve2jlCjg,105152
|
16
16
|
novelwriter/assets/i18n/nw_en_US.qm,sha256=rK_f6bhwlzqLygB9xfQr9mPLDZAPmutYHr3vie-Kf5k,98000
|
@@ -89,8 +89,8 @@ novelwriter/core/buildsettings.py,sha256=9dqXlV6oVYe2UmqSrx54PFqvRYcjOJmJEIaFmqj
|
|
89
89
|
novelwriter/core/coretools.py,sha256=u82B7foOTbkoRXDVshL_Htlup6svTQU6eiIWeJsfsEA,21515
|
90
90
|
novelwriter/core/docbuild.py,sha256=D7YF2aGhpDZ1gGkL8mzXxH1SSilfhoZDy9PVCGZf6s0,14173
|
91
91
|
novelwriter/core/document.py,sha256=AA6Fhwi9Q-UtAFYXjMUXSU-cQF2jogScqPJ5sNaRbEI,12139
|
92
|
-
novelwriter/core/index.py,sha256=
|
93
|
-
novelwriter/core/indexdata.py,sha256=
|
92
|
+
novelwriter/core/index.py,sha256=Gzg1Co_oNFVx_yBqIN--f-yWGxP6OVH67DsME0-A2qU,41319
|
93
|
+
novelwriter/core/indexdata.py,sha256=4FX4DJHfTpJPhiOilPpKVAuj5iDh6OGFI89Z_fQdLE0,13458
|
94
94
|
novelwriter/core/item.py,sha256=4fu4bKIqqCmQamyQnY0LUCO8p0qg371xIQbrVZrxCPU,19677
|
95
95
|
novelwriter/core/itemmodel.py,sha256=wVRUjT_0FGEAzkZFNo4fgCMR4hlQfny2og3gPE3kd8Q,18472
|
96
96
|
novelwriter/core/novelmodel.py,sha256=lAtxerg-BuRydJTqwNggPFoYamTrJc4Z-GVXwq_2zwo,7414
|
@@ -122,21 +122,21 @@ novelwriter/extensions/switch.py,sha256=dfsZtJsXvqzkgkCQHRSjNfT6S4P3zy4UmTJ3CKpY
|
|
122
122
|
novelwriter/extensions/switchbox.py,sha256=QIBgy75OeVwmu53A1sOhlrarSlRH6TxSQNkIyoqFc9Q,4311
|
123
123
|
novelwriter/extensions/versioninfo.py,sha256=8DTvtu4sFPCioY7L-3rK1_sAN1qod3XwXl3F4LtKbDY,5046
|
124
124
|
novelwriter/formats/shared.py,sha256=I_MfvU9ZuN23WblDXdggiV282cXuPDpkq72M3MyK-G8,4666
|
125
|
-
novelwriter/formats/todocx.py,sha256=
|
125
|
+
novelwriter/formats/todocx.py,sha256=8N7UlA-c-NCOmiRu0XmyEcxndGbKacjI52I7ZzQ7eXI,40368
|
126
126
|
novelwriter/formats/tohtml.py,sha256=04OjlD_kZJyWBIuUc2olX-jSVh89_lLctST89gWIQMw,17153
|
127
|
-
novelwriter/formats/tokenizer.py,sha256=
|
127
|
+
novelwriter/formats/tokenizer.py,sha256=IrkeFgiUYqltTVk1Y5munfoV9BPHpAcOdqpGljc1qGE,48550
|
128
128
|
novelwriter/formats/tomarkdown.py,sha256=CN9mJRwqoit1c9rOHwsqBZEpPjEWYvh81IVgttUxtEU,7044
|
129
129
|
novelwriter/formats/toodt.py,sha256=LuzN8vE46mclcfpOs9QZcElXDVOx14wjyKPkOQE6KYQ,58672
|
130
|
-
novelwriter/formats/toqdoc.py,sha256
|
130
|
+
novelwriter/formats/toqdoc.py,sha256=aJGFhq482p7lxr72bCidd2KkpkNH0mcsQvV2AcI1zgo,18315
|
131
131
|
novelwriter/formats/toraw.py,sha256=6qLNvDc87t6c25j1H2IL9whajp1u-SOnHFk9c4gV_7E,2903
|
132
132
|
novelwriter/gui/doceditor.py,sha256=yTi2w289ONN-0YJBUFSPXZXMl2tENo78u0X3HoxCAnA,117541
|
133
133
|
novelwriter/gui/dochighlight.py,sha256=DDCEK9iKUBd5miScrJCj9NlRj3sdOgD_bY8_4ARsSMg,19576
|
134
|
-
novelwriter/gui/docviewer.py,sha256=
|
134
|
+
novelwriter/gui/docviewer.py,sha256=7r24roJ1NcGAXC022Yo3wqdwb3AgpCkX65vN7xxQja8,34569
|
135
135
|
novelwriter/gui/docviewerpanel.py,sha256=m5e9hO5dgV729RnOEJzNzCOU2CB3vPzp4TB4HKgTjGA,19361
|
136
136
|
novelwriter/gui/editordocument.py,sha256=SPWulwJEsG_m_d7cJzAa8fhWmNKLGNPfI-Lsq_mF9CU,4774
|
137
137
|
novelwriter/gui/itemdetails.py,sha256=3mwtSGmOwKkFsFQi6ydmkaPaT4Eecg4fetkG6TduPWk,9605
|
138
138
|
novelwriter/gui/mainmenu.py,sha256=toBoa8tuSKuFrCClGdyI2jVF82kp3V2ZWC3W4xzrfFU,42043
|
139
|
-
novelwriter/gui/noveltree.py,sha256
|
139
|
+
novelwriter/gui/noveltree.py,sha256=HWM1DV6rqRGoJ_5DdQXm9Q99iXWOv5ZuXGPshRWJalA,20758
|
140
140
|
novelwriter/gui/outline.py,sha256=T4hxb_qjn_tl3e_mcBvr5X-PUZjBRYJo4Oga4nQ3FHg,41786
|
141
141
|
novelwriter/gui/projtree.py,sha256=ACteHsSp0Od6s3d9nMxsJwpsCfWCEiewIMZhTujxWH0,53760
|
142
142
|
novelwriter/gui/search.py,sha256=UsqOoDBdgFNxIN2hOSBJppTiJ31OTuoscNpQarNtnDo,13107
|
@@ -149,14 +149,14 @@ novelwriter/text/patterns.py,sha256=ewlKV9IiKMlLZj4tJk2noSh8V5fzyDK9Cn_vmXo7eEk,
|
|
149
149
|
novelwriter/tools/dictionaries.py,sha256=ItM080yCoB5lgcovwUU1AO6usDFBRQpcV1UG0KGFvek,8932
|
150
150
|
novelwriter/tools/lipsum.py,sha256=tYSKrrtqCFlpCzXizgiVcG75Zud1hRhoPwtFpKPLL-0,4842
|
151
151
|
novelwriter/tools/manusbuild.py,sha256=FcM36eukyaWTI7G5Yb5bOShoZhoqSHCvJtmmhYng4Eo,13814
|
152
|
-
novelwriter/tools/manuscript.py,sha256=
|
153
|
-
novelwriter/tools/manussettings.py,sha256=
|
152
|
+
novelwriter/tools/manuscript.py,sha256=cnTkXgaLlGcXFKJo5UG2fFhKlzfc9zGvEinfzetf91E,39567
|
153
|
+
novelwriter/tools/manussettings.py,sha256=pQhugOCzL957M7pqT2szajZzNgnWWA1qFiIHex0RDyQ,62707
|
154
154
|
novelwriter/tools/noveldetails.py,sha256=4BVi3Pc6HNJlYcYnyHKiIuR23uKZ9elNZOcJJOoLlAw,18067
|
155
155
|
novelwriter/tools/welcome.py,sha256=f657EWmQxe3l2sRL3Wq1A9R5mnFciivAF5TDbsUlsRc,27431
|
156
156
|
novelwriter/tools/writingstats.py,sha256=3U4dUlaeNR16E_Kxo5am8ov3ICH0j6S48FLJ-IptHDI,23161
|
157
|
-
novelwriter-2.7.
|
158
|
-
novelwriter-2.7.
|
159
|
-
novelwriter-2.7.
|
160
|
-
novelwriter-2.7.
|
161
|
-
novelwriter-2.7.
|
162
|
-
novelwriter-2.7.
|
157
|
+
novelwriter-2.7.2.dist-info/licenses/LICENSE.md,sha256=2GirkkLrPfQqx7fACKRJjtKJUegKc8067erGvcDVQHM,32197
|
158
|
+
novelwriter-2.7.2.dist-info/METADATA,sha256=eCH_hT1p3s1ABiIDhMZqYDHIC2lslcwPM7i75kxlIWs,2458
|
159
|
+
novelwriter-2.7.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
|
160
|
+
novelwriter-2.7.2.dist-info/entry_points.txt,sha256=YDUG1w361LtLsjD3YhxoTDTwM17JA5-nigjC6j5C74A,45
|
161
|
+
novelwriter-2.7.2.dist-info/top_level.txt,sha256=wFFEucjEeNC_Ap5ULBuEutg5a1Uc0-YO9uFT5L2naNI,12
|
162
|
+
novelwriter-2.7.2.dist-info/RECORD,,
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|