From a3d2e89a657de7655d9b776e9630f59b627e1167 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Thu, 25 May 2023 22:00:56 +0800 Subject: [PATCH] :art: Formula parsing supports $ followed by numbers when importing Markdown https://github.com/siyuan-note/siyuan/issues/8362 --- kernel/model/import.go | 13 +------------ kernel/util/lute.go | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/kernel/model/import.go b/kernel/model/import.go index 24ad4b4e7..acc8e0a88 100644 --- a/kernel/model/import.go +++ b/kernel/model/import.go @@ -38,7 +38,6 @@ import ( "time" "github.com/88250/gulu" - "github.com/88250/lute" "github.com/88250/lute/ast" "github.com/88250/lute/html" "github.com/88250/lute/html/atom" @@ -712,17 +711,7 @@ func ImportFromLocalPath(boxID, localPath string, toPath string) (err error) { } func parseStdMd(markdown []byte) (ret *parse.Tree) { - luteEngine := lute.New() - luteEngine.SetFootnotes(false) - luteEngine.SetToC(false) - luteEngine.SetIndentCodeBlock(false) - luteEngine.SetAutoSpace(false) - luteEngine.SetHeadingID(false) - luteEngine.SetSetext(false) - luteEngine.SetYamlFrontMatter(false) - luteEngine.SetLinkRef(false) - luteEngine.SetGFMAutoLink(false) // 导入 Markdown 时不自动转换超链接 https://github.com/siyuan-note/siyuan/issues/7682 - luteEngine.SetImgPathAllowSpace(true) + luteEngine := util.NewStdLute() ret = parse.Parse("", markdown, luteEngine.ParseOptions) if nil == ret { return diff --git a/kernel/util/lute.go b/kernel/util/lute.go index 2caf8875a..26aae3d9b 100644 --- a/kernel/util/lute.go +++ b/kernel/util/lute.go @@ -46,3 +46,19 @@ func NewLute() (ret *lute.Lute) { ret.SetSanitize(true) return } + +func NewStdLute() (ret *lute.Lute) { + ret = lute.New() + ret.SetFootnotes(false) + ret.SetToC(false) + ret.SetIndentCodeBlock(false) + ret.SetAutoSpace(false) + ret.SetHeadingID(false) + ret.SetSetext(false) + ret.SetYamlFrontMatter(false) + ret.SetLinkRef(false) + ret.SetGFMAutoLink(false) // 导入 Markdown 时不自动转换超链接 https://github.com/siyuan-note/siyuan/issues/7682 + ret.SetImgPathAllowSpace(true) + ret.SetInlineMathAllowDigitAfterOpenMarker(true) // Formula parsing supports $ followed by numbers when importing Markdown https://github.com/siyuan-note/siyuan/issues/8362 + return +}