Update to v3.6.0

forFudan · Sep 16, 2024 · b524d75 · b524d75
1 parent 608c451
commit b524d75
Show file tree

Hide file tree

Showing 93 changed files with 210,213 additions and 215,655 deletions.
diff --git a/build.ps1 b/build.ps1
@@ -0,0 +1,10 @@
+cd "D:\Dropbox\GitHub\yuhao\yulight"
+python build_release.py
+
+cd "D:\Dropbox\GitHub\yuhao\yustar"
+python build_release.py
+
+cd "D:\Dropbox\GitHub\yuhao\yujoy"
+python build_release.py
+
+cd "D:\Dropbox\GitHub\yuhao"
diff --git a/...ta/schema/lua/yuhao/yuhao_auto_select.lua → lua/yuhao/yuhao_auto_select.lua b/...ta/schema/lua/yuhao/yuhao_auto_select.lua → lua/yuhao/yuhao_auto_select.lua
diff --git a/...lua/yuhao/yuhao_autocompletion_filter.lua → lua/yuhao/yuhao_autocompletion_filter.lua b/...lua/yuhao/yuhao_autocompletion_filter.lua → lua/yuhao/yuhao_autocompletion_filter.lua
diff --git a/...hao_autocompletion_filter_conditional.lua → ...hao_autocompletion_filter_conditional.lua b/...hao_autocompletion_filter_conditional.lua → ...hao_autocompletion_filter_conditional.lua
diff --git a/...t/beta/schema/lua/yuhao/yuhao_chaifen.lua → lua/yuhao/yuhao_chaifen.lua b/...t/beta/schema/lua/yuhao/yuhao_chaifen.lua → lua/yuhao/yuhao_chaifen.lua
diff --git a/...schema/lua/yuhao/yuhao_chaifen_filter.lua → lua/yuhao/yuhao_chaifen_filter.lua b/...schema/lua/yuhao/yuhao_chaifen_filter.lua → lua/yuhao/yuhao_chaifen_filter.lua
diff --git a/...ema/lua/yuhao/yuhao_chaifen_processor.lua → lua/yuhao/yuhao_chaifen_processor.lua b/...ema/lua/yuhao/yuhao_chaifen_processor.lua → lua/yuhao/yuhao_chaifen_processor.lua
diff --git a/...ta/schema/lua/yuhao/yuhao_char_filter.lua → lua/yuhao/yuhao_char_filter.lua b/...ta/schema/lua/yuhao/yuhao_char_filter.lua → lua/yuhao/yuhao_char_filter.lua
diff --git a/...eta/schema/lua/yuhao/yuhao_char_first.lua → lua/yuhao/yuhao_char_first.lua b/...eta/schema/lua/yuhao/yuhao_char_first.lua → lua/yuhao/yuhao_char_first.lua
diff --git a/...beta/schema/lua/yuhao/yuhao_char_only.lua → lua/yuhao/yuhao_char_only.lua b/...beta/schema/lua/yuhao/yuhao_char_only.lua → lua/yuhao/yuhao_char_only.lua
diff --git a/...schema/lua/yuhao/yuhao_charset_filter.lua → lua/yuhao/yuhao_charset_filter.lua b/...schema/lua/yuhao/yuhao_charset_filter.lua → lua/yuhao/yuhao_charset_filter.lua
@@ -41,19 +41,20 @@ So a lua filter would be helpful to filter the frequently used
 20240807: 重構並加入常用字前置代碼.
 20240819: 前置常用漢字功能只對 CJK 内的漢字生效.
 20240820: 前置常用漢字功能只在輸入爲四碼時方纔生效.
+20240908: 加入前置極常用繁簡漢字功能.
 ------------------------------------------------------------------------
 ]]
 
 local core = require("yuhao.yuhao_core")
 local yuhao_charsets = require("yuhao.yuhao_charsets")
-local set_of_frequent_chars = core.set_from_str(yuhao_charsets.frequent)
+local set_of_ubiquitous_chars = core.set_from_str(yuhao_charsets.ubiquitous)
 local set_of_common_chars = core.set_from_str(yuhao_charsets.common)
 local set_of_tonggui_chars = core.set_from_str(yuhao_charsets.tonggui)
 local set_of_harmonic_chars = core.set_from_str(yuhao_charsets.harmonic)
 
---- 前置極常用繁簡漢字
-local function yuhao_charset_filter_prioritization(input, env)
-    local switch_on = env.engine.context:get_option("yuhao_charset_filter_prioritization")
+--- 前置器
+local function yuhao_charset_prioritizer(input, env, option, charset)
+    local switch_on = env.engine.context:get_option(option)
     local chars_of_low_priority = {}
     local length_of_input_is_4 = (string.len(env.engine.context.input) == 4)
     if not length_of_input_is_4 then
