python-hwpx 2.21.0__tar.gz → 2.22.0__tar.gz

{python_hwpx-2.21.0/src/python_hwpx.egg-info → python_hwpx-2.22.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-hwpx
-Version: 2.21.0
+Version: 2.22.0
 Summary: 한글 없이 HWPX 문서를 열고, 편집하고, 생성하고, 검증하는 Python 자동화 라이브러리
 Author: python-hwpx Maintainers
 License-Expression: Apache-2.0

{python_hwpx-2.21.0 → python_hwpx-2.22.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-hwpx"
-version = "2.21.0"
+version = "2.22.0"
 description = "한글 없이 HWPX 문서를 열고, 편집하고, 생성하고, 검증하는 Python 자동화 라이브러리"
 readme = { file = "README.md", content-type = "text/markdown" }
 license = "Apache-2.0"

{python_hwpx-2.21.0 → python_hwpx-2.22.0}/src/hwpx/table_patch.py

@@ -600,6 +600,57 @@ def _insert_row_by_clone(table: str, ref_row: int, count: int = 1) -> str:
     return _rebuild(prefix, new_rows, suffix, rowcnt=len(new_rows))
 
 
+def _set_column_widths(table: str, new_widths: dict[int, int]) -> str:
+    """Set logical column widths (HWPUNIT). Each cell's cellSz.width = sum of its
+    spanned columns' new widths. Byte-preserving cellSz edits; grid unchanged."""
+    _guard_flat(table)
+    prefix, rows, suffix = _parse_table(table)
+
+    def fix(tc: str):
+        ca = _si(tc, "cellAddr", "colAddr")
+        cs = _si(tc, "cellSpan", "colSpan") or 1
+        w = sum(int(new_widths.get(c, 0)) for c in range(ca, ca + cs))
+        if w > 0:
+            tc = _ss(tc, "cellSz", "width", w)
+        return tc
+
+    rows = [_map_cells(r, fix) for r in rows]
+    return _rebuild(prefix, rows, suffix)
+
+
+def _autofit_columns(table: str, *, min_frac: float = 0.06, damp: float = 0.5) -> str:
+    """Rebalance column widths to content: content-heavy columns widen, light ones
+    narrow, table total width preserved. Demand = longest single-span cell's text
+    width (form_fit advance model), sqrt-damped so a paragraph column doesn't run
+    away; every column keeps a floor of *min_frac* of the total."""
+    from .form_fit.measure import estimate_text_width
+
+    prefix, rows, suffix = _parse_table(table)
+    cur = _uniform_col_widths(rows)
+    if cur is None:
+        raise TableStructureError("no uniform (all colSpan=1) row to autofit widths")
+    ncol = max(cur) + 1
+    total = sum(cur.values())
+    demand = {c: 0.0 for c in range(ncol)}
+    for r in rows:
+        for tc in _S_TC.findall(r):
+            if (_si(tc, "cellSpan", "colSpan") or 1) != 1:
+                continue
+            ca = _si(tc, "cellAddr", "colAddr")
+            txt = "".join(re.findall(r"<hp:t>(.*?)</hp:t>", tc, re.DOTALL))
+            demand[ca] = max(demand[ca], estimate_text_width(txt, 10.0))
+    weight = {c: max(demand[c], 1.0) ** damp for c in range(ncol)}
+    sw = sum(weight.values()) or 1.0
+    floor = total * min_frac
+    raw = {c: max(floor, total * weight[c] / sw) for c in range(ncol)}
+    scale = total / (sum(raw.values()) or 1.0)
+    new = {c: int(round(raw[c] * scale)) for c in range(ncol)}
+    # absorb rounding drift into the widest column so the total is exact
+    drift = total - sum(new.values())
+    new[max(new, key=lambda c: new[c])] += drift
+    return _set_column_widths(table, new)
+
+
 def _validate_or_raise(table: str) -> None:
     _grid, rep = build_grid(table.encode("utf-8"))
     if not rep.ok:
@@ -608,10 +659,17 @@ def _validate_or_raise(table: str) -> None:
 
 # --- section-level application (byte-region splice back) ----------------------
 
+def _widths_arg(o: Mapping[str, Any]) -> dict[int, int]:
+    w = o["widths"]
+    return {int(k): int(v) for k, v in w.items()} if isinstance(w, Mapping) else {i: int(v) for i, v in enumerate(w)}
+
+
 _STRUCT_OPS = {
     "delete_column": lambda t, o: _collapse_empty_rows(_delete_columns(t, o["cols"] if "cols" in o else [o["col"]])),
     "delete_row": lambda t, o: _delete_rows(t, o["rows"] if "rows" in o else [o["row"]]),
     "insert_row_by_clone": lambda t, o: _insert_row_by_clone(t, o["ref_row"], int(o.get("count", 1))),
+    "set_column_widths": lambda t, o: _set_column_widths(t, _widths_arg(o)),
+    "autofit_columns": lambda t, o: _autofit_columns(t, min_frac=float(o.get("min_frac", 0.06)), damp=float(o.get("damp", 0.5))),
 }
 
 

{python_hwpx-2.21.0 → python_hwpx-2.22.0/src/python_hwpx.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-hwpx
-Version: 2.21.0
+Version: 2.22.0
 Summary: 한글 없이 HWPX 문서를 열고, 편집하고, 생성하고, 검증하는 Python 자동화 라이브러리
 Author: python-hwpx Maintainers
 License-Expression: Apache-2.0

{python_hwpx-2.21.0 → python_hwpx-2.22.0}/tests/test_table_patch.py

@@ -320,3 +320,56 @@ def test_multiple_cells_same_table_no_overlap(merged):
     txt = _section(res.data)[1].decode("utf-8")
     # at least the distinct (non-merge-colliding) cells landed
     assert sum(f"V{i}" in txt for i in range(3)) >= 1
+
+
+# --- P6: column-width fit (set_column_widths / autofit_columns) ---------------
+
+def _uniform_row_table(data: bytes):
+    """Find a table with a uniform (all colSpan=1) row and >=3 columns."""
+    from hwpx.table_patch import _uniform_col_widths
+    sec, spans = _tables(data)
+    for ti, sp in enumerate(spans):
+        rows = _parse_table(sec[sp[0]:sp[1]].decode("utf-8"))[1]
+        w = _uniform_col_widths(rows)
+        if w and len(w) >= 3:
+            return ti, w
+    return None, None
+
+
+def test_set_column_widths_preserves_total_and_grid(merged):
+    from hwpx.table_patch import _uniform_col_widths
+    ti, w = _uniform_row_table(merged)
+    if ti is None:
+        pytest.skip("no uniform multi-column table")
+    total = sum(w.values())
+    target = {c: total // len(w) for c in range(len(w))}
+    target[0] += total - sum(target.values())  # exact total
+    res = apply_table_ops(merged, [{"op": "set_column_widths", "table_index": ti, "widths": target}])
+    assert res.ok, res.skipped
+    sec2, spans2 = _tables(res.data)
+    rep = build_grid(sec2[spans2[ti][0]:spans2[ti][1]])[1]
+    assert rep.ok
+    new_w = _uniform_col_widths(_parse_table(sec2[spans2[ti][0]:spans2[ti][1]].decode("utf-8"))[1])
+    assert sum(new_w.values()) == total
+
+
+def test_autofit_columns_widens_content_heavy(merged):
+    from hwpx.table_patch import _uniform_col_widths
+    ti, w = _uniform_row_table(merged)
+    if ti is None:
+        pytest.skip("no uniform multi-column table")
+    total = sum(w.values())
+    # make col 0 content-heavy, col 1 light, then autofit
+    long_txt = "가나다라마바사아자차카타파하" * 6
+    filled = fill_cells(merged, [
+        {"table_index": ti, "row": 0, "col": 0, "text": long_txt},
+        {"table_index": ti, "row": 0, "col": 1, "text": "짧"},
+    ])
+    res = apply_table_ops(filled.data, [{"op": "autofit_columns", "table_index": ti}])
+    assert res.ok, res.skipped
+    sec2, spans2 = _tables(res.data)
+    new_w = _uniform_col_widths(_parse_table(sec2[spans2[ti][0]:spans2[ti][1]].decode("utf-8"))[1])
+    assert new_w is not None
+    assert sum(new_w.values()) == total          # total preserved
+    assert new_w[0] > new_w[1]                    # heavy column wider than light
+    assert build_grid(sec2[spans2[ti][0]:spans2[ti][1]])[1].ok