From 528283001b6c44f51f398cb0756edacda3b6e5f1 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Sat, 27 May 2023 10:50:22 +0800
Subject: [PATCH 1/2] :art: Paste code from IDE no longer escape `<` and `>`
Fix https://github.com/siyuan-note/siyuan/issues/8340
---
app/src/protyle/util/processCode.ts | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/app/src/protyle/util/processCode.ts b/app/src/protyle/util/processCode.ts
index 3c2622535..31203b4e3 100644
--- a/app/src/protyle/util/processCode.ts
+++ b/app/src/protyle/util/processCode.ts
@@ -29,10 +29,12 @@ export const processPasteCode = (html: string, text: string) => {
}
if (isCode) {
- const code = text || html;
+ let code = text || html;
if (/\n/.test(code)) {
return `
${window.siyuan.storage[Constants.LOCAL_CODELANG]}
${code.replace(/&/g, "&").replace(/
${Constants.ZWSP}
`;
} else {
+ // Paste code from IDE no longer escape `<` and `>` https://github.com/siyuan-note/siyuan/issues/8340
+ code = code.replace("<", "<").replace('>', ">");
return "`" + code + "`";
}
}
From b7ab1d0a6a2485c86c5401a94dea46922e2e6518 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Sat, 27 May 2023 11:21:45 +0800
Subject: [PATCH 2/2] :art: Update README
---
README.md | 8 +++++---
README_zh_CN.md | 6 +++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
index c76fb16be..66a129090 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,8 @@ Build Your Eternal Digital Garden
SiYuan is a privacy-first personal knowledge management system, support fine-grained block-level reference and Markdown
WYSIWYG.
+Welcome to [SiYuan English Discussion Forum](https://liuyun.io) to learn more.
+

## 🔮 Features
@@ -156,9 +158,9 @@ We release insider preview before major updates, please visit [https://github.co
## 🏘️ Community
-* [Issues](https://github.com/siyuan-note/siyuan/issues) Official support channels
-* [Discord](https://discord.com/invite/bzfCBwMzdP) A community built by enthusiastic users
-* [Awesome SiYuan](https://github.com/siyuan-note/awesome) Resources organized by enthusiastic users
+* [English Discussion Forum](https://liuyun.io)
+* [Discord](https://discord.com/invite/bzfCBwMzdP)
+* [Awesome SiYuan](https://github.com/siyuan-note/awesome)
## 🛠️ Development Guide
diff --git a/README_zh_CN.md b/README_zh_CN.md
index e1bec6eee..6b5efe0df 100644
--- a/README_zh_CN.md
+++ b/README_zh_CN.md
@@ -161,9 +161,9 @@
## 🏘️ 社区
-* [中文讨论区](https://ld246.com/domain/siyuan) 官方支持渠道
-* [用户社区汇总](https://ld246.com/article/1640266171309) 由热心用户建立的社区
-* [Awesome SiYuan](https://github.com/siyuan-note/awesome) 由热心用户整理的资源
+* [中文讨论区](https://ld246.com/domain/siyuan)
+* [用户社区汇总](https://ld246.com/article/1640266171309)
+* [Awesome SiYuan](https://github.com/siyuan-note/awesome)
## 🛠️ 开发指南