python-hwpx 5.4.0__py3-none-any.whl → 5.5.0__py3-none-any.whl

hwpx/oxml/memo.py

@@ -14,7 +14,6 @@ from ._document_primitives import (
     _default_sublist_attributes,
     _element_local_name,
     _memo_id,
-    _paragraph_id,
     _sanitize_text,
 )
 
@@ -213,14 +212,35 @@ class HwpxOxmlNote:
 
     @text.setter
     def text(self, value: str) -> None:
-        """Replace the note body text."""
+        """Replace the note body text.
+
+        The gold-shaped body (각주/미주 style paragraph with the leading
+        ``<hp:autoNum>`` control real Hancom requires to render the note) is
+        preserved: only text content is replaced.
+        """
         sublist = self.element.find(f"{_HP}subList")
         if sublist is None:
-            sublist = _append_child(self.element, f"{_HP}subList", _default_sublist_attributes())
-        for p in sublist.findall(f"{_HP}p"):
+            attrs = _default_sublist_attributes()
+            attrs["vertAlign"] = "TOP"
+            sublist = _append_child(self.element, f"{_HP}subList", attrs)
+        paragraphs = sublist.findall(f"{_HP}p")
+        template = paragraphs[0] if paragraphs else None
+        p_attrs = (
+            dict(template.attrib)
+            if template is not None
+            else {"id": "0", **_DEFAULT_PARAGRAPH_ATTRS}
+        )
+        first_run = template.find(f"{_HP}run") if template is not None else None
+        run_attrs = dict(first_run.attrib) if first_run is not None else {"charPrIDRef": "0"}
+        auto_num = (
+            first_run.find(f"{_HP}ctrl") if first_run is not None else None
+        )
+        for p in paragraphs:
             sublist.remove(p)
-        paragraph = _append_child(sublist, f"{_HP}p", {"id": _paragraph_id(), **_DEFAULT_PARAGRAPH_ATTRS})
-        run = _append_child(paragraph, f"{_HP}run", {"charPrIDRef": "0"})
+        paragraph = _append_child(sublist, f"{_HP}p", p_attrs)
+        run = _append_child(paragraph, f"{_HP}run", run_attrs)
+        if auto_num is not None:
+            run.append(auto_num)
         t = _append_child(run, f"{_HP}t", {})
         t.text = _sanitize_text(value)
         self.paragraph.section.mark_dirty()

hwpx/oxml/paragraph.py

@@ -23,7 +23,6 @@ from ._document_primitives import (
     _default_sublist_attributes,
     _is_tab_control_element,
     _object_id,
-    _paragraph_id,
     _sanitize_text,
 )
 from .memo import HwpxOxmlNote
@@ -1183,6 +1182,61 @@ class HwpxOxmlParagraph:
     # Footnote / Endnote helpers
     # ------------------------------------------------------------------
 
+    _NOTE_STYLE_NAMES = {"footNote": ("각주", "Footnote"), "endNote": ("미주", "Endnote")}
+    _NOTE_STYLE_FALLBACK = {"footNote": ("15", "10", "3"), "endNote": ("16", "10", "3")}
+
+    def _note_style_refs(self, tag: str) -> tuple[str, str, str]:
+        """(styleIDRef, paraPrIDRef, charPrIDRef) for the note body paragraph.
+
+        Real Hancom puts note bodies on the 각주/미주 paragraph styles. Resolve
+        by style name from the header so documents with re-numbered styles stay
+        correct; fall back to the fixed template coordinates.
+        """
+
+        korean, english = self._NOTE_STYLE_NAMES[tag]
+        document = self.section.document
+        headers = cast(
+            "Sequence[object]",
+            getattr(document, "_headers", []) if document is not None else [],
+        )
+        for header in headers:
+            styles = getattr(header, "_styles_element", None)
+            container = cast(
+                "ET.Element | None", styles() if callable(styles) else None
+            )
+            if container is None:
+                continue
+            for style in container:
+                if style.get("name") == korean or style.get("engName") == english:
+                    return (
+                        style.get("id") or self._NOTE_STYLE_FALLBACK[tag][0],
+                        style.get("paraPrIDRef") or self._NOTE_STYLE_FALLBACK[tag][1],
+                        style.get("charPrIDRef") or self._NOTE_STYLE_FALLBACK[tag][2],
+                    )
+        return self._NOTE_STYLE_FALLBACK[tag]
+
+    def _note_suffix_char(self, tag: str) -> str:
+        """The note suffix character from secPr, defaulting to ")"."""
+
+        properties = self.section._section_properties_element()
+        if properties is not None:
+            pr = properties.find(f"{_HP}{tag}Pr")
+            if pr is not None:
+                fmt = pr.find(f"{_HP}autoNumFormat")
+                if fmt is not None and fmt.get("suffixChar"):
+                    return fmt.get("suffixChar", ")")
+        return ")"
+
+    def _next_note_number(self, tag: str) -> int:
+        """Document-continuous note number, counted per note type."""
+
+        document = self.section.document
+        sections = document.sections if document is not None else [self.section]
+        count = 0
+        for section in sections:
+            count += sum(1 for _ in section.element.iter(f"{_HP}{tag}"))
+        return count + 1
+
     def _add_note(
         self,
         tag: str,
@@ -1191,17 +1245,54 @@ class HwpxOxmlParagraph:
         run_attributes: dict[str, str] | None = None,
         char_pr_id_ref: str | int | None = None,
     ) -> HwpxOxmlNote:
