Skip to content

Update: libime lm 20250113 and rime #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 16, 2025
Merged

Update: libime lm 20250113 and rime #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d2ff08
Update libime lm
rocka Jan 16, 2025
b50e7f1
Update rime and plugins
rocka Jan 16, 2025
442ace8
fix rime patches
rocka Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions build.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
## https://github.com/fcitx/fcitx5/blob/master/src/modules/spell/CMakeLists.txt#L31
# en dict
en_dict = en_dict-20121020.tar.gz
en_dict_sha256 = c44a5d7847925eea9e4d2d04748d442cd28dd9299a0b572ef7d91eac4f5a6ceb

## https://github.com/fcitx/libime/blob/master/data/CMakeLists.txt
# lm
lm_sc = lm_sc.arpa-20241001.tar.zst
lm_sc_sha256 = 54934e73966eb38ea4fe8eae9c61dfe486af37da1cb5316a06b19c7d289e3063
lm_sc = lm_sc.arpa-20250113.tar.zst
lm_sc_sha256 = ee83ecf20d52e8bccdba4cf6cd57183d53c257713a5eb77ee3a63d50fc3796dd

# pinyin dict
pinyin_dict = dict-20241001.tar.zst
Expand All @@ -14,10 +16,12 @@ pinyin_dict_sha256 = d3313b88a68620a23bc8d5f9564cf1b678848dc7af541c4f5f02198e5a3
table = table-20240108.tar.gz
table_sha256 = 729c596d86907de727c74d0fc3fd241c406c5debd2b4cb74eefe022387ee9dae

## https://github.com/fcitx/fcitx5-chinese-addons/blob/master/im/pinyin/chaizi.txt
# extra pinyin dict
chinese_addon_repo = https://raw.githubusercontent.com/fcitx/fcitx5-chinese-addons/5.1.2/im/pinyin/
chaizi_sha256 = cd659605360120f7390fda1a278eea12c4df6d763a95c8099068ab09cfafd058

## https://github.com/fcitx/fcitx5-chinese-addons/blob/master/modules/pinyinhelper/CMakeLists.txt
# py stroke
py_stroke = py_stroke-20121124.tar.gz
py_stroke_sha256 = 8eb128a9bfa43952e67cf2fcee1fd134c6f4cfd317bc2f6c38a615f5eb64e248
Expand All @@ -26,10 +30,12 @@ py_stroke_sha256 = 8eb128a9bfa43952e67cf2fcee1fd134c6f4cfd317bc2f6c38a615f5eb64e
py_table = py_table-20121124.tar.gz
py_table_sha256 = 42146ac97de6c13d55f9e99ed873915f4c66739e9c11532a34556badf9792c04

## https://github.com/boostorg/boost/releases
# boost
boost_version = 1.86.0
boost_sha256 = 2c5ec5edcdff47ff55e27ed9560b0a0b94b07bd07ed9928b476150e16b0efc57