@@ -63,7 +64,7 @@ local function yuhao_charset_filter_prioritization(input, env)
     end
     if length_of_input_is_4 then
         for cand in input:iter() do
-            local is_charset_or_not_cjk = core.string_is_in_set(cand.text, set_of_frequent_chars)
+            local is_charset_or_not_cjk = core.string_is_in_set(cand.text, charset)
             -- 二種情況顯示字符: (1) 極常用 (2) 過濾器關閉
             if is_charset_or_not_cjk or not switch_on then
                 yield(cand)
@@ -78,6 +79,16 @@ local function yuhao_charset_filter_prioritization(input, env)
     end
 end
 
+--- 前置極常用繁簡漢字
+local function yuhao_charset_prioritizer_ubiquitous(input, env)
+    yuhao_charset_prioritizer(input, env, "yuhao_charset_prioritizer_ubiquitous", set_of_ubiquitous_chars)
+end
+
+--- 前置常用繁簡漢字
+local function yuhao_charset_prioritizer_common(input, env)
+    yuhao_charset_prioritizer(input, env, "yuhao_charset_prioritizer_common", set_of_common_chars)
+end
+
 local function yuhao_charset_filter_common(input, env)
     local switch_on = env.engine.context:get_option("yuhao_charset_filter_common")
     for cand in input:iter() do
@@ -112,7 +123,8 @@ local function yuhao_charset_filter_harmonic(input, env)
 end
 
 return {
-    yuhao_charset_filter_prioritization = yuhao_charset_filter_prioritization,
+    yuhao_charset_prioritizer_ubiquitous = yuhao_charset_prioritizer_ubiquitous,
+    yuhao_charset_prioritizer_common = yuhao_charset_prioritizer_common,
     yuhao_charset_filter_common = yuhao_charset_filter_common,
     yuhao_charset_filter_tonggui = yuhao_charset_filter_tonggui,
     yuhao_charset_filter_harmonic = yuhao_charset_filter_harmonic,

diff --git a/...lua/yuhao/yuhao_charset_filter_common.lua → lua/yuhao/yuhao_charset_filter_common.lua b/...lua/yuhao/yuhao_charset_filter_common.lua → lua/yuhao/yuhao_charset_filter_common.lua
@@ -1,2 +1,2 @@
 local yuhao_charset_filter = require("yuhao.yuhao_charset_filter")
-return yuhao_charset_filter.yuhao_charset_filter_common
+return yuhao_charset_filter.yuhao_charset_filter_common
diff --git a/...a/yuhao/yuhao_charset_filter_harmonic.lua → lua/yuhao/yuhao_charset_filter_harmonic.lua b/...a/yuhao/yuhao_charset_filter_harmonic.lua → lua/yuhao/yuhao_charset_filter_harmonic.lua
diff --git a/...ua/yuhao/yuhao_charset_filter_tonggui.lua → lua/yuhao/yuhao_charset_filter_tonggui.lua b/...ua/yuhao/yuhao_charset_filter_tonggui.lua → lua/yuhao/yuhao_charset_filter_tonggui.lua
diff --git a/...o/yuhao_charset_filter_prioritization.lua → ...uhao/yuhao_charset_prioritizer_common.lua b/...o/yuhao_charset_filter_prioritization.lua → ...uhao/yuhao_charset_prioritizer_common.lua
@@ -1,2 +1,2 @@
 local yuhao_charset_filter = require("yuhao.yuhao_charset_filter")
-return yuhao_charset_filter.yuhao_charset_filter_prioritization
+return yuhao_charset_filter.yuhao_charset_prioritizer_common
diff --git a/lua/yuhao/yuhao_charset_prioritizer_ubiquitous.lua b/lua/yuhao/yuhao_charset_prioritizer_ubiquitous.lua
@@ -0,0 +1,2 @@
+local yuhao_charset_filter = require("yuhao.yuhao_charset_filter")
+return yuhao_charset_filter.yuhao_charset_prioritizer_ubiquitous
diff --git a/.../beta/schema/lua/yuhao/yuhao_charsets.lua → lua/yuhao/yuhao_charsets.lua b/.../beta/schema/lua/yuhao/yuhao_charsets.lua → lua/yuhao/yuhao_charsets.lua
@@ -13,16 +13,16 @@ Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International
 
 介紹:
 常用漢字字符集包括:
-- 極常用繁簡漢字 (前三千簡化字 + 前三千臺標字 + 前三千陸標繁).
+- 極常用繁簡漢字（繁簡字頻分别位於前 3000 的漢字）
 - 常用繁簡漢字 (通用規範漢字 + 國字常用字 + 大陸繁體字).
-- 《通用規範漢字表》中定義的 8500 字.
+- 《通用規範漢字表》中定義的 8150 字.
 - 《通用規範漢字表》中定義漢字所對應的大陸標準繁體漢字.
 -------------------------
 ]]
 
 local this = {}
 