-        """Insert a ``<hp:footNote>`` or ``<hp:endNote>`` element."""
+        """Insert a ``<hp:footNote>`` or ``<hp:endNote>`` element.
 
-        run = self._create_run_for_object(run_attributes, char_pr_id_ref=char_pr_id_ref)
-        note_element = _append_child(run, f"{_HP}{tag}", {"instId": _object_id()})
-        sublist = _append_child(note_element, f"{_HP}subList", _default_sublist_attributes())
-        p_attrs = {"id": _paragraph_id(), **_DEFAULT_PARAGRAPH_ATTRS}
+        Emits the real-Hancom shape (gold-reversed): the note element is
+        wrapped in ``<hp:ctrl>`` inside a body run, carries ``number`` and
+        ``suffixChar``, and its body paragraph uses the 각주/미주 style with a
+        leading ``<hp:autoNum>`` control — without these real Hancom does not
+        render the note at all.
+        """
+
+        number = self._next_note_number(tag)
+        suffix = self._note_suffix_char(tag)
+        style_ref, para_pr_ref, note_char_ref = self._note_style_refs(tag)
+        if char_pr_id_ref is not None:
+            note_char_ref = str(char_pr_id_ref)
+
+        runs = self._run_elements()
+        if run_attributes is None and runs:
+            run = runs[-1]
+        else:
+            run = self._create_run_for_object(run_attributes, char_pr_id_ref=char_pr_id_ref)
+        ctrl = _append_child(run, f"{_HP}ctrl", {})
+        note_element = _append_child(
+            ctrl,
+            f"{_HP}{tag}",
+            {
+                "number": str(number),
+                "suffixChar": str(ord(suffix[0])) if suffix else "41",
+                "instId": _object_id(),
+            },
+        )
+        sublist_attrs = _default_sublist_attributes()
+        sublist_attrs["vertAlign"] = "TOP"
+        sublist = _append_child(note_element, f"{_HP}subList", sublist_attrs)
+        p_attrs = dict(_DEFAULT_PARAGRAPH_ATTRS)
+        p_attrs.update({"id": "0", "paraPrIDRef": para_pr_ref, "styleIDRef": style_ref})
         paragraph = _append_child(sublist, f"{_HP}p", p_attrs)
-        # 본문 run의 charPrIDRef도 인자를 따라가도록 적용 (host run과 동일 스타일).
-        # None이면 "0"(default).
-        body_cpr = "0" if char_pr_id_ref is None else str(char_pr_id_ref)
-        note_run = _append_child(paragraph, f"{_HP}run", {"charPrIDRef": body_cpr})
+        note_run = _append_child(paragraph, f"{_HP}run", {"charPrIDRef": note_char_ref})
+        num_ctrl = _append_child(note_run, f"{_HP}ctrl", {})
+        auto_num = _append_child(
+            num_ctrl,
+            f"{_HP}autoNum",
+            {"num": str(number), "numType": "FOOTNOTE" if tag == "footNote" else "ENDNOTE"},
+        )
+        _append_child(
+            auto_num,
+            f"{_HP}autoNumFormat",
+            {"type": "DIGIT", "userChar": "", "prefixChar": "", "suffixChar": suffix, "supscript": "0"},
+        )
         t = _append_child(note_run, f"{_HP}t", {})
         t.text = _sanitize_text(text)
         self.section.mark_dirty()

hwpx/tools/markdown_export.py

@@ -228,7 +228,7 @@ def _md_push_text(state: _MdParagraphState, cpr, text) -> None:
         state.items.append((cpr, text))
 
 
