python-hwpx 6.2.1__py3-none-any.whl → 6.3.0__py3-none-any.whl

hwpx/oxml/_document_primitives.py

@@ -200,8 +200,12 @@ def _refresh_copied_paragraph_subtree_ids(paragraph: ET.Element) -> None:
         }:
             node.set("id", _object_id())
 
-        if "instId" in node.attrib:
-            node.set("instId", _object_id())
+        # 스키마·실한컴 산출물의 속성명은 소문자 "instid"다. 과거 이 코드가
+        # 방출한 "instId"(카멜케이스)를 실은 파일도 재발급 대상에 남긴다 —
+        # 속성명 자체는 보존(바이트 보수), 값만 재발급.
+        for inst_attr in ("instid", "instId"):
+            if inst_attr in node.attrib:
+                node.set(inst_attr, _object_id())
 
 
 def _clone_paragraph_element(paragraph: ET.Element) -> ET.Element:

hwpx/oxml/body.py

@@ -32,7 +32,10 @@ INLINE_OBJECT_NAMES = {
     "ole",
     "chart",
     "video",
-    "audio",
+    # "audio"는 제외 — 실한컴(Windows 한글 2024 실측)은 소리 삽입을
+    # hp:ole(EMBEDDED/ICON)로 방출하고 hp:audio를 생성하지 않으며, 보유
+    # 실코퍼스 표본도 0건이다. 실물 미검증 요소를 인라인 읽기 지원으로
+    # 분류하지 않는다(빈도 0 = 읽기측 불투명 보존만). python-hwpx#89.
     "textart",
 }
 

hwpx/oxml/memo.py

@@ -277,7 +277,9 @@ class HwpxOxmlNote:
 
     @property
     def inst_id(self) -> str | None:
-        return self.element.get("instId")
+        # 정본 속성명은 "instid"(스키마·실한컴). "instId"는 과거 우리 저작이
+        # 방출한 카멜케이스 산출물 호환용 폴백.
+        return self.element.get("instid") or self.element.get("instId")
 
     @property
     def text(self) -> str:

hwpx/oxml/note_authoring.py

@@ -128,7 +128,7 @@ def _paragraph_add_note(
         {
             "number": str(number),
             "suffixChar": str(ord(suffix[0])) if suffix else "41",
-            "instId": _object_id(),
+            "instid": _object_id(),
         },
     )
     sublist_attrs = _default_sublist_attributes()

hwpx/table_patch.py

@@ -1053,6 +1053,34 @@ def _delete_rows(table: str, del_rows: Iterable[int]) -> str:
     return _rebuild(prefix, rows, suffix, rowcnt=len(rows))
 
 
+def _reorder_rows(table: str, order: Sequence[int]) -> str:
+    """물리 행 재배열 — 편집기 [표>정렬…] 대응의 엔진 프리미티브.
+
+    *order*는 현재 물리 행 인덱스의 완전 순열: 새 ``i``번째 행 = 기존
+    ``order[i]``. 행 문자열을 통째로 옮기고 각 셀의 ``rowAddr``만 목적지
+    인덱스로 재기입한다(행 높이·서식·문단은 행과 함께 이동). 수직 병합
+    (rowSpan>1)이 하나라도 있으면 refuse — 병합 블록을 가로지르는 재배열은
+    의미가 정의되지 않는다. 정렬 키 비교(어떤 순서로 놓을지)는 호출자 몫이다.
+    """
+    _guard_flat(table)
+    prefix, rows, suffix = _parse_table(table)
+    if sorted(order) != list(range(len(rows))):
+        raise TableStructureError(
+            f"reorder_rows: order must be a permutation of 0..{len(rows) - 1}, got {list(order)}"
+        )
+    for row in rows:
+        for tc in _S_TC.findall(row):
+            if (_si(tc, "cellSpan", "rowSpan") or 1) > 1:
+                raise TableStructureError(
+                    "reorder_rows: vertical merge (rowSpan>1) present — refuse"
+                )
+    new_rows = [
+        _map_cells(rows[src], lambda tc, dest=dest: _ss(tc, "cellAddr", "rowAddr", dest))
+        for dest, src in enumerate(order)
+    ]
+    return _rebuild(prefix, new_rows, suffix)
+
+
 _PARA_ID_RE = re.compile(r'(<hp:p\b[^>]*\bid=")(\d+)(")')
 
 
