♻️ emoji #13241

siyuan-note · Dec 14, 2024 · 152fa6e · 152fa6e
1 parent fec3211
commit 152fa6e
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 43 deletions.
diff --git a/app/appearance/themes/daylight/theme.css b/app/appearance/themes/daylight/theme.css
@@ -23,12 +23,11 @@
 
     /* 字体 */
     /* Windows 斜体遮挡添加 "Segoe UI" 字体 https://github.com/siyuan-note/siyuan/issues/11841 */
-    --b3-font-family: "Helvetica Neue", "Luxi Sans", "DejaVu Sans", "Hiragino Sans", "Segoe UI", "Tahoma", "Arial", "Other Emojis", sans-serif;
-    /* 优先使用定义好的数字和表情 */
-    --b3-font-family-protyle: "Number Glyphs", "Segoe Good Emoji", "Other SiYuan Emojis", var(--b3-font-family);
-    --b3-font-family-code: "Number Glyphs Of JetBrainsMono-Regular", "Segoe Good Emoji", "Other SiYuan Emojis", "JetBrainsMono-Regular", mononoki, Consolas, "Liberation Mono", Menlo, Courier, monospace, var(--b3-font-family);
+    --b3-font-family: "Helvetica Neue", "Luxi Sans", "DejaVu Sans", "Hiragino Sans", "Segoe UI", sans-serif, "Arial", "Tahoma", "Emojis";
+    --b3-font-family-protyle: "Number Glyphs", "SiYuan Emojis", "Emojis", var(--b3-font-family);
+    --b3-font-family-code: "Number Glyphs Of JetBrainsMono-Regular", "SiYuan Emojis", "Emoji", "JetBrainsMono-Regular", mononoki, Consolas, "Liberation Mono", Menlo, Courier, monospace, var(--b3-font-family);
     --b3-font-family-graph: arial;
-    --b3-font-family-emoji: "Segoe Good Emoji", "Other Emojis";
+    --b3-font-family-emoji: "SiYuan Emojis", "Emojis";
     --b3-font-family-math: KaTeX_Math;
     --b3-font-size: 14px;
 
@@ -202,14 +201,16 @@
     --b3-parent-background: var(--b3-theme-background);
 }
 
