0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🎨 Improve exporting block ref https://github.com/siyuan-note/siyuan/issues/13283

Browse source
This commit is contained in:
Daniel 2024-11-28 13:25:24 +08:00
parent 7884b62718
commit e1a9051d76
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 19 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
kernel/model/export.go
View file

@ -2148,32 +2148,27 @@ func exportTree(tree *parse.Tree, wysiwyg, keepFold, avHiddenCol bool,
if 4 == blockRefMode { // 块引转脚注
unlinks = nil
if footnotesDefBlock := resolveFootnotesDefs(&refFootnotes, ret, currentTreeNodeIDs, blockRefTextLeft, blockRefTextRight); nil != footnotesDefBlock {
footnotesDefBlock := resolveFootnotesDefs(&refFootnotes, ret, currentTreeNodeIDs, blockRefTextLeft, blockRefTextRight)
if nil != footnotesDefBlock {
// 如果是聚焦导出，可能存在没有使用的脚注定义块，在这里进行清理
// Improve focus export conversion of block refs to footnotes https://github.com/siyuan-note/siyuan/issues/10647
//footnotesRefs := ret.Root.ChildrenByType(ast.NodeFootnotesRef)
//for _, ref := range footnotesRefs {
// ast.Walk(ref, func(n *ast.Node, entering bool) ast.WalkStatus {
// if !entering {
// return ast.WalkContinue
// }
//
// if treenode.IsBlockRef(n) {
// refIDsInfnDefs[n.TextMarkBlockRefID] = true
// }
// return ast.WalkContinue
// })
//}
//
//for footnotesDef := footnotesDefBlock.FirstChild; nil != footnotesDef; footnotesDef = footnotesDef.Next {
// exist := refIDsInfnDefs[footnotesDef.ID]
// if !exist {
// unlinks = append(unlinks, footnotesDef)
// }
//}
//for _, n := range unlinks {
// n.Unlink()
//}
footnotesRefs := ret.Root.ChildrenByType(ast.NodeFootnotesRef)
for footnotesDef := footnotesDefBlock.FirstChild; nil != footnotesDef; footnotesDef = footnotesDef.Next {
exist := false
for _, ref := range footnotesRefs {
if ref.FootnotesRefId == footnotesDef.FootnotesRefId {
exist = true
break
}
}
if !exist {
unlinks = append(unlinks, footnotesDef)
}
}
for _, n := range unlinks {
n.Unlink()
}
ret.Root.AppendChild(footnotesDefBlock)
}