-def _md_handle_ctrl_child(child, state: _MdParagraphState, base_cp, chars) -> None:
+def _md_handle_ctrl_child(child, state: _MdParagraphState, base_cp, chars, doc=None, notes_out=None) -> None:
     for gc in child:
         gctag = _local_name(gc)
         if gctag == "fieldBegin" and gc.get("type") == "HYPERLINK":
@@ -236,6 +236,9 @@ def _md_handle_ctrl_child(child, state: _MdParagraphState, base_cp, chars) -> No
             state.link_url = gc.get("name", "")
         elif gctag == "fieldEnd":
             _md_flush_link(state, base_cp, chars)
+        elif gctag in ("footNote", "endNote"):
+            # 실한컴 계약: 각주/미주는 run 안 <hp:ctrl>에 래핑되어 있다.
+            _md_handle_note_child(gc, gctag, state, base_cp, chars, doc, notes_out)
 
 
 def _md_handle_note_child(
@@ -271,8 +274,9 @@ def _p_element_to_md(p_el, doc, notes_out: list | None = None) -> str:
                 if child.text:
                     _md_push_text(state, cpr, child.text)
             elif tag == "ctrl":
-                _md_handle_ctrl_child(child, state, base_cp, chars)
+                _md_handle_ctrl_child(child, state, base_cp, chars, doc, notes_out)
             elif tag in ("footNote", "endNote"):
+                # 구식(5.4 이전 자사 방출) 호환: run 직속 각주도 계속 읽는다.
                 _md_handle_note_child(child, tag, state, base_cp, chars, doc, notes_out)
 
     _md_flush_items(state, base_cp, chars)

hwpx/tools/text_extractor.py

@@ -483,6 +483,20 @@ class TextExtractor:
         annotations: Optional[AnnotationOptions],
         preserve_breaks: bool,
     ) -> None:
+        # 실한컴 계약: 각주/미주는 <hp:ctrl> 래핑으로 나타난다 — annotations
+        # 유무와 무관하게 노트 분기로 위임한다(구식 run 직속도 별도 분기 유지).
+        for note_tag in ("footNote", "endNote"):
+            note = _first_child_by_local(element, note_tag)
+            if note is not None:
+                self._handle_note(
+                    note,
+                    fragments,
+                    note_tag,
+                    annotations=annotations,
+                    preserve_breaks=preserve_breaks,
+                )
+                return
+
         if annotations is None:
             return
 

{python_hwpx-5.4.0.dist-info → python_hwpx-5.5.0.dist-info}/METADATA

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

{python_hwpx-5.4.0.dist-info → python_hwpx-5.5.0.dist-info}/RECORD

@@ -52,11 +52,11 @@ hwpx/oxml/document.py,sha256=0Ml-t2fwa4f2xMfu5jbkOoh_KDKCCf3gNpaYICRV-KY,1172
 hwpx/oxml/document_parts.py,sha256=NSlCmXKfItIaTEYruu6zUh-XHZRRDI9XZ2U-5rD2UUU,49240
 hwpx/oxml/header.py,sha256=4LtTDPe7YW0o_4jPv3Rd-vyv5suRfebecxtTWbF65Uw,50011
 hwpx/oxml/header_part.py,sha256=JBOw3Ljkt0PCYYKP7IlFpxA1ZRbrBHqDo8hjvE-yMsk,51409
-hwpx/oxml/memo.py,sha256=QlmuELEzywnmywgjm94S3vzJB8wPpoFOmI8KVuzoNPw,9484
+hwpx/oxml/memo.py,sha256=jTtZIrR7LwWn_vvFN6Fr9yX2eSJfMPh8WnNW1DhD2Rs,10283
 hwpx/oxml/namespaces.py,sha256=c7JfdOdJbzrhyHvjbxoeeeloRE3xPuoB7v3YI8SmKDk,6524
 hwpx/oxml/numbering.py,sha256=9a0ARGW1DkKsTF7mEEXM4FA5loQmzIBuqE4APA8UFIQ,669
 hwpx/oxml/objects.py,sha256=8ErDXWvkjLm3FTsx0Z_IovUXbiv2uc-j0B5Y2-OtihA,20864
