mkdocs2confluence 0.7.13__tar.gz → 0.7.14__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {mkdocs2confluence-0.7.13/src/mkdocs2confluence.egg-info → mkdocs2confluence-0.7.14}/PKG-INFO +1 -1
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/pyproject.toml +1 -1
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14/src/mkdocs2confluence.egg-info}/PKG-INFO +1 -1
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/parser/markdown.py +15 -1
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/tests/test_parser.py +13 -1
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/LICENSE +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/README.md +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/setup.cfg +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs2confluence.egg-info/SOURCES.txt +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs2confluence.egg-info/dependency_links.txt +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs2confluence.egg-info/entry_points.txt +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs2confluence.egg-info/requires.txt +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs2confluence.egg-info/top_level.txt +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/__init__.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/cli.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/emitter/__init__.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/emitter/xhtml.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/ir/__init__.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/ir/document.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/ir/nodes.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/ir/treeutil.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/loader/__init__.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/loader/config.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/loader/extra_css.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/loader/nav.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/loader/page.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/parser/__init__.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/pdf/__init__.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/pdf/generator.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/pdf/render.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/preprocess/__init__.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/preprocess/abbrevs.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/preprocess/fence.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/preprocess/frontmatter.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/preprocess/icons.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/preprocess/includes.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/preprocess/linkdefs.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/preview/__init__.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/preview/render.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/preview/server.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/publisher/__init__.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/publisher/client.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/publisher/pipeline.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/transforms/__init__.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/transforms/abbrevs.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/transforms/assets.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/transforms/editlink.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/transforms/images.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/transforms/internallinks.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/transforms/mermaid.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/tests/test_abbrevs.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/tests/test_cli.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/tests/test_editlink.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/tests/test_emitter.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/tests/test_extra_css.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/tests/test_frontmatter.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/tests/test_icons.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/tests/test_images.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/tests/test_internallinks.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/tests/test_ir.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/tests/test_linkdefs.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/tests/test_loader.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/tests/test_mermaid.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/tests/test_page_loader.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/tests/test_pdf.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/tests/test_preprocess.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/tests/test_preview.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/tests/test_publish_client.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/tests/test_publish_config.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/tests/test_publish_pipeline.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/tests/test_server.py +0 -0
- {mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/tests/test_treeutil.py +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
[project]
|
|
2
2
|
name = "mkdocs2confluence"
|
|
3
|
-
version = "0.7.
|
|
3
|
+
version = "0.7.14"
|
|
4
4
|
description = "Publish MkDocs Material pages to Confluence Cloud — admonitions, Mermaid diagrams, tabs, page properties and more"
|
|
5
5
|
readme = "README.md"
|
|
6
6
|
license = { text = "GPL-3.0-or-later" }
|
{mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/parser/markdown.py
RENAMED
|
@@ -243,6 +243,18 @@ _ADMONITION_RE = re.compile(
|
|
|
243
243
|
# Matches a Material for MkDocs content tab opener: === "Label"
|
|
244
244
|
_TAB_RE = re.compile(r'^===\s+["\'](?P<label>[^"\']*)["\']$')
|
|
245
245
|
|
|
246
|
+
# Inline Markdown formatting patterns to strip from plain-text title strings.
|
|
247
|
+
_INLINE_MD_RE = re.compile(r'\*\*(.+?)\*\*|__(.+?)__|[*_](.+?)[*_]|`(.+?)`')
|
|
248
|
+
|
|
249
|
+
|
|
250
|
+
def _strip_md_inline(text: str) -> str:
|
|
251
|
+
"""Remove inline Markdown formatting markers from a plain-text string.
|
|
252
|
+
|
|
253
|
+
Used for titles that land in ``ac:parameter`` elements (plain text only).
|
|
254
|
+
``**bold**`` → ``bold``, ``*italic*`` → ``italic``, etc.
|
|
255
|
+
"""
|
|
256
|
+
return _INLINE_MD_RE.sub(lambda m: next(g for g in m.groups() if g is not None), text)
|
|
257
|
+
|
|
246
258
|
# Matches a horizontal rule (3+ dashes, stars, or underscores alone on a line).
|
|
247
259
|
_HR_RE = re.compile(r'^(?:-{3,}|\*{3,}|_{3,})\s*$')
|
|
248
260
|
|
|
@@ -386,6 +398,8 @@ def _tokenize(text: str) -> list[_Token]:
|
|
|
386
398
|
marker = adm_m.group("marker")
|
|
387
399
|
kind = adm_m.group("kind")
|
|
388
400
|
title = adm_m.group("title") # None if no quoted title given
|
|
401
|
+
if title is not None:
|
|
402
|
+
title = _strip_md_inline(title)
|
|
389
403
|
collapsible = marker.startswith("?")
|
|
390
404
|
expanded = marker == "???+"
|
|
391
405
|
i += 1
|
|
@@ -424,7 +438,7 @@ def _tokenize(text: str) -> list[_Token]:
|
|
|
424
438
|
tm = _TAB_RE.match(lines[i])
|
|
425
439
|
if not tm:
|
|
426
440
|
break
|
|
427
|
-
label = tm.group("label")
|
|
441
|
+
label = _strip_md_inline(tm.group("label"))
|
|
428
442
|
i += 1
|
|
429
443
|
body_raw_tab: list[str] = []
|
|
430
444
|
while i < len(lines):
|
|
@@ -500,7 +500,19 @@ class TestAdmonitions:
|
|
|
500
500
|
assert isinstance(adm, Admonition)
|
|
501
501
|
assert adm.title == 'title with "double" quotes'
|
|
502
502
|
|
|
503
|
-
def
|
|
503
|
+
def test_bold_markers_stripped_from_title(self) -> None:
|
|
504
|
+
adm = first(parse('!!! info "**Test**"\n Body.\n'), Admonition)
|
|
505
|
+
assert adm.title == "Test"
|
|
506
|
+
|
|
507
|
+
def test_italic_markers_stripped_from_title(self) -> None:
|
|
508
|
+
adm = first(parse('!!! info "*Test*"\n Body.\n'), Admonition)
|
|
509
|
+
assert adm.title == "Test"
|
|
510
|
+
|
|
511
|
+
def test_mixed_md_stripped_from_title(self) -> None:
|
|
512
|
+
adm = first(parse('!!! info "**Bold** and *italic*"\n Body.\n'), Admonition)
|
|
513
|
+
assert adm.title == "Bold and italic"
|
|
514
|
+
|
|
515
|
+
|
|
504
516
|
adm = first(parse("!!! note\n Body.\n"), Admonition)
|
|
505
517
|
assert isinstance(adm, Admonition)
|
|
506
518
|
assert adm.collapsible is False
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs2confluence.egg-info/SOURCES.txt
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
{mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs2confluence.egg-info/requires.txt
RENAMED
|
File without changes
|
{mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs2confluence.egg-info/top_level.txt
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
{mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/emitter/__init__.py
RENAMED
|
File without changes
|
{mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/emitter/xhtml.py
RENAMED
|
File without changes
|
{mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/ir/__init__.py
RENAMED
|
File without changes
|
{mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/ir/document.py
RENAMED
|
File without changes
|
|
File without changes
|
{mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/ir/treeutil.py
RENAMED
|
File without changes
|
{mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/loader/__init__.py
RENAMED
|
File without changes
|
{mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/loader/config.py
RENAMED
|
File without changes
|
{mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/loader/extra_css.py
RENAMED
|
File without changes
|
{mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/loader/nav.py
RENAMED
|
File without changes
|
{mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/loader/page.py
RENAMED
|
File without changes
|
{mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/parser/__init__.py
RENAMED
|
File without changes
|
{mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/pdf/__init__.py
RENAMED
|
File without changes
|
{mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/pdf/generator.py
RENAMED
|
File without changes
|
{mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/pdf/render.py
RENAMED
|
File without changes
|
|
File without changes
|
{mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/preprocess/abbrevs.py
RENAMED
|
File without changes
|
{mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/preprocess/fence.py
RENAMED
|
File without changes
|
|
File without changes
|
{mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/preprocess/icons.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
{mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/preview/__init__.py
RENAMED
|
File without changes
|
{mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/preview/render.py
RENAMED
|
File without changes
|
{mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/preview/server.py
RENAMED
|
File without changes
|
{mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/publisher/__init__.py
RENAMED
|
File without changes
|
{mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/publisher/client.py
RENAMED
|
File without changes
|
{mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/publisher/pipeline.py
RENAMED
|
File without changes
|
|
File without changes
|
{mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/transforms/abbrevs.py
RENAMED
|
File without changes
|
{mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/transforms/assets.py
RENAMED
|
File without changes
|
|
File without changes
|
{mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/transforms/images.py
RENAMED
|
File without changes
|
|
File without changes
|
{mkdocs2confluence-0.7.13 → mkdocs2confluence-0.7.14}/src/mkdocs_to_confluence/transforms/mermaid.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|