-this.frequent = [[
+this.ubiquitous = [[
 的
 一
 了
@@ -15868,52 +15868,6 @@ this.common = [[
 丼
 仮
 辻
-冖
-讠
-礻
-匚
-纟
-廴
-囗
-辶
-冂
-丷
-凵
-龰
-扌
-罒
-刂
-丌
-丂
-宀
-丄
-𠂤
-厶
-丶
-艹
-𧘇
-卩
-乚
-夂
-丅
-阝
-彡
-钅
-巛
-疒
-𬺰
-攴
-𠂇
-犭
-丿
-衤
-氵
-亻
-彐
-饣
-丱
-丨
-乀
 ]]
 
 this.tonggui = [[

diff --git a/yulight/beta/schema/lua/yuhao/yuhao_core.lua → lua/yuhao/yuhao_core.lua b/yulight/beta/schema/lua/yuhao/yuhao_core.lua → lua/yuhao/yuhao_core.lua
diff --git a/.../schema/lua/yuhao/yuhao_embeded_cands.lua → lua/yuhao/yuhao_embeded_cands.lua b/.../schema/lua/yuhao/yuhao_embeded_cands.lua → lua/yuhao/yuhao_embeded_cands.lua
diff --git a/...ua/yuhao/yuhao_embeded_cands_archived.lua → lua/yuhao/yuhao_embeded_cands_archived.lua b/...ua/yuhao/yuhao_embeded_cands_archived.lua → lua/yuhao/yuhao_embeded_cands_archived.lua
diff --git a/...ht/beta/schema/lua/yuhao/yuhao_helper.lua → lua/yuhao/yuhao_helper.lua b/...ht/beta/schema/lua/yuhao/yuhao_helper.lua → lua/yuhao/yuhao_helper.lua
diff --git a/...chema/lua/yuhao/yuhao_high_freq_first.lua → lua/yuhao/yuhao_high_freq_first.lua b/...chema/lua/yuhao/yuhao_high_freq_first.lua → lua/yuhao/yuhao_high_freq_first.lua
diff --git a/...schema/lua/yuhao/yuhao_no_quick_words.lua → lua/yuhao/yuhao_no_quick_words.lua b/...schema/lua/yuhao/yuhao_no_quick_words.lua → lua/yuhao/yuhao_no_quick_words.lua
diff --git a/...ma/lua/yuhao/yuhao_postpone_full_code.lua → lua/yuhao/yuhao_postpone_full_code.lua b/...ma/lua/yuhao/yuhao_postpone_full_code.lua → lua/yuhao/yuhao_postpone_full_code.lua
diff --git a/.../beta/schema/lua/yuhao/yuhao_sc_first.lua → lua/yuhao/yuhao_sc_first.lua b/.../beta/schema/lua/yuhao/yuhao_sc_first.lua → lua/yuhao/yuhao_sc_first.lua
diff --git a/.../yuhao_single_char_only_for_full_code.lua → .../yuhao_single_char_only_for_full_code.lua b/.../yuhao_single_char_only_for_full_code.lua → .../yuhao_single_char_only_for_full_code.lua
diff --git a/...ht/beta/schema/lua/yuhao/yuhao_switch.lua → lua/yuhao/yuhao_switch.lua b/...ht/beta/schema/lua/yuhao/yuhao_switch.lua → lua/yuhao/yuhao_switch.lua
diff --git a/...ta/schema/lua/yuhao/yuhao_switch_proc.lua → lua/yuhao/yuhao_switch_proc.lua b/...ta/schema/lua/yuhao/yuhao_switch_proc.lua → lua/yuhao/yuhao_switch_proc.lua
diff --git a/...beta/schema/lua/yuhao/yuhao_switch_tr.lua → lua/yuhao/yuhao_switch_tr.lua b/...beta/schema/lua/yuhao/yuhao_switch_tr.lua → lua/yuhao/yuhao_switch_tr.lua
diff --git a/.../beta/schema/lua/yuhao/yuhao_tc_first.lua → lua/yuhao/yuhao_tc_first.lua b/.../beta/schema/lua/yuhao/yuhao_tc_first.lua → lua/yuhao/yuhao_tc_first.lua
diff --git a/.../beta/schema/lua/yuhao/yuhao_tw_first.lua → lua/yuhao/yuhao_tw_first.lua b/.../beta/schema/lua/yuhao/yuhao_tw_first.lua → lua/yuhao/yuhao_tw_first.lua