From ee137b6ffd7e7b8fcc12148fabcc0733a32b79c9 Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Mon, 27 May 2024 00:26:53 +0200
Subject: [PATCH] Parse text indentation in the tokenizer instead

---
 novelwriter/core/tokenizer.py | 18 ++++++++++++++++--
 novelwriter/core/toodt.py     |  8 +-------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/novelwriter/core/tokenizer.py b/novelwriter/core/tokenizer.py
index d90cbf63..c8a942dc 100644
--- a/novelwriter/core/tokenizer.py
+++ b/novelwriter/core/tokenizer.py
@@ -115,6 +115,10 @@ class Tokenizer(ABC):
     A_Z_BTMMRG = 0x0080  # Zero bottom margin
     A_IND_L    = 0x0100  # Left indentation
     A_IND_R    = 0x0200  # Right indentation
+    A_IND_T    = 0x0400  # Text indentation
+
+    # Masks
+    M_ALIGNED = A_LEFT | A_RIGHT | A_CENTRE | A_JUSTIFY
 
     # Lookups
     L_HEADINGS = [T_TITLE, T_HEAD1, T_HEAD2, T_HEAD3, T_HEAD4]
@@ -839,6 +843,7 @@ class Tokenizer(ABC):
         pLines: list[T_Token] = []
 
         tCount = len(tokens)
+        pIndent = True
         for n, cToken in enumerate(tokens):
 
             if n > 0:
@@ -846,6 +851,9 @@ class Tokenizer(ABC):
             if n < tCount - 1:
                 nToken = tokens[n+1]  # Look ahead
 
+            if not self._indentFirst and cToken[0] in self.L_SKIP_INDENT:
+                pIndent = False
+
             if cToken[0] == self.T_EMPTY:
                 # We don't need to keep the empty lines after this pass
                 pass
@@ -866,8 +874,13 @@ class Tokenizer(ABC):
                 pLines.append(cToken)
                 if nToken[0] != self.T_TEXT:
                     nLines = len(pLines)
+                    cStyle = pLines[0][4]
+                    if self._firstIndent and pIndent and not cStyle & self.M_ALIGNED:
+                        cStyle |= self.A_IND_T
                     if nLines == 1:
-                        self._tokens.append(pLines[0])
+                        self._tokens.append((
+                            self.T_TEXT, pLines[0][1], pLines[0][2], pLines[0][3], cStyle
+                        ))
                     elif nLines > 1:
                         tTxt = ""
                         tFmt: T_Formats = []
@@ -876,9 +889,10 @@ class Tokenizer(ABC):
                             tTxt += f"{aToken[2]}{lineSep}"
                             tFmt.extend((p+tLen, fmt, key) for p, fmt, key in aToken[3])
                         self._tokens.append((
-                            self.T_TEXT, pLines[0][1], tTxt[:-1], tFmt, pLines[0][4]
+                            self.T_TEXT, pLines[0][1], tTxt[:-1], tFmt, cStyle
                         ))
                     pLines = []
+                    pIndent = True
 
             else:
                 self._tokens.append(cToken)
diff --git a/novelwriter/core/toodt.py b/novelwriter/core/toodt.py
index be4a9fe8..91c924d5 100644
--- a/novelwriter/core/toodt.py
+++ b/novelwriter/core/toodt.py
@@ -438,7 +438,6 @@ class ToOdt(Tokenizer):
         self._result = ""  # Not used, but cleared just in case
 
         xText = self._xText
-        pIndent = True
         for tType, _, tText, tFormat, tStyle in self._tokens:
 
             # Styles
@@ -455,7 +454,6 @@ class ToOdt(Tokenizer):
 
                 if tStyle & self.A_PBB:
                     oStyle.setBreakBefore("page")
-
                 if tStyle & self.A_PBA:
                     oStyle.setBreakAfter("page")
 
@@ -469,16 +467,12 @@ class ToOdt(Tokenizer):
                 if tStyle & self.A_IND_R:
                     oStyle.setMarginRight(self._fBlockIndent)
 
-            if not self._indentFirst and tType in self.L_SKIP_INDENT:
-                pIndent = False
-
             # Process Text Types
             if tType == self.T_TEXT:
-                if self._firstIndent and pIndent and oStyle.isUnaligned():
+                if tStyle & self.A_IND_T:
                     self._addTextPar(xText, S_FIND, oStyle, tText, tFmt=tFormat)
                 else:
                     self._addTextPar(xText, S_TEXT, oStyle, tText, tFmt=tFormat)
-                pIndent = True
 
             elif tType == self.T_TITLE:
                 # Title must be text:p