From a942ae6a1b71fc8f503d7dddf0d2bb76c31b948a Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Thu, 15 Sep 2022 23:06:53 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E8=A1=8C=E7=BA=A7=E5=85=83?= =?UTF-8?q?=E7=B4=A0=E6=94=AF=E6=8C=81=E5=A4=9A=E9=87=8D=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=20https://github.com/siyuan-note/siyuan/issu?= =?UTF-8?q?es/2911?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/api/lute.go | 2 +- kernel/model/export.go | 2 +- kernel/model/render.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/api/lute.go b/kernel/api/lute.go index e1b6baff8..ebef8d1fe 100644 --- a/kernel/api/lute.go +++ b/kernel/api/lute.go @@ -120,7 +120,7 @@ func html2BlockDOM(c *gin.Context) { }) } - renderer := render.NewBlockRenderer(tree, luteEngine.RenderOptions) + renderer := render.NewProtyleRenderer(tree, luteEngine.RenderOptions) output := renderer.Render() ret.Data = gulu.Str.FromBytes(output) } diff --git a/kernel/model/export.go b/kernel/model/export.go index ca6cc807e..93ede05ee 100644 --- a/kernel/model/export.go +++ b/kernel/model/export.go @@ -452,7 +452,7 @@ func ExportHTML(id, savePath string, pdf bool) (name, dom string) { luteEngine.SetFootnotes(true) luteEngine.RenderOptions.ProtyleContenteditable = false - renderer := render.NewBlockExportRenderer(tree, luteEngine.RenderOptions) + renderer := render.NewProtyleExportRenderer(tree, luteEngine.RenderOptions) dom = gulu.Str.FromBytes(renderer.Render()) return } diff --git a/kernel/model/render.go b/kernel/model/render.go index a0ccb7c07..b83ee4996 100644 --- a/kernel/model/render.go +++ b/kernel/model/render.go @@ -104,7 +104,7 @@ func renderBlockText(node *ast.Node) (ret string) { func renderBlockDOMByNodes(nodes []*ast.Node, luteEngine *lute.Lute) string { tree := &parse.Tree{Root: &ast.Node{Type: ast.NodeDocument}, Context: &parse.Context{ParseOption: luteEngine.ParseOptions}} - blockRenderer := render.NewBlockRenderer(tree, luteEngine.RenderOptions) + blockRenderer := render.NewProtyleRenderer(tree, luteEngine.RenderOptions) for _, n := range nodes { ast.Walk(n, func(node *ast.Node, entering bool) ast.WalkStatus { rendererFunc := blockRenderer.RendererFuncs[node.Type]