python-hwpx 2.2__tar.gz → 2.3__tar.gz

{python_hwpx-2.2 → python_hwpx-2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-hwpx
-Version: 2.2
+Version: 2.3
 Summary: Hancom HWPX 패키지를 로드하고 편집하기 위한 Python 유틸리티 모음
 Author: python-hwpx Maintainers
 License: Non-Commercial License

{python_hwpx-2.2 → python_hwpx-2.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-hwpx"
-version = "2.2"
+version = "2.3"
 description = "Hancom HWPX 패키지를 로드하고 편집하기 위한 Python 유틸리티 모음"
 readme = { file = "README.md", content-type = "text/markdown" }
 license = { file = "LICENSE" }

{python_hwpx-2.2 → python_hwpx-2.3}/src/hwpx/oxml/document.py

@@ -1782,33 +1782,71 @@ class HwpxOxmlTable:
     def rows(self) -> list[HwpxOxmlTableRow]:
         return [HwpxOxmlTableRow(row, self) for row in self.element.findall(f"{_HP}tr")]
 
-    def _build_cell_grid(self) -> dict[tuple[int, int], HwpxTableGridPosition]:
-        mapping: dict[tuple[int, int], HwpxTableGridPosition] = {}
-        for row in self.element.findall(f"{_HP}tr"):
-            for cell_element in row.findall(f"{_HP}tc"):
-                wrapper = HwpxOxmlTableCell(cell_element, self, row)
-                start_row, start_col = wrapper.address
-                span_row, span_col = wrapper.span
-                for logical_row in range(start_row, start_row + span_row):
-                    for logical_col in range(start_col, start_col + span_col):
-                        key = (logical_row, logical_col)
-                        existing = mapping.get(key)
-                        entry = HwpxTableGridPosition(
+    def _build_cell_grid(self) -> dict[tuple[int, int], HwpxTableGridPosition]:
+        mapping: dict[tuple[int, int], HwpxTableGridPosition] = {}
+
+        def _is_deactivated_cell(
+            cell: HwpxOxmlTableCell, span: tuple[int, int]
+        ) -> bool:
+            span_row, span_col = span
+            if span_row != 1 or span_col != 1:
+                return False
+            if cell.width != 0 or cell.height != 0:
+                return False
+            for text_element in cell.element.findall(f".//{_HP}t"):
+                if text_element.text:
+                    return False
+            return True
+
+        for row in self.element.findall(f"{_HP}tr"):
+            for cell_element in row.findall(f"{_HP}tc"):
+                wrapper = HwpxOxmlTableCell(cell_element, self, row)
+                start_row, start_col = wrapper.address
+                span_row, span_col = wrapper.span
+                wrapper_span = (span_row, span_col)
+                wrapper_is_deactivated = _is_deactivated_cell(wrapper, wrapper_span)
+                for logical_row in range(start_row, start_row + span_row):
+                    for logical_col in range(start_col, start_col + span_col):
+                        key = (logical_row, logical_col)
+                        existing = mapping.get(key)
+                        entry = HwpxTableGridPosition(
                             row=logical_row,
                             column=logical_col,
                             cell=wrapper,
                             anchor=(start_row, start_col),
-                            span=(span_row, span_col),
-                        )
-                        if (
-                            existing is not None
-                            and existing.cell.element is not wrapper.element
-                        ):
-                            raise ValueError(
-                                "table grid contains overlapping cell spans"
-                            )
-                        mapping[key] = entry
-        return mapping
+                            span=(span_row, span_col),
+                        )
+                        if (
+                            existing is not None
+                            and existing.cell.element is not wrapper.element
+                        ):
+                            existing_span = existing.span
+                            existing_spans_multiple = (
+                                existing_span[0] != 1 or existing_span[1] != 1
+                            )
+                            wrapper_spans_multiple = (
+                                wrapper_span[0] != 1 or wrapper_span[1] != 1
+                            )
+                            existing_is_deactivated = _is_deactivated_cell(
+                                existing.cell, existing_span
+                            )
+
+                            if (
+                                wrapper_is_deactivated
+                                and existing_spans_multiple
+                            ):
+                                continue
+                            if (
+                                existing_is_deactivated
+                                and wrapper_spans_multiple
+                            ):
+                                mapping[key] = entry
+                                continue
+                            raise ValueError(
+                                "table grid contains overlapping cell spans"
+                            )
+                        mapping[key] = entry
+        return mapping
 
     def _grid_entry(self, row_index: int, col_index: int) -> HwpxTableGridPosition:
         if row_index < 0 or col_index < 0:
@@ -2096,21 +2134,23 @@ class HwpxOxmlTable:
                 if cell.element is not target.element:
                     removal_elements.add(cell.element)
 
-        if not removal_elements and target.span == (new_row_span, new_col_span):
-            return target
-
-        for element in removal_elements:
-            row_element = element_to_row.get(element)
-            if row_element is not None:
-                try:
-                    row_element.remove(element)
-                except ValueError:
-                    continue
-
-        target.set_span(new_row_span, new_col_span)
-        target.set_size(total_width or target.width, total_height or target.height)
-        self.mark_dirty()
-        return target
+        if not removal_elements and target.span == (new_row_span, new_col_span):
+            return target
+
+        for element in removal_elements:
+            row_element = element_to_row.get(element)
+            if row_element is None:
+                continue
+            wrapper = HwpxOxmlTableCell(element, self, row_element)
+            wrapper.set_span(1, 1)
+            wrapper.set_size(0, 0)
+            for text_element in element.findall(f".//{_HP}t"):
+                text_element.text = ""
+
+        target.set_span(new_row_span, new_col_span)
+        target.set_size(total_width or target.width, total_height or target.height)
+        self.mark_dirty()
+        return target
 
 @dataclass
 class HwpxOxmlParagraph:

{python_hwpx-2.2 → python_hwpx-2.3}/src/python_hwpx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-hwpx
-Version: 2.2
+Version: 2.3
 Summary: Hancom HWPX 패키지를 로드하고 편집하기 위한 Python 유틸리티 모음
 Author: python-hwpx Maintainers
 License: Non-Commercial License

{python_hwpx-2.2 → python_hwpx-2.3}/tests/test_document_formatting.py

@@ -413,28 +413,54 @@ def test_table_cell_text_marks_cell_dirty_attribute() -> None:
     assert table.cell(0, 0).element.get("dirty") == "1"
 
 
-def test_table_merge_cells_updates_spans_and_structure() -> None:
+def test_table_merge_cells_updates_spans_and_structure() -> None:
     section_element = ET.Element(f"{HS}sec")
     section = HwpxOxmlSection("section0.xml", section_element)
     manifest = ET.Element("manifest")
     root = HwpxOxmlDocument(manifest, [section], [])
     document = HwpxDocument(cast(HwpxPackage, object()), root)
 
-    table = document.add_table(3, 3, section=section)
-    initial_width = table.cell(0, 0).width
-    initial_height = table.cell(0, 0).height
-    section.reset_dirty()
-
-    merged = table.merge_cells(0, 0, 1, 1)
-
-    assert merged.span == (2, 2)
-    assert merged.width >= initial_width
-    assert merged.height >= initial_height
-    assert table.cell(0, 1).element is merged.element
-    assert table.cell(1, 0).element is merged.element
-    assert len(table.rows[0].cells) == 2
-    assert len(table.rows[1].cells) == 1
-    assert section.dirty is True
+    table = document.add_table(3, 3, section=section)
+    initial_width = table.cell(0, 0).width
+    initial_height = table.cell(0, 0).height
+    table.set_cell_text(0, 1, "Top Right")
+    table.set_cell_text(1, 0, "Bottom Left")
+    table.set_cell_text(1, 1, "Bottom Right")
+    section.reset_dirty()
+
+    merged = table.merge_cells(0, 0, 1, 1)
+
+    physical_by_address = {
+        cell.address: cell for row in table.rows for cell in row.cells
+    }
+    covered_top_right = physical_by_address[(0, 1)]
+    covered_bottom_left = physical_by_address[(1, 0)]
+    covered_bottom_right = physical_by_address[(1, 1)]
+
+    assert merged.span == (2, 2)
+    assert merged.width >= initial_width
+    assert merged.height >= initial_height
+    assert table.cell(0, 1).element is merged.element
+    assert table.cell(1, 0).element is merged.element
+    assert table.cell(1, 1).element is merged.element
+    assert len(table.rows[0].cells) == 3
+    assert len(table.rows[1].cells) == 3
+    assert covered_top_right.element is not merged.element
+    assert covered_top_right.span == (1, 1)
+    assert covered_top_right.width == 0
+    assert covered_top_right.height == 0
+    assert covered_top_right.text == ""
+    assert covered_bottom_left.element is not merged.element
+    assert covered_bottom_left.span == (1, 1)
+    assert covered_bottom_left.width == 0
+    assert covered_bottom_left.height == 0
+    assert covered_bottom_left.text == ""
+    assert covered_bottom_right.element is not merged.element
+    assert covered_bottom_right.span == (1, 1)
+    assert covered_bottom_right.width == 0
+    assert covered_bottom_right.height == 0
+    assert covered_bottom_right.text == ""
+    assert section.dirty is True
 
 
 def test_table_merge_cells_rejects_partial_overlap() -> None: