From 9f0e1c7a21f4f020f6a8ac62a1902d25b4662459 Mon Sep 17 00:00:00 2001
From: Braian PLAKU <braianplaku@gmail.com>
Date: Tue, 8 Sep 2026 13:24:57 +0200
Subject: [PATCH 1/2] fix: insert rowspan placeholders in column order

---
 CHANGELOG.md  | 1 +
 fpdf/table.py | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b33160f74..0e4fc559ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ This can also be enabled programmatically with `warnings.simplefilter('default',
 * visual gap in rendering subsequent text after `{nb}` page alias when text shaping is enabled - _cf._ [issue #1090](https://github.com/py-pdf/fpdf2/issues/1090) - thanks to @prateek-dagar
 * `FPDF.write_html()` no longer raises `IndexError: pop from empty list` when a `<ul>` or `<ol>` element carries a `line-height` that is not a bare number (_e.g._ `line-height: normal` or `line-height: 1.5em`); such values are now ignored, and the default line height is used, consistently with `<p line-height="x">` - _cf._ [PR #1917](https://github.com/py-pdf/fpdf2/pull/1917)
 * `FPDF.write_html()` now renders list bullets with correct font styling instead of inheriting preceding heading (e.g. `<h1>`) styles - _cf._ [issue #1921](https://github.com/py-pdf/fpdf2/issues/1921)
+* table cells landing in the wrong column when a row was covered by several rowspans that did not start in column order - _cf._ [issue #1948](https://github.com/py-pdf/fpdf2/issues/1948)
 
 
 ## [2.8.8] - 2026-08-09
diff --git a/fpdf/table.py b/fpdf/table.py
index d6bd2d91ac..9142f9e329 100644
--- a/fpdf/table.py
+++ b/fpdf/table.py
@@ -793,7 +793,10 @@ def convert_spans(
                     cells.extend([None] * (cell.colspan - 1))
         # now we can correctly interpret active_rowspans
         remaining_rowspans: dict[int, int] = {}
-        for k, v in active_rowspans.items():
+        # ascending, so that an insert never shifts a placeholder that is
+        # already in place: the keys reach us in the order the rowspans
+        # started, which is not the column order
+        for k, v in sorted(active_rowspans.items()):
             cells.insert(k, None)
             if v > 1:
                 remaining_rowspans[k] = v - 1

From 886d05f453ff4ac58ea45eb44a5a37cabd301d10 Mon Sep 17 00:00:00 2001
From: Braian PLAKU <braianplaku@gmail.com>
Date: Tue, 8 Sep 2026 13:24:58 +0200
Subject: [PATCH 2/2] test: cover a row whose rowspans do not start in column
 order

---
 .../table/table_with_rowspan_out_of_order.pdf | Bin 0 -> 1103 bytes
 test/table/test_table_rowspan.py              |  31 ++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 test/table/table_with_rowspan_out_of_order.pdf

diff --git a/test/table/table_with_rowspan_out_of_order.pdf b/test/table/table_with_rowspan_out_of_order.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..5eb8441ab9d0cb805662089612e3e27c858f8cc4
GIT binary patch
literal 1103
zcmah}T}TvB6b?*?iBt#zsfR1NqM6RjuH(+=BDgy{v}(HUmQkz8=-%BXX7A|C-B`7M
zB7KO^jQ&h|s2-x9ryyd%z=sMSB7z_#BC@D35FrS9$nITN9rU65a%aAK&v(vz=R4yF
z%1R|)<zgH^<`<tcJm7%QeT?yV7}jSb5e7WNHfd1{L|o)3)XA{>U{q7RMhZkYf(VjO
z<rINf%~y#MIo;pi3jrHc<IrO2>luiml+J0RZS94qp$BUQ%5nl$(ePe?lDbX^XlS$A
zZzM5bTM_gbdNP5QVGGdmLMuspDpqwPZc9T;T&o^oh_D5!mt%seNnTeNLeMgjW)HML
zjh&JvxAD=?6+T7NF*Hf7x{9F;dyFV#*k*|0_$c5dfks)_gld9G-I^HTk56$0xr4Vq
zUwflJdGM}rH(%<X{k~=7+~o`N+rJggwCA*>-;TRaZ|<77Q_#0iGMYcUqpa+G#i28$
zX5Q1Slj+G%b7MudN2c>zpvO`Aayam+V!AM$v(WZ<u3|j+I&yYOIpzOZ(Pox}uYb)Q
zJ<tVC_Fmbx_<QNRr~U3g(afIvf%2hyU$~~fu%j+E$QGw>w#{DLwKUfE@k3L(f9K+}
z{?fcha|6H9m##jn{qv%)xX<h;7-~GR=>{6FqkYSMO}2xAO$x7SLB$|qvir3Jv?@bJ
zLM1KoBO;21;($G<p$24WD*(fWlifID3~CSJsAZQ>4x8Gv6RT=ddXI-yctA6Uh`Mah
zG<w1ig9uAJOLD^$sUVObE%Rn~Uv>|4+GyQ2S|4c;b)HOm2+HJIUaFCJr;Fz$j;zDw
zwy=~5V+;pGhMp`hP$LK~0mQ&6#*^ac0%#TEIb!y8n3LOh&na%i1Yu)rjX+Glj?e89
z*D!3Vnhwp($cD86NJ?fyhJgVcIx;K)6f*!7fj-M1;t~C#BFUWMZ{Q@w=kvSWvLHKo
fo|Bz!pXe3q|9>N+uZ2|;XJm3q<p1IDw<^p(Tf$AO

literal 0
HcmV?d00001

diff --git a/test/table/test_table_rowspan.py b/test/table/test_table_rowspan.py
index 25afc65ed0..e6ada9d8a6 100644
--- a/test/table/test_table_rowspan.py
+++ b/test/table/test_table_rowspan.py
@@ -259,3 +259,34 @@ def test_table_with_rowspan_images(tmp_path):
         row.cell("Four\nlines\nof\ntext")
 
     assert_pdf_equal(pdf, HERE / "table_with_rowspan_images.pdf", tmp_path)
+
+
+def test_table_with_rowspan_out_of_order(tmp_path):
+    # A rowspan starting in a later column, followed by one starting in an
+    # earlier column, leaves the active rowspans in a different order than the
+    # columns they belong to - cf. issue #1948
+    pdf = FPDF()
+    pdf.set_font("Times", size=24)
+    pdf.add_page()
+    with pdf.table(text_align="CENTER", first_row_as_headings=False) as table:
+        row = table.row()
+        row.cell("A1")
+        row.cell("B1")
+        row.cell("C1", rowspan=3)
+        row.cell("D1")
+        row = table.row()
+        row.cell("A2", rowspan=2)
+        row.cell("B2")
+        row.cell("D2")
+        row = table.row()
+        row.cell("B3")
+        row.cell("D3")
+
+    # the last row keeps a placeholder under both rowspans, so D3 stays in the
+    # fourth column instead of sliding into the third one
+    assert [
+        cell.text if cell is not None else None for cell in table.rows[2].cells
+    ] == [None, "B3", None, "D3"]
+    assert_pdf_equal(
+        pdf, HERE / "table_with_rowspan_out_of_order.pdf", tmp_path, generate=False
+    )