From 7ede0cbf524c8f711e5e864c750f97f0c112a607 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Mon, 19 Sep 2022 23:58:00 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E9=81=97=E7=95=99=E7=9A=84=20Markdown?= =?UTF-8?q?=20=E5=B5=8C=E5=A5=97=E8=8A=82=E7=82=B9=E8=BF=81=E7=A7=BB?= =?UTF-8?q?=E4=B8=BA=E5=B9=B3=E9=93=BA=E7=9A=84=E6=96=87=E6=9C=AC=E6=A0=87?= =?UTF-8?q?=E8=AE=B0=E8=8A=82=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/filesys/tree.go | 4 +- kernel/model/import.go | 7 ++-- kernel/treenode/node.go | 92 ----------------------------------------- 3 files changed, 6 insertions(+), 97 deletions(-) diff --git a/kernel/filesys/tree.go b/kernel/filesys/tree.go index 96764a83d..9e43513d7 100644 --- a/kernel/filesys/tree.go +++ b/kernel/filesys/tree.go @@ -105,7 +105,7 @@ func WriteTree(tree *parse.Tree) (err error) { filePath := filepath.Join(util.DataDir, tree.Box, tree.Path) if oldSpec := tree.Root.Spec; "" == oldSpec { - treenode.NestedInlines2FlattedSpans(tree) + luteEngine.NestedInlines2FlattedSpans(tree) tree.Root.Spec = "1" logging.LogInfof("migrated tree [%s] from spec [%s] to [%s]", filePath, oldSpec, tree.Root.Spec) } @@ -190,7 +190,7 @@ func parseJSON2Tree(boxID, p string, jsonData []byte, luteEngine *lute.Lute) (re filePath := filepath.Join(util.DataDir, ret.Box, ret.Path) if oldSpec := ret.Root.Spec; "" == oldSpec { - treenode.NestedInlines2FlattedSpans(ret) + luteEngine.NestedInlines2FlattedSpans(ret) ret.Root.Spec = "1" needFix = true logging.LogInfof("migrated tree [%s] from spec [%s] to [%s]", filePath, oldSpec, ret.Root.Spec) diff --git a/kernel/model/import.go b/kernel/model/import.go index ed575f8bb..2513fad74 100644 --- a/kernel/model/import.go +++ b/kernel/model/import.go @@ -150,7 +150,7 @@ func ImportSY(zipPath, boxID, toPath string) (err error) { for _, tree := range trees { syPath := filepath.Join(unzipRootPath, tree.Path) if "" == tree.Root.Spec { - treenode.NestedInlines2FlattedSpans(tree) + luteEngine.NestedInlines2FlattedSpans(tree) tree.Root.Spec = "1" } renderer := render.NewJSONRenderer(tree, luteEngine.RenderOptions) @@ -367,6 +367,7 @@ func ImportFromLocalPath(boxID, localPath string, toPath string) (err error) { } boxLocalPath = filepath.Join(util.DataDir, boxID) + luteEngine := NewLute() if gulu.File.IsDir(localPath) { // 收集所有资源文件 assets := map[string]string{} @@ -459,7 +460,7 @@ func ImportFromLocalPath(boxID, localPath string, toPath string) (err error) { targetPaths[curRelPath] = targetPath tree.HPath = hPath tree.Root.Spec = "1" - treenode.NestedInlines2FlattedSpans(tree) + luteEngine.NestedInlines2FlattedSpans(tree) docDirLocalPath := filepath.Dir(filepath.Join(boxLocalPath, targetPath)) assetDirPath := getAssetsDir(boxLocalPath, docDirLocalPath) @@ -547,7 +548,7 @@ func ImportFromLocalPath(boxID, localPath string, toPath string) (err error) { tree.Box = boxID tree.Path = targetPath tree.HPath = path.Join(baseHPath, title) - treenode.NestedInlines2FlattedSpans(tree) + luteEngine.NestedInlines2FlattedSpans(tree) docDirLocalPath := filepath.Dir(filepath.Join(boxLocalPath, targetPath)) assetDirPath := getAssetsDir(boxLocalPath, docDirLocalPath) diff --git a/kernel/treenode/node.go b/kernel/treenode/node.go index 7479d86ec..4375f1a3c 100644 --- a/kernel/treenode/node.go +++ b/kernel/treenode/node.go @@ -75,98 +75,6 @@ func IsBlockRef(n *ast.Node) bool { return false } -// NestedInlines2FlattedSpans 将嵌套的行级节点转换为平铺的文本标记节点。 -func NestedInlines2FlattedSpans(tree *parse.Tree) { - defer logging.Recover() - - var tags []string - var unlinks []*ast.Node - var span *ast.Node - ast.Walk(tree.Root, func(n *ast.Node, entering bool) ast.WalkStatus { - switch n.Type { - case ast.NodeCodeSpan: - processNestedNode(n, "code", &tags, &unlinks, entering) - case ast.NodeTag: - processNestedNode(n, "tag", &tags, &unlinks, entering) - case ast.NodeInlineMath: - processNestedNode(n, "inline-math", &tags, &unlinks, entering) - case ast.NodeEmphasis: - processNestedNode(n, "em", &tags, &unlinks, entering) - case ast.NodeStrong: - processNestedNode(n, "strong", &tags, &unlinks, entering) - case ast.NodeStrikethrough: - processNestedNode(n, "s", &tags, &unlinks, entering) - case ast.NodeMark: - processNestedNode(n, "mark", &tags, &unlinks, entering) - case ast.NodeUnderline: - processNestedNode(n, "u", &tags, &unlinks, entering) - case ast.NodeSub: - processNestedNode(n, "sub", &tags, &unlinks, entering) - case ast.NodeSup: - processNestedNode(n, "sup", &tags, &unlinks, entering) - case ast.NodeKbd: - processNestedNode(n, "kbd", &tags, &unlinks, entering) - case ast.NodeLink: - processNestedNode(n, "a", &tags, &unlinks, entering) - case ast.NodeText, ast.NodeCodeSpanContent, ast.NodeInlineMathContent, ast.NodeLinkText: - if 1 > len(tags) { - return ast.WalkContinue - } - - if entering { - span = &ast.Node{Type: ast.NodeTextMark, TextMarkType: strings.Join(tags, " "), TextMarkTextContent: string(html.EscapeHTML(n.Tokens))} - if ast.NodeInlineMathContent == n.Type { - span.TextMarkTextContent = "" - span.TextMarkInlineMathContent = string(html.EscapeHTML(n.Tokens)) - } - if ast.NodeLinkText == n.Type && !n.ParentIs(ast.NodeImage) { - var link *ast.Node - for p := n.Parent; nil != p; p = p.Parent { - if ast.NodeLink == p.Type { - link = p - break - } - } - if nil != link { - dest := link.ChildByType(ast.NodeLinkDest) - if nil != dest { - span.TextMarkAHref = string(dest.Tokens) - } - title := link.ChildByType(ast.NodeLinkTitle) - if nil != title { - span.TextMarkATitle = string(title.Tokens) - } - } - } - } else { - span.KramdownIAL = n.Parent.KramdownIAL - n.Parent.InsertBefore(span) - } - } - return ast.WalkContinue - }) - - for _, n := range unlinks { - n.Unlink() - } -} - -func processNestedNode(n *ast.Node, tag string, tags *[]string, unlinks *[]*ast.Node, entering bool) { - if entering { - *tags = append(*tags, tag) - } else { - *tags = (*tags)[:len(*tags)-1] - *unlinks = append(*unlinks, n) - for c := n.FirstChild; nil != c; { - next := c.Next - if ast.NodeTextMark == c.Type { - n.InsertBefore(c) - } - c = next - } - } -} - func NodeStaticMdContent(node *ast.Node, luteEngine *lute.Lute) (md, content string) { md = ExportNodeStdMd(node, luteEngine) content = NodeStaticContent(node)