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 2024-11-12 10:51:05 +08:00
commit 30ef9ab5fc
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
kernel/api/filetree.go
View file

@ -742,8 +742,13 @@ func createDocWithMd(c *gin.Context) {
if nil != withMathArg {
withMath = withMathArg.(bool)
}
clippingHref := ""
clippingHrefArg := arg["clippingHref"]
if nil != clippingHrefArg {
clippingHref = clippingHrefArg.(string)
}
id, err := model.CreateWithMarkdown(tags, notebook, hPath, markdown, parentID, id, withMath)
id, err := model.CreateWithMarkdown(tags, notebook, hPath, markdown, parentID, id, withMath, clippingHref)
if err != nil {
ret.Code = -1
ret.Msg = err.Error()

12
kernel/model/file.go
View file

@ -1154,7 +1154,7 @@ func CreateDocByMd(boxID, p, title, md string, sorts []string) (tree *parse.Tree
return
}
func CreateWithMarkdown(tags, boxID, hPath, md, parentID, id string, withMath bool) (retID string, err error) {
func CreateWithMarkdown(tags, boxID, hPath, md, parentID, id string, withMath bool, clippingHref string) (retID string, err error) {
createDocLock.Lock()
defer createDocLock.Unlock()
@ -1170,6 +1170,16 @@ func CreateWithMarkdown(tags, boxID, hPath, md, parentID, id string, withMath bo
luteEngine.SetInlineMath(true)
}
luteEngine.SetHTMLTag2TextMark(true)
if strings.HasPrefix(clippingHref, "https://ld246.com/article/") || strings.HasPrefix(clippingHref, "https://liuyun.io/article/") {
// 改进链滴剪藏 https://github.com/siyuan-note/siyuan/issues/13117
luteEngine.SetInlineAsterisk(true)
luteEngine.SetInlineUnderscore(true)
luteEngine.SetSup(true)
luteEngine.SetSub(true)
luteEngine.SetTag(true)
luteEngine.SetInlineMath(true)
luteEngine.SetGFMStrikethrough(true)
}
dom := luteEngine.Md2BlockDOM(md, false)
retID, err = createDocsByHPath(box.ID, hPath, dom, parentID, id)