chore: cleanup

mknodes/basenodes/mkannotations/__init__.py

@@ -3,6 +3,8 @@
 from collections.abc import Mapping
 from typing import TYPE_CHECKING, Any
 
+from jinja2 import filters
+
 from mknodes.basenodes import mkcontainer
 from mknodes.utils import log, reprhelpers, resources
 
@@ -40,11 +42,8 @@ def __repr__(self):
 
     def _to_markdown(self) -> str:
         item_str = "\n\n".join(i.to_markdown() for i in self.items)
-        lines = item_str.split("\n")
         space = (3 - len(str(self.num))) * " "
-        result = [f"{self.num}.{space}{lines[0]}"]
-        result.extend(f"    {i}" for i in lines[1:])
-        return "\n".join(result) + "\n"
+        return f"{self.num}.{space}{filters.do_indent(item_str)}\n"
 
 
 class MkAnnotations(mkcontainer.MkContainer):

mknodes/basenodes/mkdefinitionlist/__init__.py

@@ -99,13 +99,8 @@ def items(self, data):
                 raise TypeError(data)
 
     def _to_markdown(self) -> str:
-        result = []
-        for k, v in self.data.items():
-            lines = str(v).split("\n")
-            result.extend([str(k), f":   {lines[0]}"])
-            result.extend(f"    {i}" for i in lines[1:])
-            result.append("")
-        return "\n".join(result) + "\n"
+        items = [f"{k}\n:   {filters.do_indent(str(v))}\n" for k, v in self.data.items()]
+        return "".join(items)
 
     @classmethod
     def create_example_page(cls, page):

mknodes/basenodes/mktasklist/__init__.py

@@ -2,6 +2,8 @@
 
 from typing import Any
 
+from jinja2 import filters
+
 from mknodes.basenodes import mkcontainer, mknode
 from mknodes.utils import log, resources
 
@@ -32,11 +34,9 @@ def __init__(
         self.value = value
 
     def _to_markdown(self) -> str:
-        lines = super()._to_markdown().split("\n")
+        text = super()._to_markdown()
         val = "x" if self.value else " "
-        result = [f"- [{val}] {lines[0]}"]
-        result.extend(f"      {i}" for i in lines[1:])
-        return "\n".join(result) + "\n"
+        return f"- [{val}] {filters.do_indent(str(text))}\n"
 
 
 class MkTaskList(mkcontainer.MkContainer):

mknodes/extranodes/mkgrid/__init__.py

@@ -1,6 +1,8 @@
 from __future__ import annotations
 from typing import Any
 
+from jinja2 import filters
+
 from mknodes.basenodes import mkcontainer, mknode
 from mknodes.utils import log, xmlhelpers as xml
 
@@ -34,9 +36,7 @@ def get_element(self) -> xml.Div:
         result = []
         for item in self.items:
             item_str = item.to_markdown()
-            lines = item_str.split("\n")
-            result += [f"-   {lines[0]}"]
-            result.extend(f"    {i}" for i in lines[1:])
+            result += [f"-   {filters.do_indent(item_str)}"]
         content = "\n".join(result)
         root.text = "\n\n" + content + "\n"
         return root

tests/test_docstrings.py

@@ -8,7 +8,8 @@
         options:
           docstring_section_style: 'list'
           show_root_heading: True
-    \n"""
+
+"""
 
 
 def test_docstrings():