diff options
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 8 | ||||
-rw-r--r-- | openfly-linux.patch | 61 | ||||
-rw-r--r-- | openfly.lua | 2 |
4 files changed, 36 insertions, 41 deletions
@@ -1,7 +1,7 @@ pkgbase = rime-openfly pkgdesc = 词库开源的小鹤音形 Rime 配方 pkgver = 9.9m - pkgrel = 2 + pkgrel = 3 url = https://github.com/amorphobia/openfly install = rime-openfly.install arch = any @@ -17,8 +17,8 @@ pkgbase = rime-openfly source = openfly-linux.patch source = rime-openfly.install sha256sums = 25210ecdb652179f5f71048174f2792b8d5d5dc7a08ddc67a60e21af2a805ae2 - sha256sums = f9ee06ea15dfa054dc27fe22c502d702e4159a3345fbeb1a3be1bbf56468ddfd - sha256sums = 44590b69d9d76c4fcd8db37d9c55f13e7313732b3e6813f895aea55cd5845e0d + sha256sums = 7cd0316f88ee7bc19ef64b8afa82757208daa7f3818819f26395e1775a702368 + sha256sums = fc3bb98ef69dcbdb5517b26461cd5ae242d565c35ced0f332a55cba7cefdc805 sha256sums = f90e6ba63a7a347c1cb4dce15782df4f5526ec174659eb23d55fe9f8b4b914cd pkgname = rime-openfly @@ -3,7 +3,7 @@ pkgname=rime-openfly pkgver=9.9m -pkgrel=2 +pkgrel=3 pkgdesc='词库开源的小鹤音形 Rime 配方' arch=('any') url='https://github.com/amorphobia/openfly' @@ -19,8 +19,8 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/amorphobia/openfly/archive/ "openfly-linux.patch" "$pkgname.install") sha256sums=('25210ecdb652179f5f71048174f2792b8d5d5dc7a08ddc67a60e21af2a805ae2' - 'f9ee06ea15dfa054dc27fe22c502d702e4159a3345fbeb1a3be1bbf56468ddfd' - '44590b69d9d76c4fcd8db37d9c55f13e7313732b3e6813f895aea55cd5845e0d' + '7cd0316f88ee7bc19ef64b8afa82757208daa7f3818819f26395e1775a702368' + 'fc3bb98ef69dcbdb5517b26461cd5ae242d565c35ced0f332a55cba7cefdc805' 'f90e6ba63a7a347c1cb4dce15782df4f5526ec174659eb23d55fe9f8b4b914cd') install="$pkgname.install" @@ -44,5 +44,5 @@ package() { install -Dm644 openfly.{completion,embedded.hint,fast.symbols,off-table,primary,secondary,secondary.short.code,symbols,uncommon,user,user.top,web,whimsicality}.dict.yaml -t "${pkgdir}"/usr/share/rime-data install -Dm644 openfly{,_reverse}.{schema,dict}.yaml -t "${pkgdir}"/usr/share/rime-data install -Dm644 build/openfly{,_reverse}.{schema.yaml,table.bin,prism.bin,reverse.bin} -t "${pkgdir}"/usr/share/rime-data/build - install -Dm644 lua/openfly_{common,date_translator,deletion_filter,hint_filter,time_translator}.lua -t "${pkgdir}"/usr/share/rime-data/lua + install -Dm644 lua/openfly_{common,date_translator,deletion_filter,hint_filter,shortcut_processor,shortcut_translator,time_translator}.lua -t "${pkgdir}"/usr/share/rime-data/lua } diff --git a/openfly-linux.patch b/openfly-linux.patch index 37de35cddff4..fbb66a621dd7 100644 --- a/openfly-linux.patch +++ b/openfly-linux.patch @@ -1,38 +1,31 @@ -diff --git a/openfly.fast.symbols.dict.yaml b/openfly.fast.symbols.dict.yaml -index 20430af..1609d6f 100644 ---- a/openfly.fast.symbols.dict.yaml -+++ b/openfly.fast.symbols.dict.yaml -@@ -15,7 +15,7 @@ sort: by_weight - use_preset_vocabulary: false - ... - : ; --; ; -+; ;; - ! ;a - 》 ;b - ” ;c -diff --git a/openfly.schema.yaml b/openfly.schema.yaml -index c422969..f27c512 100644 ---- a/openfly.schema.yaml -+++ b/openfly.schema.yaml -@@ -27,7 +27,7 @@ switches: +diff --git a/lua/openfly_shortcut_processor.lua b/lua/openfly_shortcut_processor.lua +index 7975b43..a49cb40 100644 +--- a/lua/openfly_shortcut_processor.lua ++++ b/lua/openfly_shortcut_processor.lua +@@ -26,6 +26,8 @@ local command = { + ["ogj"] = {'open "' .. user_path .. '"'}, + ["ojs"] = {'open -a Calculator.app'}, + ["owd"] = {'open -a "Microsoft Word.app"'}, ++ }, ++ ["Linux"] = { + } + } + local option = { +diff --git a/lua/openfly_shortcut_translator.lua b/lua/openfly_shortcut_translator.lua +index 3b6fc37..62d00a9 100644 +--- a/lua/openfly_shortcut_translator.lua ++++ b/lua/openfly_shortcut_translator.lua +@@ -23,6 +23,10 @@ local labels = { + ["ojf"] = {"[简繁切换]"}, + ["ojs"] = {"[计算器]"}, + ["owd"] = {"[Word]"}, ++ }, ++ ["Linux"] = { ++ ["oei"] = {"[启用二重简码]", "[关闭]"}, ++ ["ojf"] = {"[简繁切换]"}, + } + } - engine: - processors: -- - lua_processor@openfly_shortcut_processor -+ # - lua_processor@openfly_shortcut_processor - - ascii_composer - - recognizer - - key_binder -@@ -47,7 +47,7 @@ engine: - - table_translator - - lua_translator@openfly_date_translator - - lua_translator@openfly_time_translator -- - lua_translator@openfly_shortcut_translator -+ # - lua_translator@openfly_shortcut_translator - - reverse_lookup_translator - - history_translator@history - filters: diff --git a/openfly.user.top.dict.yaml b/openfly.user.top.dict.yaml index 8677772..88a75ea 100644 --- a/openfly.user.top.dict.yaml diff --git a/openfly.lua b/openfly.lua index e8255335c2c4..96727e5dd752 100644 --- a/openfly.lua +++ b/openfly.lua @@ -1,4 +1,6 @@ +openfly_shortcut_processor = require("openfly_shortcut_processor") openfly_date_translator = require("openfly_date_translator") openfly_time_translator = require("openfly_time_translator") +openfly_shortcut_translator = require("openfly_shortcut_translator") openfly_hint_filter = require("openfly_hint_filter") openfly_deletion_filter = require("openfly_deletion_filter") |