-:root:lang(zh_CN) { /* Simplified Chinese */
-    --b3-font-family: "Helvetica Neue", "PingFang SC", "Luxi Sans", "DejaVu Sans", "Hiragino Sans GB", "Segoe UI", "Source Han Sans SC", "Microsoft Yahei", "Tahoma", "Arial", "Other Emojis", sans-serif;
+:root:lang(zh_CN) {
+    --b3-font-family: "Helvetica Neue", "PingFang SC", "Luxi Sans", "DejaVu Sans", "Hiragino Sans GB", "Segoe UI", "Source Han Sans SC", "Microsoft Yahei", sans-serif, "Arial", "Tahoma", "Emojis";
 }
-:root:lang(zh_CHT) { /* Traditional Chinese */
-    --b3-font-family: "Helvetica Neue", "PingFang TC", "Luxi Sans", "DejaVu Sans", "Hiragino Sans TC", "Segoe UI", "Source Han Sans TC", "Microsoft JhengHei", "Tahoma", "Arial", "Other Emojis", sans-serif;
+
+:root:lang(zh_CHT) {
+    --b3-font-family: "Helvetica Neue", "PingFang TC", "Luxi Sans", "DejaVu Sans", "Hiragino Sans TC", "Segoe UI", "Source Han Sans TC", "Microsoft JhengHei", sans-serif, "Arial", "Tahoma", "Emojis";
 }
-:root:lang(ja_JP) { /* Japanese */
-    --b3-font-family: "Helvetica Neue", "Luxi Sans", "DejaVu Sans", "Hiragino Sans", "Yu Gothic UI", "Segoe UI Symbol", "Segoe UI", "Tahoma", "Arial", "Other Emojis", sans-serif;
+
+:root:lang(ja_JP) {
+    --b3-font-family: "Helvetica Neue", "Luxi Sans", "DejaVu Sans", "Hiragino Sans", "Yu Gothic UI", "Segoe UI", sans-serif, "Arial", "Tahoma", "Emojis";
 }
 
 /* https://github.com/siyuan-note/siyuan/issues/6440 */

diff --git a/app/appearance/themes/daylight/theme.json b/app/appearance/themes/daylight/theme.json
@@ -2,7 +2,7 @@
   "name": "daylight",
   "author": "Vanessa",
   "url": "https://github.com/Vanessa219",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "modes": [
     "light"
   ]

diff --git a/app/appearance/themes/midnight/theme.css b/app/appearance/themes/midnight/theme.css
@@ -22,11 +22,11 @@
     --b3-theme-on-error: #fff;
 
     /* 字体 */
-    --b3-font-family: "Helvetica Neue", "Luxi Sans", "DejaVu Sans", "Hiragino Sans", "Segoe UI", "Tahoma", "Arial", "Other Emojis", sans-serif;
-    --b3-font-family-protyle: "Number Glyphs", "Segoe Good Emoji", "Other SiYuan Emojis", var(--b3-font-family);
-    --b3-font-family-code: "Number Glyphs Of JetBrainsMono-Regular", "Segoe Good Emoji", "Other SiYuan Emojis", "JetBrainsMono-Regular", mononoki, Consolas, "Liberation Mono", Menlo, Courier, monospace, var(--b3-font-family);
+    --b3-font-family: "Helvetica Neue", "Luxi Sans", "DejaVu Sans", "Hiragino Sans", "Segoe UI", sans-serif, "Arial", "Tahoma", "Emojis";
+    --b3-font-family-protyle: "Number Glyphs", "SiYuan Emojis", "Emojis", var(--b3-font-family);
+    --b3-font-family-code: "Number Glyphs Of JetBrainsMono-Regular", "SiYuan Emojis", "Emoji", "JetBrainsMono-Regular", mononoki, Consolas, "Liberation Mono", Menlo, Courier, monospace, var(--b3-font-family);
     --b3-font-family-graph: arial;
-    --b3-font-family-emoji: "Segoe Good Emoji", "Other Emojis";
+    --b3-font-family-emoji: "SiYuan Emojis", "Emojis";
     --b3-font-family-math: KaTeX_Math;
     --b3-font-size: 14px;
 
@@ -200,14 +200,16 @@
     --b3-parent-background: var(--b3-theme-background);
 }
 
-:root:lang(zh_CN) { /* Simplified Chinese */
-    --b3-font-family: "Helvetica Neue", "PingFang SC", "Luxi Sans", "DejaVu Sans", "Hiragino Sans GB", "Segoe UI", "Source Han Sans SC", "Microsoft Yahei", "Tahoma", "Arial", "Other Emojis", sans-serif;
+:root:lang(zh_CN) {
+    --b3-font-family: "Helvetica Neue", "PingFang SC", "Luxi Sans", "DejaVu Sans", "Hiragino Sans GB", "Segoe UI", "Source Han Sans SC", "Microsoft Yahei", sans-serif, "Arial", "Tahoma", "Emojis";
 }
-:root:lang(zh_CHT) { /* Traditional Chinese */
-    --b3-font-family: "Helvetica Neue", "PingFang TC", "Luxi Sans", "DejaVu Sans", "Hiragino Sans TC", "Segoe UI", "Source Han Sans TC", "Microsoft JhengHei", "Tahoma", "Arial", "Other Emojis", sans-serif;
+
+:root:lang(zh_CHT) {
+    --b3-font-family: "Helvetica Neue", "PingFang TC", "Luxi Sans", "DejaVu Sans", "Hiragino Sans TC", "Segoe UI", "Source Han Sans TC", "Microsoft JhengHei", sans-serif, "Arial", "Tahoma", "Emojis";
 }
-:root:lang(ja_JP) { /* Japanese */
-    --b3-font-family: "Helvetica Neue", "Luxi Sans", "DejaVu Sans", "Hiragino Sans", "Yu Gothic UI", "Segoe UI Symbol", "Segoe UI", "Tahoma", "Arial", "Other Emojis", sans-serif;
+
+:root:lang(ja_JP) {
+    --b3-font-family: "Helvetica Neue", "Luxi Sans", "DejaVu Sans", "Hiragino Sans", "Yu Gothic UI", "Segoe UI", sans-serif, "Arial", "Tahoma", "Emojis";
 }
 
 /* https://github.com/siyuan-note/siyuan/issues/6440 */

diff --git a/app/appearance/themes/midnight/theme.json b/app/appearance/themes/midnight/theme.json
@@ -2,7 +2,7 @@
   "name": "midnight",
   "author": "Vanessa",
   "url": "https://github.com/Vanessa219",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "modes": [
     "dark"
   ]

diff --git a/app/src/assets/scss/component/_typography.scss b/app/src/assets/scss/component/_typography.scss
@@ -11,33 +11,22 @@
 }
 
 @font-face {
-  font-family: "Segoe Good Emoji";
-  src: local("Segoe UI Emoji"),
-  local("Segoe UI Symbol");
-  /* SiYuan表情选择器中包含的emoji（去除区域指示符字母和国旗）对应的Unicode */
-  unicode-range: U+23, U+2A, U+30-39, U+A9, U+AE, U+200D, U+203C, U+2049, U+20E3, U+2122, U+2139, U+2194-2199, U+21A9-21AA, U+231A-231B, U+2328, U+23CF, U+23E9-23F3, U+23F8-23FA, U+24C2, U+25AA-25AB, U+25B6, U+25C0, U+25FB-25FE, U+2600-2604, U+260E, U+2611, U+2614-2615, U+2618, U+261D, U+2620, U+2622-2623, U+2626, U+262A, U+262E-262F, U+2638-263A, U+2640, U+2642, U+2648-2653, U+265F-2660, U+2663, U+2665-2666, U+2668, U+267B, U+267E-267F, U+2692-2697, U+2699, U+269B-269C, U+26A0-26A1, U+26A7, U+26AA-26AB, U+26B0-26B1, U+26BD-26BE, U+26C4-26C5, U+26C8, U+26CE-26CF, U+26D1, U+26D3-26D4, U+26E9-26EA, U+26F0-26F5, U+26F7-26FA, U+26FD, U+2702, U+2705, U+2708-270D, U+270F, U+2712, U+2714, U+2716, U+271D, U+2721, U+2728, U+2733-2734, U+2744, U+2747, U+274C, U+274E, U+2753-2755, U+2757, U+2763-2764, U+2795-2797, U+27A1, U+27B0, U+27BF, U+2934-2935, U+2B05-2B07, U+2B1B-2B1C, U+2B50, U+2B55, U+3030, U+303D, U+3297, U+3299, U+E50A, U+FE0F, U+1F004, U+1F0CF, U+1F170-1F171, U+1F17E-1F17F, U+1F18E, U+1F191-1F19A, U+1F201-1F202, U+1F21A, U+1F22F, U+1F232-1F23A, U+1F250-1F251, U+1F300-1F321, U+1F324-1F393, U+1F396-1F397, U+1F399-1F39B, U+1F39E-1F3F0, U+1F3F3-1F3F5, U+1F3F7-1F4FD, U+1F4FF-1F53D, U+1F549-1F54E, U+1F550-1F567, U+1F56F-1F570, U+1F573-1F57A, U+1F587, U+1F58A-1F58D, U+1F590, U+1F595-1F596, U+1F5A4-1F5A5, U+1F5A8, U+1F5B1-1F5B2, U+1F5BC, U+1F5C2-1F5C4, U+1F5D1-1F5D3, U+1F5DC-1F5DE, U+1F5E1, U+1F5E3, U+1F5E8, U+1F5EF, U+1F5F3, U+1F5FA-1F64F, U+1F680-1F6C5, U+1F6CB-1F6D2, U+1F6D5-1F6D7, U+1F6DC-1F6E5, U+1F6E9, U+1F6EB-1F6EC, U+1F6F0, U+1F6F3-1F6FC, U+1F7E0-1F7EB, U+1F7F0, U+1F90C-1F93A, U+1F93C-1F945, U+1F947-1F9FF, U+1FA70-1FA7C, U+1FA80-1FA89, U+1FA8F-1FAC6, U+1FACE-1FADC, U+1FADF-1FAE9, U+1FAF0-1FAF8;
-}
-
-@font-face {
-  font-family: "Other SiYuan Emojis";
-  src: local("Apple Color Emoji"),
-  local("Twemoji Mozilla"),
-  local("Noto Color Emoji"),
-  local("Android Emoji"),
-  local("EmojiSymbols"),
-  url(../fonts/Noto-COLRv1-2.047/Noto-COLRv1.woff2) format("woff2");
-  /* SiYuan表情选择器中包含的emoji对应的Unicode */
+  font-family: "SiYuan Emojis";
+  src: url(../fonts/Noto-COLRv1-2.047/Noto-COLRv1.woff2) format("woff2");
+  // 表情中包含的 emoji 对应的 Unicode
   unicode-range: U+23, U+2A, U+30-39, U+A9, U+AE, U+200D, U+203C, U+2049, U+2122, U+2139, U+2194-2199, U+21A9-21AA, U+231A-231B, U+2328, U+23CF, U+23E9-23F3, U+23F8-23FA, U+24C2, U+25AA-25AB, U+25B6, U+25C0, U+25FB-25FE, U+2600-2604, U+260E, U+2611, U+2614-2615, U+2618, U+261D, U+2620, U+2622-2623, U+2626, U+262A, U+262E-262F, U+2638-263A, U+2640, U+2642, U+2648-2653, U+265F-2660, U+2663, U+2665-2666, U+2668, U+267B, U+267E-267F, U+2692-2697, U+2699, U+269B-269C, U+26A0-26A1, U+26A7, U+26AA-26AB, U+26B0-26B1, U+26BD-26BE, U+26C4-26C5, U+26C8, U+26CE-26CF, U+26D1, U+26D3-26D4, U+26E9-26EA, U+26F0-26F5, U+26F7-26FA, U+26FD, U+2702, U+2705, U+2708-270D, U+270F, U+2712, U+2714, U+2716, U+271D, U+2721, U+2728, U+2733-2734, U+2744, U+2747, U+274C, U+274E, U+2753-2755, U+2757, U+2763-2764, U+2795-2797, U+27A1, U+27B0, U+27BF, U+2934-2935, U+2B05-2B07, U+2B1B-2B1C, U+2B50, U+2B55, U+3030, U+303D, U+3297, U+3299, U+E50A, U+1F004, U+1F0CF, U+1F170-1F171, U+1F17E-1F17F, U+1F18E, U+1F191-1F19A, U+1F1E6-1F1FF, U+1F201-1F202, U+1F21A, U+1F22F, U+1F232-1F23A, U+1F250-1F251, U+1F300-1F321, U+1F324-1F393, U+1F396-1F397, U+1F399-1F39B, U+1F39E-1F3F0, U+1F3F3-1F3F5, U+1F3F7-1F4FD, U+1F4FF-1F53D, U+1F549-1F54E, U+1F550-1F567, U+1F56F-1F570, U+1F573-1F57A, U+1F587, U+1F58A-1F58D, U+1F590, U+1F595-1F596, U+1F5A4-1F5A5, U+1F5A8, U+1F5B1-1F5B2, U+1F5BC, U+1F5C2-1F5C4, U+1F5D1-1F5D3, U+1F5DC-1F5DE, U+1F5E1, U+1F5E3, U+1F5E8, U+1F5EF, U+1F5F3, U+1F5FA-1F64F, U+1F680-1F6C5, U+1F6CB-1F6D2, U+1F6D5-1F6D7, U+1F6DC-1F6E5, U+1F6E9, U+1F6EB-1F6EC, U+1F6F0, U+1F6F3-1F6FC, U+1F7E0-1F7EB, U+1F7F0, U+1F90C-1F93A, U+1F93C-1F945, U+1F947-1F9FF, U+1FA70-1FA7C, U+1FA80-1FA89, U+1FA8F-1FAC6, U+1FACE-1FADC, U+1FADF-1FAE9, U+1FAF0-1FAF8;
 }
 
 @font-face {
-  font-family: "Other Emojis";
-  src: local("Apple Color Emoji"),
+  font-family: "Emojis";
+  src: local("Segoe UI Emoji"),
+  local("Segoe UI Symbol"),
+  local("Apple Color Emoji"),
   local("Twemoji Mozilla"),
   local("Noto Color Emoji"),
   local("Android Emoji"),
   local("EmojiSymbols"),
-  url(../fonts/Noto-COLRv1-2.047/Noto-COLRv1.woff2) format("woff2");
+  local("SiYuan Emojis");
 }
 
 .b3-typography,

diff --git a/app/src/util/assets.ts b/app/src/util/assets.ts
@@ -208,7 +208,7 @@ export const setInlineStyle = (set = true) => {
   src: local("${window.siyuan.config.editor.fontFamily}");
   unicode-range: U+30-39;
 }
-.b3-typography:not(.b3-typography--default), .protyle-wysiwyg, .protyle-title {font-family: "Number Glyphs", "Segoe Good Emoji", "Other SiYuan Emojis", "${window.siyuan.config.editor.fontFamily}", var(--b3-font-family-protyle)}`;
+.b3-typography:not(.b3-typography--default), .protyle-wysiwyg, .protyle-title {font-family: "Number Glyphs", "SiYuan Emojis", "Emoji", "${window.siyuan.config.editor.fontFamily}", var(--b3-font-family-protyle)}`;
     } else {
         style = `@font-face {
   font-family: "Number Glyphs";