mkdocs2confluence 0.20.0__tar.gz → 0.20.2__tar.gz

{mkdocs2confluence-0.20.0/src/mkdocs2confluence.egg-info → mkdocs2confluence-0.20.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mkdocs2confluence
-Version: 0.20.0
+Version: 0.20.2
 Summary: Publish MkDocs Material pages to Confluence Cloud — admonitions, Mermaid diagrams, tabs, page properties and more
 Author: Anders Hybertz
 License: GPL-3.0-or-later
@@ -16,6 +16,7 @@ Classifier: License :: OSI Approved :: GNU General Public License v3 or later (G
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Documentation
 Classifier: Topic :: Software Development :: Documentation
 Classifier: Topic :: Text Processing :: Markup

{mkdocs2confluence-0.20.0 → mkdocs2confluence-0.20.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mkdocs2confluence"
-version = "0.20.0"
+version = "0.20.2"
 description = "Publish MkDocs Material pages to Confluence Cloud — admonitions, Mermaid diagrams, tabs, page properties and more"
 readme = "README.md"
 license = { text = "GPL-3.0-or-later" }
@@ -24,6 +24,7 @@ classifiers = [
   "Programming Language :: Python :: 3",
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
+  "Programming Language :: Python :: 3.14",
   "Topic :: Documentation",
   "Topic :: Software Development :: Documentation",
   "Topic :: Text Processing :: Markup",

{mkdocs2confluence-0.20.0 → mkdocs2confluence-0.20.2/src/mkdocs2confluence.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mkdocs2confluence
-Version: 0.20.0
+Version: 0.20.2
 Summary: Publish MkDocs Material pages to Confluence Cloud — admonitions, Mermaid diagrams, tabs, page properties and more
 Author: Anders Hybertz
 License: GPL-3.0-or-later
@@ -16,6 +16,7 @@ Classifier: License :: OSI Approved :: GNU General Public License v3 or later (G
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Documentation
 Classifier: Topic :: Software Development :: Documentation
 Classifier: Topic :: Text Processing :: Markup

{mkdocs2confluence-0.20.0 → mkdocs2confluence-0.20.2}/src/mkdocs_to_confluence/loader/config.py

@@ -123,7 +123,7 @@ def _make_env_loader() -> type[yaml.SafeLoader]:
     def _ignore(loader: yaml.SafeLoader, _tag_suffix: str, node: yaml.Node) -> None:
         return None
 
-    _Loader.add_multi_constructor("", _ignore)  # type: ignore[no-untyped-call]
+    _Loader.add_multi_constructor("", _ignore)
     return _Loader
 
 

{mkdocs2confluence-0.20.0 → mkdocs2confluence-0.20.2}/src/mkdocs_to_confluence/parser/markdown.py

@@ -51,6 +51,7 @@ from __future__ import annotations
 import contextlib
 import html
 import re
+import textwrap
 from dataclasses import dataclass, field
 from typing import Union
 
@@ -329,6 +330,17 @@ def _grid_kind(line: str) -> str | None:
 _CARD_BULLET_RE = re.compile(r'^(?P<marker>[-*+]\s+)(?P<text>.*)$')
 
 
+def _dedent_body(lines: list[str]) -> str:
+    """Join admonition/tab body *lines* and drop any indent they all share.
+
+    The collector strips the 4 columns that delimit the body, but authors often
+    indent the content further (8 spaces is a common habit). That residual indent
+    is invisible to the author and would stop a list, fence or heading from being
+    recognised, since those anchor at column 0.
+    """
+    return textwrap.dedent("\n".join(_expand_leading_tabs(ln) for ln in lines))
+
+
 def _expand_leading_tabs(line: str) -> str:
     """Expand tabs in *line*'s leading whitespace to 4-space tab stops.
 
@@ -536,7 +548,7 @@ def _tokenize(text: str) -> list[_Token]:
             # Drop trailing blank lines so the recursive tokenizer stays clean.
             while body_raw and not body_raw[-1].strip():
                 body_raw.pop()
-            body_tokens = _tokenize("\n".join(body_raw))
+            body_tokens = _tokenize(_dedent_body(body_raw))
             tokens.append(
                 _AdmonitionToken(
                     kind=kind,
@@ -571,7 +583,7 @@ def _tokenize(text: str) -> list[_Token]:
                         break
                 while body_raw_tab and not body_raw_tab[-1].strip():
                     body_raw_tab.pop()
-                tabs.append(_TabData(label=label, body_tokens=_tokenize("\n".join(body_raw_tab))))
+                tabs.append(_TabData(label=label, body_tokens=_tokenize(_dedent_body(body_raw_tab))))
             if tabs:
                 tokens.append(_ContentTabsToken(tabs=tabs))
             continue

{mkdocs2confluence-0.20.0 → mkdocs2confluence-0.20.2}/tests/test_parser.py

@@ -1668,3 +1668,52 @@ class TestGridCardIndentEdgeCases:
         src = '<div class="grid cards" markdown>\r\n\r\n- !!! tip "T"\r\n\r\n      Body.\r\n\r\n</div>\r\n'
         from mkdocs_to_confluence.emitter.xhtml import emit
         assert "Body." in self._panel_body(emit(parse(src)))
+
+
+class TestAdmonitionBodyOverIndent:
+    """Body content indented past the 4 that delimit it must still parse."""
+
+    def _emit(self, src: str) -> str:
+        from mkdocs_to_confluence.emitter.xhtml import emit
+        return emit(parse(src))
+
+    def test_list_indented_eight_spaces(self) -> None:
+        """8 spaces (4 for the body + 4 more) is a common authoring habit."""
+        xhtml = self._emit('!!! note "T"\n\n        - one\n        - two\n')
+        assert "<li><p>one</p></li>" in xhtml
+        assert "<p>- one" not in xhtml, "list flattened to a paragraph"
+
+    def test_list_indented_four_spaces_still_works(self) -> None:
+        xhtml = self._emit('!!! note "T"\n\n    - one\n    - two\n')
+        assert "<li><p>one</p></li>" in xhtml
+
+    def test_nested_list_relative_indent_is_preserved(self) -> None:
+        """Dedenting must not flatten a sub-list into its parent."""
+        for sub_indent in ("      ", "        "):  # 2 and 4 spaces past the item
+            xhtml = self._emit(f'!!! note "T"\n\n    - one\n{sub_indent}- sub\n    - two\n')
+            assert xhtml.count("<ul>") == 2, f"sub-list lost at {len(sub_indent)} spaces"
+
+    def test_mixed_indent_body_is_left_alone(self) -> None:
+        """A deeper line beside a column-0 line keeps its relative indent."""
+        xhtml = self._emit('!!! note "T"\n\n    Intro.\n\n        - deeper\n')
+        assert "<p>Intro.</p>" in xhtml
+
+    def test_over_indented_code_fence(self) -> None:
+        xhtml = self._emit('!!! note "T"\n\n        ```python\n        x = 1\n        ```\n')
+        assert "<![CDATA[x = 1]]>" in xhtml
+
+    def test_content_tab_body_is_dedented_too(self) -> None:
+        xhtml = self._emit('=== "A"\n\n        - one\n        - two\n')
+        assert "<li><p>one</p></li>" in xhtml
+
+    def test_grid_card_admonition_with_over_indented_list(self) -> None:
+        """The reported case: grid card, bulleted admonition, list at 8 spaces."""
+        xhtml = self._emit(
+            '<div class="grid cards">\n\n'
+            '- !!! abstract "Documentation"\n\n'
+            '        - **Scope:** test\n'
+            '        - **Out:** test\n\n'
+            '</div>\n'
+        )
+        assert "<li><p><strong>Scope:</strong> test</p></li>" in xhtml
+        assert "<p>- " not in xhtml