Update docx_builder.py

docx_builder.py

@@ -147,20 +147,18 @@ def _add_run(par, token: str, font_size=None):
     if font_size:
         run.font.size = font_size
 
+
+# ─────────────────────── enhanced paragraph builder ───────────────────────
 def add_paragraph_with_tokens(doc, raw, style_name="Normal", indent=0, alignment=None, spacing_before=0, spacing_after=0):
+    """
+    Adds a paragraph preserving inline formatting and enforced alignment.
+    """
     try:
         p = doc.add_paragraph(style=style_name)
     except KeyError:
         p = doc.add_paragraph(style="Normal")
 
-    if indent:
-        p.paragraph_format.left_indent = Inches(indent)
-    if alignment:
-        p.alignment = alignment
-    if spacing_before:
-        p.paragraph_format.space_before = Pt(spacing_before)
-    if spacing_after:
-        p.paragraph_format.space_after = Pt(spacing_after)
+    # Add text content first
     for part in INLINE_RE.split(raw):
         if not part:
             continue
@@ -168,6 +166,33 @@ def add_paragraph_with_tokens(doc, raw, style_name="Normal", indent=0, alignment
             _add_run(p, part)
         else:
             p.add_run(part)
+
+    # Apply paragraph formatting
+    fmt = p.paragraph_format
+    if indent:
+        fmt.left_indent = Inches(indent)
+    if spacing_before:
+        fmt.space_before = Pt(spacing_before)
+    if spacing_after:
+        fmt.space_after = Pt(spacing_after)
+
+    # Force alignment after adding runs
+    if alignment is not None:
+        p.alignment = alignment
+    else:
+        p.alignment = WD_ALIGN_PARAGRAPH.LEFT
+
+    # XML-level enforcement for safety
+    pPr = p._p.get_or_add_pPr()
+    jc = OxmlElement("w:jc")
+    jc.set(qn("w:val"), {
+        WD_ALIGN_PARAGRAPH.LEFT: "left",
+        WD_ALIGN_PARAGRAPH.CENTER: "center",
+        WD_ALIGN_PARAGRAPH.RIGHT: "right",
+        WD_ALIGN_PARAGRAPH.JUSTIFY: "both"
+    }.get(p.alignment, "left"))
+    pPr.append(jc)
+
     return p
 
 # ───────────────────────── table helper ─────────────────────
@@ -281,6 +306,12 @@ def create_docx_with_layout(text: str, title=None, author=None) -> BytesIO:
         elif align_line.startswith("<right>") and align_line.endswith("</right>"):
             alignment = WD_ALIGN_PARAGRAPH.RIGHT
             line = align_line[7:-8].strip()
+        elif align_line.startswith("<left>") and align_line.endswith("</left>"):
+            alignment = WD_ALIGN_PARAGRAPH.LEFT
+            line = align_line[6:-7].strip()
+        elif align_line.startswith("<justify>") and align_line.endswith("</justify>"):
+            alignment = WD_ALIGN_PARAGRAPH.JUSTIFY
+            line = align_line[9:-10].strip()
 
         # ── fenced code ──
         fence = re.match(r"^```(\w+)?\s*$", line)
@@ -333,7 +364,7 @@ def create_docx_with_layout(text: str, title=None, author=None) -> BytesIO:
         if m:
             level = len(m.group(1))
             heading_text = m.group(2).strip()
-            heading_style = f"Heading {level}"  # ✅ fixed
+            heading_style = f"Heading {level}"
             add_paragraph_with_tokens(doc, heading_text, style_name=heading_style, alignment=alignment)
             toc_entries.append((level, heading_text, "1"))
             continue