Skip to content

Commit 3cea49b

Browse files
committed
update
1 parent 24ad079 commit 3cea49b

5 files changed

Lines changed: 235 additions & 170 deletions

File tree

src/sphinxnotes/data/__init__.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@
1818
from . import meta
1919
from .data import Field, Schema
2020
from .template import Template, Phase
21-
from .render import BaseDataDirective, BaseDataRole, pending_node
21+
from .render import BaseDataDirective, BaseDataRole
2222
from .utils.freestyle import FreeStyleDirective, FreeStyleOptionSpec
23+
from . import preset
2324

2425
logger = logging.getLogger(__name__)
2526

@@ -64,12 +65,12 @@ def run(self) -> list[nodes.Node]:
6465
class FreeDataRole(BaseDataRole):
6566
@override
6667
def current_template(self) -> Template:
67-
tmpl = self.env.current_document.get(TEMPLATE_KEY, Template.preset_role())
68+
tmpl = self.env.current_document.get(TEMPLATE_KEY, preset.Role.template())
6869
return cast(Template, tmpl)
6970

7071
@override
7172
def current_schema(self) -> Schema:
72-
schema = self.env.current_document.get(SCHEMA_KEY, Schema.role_default())
73+
schema = self.env.current_document.get(SCHEMA_KEY, preset.Role.schema())
7374
return cast(Schema, schema)
7475

7576

@@ -79,20 +80,20 @@ class FreeDataDirective(BaseDataDirective, FreeStyleDirective):
7980

8081
@override
8182
def current_template(self) -> Template:
82-
tmpl = self.env.current_document.get(TEMPLATE_KEY, Template.preset_directive())
83+
tmpl = self.env.current_document.get(TEMPLATE_KEY, preset.Directive.template())
8384
return cast(Template, tmpl)
8485

8586
@override
8687
def current_schema(self) -> Schema:
87-
schema = self.env.current_document.get(SCHEMA_KEY, Schema.directive_default())
88+
schema = self.env.current_document.get(SCHEMA_KEY, preset.Directive.schema())
8889
return cast(Schema, schema)
8990

9091

9192
# class AutoFreeDataDirective(FreeDataDirective):
9293
# @override
9394
# def process_pending_node(self, n: pending_node) -> None:
9495
# n.name_external = n.content_external = True
95-
#
96+
#
9697
# @override
9798
# def current_template(self) -> Template:
9899
# tmpl = super().current_template()

0 commit comments

Comments
 (0)