MDit 0.0.0.dev2__tar.gz → 0.0.0.dev3__tar.gz

{mdit-0.0.0.dev2 → mdit-0.0.0.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MDit
-Version: 0.0.0.dev2
+Version: 0.0.0.dev3
 Requires-Python: >=3.10
 Requires-Dist: sphinx<8
 Requires-Dist: myst-parser<4,>3
@@ -13,15 +13,15 @@ Requires-Dist: linkify-it-py
 Requires-Dist: readme-renderer
 Requires-Dist: cmarkgfm
 Requires-Dist: zundler
-Requires-Dist: PkgData
-Requires-Dist: PySerials
-Requires-Dist: PyLinks
-Requires-Dist: PyBadger
-Requires-Dist: PyColorIt
 Requires-Dist: IPython
 Requires-Dist: jupyterlab_myst
-Requires-Dist: PyProtocol
-Requires-Dist: HTMP
-Requires-Dist: ansi-sgr
 Requires-Dist: pygments
 Requires-Dist: rich
+Requires-Dist: PkgData==0.0.0.dev3
+Requires-Dist: PySerials==0.0.0.dev7
+Requires-Dist: PyLinks==0.0.0.dev27
+Requires-Dist: PyBadger==0.0.0.dev8
+Requires-Dist: PyColorIt==0.0.0.dev5
+Requires-Dist: ProtocolMan==0.0.0.dev2
+Requires-Dist: HTMP==0.0.0.dev3
+Requires-Dist: ANSI-SGR==0.0.0.dev9

{mdit-0.0.0.dev2 → mdit-0.0.0.dev3}/pyproject.toml

@@ -17,7 +17,7 @@ namespaces = true
 # ----------------------------------------- Project Metadata -------------------------------------
 #
 [project]
-version = "0.0.0.dev2"
+version = "0.0.0.dev3"
 name = "MDit"
 requires-python = ">=3.10"
 dependencies = [
@@ -32,16 +32,16 @@ dependencies = [
     "readme-renderer",
     "cmarkgfm",
     "zundler",
-    "PkgData",
-    "PySerials",
-    "PyLinks",
-    "PyBadger",
-    "PyColorIt",
     "IPython",
     "jupyterlab_myst",
-    "PyProtocol",
-    "HTMP",
-    "ansi-sgr",
     "pygments",
     "rich",
+    "PkgData == 0.0.0.dev3",
+    "PySerials == 0.0.0.dev7",
+    "PyLinks == 0.0.0.dev27",
+    "PyBadger == 0.0.0.dev8",
+    "PyColorIt == 0.0.0.dev5",
+    "ProtocolMan == 0.0.0.dev2",
+    "HTMP == 0.0.0.dev3",
+    "ANSI-SGR == 0.0.0.dev9",
 ]

{mdit-0.0.0.dev2 → mdit-0.0.0.dev3}/src/MDit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MDit
-Version: 0.0.0.dev2
+Version: 0.0.0.dev3
 Requires-Python: >=3.10
 Requires-Dist: sphinx<8
 Requires-Dist: myst-parser<4,>3
@@ -13,15 +13,15 @@ Requires-Dist: linkify-it-py
 Requires-Dist: readme-renderer
 Requires-Dist: cmarkgfm
 Requires-Dist: zundler
-Requires-Dist: PkgData
-Requires-Dist: PySerials
-Requires-Dist: PyLinks
-Requires-Dist: PyBadger
-Requires-Dist: PyColorIt
 Requires-Dist: IPython
 Requires-Dist: jupyterlab_myst
-Requires-Dist: PyProtocol
-Requires-Dist: HTMP
-Requires-Dist: ansi-sgr
 Requires-Dist: pygments
 Requires-Dist: rich
+Requires-Dist: PkgData==0.0.0.dev3
+Requires-Dist: PySerials==0.0.0.dev7
+Requires-Dist: PyLinks==0.0.0.dev27
+Requires-Dist: PyBadger==0.0.0.dev8
+Requires-Dist: PyColorIt==0.0.0.dev5
+Requires-Dist: ProtocolMan==0.0.0.dev2
+Requires-Dist: HTMP==0.0.0.dev3
+Requires-Dist: ANSI-SGR==0.0.0.dev9

{mdit-0.0.0.dev2 → mdit-0.0.0.dev3}/src/MDit.egg-info/requires.txt

@@ -9,15 +9,15 @@ linkify-it-py
 readme-renderer
 cmarkgfm
 zundler
-PkgData
-PySerials
-PyLinks
-PyBadger
-PyColorIt
 IPython
 jupyterlab_myst
-PyProtocol
-HTMP
-ansi-sgr
 pygments
 rich
+PkgData==0.0.0.dev3
+PySerials==0.0.0.dev7
+PyLinks==0.0.0.dev27
+PyBadger==0.0.0.dev8
+PyColorIt==0.0.0.dev5
+ProtocolMan==0.0.0.dev2
+HTMP==0.0.0.dev3
+ANSI-SGR==0.0.0.dev9

{mdit-0.0.0.dev2 → mdit-0.0.0.dev3}/src/mdit/element.py

@@ -153,7 +153,7 @@ class Admonition(Element):
         self.title_bold = title_bold
         self.title_tight = title_tight
         self.emoji = emoji or self.EMOJI[type]
-        self.config_rich = config_rich or PanelConfig(
+        self.config_rich = config_rich or _mdit.target.rich.PanelConfig(
             title_style=_mdit.target.rich.StyleConfig(
                 bgcolor=self.COLOR[type],
                 color=(255, 255, 255),
@@ -172,7 +172,7 @@ class Admonition(Element):
         title = self.title.source(target=target, filters=filters).strip()
         body = self.body.source(target=target, filters=filters).strip()
         footer = self.footer.source(target=target, filters=filters).strip()
-        content = f"{body}\n\n---\n\n{footer}".strip()
+        content = f"{body}\n\n---\n\n{footer}" if footer else body
         if target.directive_admo:
             return self._str_admo(title=title, content=content, target=target, filters=filters)
         if target.alerts:
@@ -708,9 +708,9 @@ class Directive(Element):
     def __init__(
         self,
         name: Stringable,
-        args: MDContainer | None = None,
+        args: MDContainer | Stringable | None = None,
         options: dict[Stringable, Stringable | list[Stringable] | None] | None = None,
-        content: MDContainer | None = None,
+        content: MDContainer | Stringable | None = None,
         target_configs: TargetConfigs = None,
         target_default: str = "sphinx",
     ):
@@ -747,10 +747,21 @@ class Directive(Element):
             return f"{"\n".join(option_lines)}\n"
 
         target = self._resolve_target(target)
-        content = f"\n{self.content.source(target=target, filters=filters)}\n\n" if self.content else ""
+        if isinstance(self.content, _MDITRenderable):
+            content = self.content.source(target=target, filters=filters).strip()
+        elif not self.content:
+            content = ""
+        else:
+            content = str(self.content).strip()
+        content = f"\n{content}\n\n" if content else ""
         fence = target.fence * self.code_fence_count
-        args = self.args.source(target=target, filters=filters) if self.args else ""
-        start_line = f"{fence}{{{self.name}}} {args}"
+        if isinstance(self.args, _MDITRenderable):
+            args = self.args.source(target=target, filters=filters).strip()
+        elif not self.args:
+            args = ""
+        else:
+            args = str(self.args).strip()
+        start_line = f"{fence}{{{self.name}}} {args}".strip()
         opts = options()
         return f"{start_line}\n{opts}{content}{fence}"
 
@@ -804,9 +815,9 @@ class DropDown(Element):
         self.classes_container = classes_container or []
         self.classes_title = classes_title or []
         self.classes_body = classes_body or []
-        self.config_rich = config_rich or PanelConfig(
+        self.config_rich = config_rich or _mdit.target.rich.PanelConfig(
             title_style=_mdit.target.rich.StyleConfig(
-                bgcolor=self.COLOR[color],
+                bgcolor=self.COLOR[color or "muted"],
                 color="#fff" if color != "light" else "#212529",
                 bold=True,
             ),
@@ -825,7 +836,7 @@ class DropDown(Element):
         title = self.title.source(target=target, filters=filters).strip()
         content = self.body.source(target=target, filters=filters).strip()
         footer = self.footer.source(target=target, filters=filters).strip()
-        content_full = f"{content}\n\n---\n\n{footer}".strip()
+        content_full = f"{content}\n\n---\n\n{footer}" if footer else content
         if target.directive_dropdown:
             options = {
                 "open": self.opened,
@@ -850,6 +861,10 @@ class DropDown(Element):
         details_content = [_htmp.element.summary(title), _htmp.elementor.markdown(content)]
         return str(_htmp.element.details(details_content, {"open": self.opened}))
 
+    @property
+    def code_fence_count(self) -> int:
+        return max(self.body.code_fence_count, 2) + 1
+
 
 class FieldListItem(Element):
     def __init__(
@@ -1469,8 +1484,8 @@ class Table(Element):
             rows = []
             for row, _ in self.rows:
                 cells = [cell for cell, _ in row]
-                rows.append(unordered_list(*cells))
-            table_content = unordered_list(*rows)
+                rows.append(unordered_list(cells))
+            table_content = unordered_list(rows)
             return directive(
                 name="list-table",
                 args=self.caption,
@@ -3409,7 +3424,7 @@ def unordered_list_item(
 
 
 def unordered_list(
-    content: Sequence[UnOrderedListItem | ContainerContentInputType | MDContainer] | MDContainer,
+    content: Sequence[UnOrderedListItem | ContainerContentInputType | MDContainer] | MDContainer = None,
     classes: list[Stringable] | None = None,
     name: Stringable | None = None,
     tight: bool = True,

{mdit-0.0.0.dev2 → mdit-0.0.0.dev3}/src/mdit/protocol.py

@@ -6,7 +6,7 @@ from typing import (
     TYPE_CHECKING as _TYPE_CHECKING,
 )
 
-from pyprotocol import Stringable
+from protocolman import Stringable
 from htmp.protocol import AttrsInputType as _AttrsInputType
 
 from mdit.target.md import Config as MDTargetConfig

{mdit-0.0.0.dev2 → mdit-0.0.0.dev3}/src/mdit/renderable.py

@@ -62,7 +62,8 @@ class Renderable:
     def _source_md(self, target: MDTargetConfig, filters: str | list[str] | None = None) -> str:
         return ""
 
-    def _count_code_fence(self, content: str) -> int:
-        pattern = _re.compile(r'^\s{0, 3}(`{3,}|~{3,}|:{3,})', _re.MULTILINE)
+    @staticmethod
+    def _count_code_fence(content: str) -> int:
+        pattern = _re.compile(r'^\s{0,3}(`{3,}|~{3,}|:{3,})', _re.MULTILINE)
         matches = pattern.findall(str(content))
         return max(len(match) for match in matches) if matches else 0

{mdit-0.0.0.dev2 → mdit-0.0.0.dev3}/src/mdit/target/__init__.py

@@ -130,9 +130,24 @@ def sphinx(
             "extensions": [
                 'myst_parser',
                 'sphinx_design',
-                'sphinx_togglebutton'
+                'sphinx_togglebutton',
+            ],
+            "myst_enable_extensions": [
+                "amsmath",
+                "attrs_inline",
+                "colon_fence",
+                "deflist",
+                "dollarmath",
+                "fieldlist",
+                "html_admonition",
+                "html_image",
+                "linkify",
+                "replacements",
+                "smartquotes",
+                "strikethrough",
+                "substitution",
+                "tasklist",
             ],
-            "myst_enable_extensions": ["colon_fence"],
             "html_theme": "pydata_sphinx_theme",
             "html_title": "",
         }