Handle text justify in Tokenizer instead

novelwriter/formats/todocx.py

@@ -255,8 +255,6 @@ class ToDocX(Tokenizer):
 
             # Process Text Types
             if tType == self.T_TEXT:
-                if self._doJustify and "\n" in tText:
-                    par.overrideJustify(self._defaultAlign)
                 self._processFragments(par, S_NORM, tText, tFormat)
 
             elif tType == self.T_TITLE:
@@ -544,7 +542,6 @@ class ToDocX(Tokenizer):
         fSz2 = (nwStyles.H_SIZES[2] * fSz) if hScale else fSz
         fSz3 = (nwStyles.H_SIZES[3] * fSz) if hScale else fSz
         fSz4 = (nwStyles.H_SIZES[4] * fSz) if hScale else fSz
-        align = "both" if self._doJustify else "left"
 
         # Add Normal Style
         styles.append(DocXParStyle(
@@ -556,7 +553,7 @@ class ToDocX(Tokenizer):
             after=fSz * self._marginText[1],
             line=fSz * self._lineHeight,
             indentFirst=fSz * self._firstWidth,
-            align=align,
+            align=self._defaultAlign,
         ))
 
         # Add Title
@@ -1085,12 +1082,6 @@ class DocXParagraph:
     #  Methods
     ##
 
-    def overrideJustify(self, default: str) -> None:
-        """Override inherited justify setting if None is set."""
-        if self._textAlign is None:
-            self.setAlignment(default)
-        return
-
     def addContent(self, run: ET.Element) -> None:
         """Add a run segment to the paragraph."""
         self._content.append(run)

novelwriter/formats/tohtml.py

@@ -372,7 +372,7 @@ class ToHtml(Tokenizer):
             "margin-top: {2:.2f}em; margin-bottom: {3:.2f}em;"
             "}}"
         ).format(
-            "justify" if self._doJustify else self._defaultAlign,
+            self._defaultAlign,
             round(100 * self._lineHeight),
             mScale * self._marginText[0],
             mScale * self._marginText[1],

novelwriter/formats/tokenizer.py

@@ -622,6 +622,9 @@ class Tokenizer(ABC):
                 if aLine.startswith("%~"):
                     continue
 
+                if self._doJustify and not sAlign & self.M_ALIGNED:
+                    sAlign |= self.A_JUSTIFY
+
                 cStyle, cKey, cText, _, _ = processComment(aLine)
                 if cStyle == nwComment.SYNOPSIS:
                     tLine, tFmt = self._extractFormats(cText)
@@ -935,8 +938,11 @@ class Tokenizer(ABC):
                         cStyle |= self.A_IND_T
 
                     if nLines == 1:
-                        # The paragraph contains a single line, so we just
-                        # save that directly to the token list
+                        # The paragraph contains a single line, so we just save
+                        # that directly to the token list. If justify is
+                        # enabled, and there is no alignment, we apply it.
+                        if self._doJustify and not cStyle & self.M_ALIGNED:
+                            cStyle |= self.A_JUSTIFY
                         self._tokens.append((
                             self.T_TEXT, pLines[0][1], pLines[0][2], pLines[0][3], cStyle
                         ))

novelwriter/formats/toodt.py

@@ -183,7 +183,6 @@ class ToOdt(Tokenizer):
         self._fLineHeight  = "115%"
         self._fBlockIndent = "1.693cm"
         self._fTextIndent  = "0.499cm"
-        self._textAlign    = "left"
         self._dLanguage    = "en"
         self._dCountry     = "GB"
 
@@ -327,7 +326,6 @@ class ToOdt(Tokenizer):
         self._fLineHeight  = f"{round(100 * self._lineHeight):d}%"
         self._fBlockIndent = self._emToCm(self._blockIndent)
         self._fTextIndent  = self._emToCm(self._firstWidth)
-        self._textAlign    = "justify" if self._doJustify else self._defaultAlign
 
         # Clear Errors
         self._errData = []
@@ -457,9 +455,6 @@ class ToOdt(Tokenizer):
 
             # Process Text Types
             if tType == self.T_TEXT:
-                if self._doJustify and "\n" in tText:
-                    oStyle.overrideJustify(self._defaultAlign)
-
                 # Text indentation is processed here because there is a
                 # dedicated pre-defined style for it
                 if tStyle & self.A_IND_T:
@@ -906,7 +901,7 @@ class ToOdt(Tokenizer):
         style.setMarginTop(self._mTopText)
         style.setMarginBottom(self._mBotText)
         style.setLineHeight(self._fLineHeight)
-        style.setTextAlign(self._textAlign)
+        style.setTextAlign(self._defaultAlign)
         style.setFontName(self._fontFamily)
         style.setFontFamily(self._fontFamily)
         style.setFontSize(self._fSizeText)
@@ -1316,12 +1311,6 @@ class ODTParagraphStyle:
     #  Methods
     ##
 
-    def overrideJustify(self, default: str) -> None:
-        """Override inherited justify setting if None is set."""
-        if self._pAttr["text-align"][1] is None:
-            self.setTextAlign(default)
-        return
-
     def checkNew(self, style: ODTParagraphStyle) -> bool:
         """Check if there are new settings in style that differ from
         those in this object. Unset styles are ignored as they can be

novelwriter/formats/toqdoc.py

@@ -170,7 +170,7 @@ class ToQTextDocument(Tokenizer):
         self._blockFmt = QTextBlockFormat()
         self._blockFmt.setTopMargin(self._mText[0])
         self._blockFmt.setBottomMargin(self._mText[1])
-        self._blockFmt.setAlignment(QtAlignJustify if self._doJustify else QtAlignAbsolute)
+        self._blockFmt.setAlignment(QtAlignAbsolute)
         self._blockFmt.setLineHeight(
             100*self._lineHeight, QTextBlockFormat.LineHeightTypes.ProportionalHeight
         )