MDit 0.0.0.dev52__tar.gz → 0.0.0.dev54__tar.gz

{mdit-0.0.0.dev52/src/MDit.egg-info → mdit-0.0.0.dev54}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MDit
-Version: 0.0.0.dev52
+Version: 0.0.0.dev54
 Requires-Python: >=3.10
 Requires-Dist: sphinx<8
 Requires-Dist: myst-nb<2,>1
@@ -23,9 +23,9 @@ Requires-Dist: rich>=13.8
 Requires-Dist: pydantic>=2.9
 Requires-Dist: referencing>=0.35.1
 Requires-Dist: PkgData==0.0.0.dev5
-Requires-Dist: PySerials==0.0.0.dev55
-Requires-Dist: PyBadger==0.0.0.dev49
+Requires-Dist: PySerials==0.0.0.dev57
+Requires-Dist: PyBadger==0.0.0.dev51
 Requires-Dist: PyColorIT==0.0.0.dev8
 Requires-Dist: ProtocolMan==0.0.0.dev2
 Requires-Dist: HTMP==0.0.0.dev5
-Requires-Dist: JSONSchemata==0.0.0.dev51
+Requires-Dist: JSONSchemata==0.0.0.dev53

{mdit-0.0.0.dev52 → mdit-0.0.0.dev54}/pyproject.toml

@@ -17,7 +17,7 @@ namespaces = true
 # ----------------------------------------- Project Metadata -------------------------------------
 #
 [project]
