From fc56c54c6eb33484da7fb52020eb69c2b1e0459a Mon Sep 17 00:00:00 2001
From: Lucas Cimon <925560+Lucas-C@users.noreply.github.com>
Date: Thu, 29 Feb 2024 19:36:16 +0100
Subject: [PATCH] Adding enum values EVEN_ROWS & EVEN_COLUMNS

---
 CHANGELOG.md                        |   6 +++---
 docs/HTML.md                        |   2 ++
 docs/Tables.md                      |   3 ++-
 fpdf/enums.py                       |  14 +++++++++++--
 test/table/table_cell_fill_mode.pdf | Bin 0 -> 2061 bytes
 test/table/test_table.py            |  31 +++++++++++++++++++++++++---
 6 files changed, 47 insertions(+), 9 deletions(-)
 create mode 100644 test/table/table_cell_fill_mode.pdf

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd85f9329..d2763b548 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,11 +19,11 @@ This can also be enabled programmatically with `warnings.simplefilter('default',
 ## [2.7.9] - Not released yet
 ### Added
 * support for overriding paragraph direction on bidirectional text
-* new optional `li_prefix_color` parameter for `FPDF.write_html()`
-* support for `start` & `type` attributes of `<ol>` tags, and `type` attribute of `<ul>` tags, when using `FPDF.write_html()`
+* new optional `li_prefix_color` parameter for [`FPDF.write_html()`](https://py-pdf.github.io/fpdf2/fpdf/fpdf.html#fpdf.fpdf.FPDF.write_html)
+* support for `start` & `type` attributes of `<ol>` tags, and `type` attribute of `<ul>` tags, when using [`FPDF.write_html()`](https://py-pdf.github.io/fpdf2/fpdf/fpdf.html#fpdf.fpdf.FPDF.write_html)
 * [`FPDF.write_html()`](https://py-pdf.github.io/fpdf2/fpdf/fpdf.html#fpdf.fpdf.FPDF.write_html) now accepts a `tag_styles` parameter to control the font, color & size of HTML elements: `<a>`, `<blockquote>`, `<li>`...
 * [`FPDF.write_html()`](https://py-pdf.github.io/fpdf2/fpdf/fpdf.html#fpdf.fpdf.FPDF.write_html) now accepts a `tag_indents` parameter to control, for example, the indent of `<blockquote>` elements
-* allow to define custom `cell_fill_mode` logic for tables: [_Set cells background_ - documentation section](https://py-pdf.github.io/fpdf2/Tables.html#set-cells-background)
+* allow to define custom `cell_fill_mode` logic for tables: [_Set cells background_ - documentation section](https://py-pdf.github.io/fpdf2/Tables.html#set-cells-background). Also added 2 new values: `TableCellFillMode.EVEN_ROWS` & `TableCellFillMode.EVEN_COLUMNS`: [documentation](https://py-pdf.github.io/fpdf2/fpdf/enums.html#fpdf.enums.TableCellFillMode)
 ### Changed
 * improved the performance of `FPDF.start_section()` - _cf._ [issue #1092](https://github.com/py-pdf/fpdf2/issues/1092)
 ### Deprecated
diff --git a/docs/HTML.md b/docs/HTML.md
index 810d9e3d0..0610dd1fb 100644
--- a/docs/HTML.md
+++ b/docs/HTML.md
@@ -81,6 +81,8 @@ pdf.output("html.pdf")
 
 ## Styling HTML tags globally
 
+_New in [:octicons-tag-24: 2.7.9](https://github.com/py-pdf/fpdf2/blob/master/CHANGELOG.md)_
+
 The style of several HTML tags (`<a>`, `<blockquote>`, `<code>`, `<pre>`, `<h1>`, `<h2>`, `<h3>`...) can be set globally, for the whole HTML document, by passing `tag_styles` to `FPDF.write_html()`:
 
 ```python
