python-hwpx 2.2__py3-none-any.whl → 2.3__py3-none-any.whl

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.dist-info → python_hwpx-2.3.dist-info}/METADATA

@@ -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.dist-info → python_hwpx-2.3.dist-info}/RECORD

@@ -9,7 +9,7 @@ hwpx/opc/xml_utils.py,sha256=-hKV6cZE6bvE1K-AnteRuaReTqoXfd4IlZHqj7j38o0,1628
 hwpx/oxml/__init__.py,sha256=_vifVi072wFdPty5RTyCoACbdweXxmaA9ed2ztysPOU,5145
 hwpx/oxml/body.py,sha256=iWyi0hoQ3PqAp9THSqnfiwxqP291RDP6FKYJPD4j-do,13719
 hwpx/oxml/common.py,sha256=2ZGe_0tAaFMWdDHDrXOpErWpZeS1Kh1x91LEEXwVf-0,1042
-hwpx/oxml/document.py,sha256=k7Vyy1l1iC5ZxdajQLt-ze-o28lAtQ_hntI1FuEpRZk,126684
+hwpx/oxml/document.py,sha256=BaIB88MOrSZUy5l6t-EbVmHEz1yFgJFxTd3BqroDQkw,128429
 hwpx/oxml/header.py,sha256=a53ElDngElCGQZwx4zL_BGGDyaJA0dZRYVDsj1KH5t8,44411
 hwpx/oxml/header_part.py,sha256=81qNuSamLLP_mJIoGJUrUzCjM2C5b3E9Uag1y8M6g30,203
 hwpx/oxml/memo.py,sha256=awhHOojaeYDB9iUwFMVFvTqUTFEvX1HAl9f1Zaw-2dY,200
@@ -25,9 +25,9 @@ hwpx/tools/text_extractor.py,sha256=anwGasEWgUObP_8f3FvLJRXAaVbeN1NU3t9PECnxslY,
 hwpx/tools/validator.py,sha256=tMOghlWd0tstjDEcknfeq6vbyZrEjEJ9_KkqqmsCW20,6163
 hwpx/tools/_schemas/header.xsd,sha256=6lwERCwYG7ux41GwCc_c-JHQ1RLPkv9esJQUbkj4Z-Y,678
 hwpx/tools/_schemas/section.xsd,sha256=Yh4OIfVUfudd8DTg6wUpxcIiqMs-0wlD9KMUAaQEjuU,534
-python_hwpx-2.2.dist-info/licenses/LICENSE,sha256=e7IU-h7BsVemhh49-5Xn8O368ON7_tyjF8wX6URTiGU,1641
-python_hwpx-2.2.dist-info/METADATA,sha256=RtBAuS46ITt5wKSBByeuy45FOUcZddz1YCKZ8JQuRTc,9399
-python_hwpx-2.2.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
-python_hwpx-2.2.dist-info/entry_points.txt,sha256=wBO_QZkkQ0FIyAxBhJ08EAtv2SmBnN1xabRHE5G2CyM,60
-python_hwpx-2.2.dist-info/top_level.txt,sha256=R1iToqDh80Nf2oQhRjTN0rbN2X6kyDUizIocZjkhuxc,5
-python_hwpx-2.2.dist-info/RECORD,,
+python_hwpx-2.3.dist-info/licenses/LICENSE,sha256=e7IU-h7BsVemhh49-5Xn8O368ON7_tyjF8wX6URTiGU,1641
+python_hwpx-2.3.dist-info/METADATA,sha256=DXlVL9xG7iPhUSgLCJlkj52OSLMliLxjS9lz_Qrm3z8,9399
+python_hwpx-2.3.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
+python_hwpx-2.3.dist-info/entry_points.txt,sha256=wBO_QZkkQ0FIyAxBhJ08EAtv2SmBnN1xabRHE5G2CyM,60
+python_hwpx-2.3.dist-info/top_level.txt,sha256=R1iToqDh80Nf2oQhRjTN0rbN2X6kyDUizIocZjkhuxc,5
+python_hwpx-2.3.dist-info/RECORD,,