@@ -1389,6 +1417,7 @@ def _widths_arg(o: Mapping[str, Any]) -> dict[int, int]:
 _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"]]),
+    "reorder_rows": lambda t, o: _reorder_rows(t, [int(x) for x in o["order"]]),
     "insert_row_by_clone": lambda t, o: _insert_row_by_clone(t, o["ref_row"], int(o.get("count", 1))),
     "insert_block_by_clone": lambda t, o: _insert_block_by_clone(t, int(o["ref_rows"][0]), int(o["ref_rows"][1]), int(o.get("count", 1))),
     "set_column_widths": lambda t, o: _set_column_widths(t, _widths_arg(o)),

hwpx/tools/markdown_export.py

@@ -261,7 +261,7 @@ def _md_handle_ctrl_child(child, state: _MdParagraphState, base_cp, chars, doc=N
 def _md_handle_note_child(
     child, tag: str, state: _MdParagraphState, base_cp, chars, doc, notes_out: list | None
 ) -> None:
-    inst_id = child.get("instId", "")
+    inst_id = child.get("instid") or child.get("instId", "")
     kind = "fn" if tag == "footNote" else "en"
     marker = f"[^{kind}{inst_id}]"
     if state.link_url is not None:

hwpx/tools/object_finder.py

@@ -317,7 +317,7 @@ class ObjectFinder:
     ) -> AnnotationMatch:
         path = describe_element_path(element, parent_map)
         found = FoundElement(section=section, path=path, element=element)
