update

Author: SilverRainZ

docs/index.rst

@@ -10,8 +10,10 @@ sphinxnotes-data
 FooBar
 ======
 
-.. data::
+.. data:: foo
    :color:
    :size: 1
 
+   foo
+
 Here2.

src/sphinxnotes/data/render.py

@@ -55,28 +55,28 @@ def doctree(self) -> nodes.document:
 
     @property
     def markup_parser(self) -> MarkupParser:
-        if isinstance(self, SphinxDirective):
-            return self.parse_text_to_nodes
-        if isinstance(self, SphinxRole):
+        if isinstance(self.v, SphinxDirective):
+            return self.v.parse_text_to_nodes
+        elif isinstance(self.v, SphinxRole):
             def wrapper(text: str) -> list[nodes.Node]:
-                return utils.role_parse_text_to_nodes(self, text)
+                return utils.role_parse_text_to_nodes(self.v, text)
             return wrapper
         else:
             return utils.parse_text_to_nodes
 
     @property
     def parent_node(self) -> nodes.Element | None:
-        if isinstance(self, SphinxDirective):
-            return self.state.parent
-        if isinstance(self, SphinxRole):
-            return self.inliner.parent
+        if isinstance(self.v, SphinxDirective):
+            return self.v.state.parent
+        elif isinstance(self.v, SphinxRole):
+            return self.v.inliner.parent
         else:
             return None
 
     def reporter(self, e: ValueError) -> Exception:
         if isinstance(self, SphinxDirective):
             raise self.error(str(e))
-        if isinstance(self, SphinxRole):
+        elif isinstance(self, SphinxRole):
             ...  # TODO
         else:
             ...  # TODO
@@ -85,7 +85,7 @@ def reporter(self, e: ValueError) -> Exception:
 # Nodes definitons
 # ===============
 
-class BaseNode(nodes.Element):
+class BaseNode(nodes.Node):
     template: Template
     schema: Schema
 
@@ -95,9 +95,9 @@ class RenderedNode(BaseNode):
     external_content: list[nodes.Node]
 
 class rendered_node(RenderedNode, nodes.container): ...
-class rendered_inline_node(RenderedNode, nodes.Inline): ...
+class rendered_inline_node(RenderedNode, nodes.inline): ...
 
-class pending_node(BaseNode):
+class pending_node(BaseNode, nodes.Invisible, nodes.Element):
     data: RawData
     inline: bool = False
     need_external_name: bool = False
@@ -262,7 +262,7 @@ def run(self) -> tuple[list[nodes.Node], list[nodes.system_message]]:
 
 
 
-class FixedDataDirective(BaseDataDefineDirective):
+class StrictDataDefineDirective(BaseDataDefineDirective):
     final_argument_whitespace = True
 
     schema: Schema
@@ -279,7 +279,7 @@ def current_schema(self) -> Schema:
     @classmethod
     def derive(
         cls, name: str, tmpl: Template, schema: Schema
-    ) -> type[FixedDataDirective]:
+    ) -> type[StrictDataDefineDirective]:
         """Generate an AnyDirective child class for describing object."""
         if not schema.name:
             required_arguments = 0
@@ -303,8 +303,8 @@ def derive(
 
         # Generate directive class
         return type(
-            '%sFixedDataDirective' % name.title(),
-            (FixedDataDirective,),
+            '%sStrictDataDirective' % name.title(),
+            (StrictDataDefineDirective,),
             {
                 'schema': schema,
                 'template': tmpl,