diff --git a/docs/Tables.md b/docs/Tables.md
index f572d6e38..15a183c5b 100644
--- a/docs/Tables.md
+++ b/docs/Tables.md
@@ -212,7 +212,8 @@ Finally, it is possible to define your own cell-filling logic:
 
 ```python
 class EvenOddCellFillMode():
-    def should_fill_cell(self, i, j):
+    @staticmethod
+    def should_fill_cell(i, j):
         return i % 2 and j % 2
 
 ...
diff --git a/fpdf/enums.py b/fpdf/enums.py
index 32b988a01..b8cd14074 100644
--- a/fpdf/enums.py
+++ b/fpdf/enums.py
@@ -317,6 +317,12 @@ class TableCellFillMode(CoerciveEnum):
     COLUMNS = intern("COLUMNS")
     "Fill only table cells in odd columns"
 
+    EVEN_ROWS = intern("EVEN_ROWS")
+    "Fill only table cells in even rows"
+
+    EVEN_COLUMNS = intern("EVEN_COLUMNS")
+    "Fill only table cells in even columns"
+
     @classmethod
     def coerce(cls, value):
         "Any class that has a .should_fill_cell() method is considered a valid 'TableCellFillMode' (duck-typing)"
@@ -330,9 +336,13 @@ def should_fill_cell(self, i, j):
         if self is self.ALL:
             return True
         if self is self.ROWS:
-            return bool(i % 2)
+            return i % 2 == 1
         if self is self.COLUMNS:
-            return bool(j % 2)
+            return j % 2 == 1
+        if self is self.EVEN_ROWS:
+            return i % 2 == 0
+        if self is self.EVEN_COLUMNS:
+            return j % 2 == 0
         raise NotImplementedError
 
 
diff --git a/test/table/table_cell_fill_mode.pdf b/test/table/table_cell_fill_mode.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..6c6277403809325bde0cdaf2ce4218167f892529
GIT binary patch
literal 2061
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
I19*gg1A($ZegFUf

literal 0
HcmV?d00001

diff --git a/test/table/test_table.py b/test/table/test_table.py
index 4926f2033..ed51cc16a 100644
--- a/test/table/test_table.py
+++ b/test/table/test_table.py
@@ -6,6 +6,8 @@
 from fpdf import FPDF, FPDFException
 from fpdf.drawing import DeviceRGB
 from fpdf.fonts import FontFace
+from fpdf.table import TableCellFillMode
+
 from test.conftest import assert_pdf_equal, LOREM_IPSUM
 
 
@@ -267,8 +269,9 @@ def test_table_with_cell_fill(tmp_path):
     assert_pdf_equal(pdf, HERE / "table_with_cell_fill.pdf", tmp_path)
 
 
-class EvenOddCellFillMode():
-    def should_fill_cell(self, i, j):
+class EvenOddCellFillMode:
+    @staticmethod
+    def should_fill_cell(i, j):
         return i % 2 and j % 2
 
 
@@ -277,7 +280,9 @@ def test_table_with_cell_fill_custom_class(tmp_path):
     pdf.add_page()
     pdf.set_font("Times", size=16)
     lightblue = (173, 216, 230)
-    with pdf.table(cell_fill_color=lightblue, cell_fill_mode=EvenOddCellFillMode()) as table:
+    with pdf.table(
+        cell_fill_color=lightblue, cell_fill_mode=EvenOddCellFillMode()
+    ) as table:
         for data_row in TABLE_DATA:
             row = table.row()
             for datum in data_row:
@@ -750,3 +755,23 @@ def test_table_with_varying_col_count(tmp_path):
             table.row(subset)
 
     assert_pdf_equal(pdf, HERE / "table_with_varying_col_count.pdf", tmp_path)
+
+
+def test_table_cell_fill_mode(tmp_path):
+    pdf = FPDF()
+    pdf.add_page()
+    pdf.set_font("Helvetica")
+    light_sky_blue = (150, 200, 255)
+    headings_style = FontFace(fill_color=128)  # grey
+    for mode in ("ROWS", "COLUMNS", "EVEN_ROWS", "EVEN_COLUMNS"):
+        pdf.cell(text=f"cell_fill_mode=TableCellFillMode.{mode}:")
+        pdf.ln(10)
+        with pdf.table(
+            TABLE_DATA,
+            headings_style=headings_style,
+            cell_fill_mode=getattr(TableCellFillMode, mode),
+            cell_fill_color=light_sky_blue,
+        ):
+            pass
+        pdf.ln()
+    assert_pdf_equal(pdf, HERE / "table_cell_fill_mode.pdf", tmp_path)