-        inst_id = element.get("instId") or ""
+        inst_id = element.get("instid") or element.get("instId") or ""
         behavior = options.footnote if kind == "footnote" else options.endnote
         if behavior == "inline":
             text = _resolve_note_text(

hwpx/tools/package_validator.py

@@ -331,14 +331,17 @@ def _first_child_by_local(element: ET.Element, name: str) -> ET.Element | None:
     return None
 
 
-def _simple_paragraph_text_length(paragraph: ET.Element) -> int | None:
-    """Return visible text length for plain text-only paragraphs.
+def _simple_paragraph_text(paragraph: ET.Element) -> str | None:
+    """Return visible text for plain text-only paragraphs (``None`` = 판정 불가).
 
     Paragraphs containing fields, shapes, tables, or other embedded controls are
     skipped to avoid guessing how a specific editor counts their layout units.
+    Single-position control characters (tab/linebreak/hyphen/nbspace) are
+    represented as one space — a deliberate width underestimate so downstream
+    width judgments stay conservative.
     """
 
-    total = 0
+    pieces: list[str] = []
     for child in paragraph:
         child_name = _local_name(child).lower()
         if child_name == "linesegarray":
@@ -348,12 +351,73 @@ def _simple_paragraph_text_length(paragraph: ET.Element) -> int | None:
         for run_child in child:
             run_child_name = _local_name(run_child).lower()
             if run_child_name == "t":
-                total += len("".join(run_child.itertext()))
+                pieces.append("".join(run_child.itertext()))
             elif run_child_name in {"tab", "linebreak", "hyphen", "nbspace"}:
-                total += 1
+                pieces.append(" ")
             else:
                 return None
-    return total
+    return "".join(pieces)
+
+
+def _simple_paragraph_text_length(paragraph: ET.Element) -> int | None:
+    text = _simple_paragraph_text(paragraph)
+    return None if text is None else len(text)
+
+
+#: 꼬리 폭 판정 마진 — 추정 폭이 줄 폭의 이 배수를 넘을 때만 증명으로 취급.
+_STALE_TAIL_WIDTH_FACTOR = 2.0
+_STALE_TAIL_MIN_CHARS = 8
+
+
+def _check_line_seg_tail_coverage(
+    issues: list[PackageValidationIssue],
+    part_name: str,
+    paragraph_index: int,
+    text: str,
+    line_segs: list[ET.Element],
+) -> None:
+    """Catch caches that lack lines for text grown past the last cached line.
+
+    The stale-cache direction the textpos range check cannot see: an edit made
+    the paragraph *longer* but an old ``<hp:linesegarray>`` survived, so every
+    cached ``textpos`` is still in range — yet the cache has too few lines and
+    Hancom renders the tail overlapped (the tracked-change overlap defect).
+    Provable-with-margin: the tail after the last cached line start must not
+    measure wider than that line's extent × ``_STALE_TAIL_WIDTH_FACTOR``,
+    with width estimated by the same conservative metrics the overflow lint
+    uses.
+    """
+
+    last: tuple[int, int, int] | None = None
+    for seg in line_segs:
+        try:
+            textpos = int(seg.get("textpos") or "")
+            horzsize = int(seg.get("horzsize") or "")
+            textheight = int(seg.get("textheight") or "")
+        except ValueError:
+            return
+        if last is None or textpos > last[0]:
+            last = (textpos, horzsize, textheight)
+    if last is None:
+        return
+    last_pos, horzsize, textheight = last
+    if horzsize <= 0 or textheight <= 0 or not 0 <= last_pos <= len(text):
+        return
+    tail = text[last_pos:]
+    if len(tail) < _STALE_TAIL_MIN_CHARS:
+        return
+    from hwpx.form_fit.measure import estimate_text_width
+
+    tail_width = estimate_text_width(tail, textheight / 100.0)
+    if tail_width > horzsize * _STALE_TAIL_WIDTH_FACTOR:
+        _error(
+            issues,
+            part_name,
+            f"paragraph {paragraph_index} lineseg cache lacks lines for its tail: "
+            f"{len(tail)} chars after the last cached line start (textpos={last_pos}) "
+            f"measure ~{tail_width / horzsize:.1f}x the cached line extent {horzsize} "
+            "— stale layout cache; Hancom reuses it and renders the tail overlapped",
+        )
 
 
 def _check_line_seg_text_positions(
@@ -367,15 +431,18 @@ def _check_line_seg_text_positions(
     for paragraph_index, paragraph in enumerate(
         element for element in root.iter() if _local_name(element) == "p"
     ):
-        text_length = _simple_paragraph_text_length(paragraph)
-        if text_length is None:
+        text = _simple_paragraph_text(paragraph)
+        if text is None:
             continue
+        text_length = len(text)
         for child in paragraph:
             if _local_name(child).lower() != "linesegarray":
                 continue
+            line_segs: list[ET.Element] = []
             for line_seg in child:
                 if _local_name(line_seg).lower() != "lineseg":
                     continue
+                line_segs.append(line_seg)
                 textpos_raw = line_seg.get("textpos")
                 if textpos_raw is None:
                     continue
@@ -396,6 +463,9 @@ def _check_line_seg_text_positions(
                         f"{paragraph_index} has stale lineseg textpos={textpos} "
                         f"beyond text length {text_length}",
                     )
+            _check_line_seg_tail_coverage(
+                issues, part_name, paragraph_index, text, line_segs
+            )
 
 
 def _check_table_editor_acceptance(

hwpx/tools/text_extractor.py

@@ -483,7 +483,7 @@ class TextExtractor:
             return
 
         kind_name = "footnote" if kind == "footNote" else "endnote"
-        inst_id = element.get("instId") or ""
+        inst_id = element.get("instid") or element.get("instId") or ""
 
         if option == "placeholder":
             fragments.append(

{python_hwpx-6.2.1.dist-info → python_hwpx-6.3.0.dist-info}/METADATA

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

{python_hwpx-6.2.1.dist-info → python_hwpx-6.3.0.dist-info}/RECORD

@@ -9,7 +9,7 @@ hwpx/mutation_report.py,sha256=Uw9fxft8kioXpQ0feQwSlq4vOj3-418Oywt7qmDmU_8,19494
 hwpx/package.py,sha256=0rKjGCJbPQvrVBIy07Jpjsu3fI7HhbqFCGWTiTDsJpo,1141
 hwpx/patch.py,sha256=k_LoVxHzIBNs4kg2V4yBOgAxjsrim7pksG0rmRmLApE,27264
 hwpx/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hwpx/table_patch.py,sha256=GnDkQDQf5w5XOp0uVkw2WtQMNq-2DeZ3Lo0FHrQyz5k,94351
+hwpx/table_patch.py,sha256=GrQNmkdTS7nBolGOX473NSvq-PglM8qVSAH1zDaPJCQ,95805
 hwpx/templates.py,sha256=28bYqeJVeDb1Cq8G9NZG9Mhnu4K2GamAKC4QhxvUZyA,1187
 hwpx/_document/__init__.py,sha256=REiNqMbuk_TS4NVC27FIo1rUt3Z8nhJrTBGOgNtxBRg,90
 hwpx/_document/_legacy.py,sha256=kmiiJ-U8GEUrSvTGG7L-3TaEoLGucCPMgEuGfAJoTb4,59780
@@ -73,8 +73,8 @@ hwpx/opc/security.py,sha256=0wZitXK0J55wkbsWhyMyyufq0syBu_ZsBkqozrp-2DA,9062
 hwpx/opc/xml_utils.py,sha256=L_fHY1-D5I_TfdRkDQV-bn55EnXc6AqEDWItfMpawVs,3840
 hwpx/oxml/__init__.py,sha256=Ogl__NFyPORPxboCHqrsn2IrRdcjaQBzmnYm4pPWXpA,6731
 hwpx/oxml/_document_impl.py,sha256=41cxktJqXHER37fjA5HIFR8kw7dHMoISTxEv53PRBYo,5367
-hwpx/oxml/_document_primitives.py,sha256=k0iwhuCvh_ySCTiWAoldXuLO7FPIu8jY6C0fsW3j40I,56555
-hwpx/oxml/body.py,sha256=JAjg75SP8Qj14XbF7_I54pLU_jt3N59M969tG1-ZqtY,51850
+hwpx/oxml/_document_primitives.py,sha256=IcGRT7B4gblNgJ5XDivV_DME-5cU5p88hRSAM1L8_Hk,56887
+hwpx/oxml/body.py,sha256=RRopsZ7rvHDMIYNoEwHPty7DXyaZaFRDqJQSI6gVIls,52196
 hwpx/oxml/canonical_defaults.py,sha256=WHAK7u_W-PDv3P3N1-1-aWAoiUgBh4x-UybFL4NqW-w,3791
 hwpx/oxml/color.py,sha256=K2lbU_JdqRxFkQelGD6BbBkH1IspJSQyGlKHNz1Nmf4,2393
 hwpx/oxml/common.py,sha256=TJkafzg7x4T3J29tZchRZk57ZTsrM9PEiqGT3rX3w5o,1044
@@ -90,9 +90,9 @@ hwpx/oxml/header_part.py,sha256=quQowt3JXSavPPE4AlOEKlDAFPLL_dc2wUdpsqLFvzY,6220
 hwpx/oxml/history_part.py,sha256=U13RujivAo-mo_B-PvBxOx1JtAP_Uc1U-VcMdjjnukk,6555
 hwpx/oxml/master_page.py,sha256=kS_4afrXtWL9TI_QpsOhhCQeChFT6pGHtynPxUDaeCM,4172
 hwpx/oxml/master_page_authoring.py,sha256=U9Qt87G6XQ26nEJhHlWBclGyUV_rwGcf4WVuqi-12Dg,6645
-hwpx/oxml/memo.py,sha256=GOBYGaZvT4Md7Hq_Hm7c38svHQrEVHHew_tTxoiGAqM,13403
+hwpx/oxml/memo.py,sha256=24wUY2rPMdKkHceMGFKQg9tEoiCZjM6HLAPwydPTQE4,13595
 hwpx/oxml/namespaces.py,sha256=SPYOj0N3qm6TCcl2xiEj7hkVdCVHqx0GpkF3kKDKoZg,6838
-hwpx/oxml/note_authoring.py,sha256=OJBzvAa3mfJJT3V9KcgsbW5f6DCDR_NKKM84WoqMvck,7198
+hwpx/oxml/note_authoring.py,sha256=xOoYeX640XkwdftUQeHsdojGHHbiLbobZPi3aahh5ek,7198
 hwpx/oxml/numbering.py,sha256=9a0ARGW1DkKsTF7mEEXM4FA5loQmzIBuqE4APA8UFIQ,669
 hwpx/oxml/numbering_kinds.py,sha256=dikaExXr8GZ0gNL4KM5xxvGQOZDCkCdcA5qKDLsstsg,4034
 hwpx/oxml/objects.py,sha256=8gUCyH8dMDqiz_TmISKu_ZxIIsboZOc3wJ9A6KENKz4,54118
@@ -132,10 +132,10 @@ hwpx/tools/idempotence.py,sha256=UNIgfItSCoMFBxSfd3vhA-1AMJ5YJ4eGLtdOpWtfZtc,527
 hwpx/tools/ir_equality.py,sha256=zku8kKVNwrADcwLXWvmQ4U8VlhOgliPWyv9Ca2ao1yg,4860
 hwpx/tools/layout_preview.py,sha256=-gXLXBgLnIxxFpRh--oyKOodsekzoFZZ_4xSZW2jB2U,22723
 hwpx/tools/mail_merge.py,sha256=hGELwzgLm2Qxm320ldONt9npgAP50TkPRP_ZHLOGw3Y,18590
-hwpx/tools/markdown_export.py,sha256=trOvT9SzBCL5hMVUyuRe9_dT0-ibhTAPor7ty0vk7_g,21515
-hwpx/tools/object_finder.py,sha256=ovXlbuPiQFdGzNSU08SuEzNFoeYcIb7GfF6vB9MRwBE,13800
+hwpx/tools/markdown_export.py,sha256=yEMWK66izjwxDJCSbDlVCrQU90GWkd_QCu3Y2ki_i7M,21538
+hwpx/tools/object_finder.py,sha256=sKP2aF-uSk8-dPT4_Ew_Su5NlSpKVgw2FiP_iqkdU-c,13825
 hwpx/tools/package_reconcile.py,sha256=y1Hl7hbPh4YaV59LTdDLzQwgn4g1qEnFmSjmajnrEbA,2416
-hwpx/tools/package_validator.py,sha256=kj0hudG1kcc4_diBEFBc8UWz6KtusC8brCqXTYkZHcU,37619
+hwpx/tools/package_validator.py,sha256=OMbJ8dzB7fdNrhE7S8cKdMEkeLim0joQ2TsPutlLxnU,40476
 hwpx/tools/page_guard.py,sha256=Qg9vHP46nnq9W5GCyaHbpNY5Ndt7ecJHAdSs8BfRggQ,9622
 hwpx/tools/read_fidelity.py,sha256=f_a3Kftee3MRaCGraC6KjQDZ-iz3hv3b8-GGC5VCgyw,10528
 hwpx/tools/recover.py,sha256=EOVAzMFAqR9YAT3sinZKCdjSkKygo4dKrs6T6SbGA7o,4963
@@ -147,16 +147,16 @@ hwpx/tools/table_cleanup.py,sha256=0_f6NnvNp3QD4owKd_bRX6FZbeUmoQC7a4_VGzF2SCE,1
 hwpx/tools/table_navigation.py,sha256=rtbrWFKpJhqC3LD0ZXImyHgjmDR2hjHCFy3_S-qNBwA,16479
 hwpx/tools/template_analyzer.py,sha256=iH7egGRYNb8UesDB1TJ4tvW41-mlmv5Ap3VacqJFSlE,21355
 hwpx/tools/text_extract_cli.py,sha256=BmsDAwNXpDPhEayb9ez2ORtGNzPd_Xxduy4_cLXhnUw,2188
-hwpx/tools/text_extractor.py,sha256=9Whxq3ncGZ37prvSgwvp5TAhh2PIySl4at9NCcm5leI,27904
+hwpx/tools/text_extractor.py,sha256=PZ8rCsCJMDK8wjOgfcakfoTQ5iVviH2IhWF_9l_NzY4,27929
 hwpx/tools/toc_author.py,sha256=eS1Zm5OBoonuD_H92JxcN2o276d5XmcJDqpfscd4wSg,15445
 hwpx/tools/toc_fidelity.py,sha256=rvoKH8QJ65WNVrxS0d-i2AtODvBy-4O8NRudfQ244v4,19890
 hwpx/tools/validator.py,sha256=U856izL9NcJZOiKDYoCpwOSaFNQ2Un8Jn4pzL20A96Q,7100
 hwpx/tools/_schemas/header.xsd,sha256=mJXuFMuHGT1JnFFaluUpYUglwjMCNlfbFCRVM26eHXE,664
 hwpx/tools/_schemas/section.xsd,sha256=MgvavVHG05RDfUnVPxVU10H4FQOja5ON04_m9Uk_m7E,522
-python_hwpx-6.2.1.dist-info/licenses/LICENSE,sha256=_ubz4wv-BkkT3l3gu-QuH7JGeVjuRYGZoZK95eNsCHU,9688
-python_hwpx-6.2.1.dist-info/licenses/NOTICE,sha256=he3PBLXnIZK0sNsozc-SAQ2jvWjV61goylWUZ8HPi3s,3837
-python_hwpx-6.2.1.dist-info/METADATA,sha256=UF4HklQVOIHQuJPGLtYjXo9DKg2hI9ioq0mYUKdj8Pg,13652
-python_hwpx-6.2.1.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-python_hwpx-6.2.1.dist-info/entry_points.txt,sha256=JUKRxbly9UaeHV7YzOea23y8IiqSTcrhUlooP3fS_Zc,405
-python_hwpx-6.2.1.dist-info/top_level.txt,sha256=R1iToqDh80Nf2oQhRjTN0rbN2X6kyDUizIocZjkhuxc,5
-python_hwpx-6.2.1.dist-info/RECORD,,
+python_hwpx-6.3.0.dist-info/licenses/LICENSE,sha256=_ubz4wv-BkkT3l3gu-QuH7JGeVjuRYGZoZK95eNsCHU,9688
+python_hwpx-6.3.0.dist-info/licenses/NOTICE,sha256=he3PBLXnIZK0sNsozc-SAQ2jvWjV61goylWUZ8HPi3s,3837
+python_hwpx-6.3.0.dist-info/METADATA,sha256=Ybcxl0xVXkDcdsqWplRYdERcAEZjAxQLqayu3AUnqV8,13652
+python_hwpx-6.3.0.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+python_hwpx-6.3.0.dist-info/entry_points.txt,sha256=JUKRxbly9UaeHV7YzOea23y8IiqSTcrhUlooP3fS_Zc,405
+python_hwpx-6.3.0.dist-info/top_level.txt,sha256=R1iToqDh80Nf2oQhRjTN0rbN2X6kyDUizIocZjkhuxc,5
+python_hwpx-6.3.0.dist-info/RECORD,,

{python_hwpx-6.2.1.dist-info → python_hwpx-6.3.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (83.0.0)
+Generator: setuptools (84.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any