-version = "0.0.0.dev52"
+version = "0.0.0.dev54"
 name = "MDit"
 requires-python = ">=3.10"
 dependencies = [
@@ -42,10 +42,10 @@ dependencies = [
     "pydantic >= 2.9",
     "referencing >= 0.35.1",
     "PkgData == 0.0.0.dev5",
-    "PySerials == 0.0.0.dev55",
-    "PyBadger == 0.0.0.dev49",
+    "PySerials == 0.0.0.dev57",
+    "PyBadger == 0.0.0.dev51",
     "PyColorIT == 0.0.0.dev8",
     "ProtocolMan == 0.0.0.dev2",
     "HTMP == 0.0.0.dev5",
-    "JSONSchemata == 0.0.0.dev51",
+    "JSONSchemata == 0.0.0.dev53",
 ]

{mdit-0.0.0.dev52 → mdit-0.0.0.dev54/src/MDit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MDit
-Version: 0.0.0.dev52
+Version: 0.0.0.dev54
 Requires-Python: >=3.10
 Requires-Dist: sphinx<8
 Requires-Dist: myst-nb<2,>1
@@ -23,9 +23,9 @@ Requires-Dist: rich>=13.8
 Requires-Dist: pydantic>=2.9
 Requires-Dist: referencing>=0.35.1
 Requires-Dist: PkgData==0.0.0.dev5
-Requires-Dist: PySerials==0.0.0.dev55
-Requires-Dist: PyBadger==0.0.0.dev49
+Requires-Dist: PySerials==0.0.0.dev57
+Requires-Dist: PyBadger==0.0.0.dev51
 Requires-Dist: PyColorIT==0.0.0.dev8
 Requires-Dist: ProtocolMan==0.0.0.dev2
 Requires-Dist: HTMP==0.0.0.dev5
-Requires-Dist: JSONSchemata==0.0.0.dev51
+Requires-Dist: JSONSchemata==0.0.0.dev53

{mdit-0.0.0.dev52 → mdit-0.0.0.dev54}/src/MDit.egg-info/requires.txt

@@ -19,9 +19,9 @@ rich>=13.8
 pydantic>=2.9
 referencing>=0.35.1
 PkgData==0.0.0.dev5
-PySerials==0.0.0.dev55
-PyBadger==0.0.0.dev49
+PySerials==0.0.0.dev57
+PyBadger==0.0.0.dev51
 PyColorIT==0.0.0.dev8
 ProtocolMan==0.0.0.dev2
 HTMP==0.0.0.dev5
-JSONSchemata==0.0.0.dev51
+JSONSchemata==0.0.0.dev53

{mdit-0.0.0.dev52 → mdit-0.0.0.dev54}/src/mdit/container.py

@@ -41,7 +41,9 @@ class Container:
         if not key:
             key = max((key for key in self._data.keys() if isinstance(key, int)), default=-1) + 1
         if key in self._data:
-            raise ValueError(f"Key '{key}' already exists in content.")
+            raise ValueError(
+                f"Key '{key}' already exists in container; cannot add for content {content}"
+            )
         if not conditions:
             conditions = []
         elif isinstance(conditions, str):

{mdit-0.0.0.dev52 → mdit-0.0.0.dev54}/src/mdit/element.py

@@ -5,6 +5,7 @@ from types import FunctionType as _FunctionType
 from contextlib import contextmanager as _contextmanager
 import re as _re
 import copy as _copy
+import html as _html
 
 import htmp as _htmp
 import pyserials as _ps
@@ -289,7 +290,7 @@ class Attribute(Element):
         attributor = f"{{{" ".join(attrs)}}}"
         if self.block:
             return f"{attributor}\n{content.lstrip()}"
-        return f"[{content.strip()}]{attributor}"
+        return f"{content.strip()}{attributor}"
 
     def _source_rich(self, target: RichTargetConfig, filters: str | list[str] | None = None) -> RenderableType:
         return self.content.source(
@@ -900,7 +901,7 @@ class FieldListItem(Element):
         indent = " " * (self.indent if target.field_list else 2)  # 2 for normal list
         description_indented = "\n".join(f"{indent}{line}" for line in body.splitlines()).strip()
         if target.field_list:
-            return f":{title}: {body}".strip()
+            return f":{title}: {description_indented}".strip()
         return f"- **{title}**{f": {description_indented}" if description_indented else ''}"
 
     def _source_rich(self, target: RichTargetConfig, filters: str | list[str] | None = None) -> RenderableType:
@@ -1179,27 +1180,43 @@ class InlineImage(Element):
         return
 
     def _source_md(self, target: MDTargetConfig, filters: str | list[str] | None = None) -> str:
-        img_attrs = {
-            "src": self.src,
-            "title": self.title,
-            "alt": self.alt,
-            "height": self.height,
-            "width": self.width,
-            "align": self.align,
-            "class": self.classes,
-            "id": self.name,
-        } | self.attrs_img
-        image = _htmp.elementor.picture_color_scheme(
-            src_light=self.src,
-            src_dark=self.src_dark,
-            attrs_img=img_attrs,
-            attrs_source_light=self.attrs_source_light,
-            attrs_source_dark=self.attrs_source_dark,
-            attrs_picture=self.attrs_picture,
-        ) if self.src_dark and target.picture_theme else _htmp.element.img(img_attrs)
-        if self.link:
-            attrs_a = {"href": self.link, "alt": self.alt} | self.attrs_a
-            image = _htmp.element.a(image, attrs_a)
+        if target.prefer_md:
+            alt = _html.escape(self.alt or "")
+            image = f"![{alt}]({self.src})"
+            if (self.height or self.width or self.align or self.classes or self.name) and target.attrs_inline:
+                image = attribute(
+                    content=image,
+                    block=False,
+                    classes=self.classes,
+                    name=self.name,
+                    attrs={"align": self.align, "height": self.height, "width": self.width},
+                    target_configs=self.target_configs,
+                    target_default=self.target_default,
+                ).source(target=target, filters=filters)
+            if self.link:
+                image=f"[{image}]({self.link})"
+        else:
+            img_attrs = {
+                "src": self.src,
+                "title": self.title,
+                "alt": self.alt,
+                "height": self.height,
+                "width": self.width,
+                "align": self.align,
+                "class": self.classes,
+                "id": self.name,
+            } | self.attrs_img
+            image = _htmp.elementor.picture_color_scheme(
+                src_light=self.src,
+                src_dark=self.src_dark,
+                attrs_img=img_attrs,
+                attrs_source_light=self.attrs_source_light,
+                attrs_source_dark=self.attrs_source_dark,
+                attrs_picture=self.attrs_picture,
+            ) if self.src_dark and target.picture_theme else _htmp.element.img(img_attrs)
+            if self.link:
+                attrs_a = {"href": self.link, "alt": self.alt} | self.attrs_a
+                image = _htmp.element.a(image, attrs_a)
         return self._wrap(content=str(image), container=self.container, attrs_container=self.attrs_container)
 
 
@@ -2112,8 +2129,8 @@ def badge(
     image = inline_image(
         src=bdg.url(light=True),
         src_dark=bdg.url(light=False) if params_dark else None,
-        title=title or bdg.attrs_img.get("title"),
-        alt=alt or bdg.attrs_img.get("alt"),
+        title=title if title is not None else bdg.attrs_img.get("title"),
+        alt=alt if alt is not None else bdg.attrs_img.get("alt"),
         height=height,
         width=width,
         align=align,
@@ -2835,7 +2852,7 @@ def html(
     target_configs: TargetConfigs = None,
     target_default: str = "sphinx",
 ):
-    content = _mdit.container(
+    content = _mdit.to_md_container(
         content,
         content_separator=content_separator,
         target_configs=target_configs,

{mdit-0.0.0.dev52 → mdit-0.0.0.dev54}/src/mdit/generate.py

@@ -62,7 +62,6 @@ class DocumentGenerator:
         generator = self._get_elem_generator(_mdit.template, template_name, "template")
         return generator(**config)
 
-
     def generate_container(self, container: str | list[str | dict | list[str | dict]]):
         if isinstance(container, str):
             return container