-hwpx/oxml/paragraph.py,sha256=eZHoEnwiVhk9HvvhCZ77WMo1iulOD6BtLU_RvVHoDNY,49635
+hwpx/oxml/paragraph.py,sha256=btJlX6WScB9gjKRu2uAs1qAdEQYar2BuKdSwNfdRm9U,53408
 hwpx/oxml/parser.py,sha256=pIfyNdW3WdFkCcE8JFY7hn1fobRbMngzfhVZICvWeVs,2937
 hwpx/oxml/run.py,sha256=F939J1W6zQjr-JQ1Z8-nKh2s7NQ_0Okov4QJAEyw_5M,15503
 hwpx/oxml/schema.py,sha256=ElR3_IIhhPPZEqJtNKMNCHA-VFVLdhL454W_4spuvlc,1284
@@ -83,7 +83,7 @@ hwpx/tools/idempotence.py,sha256=kRZBWsPJFVprYRJkkxn3DHjrT6qX2nK7KvhmdgJ4JpA,501
 hwpx/tools/ir_equality.py,sha256=NIjq33-4q7iTo_asv7WUvh_-EfB1JZMTwbLfYIw2c5w,4765
 hwpx/tools/layout_preview.py,sha256=cHlBUEdMn_ac-hNFDUgF5r2PMM0cTw65l7sqq7Li8NM,22702
 hwpx/tools/mail_merge.py,sha256=8kGlSk2GQL7cFxZgg6P_bKisj1zVUWy8qh8AXIZLK_w,18611
-hwpx/tools/markdown_export.py,sha256=6g0G30Zk0psN9KeZWVMK_fnSzd6Ij9w7t-ZSOsHxW3c,20133
+hwpx/tools/markdown_export.py,sha256=_qhOqnYg2tFQa4-EuXyFdJvkc_-9x6ln9lx-MeqtNeY,20495
 hwpx/tools/object_finder.py,sha256=ovXlbuPiQFdGzNSU08SuEzNFoeYcIb7GfF6vB9MRwBE,13800
 hwpx/tools/package_reconcile.py,sha256=y1Hl7hbPh4YaV59LTdDLzQwgn4g1qEnFmSjmajnrEbA,2416
 hwpx/tools/package_validator.py,sha256=fYkJevV_soQuM8LEUQMkwYaTy2k2HV4VWBwfIXFt29Y,33306
@@ -98,16 +98,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=m9OSBd4FjZrzlMP8b4uS2Lnmjp-u-t7EBKFDF3P1bTM,25514
+hwpx/tools/text_extractor.py,sha256=6Wtk3av69z848ZJAEh-fV4TU2BkAwk3qKJpIyUkYT_4,26122
 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-5.4.0.dist-info/licenses/LICENSE,sha256=_ubz4wv-BkkT3l3gu-QuH7JGeVjuRYGZoZK95eNsCHU,9688
-python_hwpx-5.4.0.dist-info/licenses/NOTICE,sha256=auRgKYGdrOgWrj4kZfAuXQnqgDnx5myI9TI17IztIzQ,3466
-python_hwpx-5.4.0.dist-info/METADATA,sha256=hd6N3Fnhn5arZdkRj-BfKR4or0Zceejz27w-lyHaQS8,13162
-python_hwpx-5.4.0.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-python_hwpx-5.4.0.dist-info/entry_points.txt,sha256=JUKRxbly9UaeHV7YzOea23y8IiqSTcrhUlooP3fS_Zc,405
-python_hwpx-5.4.0.dist-info/top_level.txt,sha256=R1iToqDh80Nf2oQhRjTN0rbN2X6kyDUizIocZjkhuxc,5
-python_hwpx-5.4.0.dist-info/RECORD,,
+python_hwpx-5.5.0.dist-info/licenses/LICENSE,sha256=_ubz4wv-BkkT3l3gu-QuH7JGeVjuRYGZoZK95eNsCHU,9688
+python_hwpx-5.5.0.dist-info/licenses/NOTICE,sha256=auRgKYGdrOgWrj4kZfAuXQnqgDnx5myI9TI17IztIzQ,3466
+python_hwpx-5.5.0.dist-info/METADATA,sha256=8nE4IAXunnxWpqeKPO01ZzKLHA1mXKqZUb034C9gB9k,13162
+python_hwpx-5.5.0.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+python_hwpx-5.5.0.dist-info/entry_points.txt,sha256=JUKRxbly9UaeHV7YzOea23y8IiqSTcrhUlooP3fS_Zc,405
+python_hwpx-5.5.0.dist-info/top_level.txt,sha256=R1iToqDh80Nf2oQhRjTN0rbN2X6kyDUizIocZjkhuxc,5
+python_hwpx-5.5.0.dist-info/RECORD,,