Fix: when adding a link on a table cell, an extra link was added erro…

…neously on the left (#1061)

CHANGELOG.md

@@ -17,7 +17,8 @@ in order to get warned about deprecated features used in your code.
 This can also be enabled programmatically with `warnings.simplefilter('default', DeprecationWarning)`.
 
 ## [2.7.8] - Not released yet
-
+### Fixed
+* When adding a link on a table cell, an extra link was added erroneously on the left. Moreover, now `FPDF._disable_writing()` properly disable link writing.
 
 ## [2.7.7] - 2023-12-10
 ### Added

fpdf/fpdf.py

@@ -111,7 +111,7 @@ class Image:
 from .sign import Signature
 from .structure_tree import StructureTreeBuilder
 from .svg import Percent, SVGObject
-from .syntax import DestinationXYZ, PDFDate
+from .syntax import DestinationXYZ, PDFArray, PDFDate
 from .table import Table
 from .text_region import TextRegionMixin, TextColumns
 from .util import get_scale_factor, Padding
@@ -3381,6 +3381,7 @@ def _disable_writing(self):
             return
         self._out = lambda *args, **kwargs: None
         prev_page, prev_x, prev_y = self.page, self.x, self.y
+        annots = PDFArray(self.pages[self.page].annots)
         self._push_local_stack()
         try:
             yield
@@ -3390,6 +3391,7 @@ def _disable_writing(self):
             for p in range(prev_page + 1, self.page + 1):
                 del self.pages[p]
             self.page = prev_page
+            self.pages[self.page].annots = annots
             self.set_xy(prev_x, prev_y)
             # restore writing function:
             del self._out

test/table/test_table.py

@@ -698,3 +698,18 @@ def test_table_with_fill_color_set_beforehand(tmp_path):  # issue 932
                     style = None
                 row.cell(datum, style=style)
     assert_pdf_equal(pdf, HERE / "table_with_fill_color_set_beforehand.pdf", tmp_path)
+
+
+def test_table_with_links(tmp_path):  # issue 1031
+    pdf = FPDF()
+    pdf.add_page()
+    pdf.set_font("Times", size=16)
+    with pdf.table() as table:
+        for i, data_row in enumerate(TABLE_DATA):
+            row = table.row()
+            for j, datum in enumerate(data_row):
+                if j == 2 and i > 0:
+                    row.cell(text=datum, link="https://py-pdf.github.io/fpdf2/")
+                else:
+                    row.cell(datum)
+    assert_pdf_equal(pdf, HERE / "table_with_links.pdf", tmp_path)

test/table/test_table_with_image.py

@@ -164,7 +164,7 @@ def test_table_with_page_break_over_image(tmp_path):
     assert_pdf_equal(pdf, HERE / "table_with_page_break_over_image.pdf", tmp_path)
 
 
-def test_table_with_links(tmp_path):
+def test_table_with_images_and_links(tmp_path):
     pdf = FPDF()
     pdf.set_font("Times", size=16)
     pdf.add_page()
@@ -183,4 +183,4 @@ def test_table_with_links(tmp_path):
                     )
                 else:
                     row.cell(datum, link=pdf.add_link(page=1))
-    assert_pdf_equal(pdf, HERE / "table_with_links.pdf", tmp_path)
+    assert_pdf_equal(pdf, HERE / "table_with_images_and_links.pdf", tmp_path)