From 0970c63bcda8d79a719edb6c584c8f2cb54eb963 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Sun, 25 Feb 2024 11:13:44 +0800 Subject: [PATCH 1/3] :memo: Update user guide --- .../20200924093441-ft2rhps.sy | 16 +++++----------- .../20200825162036-4dx365o.sy | 15 ++++----------- .../20211226121319-emrk2yy.sy | 15 ++++----------- 3 files changed, 13 insertions(+), 33 deletions(-) diff --git a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-h361q1i/20200924093441-ft2rhps.sy b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-h361q1i/20200924093441-ft2rhps.sy index f8ef88070..844b6614c 100644 --- a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-h361q1i/20200924093441-ft2rhps.sy +++ b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-h361q1i/20200924093441-ft2rhps.sy @@ -8,7 +8,7 @@ "title": "Formatting elements", "title-img": "background-color:#269;background-image: linear-gradient(white 2px, transparent 2px),linear-gradient(90deg, white 2px, transparent 2px),linear-gradient(rgba(255,255,255,.3) 1px, transparent 1px),linear-gradient(90deg, rgba(255,255,255,.3) 1px, transparent 1px);background-size: 100px 100px, 100px 100px, 20px 20px, 20px 20px;background-position:-2px -2px, -2px -2px, -1px -1px, -1px -1px;", "type": "doc", - "updated": "20230820185102" + "updated": "20240225111211" }, "Children": [ { @@ -32,7 +32,7 @@ "ListData": {}, "Properties": { "id": "20210104091509-8csaq4j", - "updated": "20220918174924" + "updated": "20240225111211" }, "Children": [ { @@ -105,7 +105,7 @@ }, "Properties": { "id": "20220916200111-8pnrqr2", - "updated": "20220916200115" + "updated": "20240225111211" }, "Children": [ { @@ -140,15 +140,13 @@ "ID": "20220916200115-rstez65", "Type": "NodeParagraph", "Properties": { - "id": "20220916200115-rstez65" + "id": "20220916200115-rstez65", + "updated": "20240225111211" }, "Children": [ { "Type": "NodeImage", "Data": "span", - "Properties": { - "style": "display: block;" - }, "Children": [ { "Type": "NodeBang" @@ -174,10 +172,6 @@ } ] }, - { - "Type": "NodeKramdownSpanIAL", - "Data": "{: style=\"display: block;\"}" - }, { "Type": "NodeText", "Data": "\n" diff --git a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-abz7w6k/20200825162036-4dx365o.sy b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-abz7w6k/20200825162036-4dx365o.sy index afe68567b..6d9e255a2 100644 --- a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-abz7w6k/20200825162036-4dx365o.sy +++ b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-abz7w6k/20200825162036-4dx365o.sy @@ -8,7 +8,7 @@ "title": "排版元素", "title-img": "background-color: hsl(2, 57%, 40%);background-image: repeating-linear-gradient(transparent, transparent 50px, rgba(0,0,0,.4) 50px, rgba(0,0,0,.4) 53px, transparent 53px, transparent 63px, rgba(0,0,0,.4) 63px, rgba(0,0,0,.4) 66px, transparent 66px, transparent 116px, rgba(0,0,0,.5) 116px, rgba(0,0,0,.5) 166px, rgba(255,255,255,.2) 166px, rgba(255,255,255,.2) 169px, rgba(0,0,0,.5) 169px, rgba(0,0,0,.5) 179px, rgba(255,255,255,.2) 179px, rgba(255,255,255,.2) 182px, rgba(0,0,0,.5) 182px, rgba(0,0,0,.5) 232px, transparent 232px),repeating-linear-gradient(270deg, transparent, transparent 50px, rgba(0,0,0,.4) 50px, rgba(0,0,0,.4) 53px, transparent 53px, transparent 63px, rgba(0,0,0,.4) 63px, rgba(0,0,0,.4) 66px, transparent 66px, transparent 116px, rgba(0,0,0,.5) 116px, rgba(0,0,0,.5) 166px, rgba(255,255,255,.2) 166px, rgba(255,255,255,.2) 169px, rgba(0,0,0,.5) 169px, rgba(0,0,0,.5) 179px, rgba(255,255,255,.2) 179px, rgba(255,255,255,.2) 182px, rgba(0,0,0,.5) 182px, rgba(0,0,0,.5) 232px, transparent 232px),repeating-linear-gradient(125deg, transparent, transparent 2px, rgba(0,0,0,.2) 2px, rgba(0,0,0,.2) 3px, transparent 3px, transparent 5px, rgba(0,0,0,.2) 5px);", "type": "doc", - "updated": "20230820185054" + "updated": "20240225111151" }, "Children": [ { @@ -32,7 +32,7 @@ "ListData": {}, "Properties": { "id": "20210104091228-ttcj9nm", - "updated": "20220918174723" + "updated": "20240225111151" }, "Children": [ { @@ -105,7 +105,7 @@ }, "Properties": { "id": "20220916195046-bdzv6fy", - "updated": "20210604222204" + "updated": "20240225111151" }, "Children": [ { @@ -141,15 +141,12 @@ "Type": "NodeParagraph", "Properties": { "id": "20210604222158-w17nnmy", - "updated": "20210604222204" + "updated": "20240225111151" }, "Children": [ { "Type": "NodeImage", "Data": "span", - "Properties": { - "style": "display: block;" - }, "Children": [ { "Type": "NodeBang" @@ -175,10 +172,6 @@ } ] }, - { - "Type": "NodeKramdownSpanIAL", - "Data": "{: style=\"display: block;\"}" - }, { "Type": "NodeText", "Data": "\n" diff --git a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226120854-dr1jfx2/20211226121319-emrk2yy.sy b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226120854-dr1jfx2/20211226121319-emrk2yy.sy index 7c598c1e6..0b643aa92 100644 --- a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226120854-dr1jfx2/20211226121319-emrk2yy.sy +++ b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226120854-dr1jfx2/20211226121319-emrk2yy.sy @@ -7,7 +7,7 @@ "id": "20211226121319-emrk2yy", "title": "排版元素", "title-img": "background-color: hsl(2, 57%, 40%);background-image: repeating-linear-gradient(transparent, transparent 50px, rgba(0,0,0,.4) 50px, rgba(0,0,0,.4) 53px, transparent 53px, transparent 63px, rgba(0,0,0,.4) 63px, rgba(0,0,0,.4) 66px, transparent 66px, transparent 116px, rgba(0,0,0,.5) 116px, rgba(0,0,0,.5) 166px, rgba(255,255,255,.2) 166px, rgba(255,255,255,.2) 169px, rgba(0,0,0,.5) 169px, rgba(0,0,0,.5) 179px, rgba(255,255,255,.2) 179px, rgba(255,255,255,.2) 182px, rgba(0,0,0,.5) 182px, rgba(0,0,0,.5) 232px, transparent 232px),repeating-linear-gradient(270deg, transparent, transparent 50px, rgba(0,0,0,.4) 50px, rgba(0,0,0,.4) 53px, transparent 53px, transparent 63px, rgba(0,0,0,.4) 63px, rgba(0,0,0,.4) 66px, transparent 66px, transparent 116px, rgba(0,0,0,.5) 116px, rgba(0,0,0,.5) 166px, rgba(255,255,255,.2) 166px, rgba(255,255,255,.2) 169px, rgba(0,0,0,.5) 169px, rgba(0,0,0,.5) 179px, rgba(255,255,255,.2) 179px, rgba(255,255,255,.2) 182px, rgba(0,0,0,.5) 182px, rgba(0,0,0,.5) 232px, transparent 232px),repeating-linear-gradient(125deg, transparent, transparent 2px, rgba(0,0,0,.2) 2px, rgba(0,0,0,.2) 3px, transparent 3px, transparent 5px, rgba(0,0,0,.2) 5px);", - "updated": "20230820185037" + "updated": "20240225111159" }, "Children": [ { @@ -31,7 +31,7 @@ "ListData": {}, "Properties": { "id": "20211226122008-1e014nh", - "updated": "20220918174803" + "updated": "20240225111159" }, "Children": [ { @@ -104,7 +104,7 @@ }, "Properties": { "id": "20220916195409-g57vfyf", - "updated": "20211226122008" + "updated": "20240225111159" }, "Children": [ { @@ -140,15 +140,12 @@ "Type": "NodeParagraph", "Properties": { "id": "20211226122008-poajwbi", - "updated": "20210604222204" + "updated": "20240225111159" }, "Children": [ { "Type": "NodeImage", "Data": "span", - "Properties": { - "style": "display: block;" - }, "Children": [ { "Type": "NodeBang" @@ -174,10 +171,6 @@ } ] }, - { - "Type": "NodeKramdownSpanIAL", - "Data": "{: style=\"display: block;\"}" - }, { "Type": "NodeText", "Data": "\n" From b22624b417b632316025c2a0df4eed8ce4063ba0 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Sun, 25 Feb 2024 22:16:41 +0800 Subject: [PATCH 2/3] :bug: Code appears when pasted as plain text Fix https://github.com/siyuan-note/siyuan/issues/10435 --- app/src/protyle/render/setLute.ts | 1 + app/src/types/protyle.d.ts | 2 ++ 2 files changed, 3 insertions(+) diff --git a/app/src/protyle/render/setLute.ts b/app/src/protyle/render/setLute.ts index 09753c921..b1bd572d1 100644 --- a/app/src/protyle/render/setLute.ts +++ b/app/src/protyle/render/setLute.ts @@ -3,6 +3,7 @@ export const setLute = (options: ILuteOptions) => { lute.SetSpellcheck(window.siyuan.config.editor.spellcheck); lute.SetProtyleMarkNetImg(window.siyuan.config.editor.displayNetImgMark); lute.SetFileAnnotationRef(true); + lute.SetHTMLTag2TextMark(true); lute.SetTextMark(true); lute.SetHeadingID(false); lute.SetYamlFrontMatter(false); diff --git a/app/src/types/protyle.d.ts b/app/src/types/protyle.d.ts index 5a7f5a078..89a736e9a 100644 --- a/app/src/types/protyle.d.ts +++ b/app/src/types/protyle.d.ts @@ -172,6 +172,8 @@ declare class Lute { public SetTextMark(enable: boolean): void; + public SetHTMLTag2TextMark(enable: boolean): void; + public SetHeadingID(enable: boolean): void; public SetProtyleMarkNetImg(enable: boolean): void; From c131e491f891b302af519b08a1cfbe1a24ab6042 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Sun, 25 Feb 2024 22:20:35 +0800 Subject: [PATCH 3/3] :bug: Code appears when pasted as plain text Fix https://github.com/siyuan-note/siyuan/issues/10435 --- kernel/go.mod | 2 +- kernel/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/go.mod b/kernel/go.mod index 264d88e08..0a4ecb29d 100644 --- a/kernel/go.mod +++ b/kernel/go.mod @@ -9,7 +9,7 @@ require ( github.com/88250/clipboard v0.1.5 github.com/88250/epub v0.0.0-20230830085737-c19055cd1f48 github.com/88250/gulu v1.2.3-0.20231209020950-b7b6994e395c - github.com/88250/lute v1.7.7-0.20240223030008-adf363ceff6c + github.com/88250/lute v1.7.7-0.20240225141140-2acd83bfa5d5 github.com/88250/pdfcpu v0.3.14-0.20230401044135-c7369a99720c github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 github.com/ClarkThan/ahocorasick v0.0.0-20231011042242-30d1ef1347f4 diff --git a/kernel/go.sum b/kernel/go.sum index 8414fd306..977f8ee5c 100644 --- a/kernel/go.sum +++ b/kernel/go.sum @@ -10,8 +10,8 @@ github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950 h1:Pa5hMiBceT github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= github.com/88250/gulu v1.2.3-0.20231209020950-b7b6994e395c h1:Fas3hxqP33xA9KKDV50jUmppiiOukk5bdV00Hk5VSSk= github.com/88250/gulu v1.2.3-0.20231209020950-b7b6994e395c/go.mod h1:pTWnjt+6qUqNnP9xltswsJxgCBVu3C7eW09u48LWX0k= -github.com/88250/lute v1.7.7-0.20240223030008-adf363ceff6c h1:2Mwk9QLj1p7a9mn7s+gSNYrft0AK74RMcd7FUFYWmlI= -github.com/88250/lute v1.7.7-0.20240223030008-adf363ceff6c/go.mod h1:+wUqx/1kdFDbWtxn9LYJlaCOAeol2pjSO6w+WJTVQsg= +github.com/88250/lute v1.7.7-0.20240225141140-2acd83bfa5d5 h1:sUT5aPsnYCYjuNSnrx80JJdXOqHslw8KdmaSd/PrAPI= +github.com/88250/lute v1.7.7-0.20240225141140-2acd83bfa5d5/go.mod h1:+wUqx/1kdFDbWtxn9LYJlaCOAeol2pjSO6w+WJTVQsg= github.com/88250/pdfcpu v0.3.14-0.20230401044135-c7369a99720c h1:Dl/8S9iLyPMTElnWIBxmjaLiWrkI5P4a21ivwAn5pU0= github.com/88250/pdfcpu v0.3.14-0.20230401044135-c7369a99720c/go.mod h1:S5YT38L/GCjVjmB4PB84PymA1qfopjEhfhTNQilLpv4= github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 h1:48T899JQDwyyRu9yXHePYlPdHtpJfrJEUGBMH3SMBWY=