mkdocs2confluence 0.7.6__tar.gz → 0.7.8__tar.gz

{mkdocs2confluence-0.7.6/src/mkdocs2confluence.egg-info → mkdocs2confluence-0.7.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mkdocs2confluence
-Version: 0.7.6
+Version: 0.7.8
 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

{mkdocs2confluence-0.7.6 → mkdocs2confluence-0.7.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mkdocs2confluence"
-version = "0.7.6"
+version = "0.7.8"
 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" }

{mkdocs2confluence-0.7.6 → mkdocs2confluence-0.7.8/src/mkdocs2confluence.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mkdocs2confluence
-Version: 0.7.6
+Version: 0.7.8
 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

{mkdocs2confluence-0.7.6 → mkdocs2confluence-0.7.8}/src/mkdocs_to_confluence/emitter/xhtml.py

@@ -307,7 +307,9 @@ def _emit_admonition(node: Admonition) -> str:
     body = emit(node.children)
 
     # ??? and ???+ → Confluence expand macro (collapsible)
-    if node.collapsible:
+    # ???+ means "expanded by default" — Confluence expand has no such option,
+    # so degrade to a regular admonition macro (always visible).
+    if node.collapsible and not node.expanded:
         return (
             '<ac:structured-macro ac:name="expand">\n'
             f'  <ac:parameter ac:name="title">{html.escape(title)}</ac:parameter>\n'
@@ -315,6 +317,8 @@ def _emit_admonition(node: Admonition) -> str:
             "</ac:structured-macro>\n"
         )
 
+    # Fall through for ???+ (expanded=True) — render as a regular admonition below.
+
     if node.kind in _ADMONITION_DANGER_KINDS:
         colours = "".join(
             f'  <ac:parameter ac:name="{k}">{v}</ac:parameter>\n'

{mkdocs2confluence-0.7.6 → mkdocs2confluence-0.7.8}/src/mkdocs_to_confluence/ir/nodes.py

@@ -338,12 +338,14 @@ class Admonition(IRNode):
         children:    Block nodes that form the admonition body.
         collapsible: ``True`` when opened with ``???`` (collapsed by default)
                      or ``???+`` (expanded by default).
+        expanded:    ``True`` only for ``???+`` — expanded by default.
     """
 
     kind: str
     title: str | None
     children: tuple[IRNode, ...]
     collapsible: bool = False
+    expanded: bool = False
 
 
 @dataclass(frozen=True)

{mkdocs2confluence-0.7.6 → mkdocs2confluence-0.7.8}/src/mkdocs_to_confluence/parser/markdown.py

@@ -139,6 +139,7 @@ class _AdmonitionToken:
     kind: str
     title: str | None       # None → use the kind's default Confluence title
     collapsible: bool       # True for ??? and ???+
+    expanded: bool          # True for ???+ (expanded by default)
     body_tokens: list[_Token]
 
 
@@ -236,7 +237,7 @@ _FENCE_OPEN_RE = re.compile(r"^(?P<fence>`{3,}|~{3,})(?P<info>.*)$")
 
 # Matches an admonition opener:  !!! kind  /  !!! kind "title"  /  ??? kind  /  ???+ kind
 _ADMONITION_RE = re.compile(
-    r'^(?P<marker>!{3}|\?{3}\+?)\s+(?P<kind>\w+)(?:\s+["\'](?P<title>[^"\']*)["\'])?$'
+    r"""^(?P<marker>!{3}|\?{3}\+?)\s+(?P<kind>\w+)(?:\s+(?P<q>["'])(?P<title>.*?)(?P=q))?$"""
 )
 
 # Matches a Material for MkDocs content tab opener:  === "Label"
@@ -386,6 +387,7 @@ def _tokenize(text: str) -> list[_Token]:
             kind = adm_m.group("kind")
             title = adm_m.group("title")    # None if no quoted title given
             collapsible = marker.startswith("?")
+            expanded = marker == "???+"
             i += 1
             # Collect body: blank lines or lines indented by ≥4 spaces / 1 tab.
             body_raw: list[str] = []
@@ -408,6 +410,7 @@ def _tokenize(text: str) -> list[_Token]:
                     kind=kind,
                     title=title,
                     collapsible=collapsible,
+                    expanded=expanded,
                     body_tokens=body_tokens,
                 )
             )
@@ -1055,6 +1058,7 @@ def _build_tree(
                     kind=token.kind,
                     title=token.title,
                     collapsible=token.collapsible,
+                    expanded=token.expanded,
                     children=body_nodes,
                 ),
                 stack,

{mkdocs2confluence-0.7.6 → mkdocs2confluence-0.7.8}/tests/test_emitter.py

@@ -136,6 +136,18 @@ class TestAdmonitionEmitter:
         assert 'ac:name="expand"' in out
         assert 'ac:name="panel"' not in out
 
+    def test_expanded_admonition_renders_as_regular_macro(self) -> None:
+        # ???+ (collapsible=True, expanded=True) has no Confluence equivalent for
+        # "expanded by default", so we degrade to a regular admonition macro.
+        out = emit((
+            Admonition(kind="note", title="Visible", children=(Paragraph((TextNode("body"),)),),
+                       collapsible=True, expanded=True),
+        ))
+        assert 'ac:name="expand"' not in out
+        assert 'ac:name="info"' in out
+        assert "Visible" in out
+        assert "body" in out
+
 
 class TestContentTabsEmitter:
     def test_tabs_render_as_expand_macros(self) -> None:

{mkdocs2confluence-0.7.6 → mkdocs2confluence-0.7.8}/tests/test_parser.py

@@ -490,6 +490,16 @@ class TestAdmonitions:
         assert isinstance(adm, Admonition)
         assert adm.title == "Pro tip"
 
+    def test_title_with_single_quotes_inside_double_quoted(self) -> None:
+        adm = first(parse("???+ note \"What 'best effort' means (C4)\"\n    Body.\n"), Admonition)
+        assert isinstance(adm, Admonition)
+        assert adm.title == "What 'best effort' means (C4)"
+
+    def test_title_with_double_quotes_inside_single_quoted(self) -> None:
+        adm = first(parse("!!! note 'title with \"double\" quotes'\n    Body.\n"), Admonition)
+        assert isinstance(adm, Admonition)
+        assert adm.title == 'title with "double" quotes'
+
     def test_bang_not_collapsible(self) -> None:
         adm = first(parse("!!! note\n    Body.\n"), Admonition)
         assert isinstance(adm, Admonition)
@@ -505,6 +515,21 @@ class TestAdmonitions:
         assert isinstance(adm, Admonition)
         assert adm.collapsible is True
 
+    def test_question_mark_plus_is_expanded(self) -> None:
+        adm = first(parse("???+ note\n    Body.\n"), Admonition)
+        assert isinstance(adm, Admonition)
+        assert adm.expanded is True
+
+    def test_question_mark_no_plus_is_not_expanded(self) -> None:
+        adm = first(parse("??? note\n    Body.\n"), Admonition)
+        assert isinstance(adm, Admonition)
+        assert adm.expanded is False
+
+    def test_bang_is_not_expanded(self) -> None:
+        adm = first(parse("!!! note\n    Body.\n"), Admonition)
+        assert isinstance(adm, Admonition)
+        assert adm.expanded is False
+
     def test_body_paragraph_parsed(self) -> None:
         adm = first(parse("!!! note\n    Body text here.\n"), Admonition)
         assert isinstance(adm, Admonition)