## https://github.com/fcitx/libime-jyutping/blob/master/data/CMakeLists.txt
# jyutping dict
jyutping_dict = jyutping-dict-20180104.tar.xz
jyutping_dict_sha256 = e3a5b13edb8efa2f764245a3232f99ba7e7670e22b8cbe666a4fffa84b35f35b
Expand Down
2 changes: 1 addition & 1 deletion libime
Open in desktop
Submodule libime updated 65 files
+1 −0 .clang-format
+2 −1 CMakeLists.txt
+2 −2 data/CMakeLists.txt
+3 −2 src/libime/core/CMakeLists.txt
+58 −30 src/libime/core/datrie.cpp
+21 −0 src/libime/core/datrie.h
+2 −1 src/libime/core/decoder.cpp
+7 −2 src/libime/core/decoder.h
+9 −0 src/libime/core/dictionary.cpp
+6 −7 src/libime/core/dictionary.h
+26 −13 src/libime/core/historybigram.cpp
+4 −0 src/libime/core/historybigram.h
+3 −5 src/libime/core/inputbuffer.cpp
+5 −3 src/libime/core/inputbuffer.h
+22 −4 src/libime/core/languagemodel.cpp
+6 −3 src/libime/core/languagemodel.h
+7 −0 src/libime/core/lattice.cpp
+9 −0 src/libime/core/lattice.h
+3 −4 src/libime/core/lattice_p.h
+8 −6 src/libime/core/lrucache.h
+13 −11 src/libime/core/naivevector.h
+11 −6 src/libime/core/prediction.cpp
+4 −0 src/libime/core/prediction.h
+12 −3 src/libime/core/segmentgraph.cpp
+18 −11 src/libime/core/segmentgraph.h
+5 −2 src/libime/core/triedictionary.cpp
+3 −1 src/libime/core/triedictionary.h
+10 −1 src/libime/core/userlanguagemodel.cpp
+5 −0 src/libime/core/userlanguagemodel.h
+1 −0 src/libime/core/utils.cpp
+3 −0 src/libime/core/utils.h
+0 −1 src/libime/core/utils_p.h
+2 −2 src/libime/core/zstdfilter.h
+1 −1 src/libime/pinyin/CMakeLists.txt
+8 −1 src/libime/pinyin/pinyincorrectionprofile.cpp
+10 −1 src/libime/pinyin/pinyincorrectionprofile.h
+2 −4 src/libime/pinyin/pinyindata.h
+13 −11 src/libime/pinyin/pinyindictionary.cpp
+13 −4 src/libime/pinyin/pinyindictionary.h
+7 −7 src/libime/pinyin/pinyinencoder.cpp
+8 −12 src/libime/pinyin/pinyinencoder.h
+334 −273 src/libime/pinyin/shuangpinprofile.cpp
+6 −0 src/libime/pinyin/shuangpinprofile.h
+1 −1 src/libime/table/CMakeLists.txt
+3 −2 src/libime/table/tablebaseddictionary.cpp
+2 −0 test/testautophrasedict.cpp
+10 −2 test/testdecoder.cpp
+9 −3 test/testhistorybigram.cpp
+2 −0 test/testinputbuffer.cpp
+5 −2 test/testmodel.cpp
+4 −0 test/testpinyincontext.cpp
+4 −0 test/testpinyindictionary.cpp
+26 −0 test/testpinyinencoder.cpp
+8 −1 test/testpinyinime.cpp
+29 −2 test/testpinyinime_unit.cpp
+3 −0 test/testprediction.cpp
+9 −0 test/testshuangpinprofile.cpp
+9 −0 test/testtable.cpp
+6 −0 test/testtableime.cpp
+3 −0 test/testtableime_unit.cpp
+5 −2 test/testtrie.cpp
+8 −2 test/testusermodel.cpp
+3 −0 test/testutils.h
+4 −0 test/triebench.cpp
+1 −1 tools/CMakeLists.txt
2 changes: 1 addition & 1 deletion librime
Open in desktop
Submodule librime updated 48 files
+17 −7 README-mac.md
+1 −1 deps/glog
+4 −4 src/rime/algo/algebra.h
+2 −2 src/rime/algo/calculus.h
+3 −3 src/rime/algo/encoder.h
+2 −2 src/rime/algo/syllabifier.h
+1 −1 src/rime/composition.h
+30 −30 src/rime/config/config_component.h
+30 −30 src/rime/config/config_types.h
+1 −1 src/rime/context.h
+2 −2 src/rime/deployer.h
+6 −6 src/rime/dict/corrector.h
+3 −3 src/rime/dict/db.h
+3 −3 src/rime/dict/dict_compiler.h
+8 −8 src/rime/dict/dictionary.h
+2 −2 src/rime/dict/level_db.cc
+1 −1 src/rime/dict/mapped_file.h
+9 −9 src/rime/dict/prism.h
+2 −2 src/rime/dict/string_table.h
+14 −14 src/rime/dict/table.h
+15 −15 src/rime/dict/text_db.h
+1 −1 src/rime/dict/user_db.cc
+5 −5 src/rime/dict/user_db.h
+1 −1 src/rime/dict/vocabulary.h
+1 −1 src/rime/engine.h
+5 −1 src/rime/gear/navigator.cc
+3 −0 src/rime/gear/navigator.h
+6 −6 src/rime/key_event.h
+4 −4 src/rime/key_table.cc
+4 −4 src/rime/key_table.h
+3 −3 src/rime/lever/deployment_tasks.h
+2 −0 src/rime/lever/levers_api_impl.h
+0 −1 src/rime/lever/levers_module.cc
+0 −1 src/rime/lever/levers_stdbool.cc
+1 −1 src/rime/lever/user_dict_manager.h
+4 −4 src/rime/menu.h
+4 −4 src/rime/registry.h
+2 −2 src/rime/resource.h
+1 −1 src/rime/segmentation.h
+1 −1 src/rime/service.h
+6 −6 src/rime/setup.cc
+6 −6 src/rime/setup.h
+1 −1 src/rime/ticket.h
+2 −2 src/rime/translation.h
+3 −2 src/rime_api.cc
+6 −2 src/rime_api.h
+2 −2 src/rime_api_impl.h
+14 −7 tools/rime_api_console.cc
2 changes: 1 addition & 1 deletion librime-lua
Open in desktop
Submodule librime-lua updated 1 files
+717 −0 contrib/librime.lua
6 changes: 3 additions & 3 deletions patches/librime.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ index 2e1c8b81..94a6b500 100644
@@ -35,6 +36,7 @@ class Engine : public Messenger {
void set_active_engine(Engine* engine = nullptr) { active_engine_ = engine; }

RIME_API static Engine* Create();
RIME_DLL static Engine* Create();
+ an<Switcher> switcher_;

protected:
Expand Down Expand Up @@ -92,14 +92,14 @@ diff --git a/src/rime_api_impl.h b/src/rime_api_impl.h
index 7749ce98..b0200a67 100644
--- a/src/rime_api_impl.h
+++ b/src/rime_api_impl.h
@@ -15,6 +15,8 @@
@@ -17,6 +17,8 @@
#include <rime/setup.h>
#include <rime/signature.h>
#include <rime/switches.h>
+#include <rime/engine.h>
+#include <rime/switcher.h>

#include "rime_api.h"
using namespace rime;

@@ -426,6 +428,13 @@ RIME_DEPRECATED void RimeSetOption(RimeSessionId session_id,
if (!ctx)
Expand Down
Loading