mdformat-mkdocs 5.2.0b1__tar.gz → 5.2.0b2__tar.gz

{mdformat_mkdocs-5.2.0b1 → mdformat_mkdocs-5.2.0b2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mdformat_mkdocs
-Version: 5.2.0b1
+Version: 5.2.0b2
 Summary: An mdformat plugin for mkdocs and Material for MkDocs
 Keywords: markdown,markdown-it,mdformat,mdformat_plugin_template
 Author: kyleking

{mdformat_mkdocs-5.2.0b1 → mdformat_mkdocs-5.2.0b2}/mdformat_mkdocs/__init__.py

@@ -1,7 +1,7 @@
 # ruff: noqa: RUF067
 """An mdformat plugin for `mkdocs`."""
 
-__version__ = "5.2.0b1"
+__version__ = "5.2.0b2"
 
 __plugin_name__ = "mkdocs"
 

{mdformat_mkdocs-5.2.0b1 → mdformat_mkdocs-5.2.0b2}/mdformat_mkdocs/plugin.py

@@ -194,27 +194,51 @@ def _render_inline_content(node: RenderTreeNode, context: RenderContext) -> str:
 
 
 _ESCAPED_LINK_SPACED_URL = re.compile(r"\\\[([^\]]*)\\\]\(([^)]*[ ][^)]*)\)")
+_PERCENT_ENCODED_URL_LINK = re.compile(r"\[([^\]]*)\]\(([^)]*%20[^)]*)\)")
+_ANGLE_BRACKET_SPACED_URL_SOURCE = re.compile(r"\]\(<([^>]* [^>]*)>\)")
 
 
 def _fix_links_with_spaced_urls(
     text: str,
-    node: RenderTreeNode,  # noqa: ARG001
+    node: RenderTreeNode,
     context: RenderContext,  # noqa: ARG001
 ) -> str:
-    """Rewrite escaped links with space-containing URLs to angle-bracket syntax.
+    r"""Rewrite links with space-containing URLs to angle-bracket syntax.
 
     CommonMark requires link destinations with spaces to use angle brackets.
-    When markdown-it fails to parse [text](url with space) as a link, mdformat
-    escapes the brackets. Detects and repairs those cases.
+    Handles two cases:
+
+    1. markdown-it fails to parse [text](url space) as a link and mdformat
+       escapes the brackets — detects ``\\[text\\](url space)`` and rewrites to
+       ``[text](<url space>)``.
+    2. markdown-it parses [text](<url space>) correctly but percent-encodes
+       the space in the href — detects [text](url%20space) and restores to
+       [text](<url space>) using the original source in node.content.
 
     Addresses: https://github.com/KyleKing/mdformat-mkdocs/issues/80
 
     """
-    return _ESCAPED_LINK_SPACED_URL.sub(
+    text = _ESCAPED_LINK_SPACED_URL.sub(
         lambda m: f"[{m.group(1)}](<{m.group(2)}>)",
         text,
     )
 
+    spaced_urls_from_source = {
+        m.group(1) for m in _ANGLE_BRACKET_SPACED_URL_SOURCE.finditer(node.content)
+    }
+    if spaced_urls_from_source:
+
+        def _restore_spaced_url(m: re.Match[str]) -> str:
+            link_text, encoded_url = m.group(1), m.group(2)
+            decoded_url = encoded_url.replace("%20", " ")
+            if decoded_url in spaced_urls_from_source:
+                return f"[{link_text}](<{decoded_url}>)"
+            return m.group(0)
+
+        text = _PERCENT_ENCODED_URL_LINK.sub(_restore_spaced_url, text)
+
+    return text
+
 
 def _render_text(node: RenderTreeNode, context: RenderContext) -> str:
     r"""Re-escape dollar signs that mdformat core stripped.

{mdformat_mkdocs-5.2.0b1 → mdformat_mkdocs-5.2.0b2}/pyproject.toml

@@ -25,7 +25,7 @@ license-files = ["LICENSE"]
 name = "mdformat_mkdocs"
 readme = "README.md"
 requires-python = ">=3.10.0"
-version = "5.2.0b1"
+version = "5.2.0b2"
 
 [project.entry-points."mdformat.parser_extension"]
 mkdocs = "mdformat_mkdocs"
@@ -70,7 +70,7 @@ homepage = "https://github.com/kyleking/mdformat-mkdocs"
 
 [tool.commitizen]
 tag_format = "v${version}"
-version = "5.2.0b1"
+version = "5.2.0b2"
 version_files = ["mdformat_mkdocs/__init__.py", "pyproject.toml:^version"]
 
 [tool.mypy]