From 04d003c134dcedd99b8491b2e26c4f0db952d532 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Thu, 8 Sep 2022 20:18:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?:art:=20=E6=9B=B4=E6=96=B0=E4=B8=AD?= =?UTF-8?q?=E6=96=87=E7=94=A8=E6=88=B7=E6=8C=87=E5=8D=97=E6=8E=92=E7=89=88?= =?UTF-8?q?=E5=85=83=E7=B4=A0=20IFrame?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../20210808180320-abz7w6k/20200825162036-4dx365o.sy | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 9f9938279..1a787d515 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 @@ -6,7 +6,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": "20220828102447" + "updated": "20220908200902" }, "Children": [ { @@ -2914,12 +2914,12 @@ ] }, { - "ID": "20210604223244-0e20a5o", + "ID": "20220908200902-6rqv2wt", "Type": "NodeIFrame", - "Data": "\u003ciframe src=\"https://player.bilibili.com/player.html?bvid=BV1kA411M7sJ\u0026amp;page=1\u0026amp;high_quality=1\u0026amp;as_wide=1\u0026amp;allowfullscreen=true\" data-src=\"\" scrolling=\"no\" border=\"0\" frameborder=\"no\" framespacing=\"0\" allowfullscreen=\"true\" sandbox=\"allow-top-navigation-by-user-activation allow-same-origin allow-forms allow-scripts allow-popups\" style=\"height: 360px; width: 640px;\"\u003e\u003c/iframe\u003e", + "Data": "\u003ciframe src=\"//player.bilibili.com/player.html?aid=247401039\u0026amp;bvid=BV1ov41187qM\u0026amp;cid=319662466\u0026amp;page=1\" data-src=\"//player.bilibili.com/player.html?aid=247401039\u0026amp;bvid=BV1ov41187qM\u0026amp;cid=319662466\u0026amp;page=1\" scrolling=\"no\" border=\"0\" frameborder=\"no\" framespacing=\"0\" allowfullscreen=\"true\" style=\"width: 981px; height: 440px;\"\u003e\u003c/iframe\u003e", "Properties": { - "id": "20210604223244-0e20a5o", - "updated": "20210604223359" + "id": "20220908200902-6rqv2wt", + "updated": "20220908200902" } }, { @@ -2940,7 +2940,7 @@ { "ID": "20210608113914-zvtw5kj", "Type": "NodeVideo", - "Data": "\u003cvideo controls=\"controls\" src=\"assets/formatting_elements-20210607225733-o1keasx.mp4\" data-src=\"assets/formatting_elements-20210607213508-y2r3y55-20210608113914-q11ou4j.mp4\" style=\"width: 360px; height: 267px;\"\u003e\u003c/video\u003e", + "Data": "\u003cvideo controls=\"controls\" src=\"assets/formatting_elements-20210607225733-o1keasx.mp4\" data-src=\"assets/formatting_elements-20210607213508-y2r3y55-20210608113914-q11ou4j.mp4\" style=\"width: 640px; height: 327px;\"\u003e\u003c/video\u003e", "Properties": { "id": "20210608113914-zvtw5kj", "updated": "20210608113914" From 7c5e3d042a95a4bb8ea95373110646f2bf685299 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Thu, 8 Sep 2022 20:49:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?:bug:=20=E5=AF=BC=E5=87=BA=20PDF=20?= =?UTF-8?q?=E6=8F=92=E5=85=A5=E6=96=87=E6=A1=A3=E6=A0=87=E9=A2=98=E8=BD=AC?= =?UTF-8?q?=E4=B9=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/export.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/model/export.go b/kernel/model/export.go index 6745e2f36..ea616aaee 100644 --- a/kernel/model/export.go +++ b/kernel/model/export.go @@ -1288,7 +1288,8 @@ func exportTree(tree *parse.Tree, wysiwyg, expandKaTexMacros bool) (ret *parse.T if Conf.Export.AddTitle { if root, _ := getBlock(id); nil != root { title := &ast.Node{Type: ast.NodeHeading, HeadingLevel: 1} - title.AppendChild(&ast.Node{Type: ast.NodeText, Tokens: []byte(root.Content)}) + content := html.UnescapeString(root.Content) + title.AppendChild(&ast.Node{Type: ast.NodeText, Tokens: []byte(content)}) ret.Root.PrependChild(title) } }