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

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2022-09-25 00:31:18 +08:00
commit 56dd997b6d
4 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/stage/protyle/js/lute/lute.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
kernel/go.mod
View file

@ -7,7 +7,7 @@ require (
github.com/88250/css v0.1.2
github.com/88250/flock v0.8.2
github.com/88250/gulu v1.2.3-0.20220916075322-eb117059d70a
github.com/88250/lute v1.7.5-0.20220923153343-0838b394efdd
github.com/88250/lute v1.7.5-0.20220924150620-e976f270d457
github.com/88250/pdfcpu v0.3.13
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1
github.com/ConradIrwin/font v0.0.0-20210318200717-ce8d41cc0732

12
kernel/go.sum
View file

@ -19,16 +19,8 @@ github.com/88250/go-sqlite3 v1.14.13-0.20220714142610-fbbda1ee84f5 h1:8HdZozCsXS
github.com/88250/go-sqlite3 v1.14.13-0.20220714142610-fbbda1ee84f5/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
github.com/88250/gulu v1.2.3-0.20220916075322-eb117059d70a h1:qQdnk8clbgA+MXtf5bXOTOby32iQYjqMOn6oBIMV/Tk=
github.com/88250/gulu v1.2.3-0.20220916075322-eb117059d70a/go.mod h1:I1qBzsksFL2ciGSuqDE7R3XW4BUMrfDgOvSXEk7FsAI=
github.com/88250/lute v1.7.5-0.20220923073346-a1a21c8c7501 h1:LbVJjsb3gGe8BL5pFguckOx7vufdYalwuWJDxKPo1rU=
github.com/88250/lute v1.7.5-0.20220923073346-a1a21c8c7501/go.mod h1:cEoBGi0zArPqAsp0MdG9SKinvH/xxZZWXU7sRx8vHSA=
github.com/88250/lute v1.7.5-0.20220923091635-33c4e7afab31 h1:YmbhOyyyDif5n1tz2jBgNO9TlGvzS/DiQNEvY/iGmSc=
github.com/88250/lute v1.7.5-0.20220923091635-33c4e7afab31/go.mod h1:cEoBGi0zArPqAsp0MdG9SKinvH/xxZZWXU7sRx8vHSA=
github.com/88250/lute v1.7.5-0.20220923111910-18fda7ca5ad5 h1:cQBBeWm8AXo5Y9XE6xS+cz4gycWqlzio6cQZEEhs3UM=
github.com/88250/lute v1.7.5-0.20220923111910-18fda7ca5ad5/go.mod h1:cEoBGi0zArPqAsp0MdG9SKinvH/xxZZWXU7sRx8vHSA=
github.com/88250/lute v1.7.5-0.20220923151059-e9fcd6382190 h1:s98Cjm1yyI0uVrYmnlWtqcVqWWJhJ/BB6slGnXNga+g=
github.com/88250/lute v1.7.5-0.20220923151059-e9fcd6382190/go.mod h1:cEoBGi0zArPqAsp0MdG9SKinvH/xxZZWXU7sRx8vHSA=
github.com/88250/lute v1.7.5-0.20220923153343-0838b394efdd h1:UblHJ7OjjrPsuFd7M1ElcJUwSMds6B+1sAAUty2Nvyg=
github.com/88250/lute v1.7.5-0.20220923153343-0838b394efdd/go.mod h1:cEoBGi0zArPqAsp0MdG9SKinvH/xxZZWXU7sRx8vHSA=
github.com/88250/lute v1.7.5-0.20220924150620-e976f270d457 h1:JBJR7CjSarVpMh567ASjZewjNlhrH5CDG1XdwiGwxyY=
github.com/88250/lute v1.7.5-0.20220924150620-e976f270d457/go.mod h1:cEoBGi0zArPqAsp0MdG9SKinvH/xxZZWXU7sRx8vHSA=
github.com/88250/pdfcpu v0.3.13 h1:touMWMZkCGalMIbEg9bxYp7rETM+zwb9hXjwhqi4I7Q=
github.com/88250/pdfcpu v0.3.13/go.mod h1:S5YT38L/GCjVjmB4PB84PymA1qfopjEhfhTNQilLpv4=
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 h1:48T899JQDwyyRu9yXHePYlPdHtpJfrJEUGBMH3SMBWY=

5
kernel/model/export.go
View file

@ -1249,6 +1249,11 @@ func exportTree(tree *parse.Tree, wysiwyg, expandKaTexMacros, keepFold bool) (re
// 块折叠以后导出 HTML/PDF 固定展开 https://github.com/siyuan-note/siyuan/issues/4064
n.RemoveIALAttr("fold")
n.RemoveIALAttr("heading-fold")
} else {
if "1" == n.IALAttr("heading-fold") {
unlinks = append(unlinks, n)
return ast.WalkContinue
}
}
if ast.NodeParagraph == n.Type {