Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-17 07:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 行级元素支持嵌套和交叉 https://github.com/siyuan-note/siyuan/issues/2911

Browse source
This commit is contained in:
Liang Ding 2022-09-14 19:45:51 +08:00
parent 76448b6ec5
commit ef17af099a
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kernel/sql/block_query.go
View file

@ -654,6 +654,8 @@ func GetContainerText(container *ast.Node) string {
case ast.NodeText, ast.NodeLinkText, ast.NodeFileAnnotationRefText, ast.NodeFootnotesRef, case ast.NodeText, ast.NodeLinkText, ast.NodeFileAnnotationRefText, ast.NodeFootnotesRef,
ast.NodeCodeSpanContent, ast.NodeInlineMathContent, ast.NodeCodeBlockCode, ast.NodeMathBlockContent: ast.NodeCodeSpanContent, ast.NodeInlineMathContent, ast.NodeCodeBlockCode, ast.NodeMathBlockContent:
buf.Write(n.Tokens) buf.Write(n.Tokens)
case ast.NodeTextMark:
buf.WriteString(n.TextMarkTextContent)
case ast.NodeBlockRef: case ast.NodeBlockRef:
if anchor := n.ChildByType(ast.NodeBlockRefText); nil != anchor { if anchor := n.ChildByType(ast.NodeBlockRefText); nil != anchor {
buf.WriteString(anchor.Text()) buf.WriteString(anchor.Text())

12
kernel/sql/database.go
View file

@ -399,6 +399,8 @@ func resolveRefContent0(node *ast.Node, anchors *map[string]string, depth *int,
case ast.NodeText, ast.NodeLinkText, ast.NodeLinkTitle, ast.NodeFileAnnotationRefText, ast.NodeFootnotesRef, case ast.NodeText, ast.NodeLinkText, ast.NodeLinkTitle, ast.NodeFileAnnotationRefText, ast.NodeFootnotesRef,
ast.NodeCodeSpanContent, ast.NodeInlineMathContent, ast.NodeCodeBlockCode, ast.NodeMathBlockContent: ast.NodeCodeSpanContent, ast.NodeInlineMathContent, ast.NodeCodeBlockCode, ast.NodeMathBlockContent:
buf.Write(n.Tokens) buf.Write(n.Tokens)
case ast.NodeTextMark:
buf.WriteString(n.TextMarkTextContent)
case ast.NodeBlockRef: case ast.NodeBlockRef:
if anchor := n.ChildByType(ast.NodeBlockRefText); nil != anchor { if anchor := n.ChildByType(ast.NodeBlockRefText); nil != anchor {
buf.WriteString(anchor.Text()) buf.WriteString(anchor.Text())
@ -537,7 +539,8 @@ func buildSpanFromNode(n *ast.Node, tree *parse.Tree, rootID, boxID, p string) (
spans = append(spans, span) spans = append(spans, span)
walkStatus = ast.WalkContinue walkStatus = ast.WalkContinue
return return
case ast.NodeTag, ast.NodeInlineMath, ast.NodeCodeSpan, ast.NodeEmphasis, ast.NodeStrong, ast.NodeStrikethrough, ast.NodeMark, ast.NodeSup, ast.NodeSub, ast.NodeKbd, ast.NodeUnderline: case ast.NodeTag, ast.NodeInlineMath, ast.NodeCodeSpan, ast.NodeEmphasis, ast.NodeStrong, ast.NodeStrikethrough, ast.NodeMark, ast.NodeSup, ast.NodeSub, ast.NodeKbd, ast.NodeUnderline, ast.NodeTextMark:
typ := treenode.TypeAbbr(n.Type.String())
var text string var text string
switch n.Type { switch n.Type {
case ast.NodeTag, ast.NodeEmphasis, ast.NodeStrong, ast.NodeStrikethrough, ast.NodeMark, ast.NodeSup, ast.NodeSub, ast.NodeKbd, ast.NodeUnderline: case ast.NodeTag, ast.NodeEmphasis, ast.NodeStrong, ast.NodeStrikethrough, ast.NodeMark, ast.NodeSup, ast.NodeSub, ast.NodeKbd, ast.NodeUnderline:
@ -546,6 +549,9 @@ func buildSpanFromNode(n *ast.Node, tree *parse.Tree, rootID, boxID, p string) (
text = n.ChildByType(ast.NodeInlineMathContent).TokensStr() text = n.ChildByType(ast.NodeInlineMathContent).TokensStr()
case ast.NodeCodeSpan: case ast.NodeCodeSpan:
text = n.ChildByType(ast.NodeCodeSpanContent).TokensStr() text = n.ChildByType(ast.NodeCodeSpanContent).TokensStr()
case ast.NodeTextMark:
text = n.TextMarkTextContent
typ = typ + " " + n.TextMarkType
} }
markdown := treenode.FormatNode(n, luteEngine) markdown := treenode.FormatNode(n, luteEngine)
@ -558,7 +564,7 @@ func buildSpanFromNode(n *ast.Node, tree *parse.Tree, rootID, boxID, p string) (
Path: p, Path: p,
Content: text, Content: text,
Markdown: markdown, Markdown: markdown,
Type: treenode.TypeAbbr(n.Type.String()), Type: typ,
IAL: treenode.IALStr(n), IAL: treenode.IALStr(n),
} }
spans = append(spans, span) spans = append(spans, span)
@ -1202,7 +1208,7 @@ func nSort(n *ast.Node) int {
case ast.NodeSuperBlock: case ast.NodeSuperBlock:
return 30 return 30
// 以下为行级元素 // 以下为行级元素
case ast.NodeText: case ast.NodeText, ast.NodeTextMark:
return 200 return 200
case ast.NodeTag: case ast.NodeTag:
return 205 return 205