sekka 1.5.4 → 1.5.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +1 -1
- data/Rakefile +20 -8
- data/VERSION.yml +1 -1
- data/emacs/sekka.el +18 -7
- data/lib/sekka/google-ime.nnd +3 -4
- data/lib/sekka/henkan.nnd +1 -1
- data/lib/sekka/sekkaversion.rb +2 -2
- data/test/google-ime.nnd +6 -11
- data/test/sekka-dump-out-1.txt +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e3485dd4e71a4fd13a045a227b6300cc99ba2a82
|
4
|
+
data.tar.gz: b033b003f3d31322ea053f08f109d872e638e814
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 895c7ccd8ea688d1e2f8cade2802b338c18f5efa17fb23915850d34c00c7450e09c8768008ef2ff01f7eb8377a709eb0088a7595c112444c8c67b6e214262437
|
7
|
+
data.tar.gz: 7a911146acc8dba8e8bafeb01495781d62f05b21ff4f0c592862d6205730f8115e7f3f7d8dd1b16d1879cbcae9b23792ffb99f7795b24371b229c9f0bf4456cf
|
data/README.md
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
# Sekka (石火) SKK like Japanese input method
|
2
|
+
[![Build Status](https://travis-ci.org/kiyoka/sekka.svg?branch=master)](https://travis-ci.org/kiyoka/sekka)
|
2
3
|
|
3
|
-
[![Build Status](https://secure.travis-ci.org/kiyoka/sekka.png)](http://travis-ci.org/kiyoka/sekka)
|
4
4
|
|
5
5
|
## Sekka(石火)はSKKライクな日本語入力メソッドです。
|
6
6
|
<http://oldtype.sumibi.org/show-page/Sekka>
|
data/Rakefile
CHANGED
@@ -77,7 +77,7 @@ end
|
|
77
77
|
|
78
78
|
task :compile do
|
79
79
|
# generate version.rb
|
80
|
-
dictVersion = "1.4.
|
80
|
+
dictVersion = "1.4.1"
|
81
81
|
vh = Jeweler::VersionHelper.new "."
|
82
82
|
open( "./lib/sekka/sekkaversion.rb", "w" ) {|f|
|
83
83
|
f.puts( "class SekkaVersion" )
|
@@ -163,8 +163,13 @@ task :bench do
|
|
163
163
|
end
|
164
164
|
|
165
165
|
task :alljisyo => [ :alljisyoS, :alljisyoL ]
|
166
|
-
task :alljisyoS => [ :jisyoS, :loadS, :dumpS ]
|
167
|
-
task :alljisyoL => [ :jisyoL, :loadL, :dumpL ]
|
166
|
+
task :alljisyoS => [ :jisyoS, :loadS, :dumpS, :md5 ]
|
167
|
+
task :alljisyoL => [ :jisyoL, :loadL, :dumpL, :md5 ]
|
168
|
+
|
169
|
+
task :md5 do
|
170
|
+
sh "md5sum ./data/SEKKA-JISYO.SMALL.N.tsv > ./data/SEKKA-JISYO.SMALL.N.md5"
|
171
|
+
sh "md5sum ./data/SEKKA-JISYO.LARGE.N.tsv > ./data/SEKKA-JISYO.LARGE.N.md5"
|
172
|
+
end
|
168
173
|
|
169
174
|
task :jisyoS do
|
170
175
|
generateTypes.each {|x|
|
@@ -172,6 +177,7 @@ task :jisyoS do
|
|
172
177
|
sh "ruby ./bin/sekka-jisyo convert#{x} ./data/SKK-JISYO.L.hira-kata >> ./data/SEKKA-JISYO.SMALL.#{x}"
|
173
178
|
sh "ruby ./bin/sekka-jisyo convert#{x} ./data/SKK-JISYO.hiragana-phrase >> ./data/SEKKA-JISYO.SMALL.#{x}"
|
174
179
|
sh "ruby ./bin/sekka-jisyo convert#{x} ./data/SKK-JISYO.hiragana-phrase2 >> ./data/SEKKA-JISYO.SMALL.#{x}"
|
180
|
+
sh "ruby ./bin/sekka-jisyo convert#{x} ./data/SKK-JISYO.hiragana-phrase3 >> ./data/SEKKA-JISYO.SMALL.#{x}"
|
175
181
|
}
|
176
182
|
end
|
177
183
|
|
@@ -184,34 +190,35 @@ task :jisyoL do
|
|
184
190
|
sh "ruby ./bin/sekka-jisyo convert#{x} ./data/SKK-JISYO.station >> ./data/SEKKA-JISYO.LARGE.#{x}"
|
185
191
|
sh "ruby ./bin/sekka-jisyo convert#{x} ./data/SKK-JISYO.hiragana-phrase >> ./data/SEKKA-JISYO.LARGE.#{x}"
|
186
192
|
sh "ruby ./bin/sekka-jisyo convert#{x} ./data/SKK-JISYO.hiragana-phrase2 >> ./data/SEKKA-JISYO.LARGE.#{x}"
|
193
|
+
sh "ruby ./bin/sekka-jisyo convert#{x} ./data/SKK-JISYO.hiragana-phrase3 >> ./data/SEKKA-JISYO.LARGE.#{x}"
|
187
194
|
}
|
188
195
|
end
|
189
196
|
|
190
197
|
task :loadS do
|
191
198
|
generateTypes.each {|x|
|
192
|
-
sh "ruby ./bin/sekka-jisyo load ./data/SEKKA-JISYO.SMALL.#{x} ./data/SEKKA-JISYO.SMALL.#{x}.tch"
|
199
|
+
sh "ruby ./bin/sekka-jisyo load ./data/SEKKA-JISYO.SMALL.#{x} ./data/SEKKA-JISYO.SMALL.#{x}.tch#xmsiz=1024m"
|
193
200
|
}
|
194
201
|
end
|
195
202
|
|
196
203
|
task :loadL do
|
197
204
|
generateTypes.each {|x|
|
198
|
-
sh "ruby ./bin/sekka-jisyo load ./data/SEKKA-JISYO.LARGE.#{x} ./data/SEKKA-JISYO.LARGE.#{x}.tch"
|
205
|
+
sh "ruby ./bin/sekka-jisyo load ./data/SEKKA-JISYO.LARGE.#{x} ./data/SEKKA-JISYO.LARGE.#{x}.tch#xmsiz=1024m"
|
199
206
|
}
|
200
207
|
end
|
201
208
|
|
202
209
|
task :dumpS do
|
203
210
|
generateTypes.each {|x|
|
204
|
-
sh "ruby ./bin/sekka-jisyo dump ./data/SEKKA-JISYO.SMALL.#{x}.tch > ./data/SEKKA-JISYO.SMALL.#{x}.tsv"
|
211
|
+
sh "ruby ./bin/sekka-jisyo dump ./data/SEKKA-JISYO.SMALL.#{x}.tch#xmsiz=1024m > ./data/SEKKA-JISYO.SMALL.#{x}.tsv"
|
205
212
|
}
|
206
213
|
end
|
207
214
|
|
208
215
|
task :dumpL do
|
209
216
|
generateTypes.each {|x|
|
210
|
-
sh "ruby ./bin/sekka-jisyo dump ./data/SEKKA-JISYO.LARGE.#{x}.tch > ./data/SEKKA-JISYO.LARGE.#{x}.tsv"
|
217
|
+
sh "ruby ./bin/sekka-jisyo dump ./data/SEKKA-JISYO.LARGE.#{x}.tch#xmsiz=1024m > ./data/SEKKA-JISYO.LARGE.#{x}.tsv"
|
211
218
|
}
|
212
219
|
end
|
213
220
|
|
214
|
-
|
221
|
+
# SKK-JISYO.hiragana-phrase はWikipediaから作られる。
|
215
222
|
task :phrase => [ "/tmp/jawiki.txt.gz", "./data/wikipedia/jawiki.hiragana.txt" ] do
|
216
223
|
sh "sort ./data/wikipedia/jawiki.hiragana.txt | uniq -c | sort > ./data/wikipedia/ranking.txt"
|
217
224
|
sh "ruby -I ./lib /usr/local/bin/nendo ./data/hiragana_phrase_in_wikipedia2.nnd ./data/wikipedia/ranking.txt > ./data/SKK-JISYO.hiragana-phrase"
|
@@ -234,6 +241,7 @@ file "/tmp/jawiki.txt.gz" do
|
|
234
241
|
end
|
235
242
|
|
236
243
|
|
244
|
+
# SKK-JISYO.hiragana-phrase2 はIPADicから作られる。
|
237
245
|
task :phrase2 => [ "./data/ipadic.all.utf8.txt" ] do
|
238
246
|
sh "time ruby -I ./lib /usr/local/bin/nendo ./data/hiragana_phrase_in_ipadic.nnd ./data/ipadic.all.utf8.txt | sort | uniq > ./data/SKK-JISYO.hiragana-phrase2"
|
239
247
|
end
|
@@ -244,12 +252,16 @@ file "./data/ipadic.all.utf8.txt" do
|
|
244
252
|
sh "iconv -f euc-jp -t utf-8 /tmp/ipadic-2.7.0/*.dic > ./data/ipadic.all.utf8.txt"
|
245
253
|
end
|
246
254
|
|
255
|
+
# SKK-JISYO.hiragana-phrase3 kiyokaが普段の運用で不足していると思ったものを手で補ったもの。
|
256
|
+
# SKK-JISYO.hiragana-phrase3 はgitにコミットする必要あり。
|
257
|
+
#
|
247
258
|
|
248
259
|
task :rackup do
|
249
260
|
# how to install mongrel is "gem install mongrel --pre"
|
250
261
|
sh "ruby -I ./lib ./bin/sekka-server"
|
251
262
|
end
|
252
263
|
|
264
|
+
# SKK-JISYO.L.hira-kata はSKK辞書のカタカナ語を抜き出したもの。
|
253
265
|
task :katakanago do
|
254
266
|
sh "nkf --euc ./data/SKK-JISYO.L.201008 > tmpfile.euc"
|
255
267
|
sh "/usr/share/skktools/filters/abbrev-convert.rb -k tmpfile.euc | skkdic-expr2 | iconv -f=EUC-JP -t=UTF-8 > ./data/SKK-JISYO.L.hira-kata"
|
data/VERSION.yml
CHANGED
data/emacs/sekka.el
CHANGED
@@ -133,10 +133,14 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
|
|
133
133
|
(defvar sekka-mode nil "漢字変換トグル変数")
|
134
134
|
(defun sekka-modeline-string ()
|
135
135
|
;; 接続先sekka-serverのホスト名を表示する。
|
136
|
-
(format " Sekka[%s]"
|
137
|
-
|
138
|
-
|
139
|
-
|
136
|
+
(format " Sekka[%s%s]"
|
137
|
+
(if current-sekka-server-url
|
138
|
+
(url-host
|
139
|
+
(url-generic-parse-url current-sekka-server-url))
|
140
|
+
"")
|
141
|
+
(if sekka-uploading-flag
|
142
|
+
"(UPLOADING)"
|
143
|
+
"")))
|
140
144
|
(defvar sekka-select-mode nil "候補選択モード変数")
|
141
145
|
(or (assq 'sekka-mode minor-mode-alist)
|
142
146
|
(setq minor-mode-alist (cons
|
@@ -189,6 +193,10 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
|
|
189
193
|
;;; 現在のsekka-serverの接続先
|
190
194
|
(defvar current-sekka-server-url nil)
|
191
195
|
|
196
|
+
;;; 辞書のアップロード中かどうか
|
197
|
+
(defvar sekka-uploading-flag nil)
|
198
|
+
|
199
|
+
|
192
200
|
;;; 候補選択モード用
|
193
201
|
(defvar sekka-history-stack '()) ; 過去に変換した、場所と変換候補の状態を保存しておくスタック
|
194
202
|
;; データ構造は以下の通り。
|
@@ -520,14 +528,17 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
|
|
520
528
|
(list (car (sekka-divide-into-few-line str)))
|
521
529
|
(sekka-divide-into-few-line str)))
|
522
530
|
(x '()))
|
531
|
+
(setq sekka-uploading-flag t)
|
532
|
+
(redraw-modeline)
|
523
533
|
(cc:thread 100
|
524
534
|
(while (< 0 (length str-lst))
|
525
535
|
(setq x (pop str-lst))
|
526
536
|
;;(message "Requesting to sekka server...")
|
527
537
|
(sekka-debug-print (format "register [%s]\n" x))
|
528
538
|
(lexical-let ((result (sekka-rest-request "register" `((dict . ,x)))))
|
529
|
-
(sekka-debug-print (format "register-result:%S\n" result))
|
530
|
-
|
539
|
+
(sekka-debug-print (format "register-result:%S\n" result))))
|
540
|
+
(setq sekka-uploading-flag nil)
|
541
|
+
(redraw-modeline)))
|
531
542
|
t))
|
532
543
|
|
533
544
|
|
@@ -1637,7 +1648,7 @@ point から行頭方向に同種の文字列が続く間を漢字変換しま
|
|
1637
1648
|
(setq default-input-method "japanese-sekka")
|
1638
1649
|
|
1639
1650
|
(defconst sekka-version
|
1640
|
-
"1.5.
|
1651
|
+
"1.5.5" ;;SEKKA-VERSION
|
1641
1652
|
)
|
1642
1653
|
(defun sekka-version (&optional arg)
|
1643
1654
|
"入力モード変更"
|
data/lib/sekka/google-ime.nnd
CHANGED
@@ -53,9 +53,9 @@
|
|
53
53
|
(apply zip kouho-list)))))
|
54
54
|
|
55
55
|
|
56
|
-
(define (request-google-ime keyword
|
56
|
+
(define (request-google-ime keyword proxy-host proxy-port)
|
57
57
|
(let* ((body "")
|
58
|
-
(target "google
|
58
|
+
(target "www.google.com")
|
59
59
|
(_ (Net::HTTP.version_1_2))
|
60
60
|
(http (if proxy-host
|
61
61
|
(let1 proxy-class (Net::HTTP.Proxy proxy-host proxy-port)
|
@@ -65,8 +65,7 @@
|
|
65
65
|
(set! http.read_timeout 20)
|
66
66
|
(http.start
|
67
67
|
(&block ()
|
68
|
-
(let* ((path (sprintf "/transliterate
|
69
|
-
(if unit-test "_test" "")
|
68
|
+
(let* ((path (sprintf "/transliterate?langpair=%s&text=%s"
|
70
69
|
"ja-Hira|ja" (URI.encode keyword)))
|
71
70
|
(response (http.get path)))
|
72
71
|
(set! body response.body))))
|
data/lib/sekka/henkan.nnd
CHANGED
data/lib/sekka/sekkaversion.rb
CHANGED
data/test/google-ime.nnd
CHANGED
@@ -67,21 +67,16 @@
|
|
67
67
|
(test-section "request to google-ime")
|
68
68
|
|
69
69
|
(test* "request online (1)"
|
70
|
-
'("日本語" "ニホンゴ" "
|
71
|
-
(request-google-ime "
|
70
|
+
'("日本語" "ニホンゴ" "にほんご" "ニホンゴ")
|
71
|
+
(request-google-ime "にほんご" nil nil))
|
72
72
|
|
73
73
|
(test* "request online (2)"
|
74
|
-
'("変換" "返還" "
|
75
|
-
(request-google-ime "
|
74
|
+
'("変換" "返還" "偏官" "へんかん" "ヘンカン")
|
75
|
+
(request-google-ime "へんかん" nil nil))
|
76
76
|
|
77
77
|
(test* "request online (3)"
|
78
|
-
'()
|
79
|
-
(request-google-ime "
|
80
|
-
|
81
|
-
(test* "request online (4)"
|
82
|
-
'()
|
83
|
-
(request-google-ime "4" #t nil nil))
|
84
|
-
|
78
|
+
'("日本" "にほん" "二本" "2本" "2本")
|
79
|
+
(request-google-ime "にほん" nil nil))
|
85
80
|
|
86
81
|
;;===================================================================
|
87
82
|
(test-end)
|
data/test/sekka-dump-out-1.txt
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: sekka
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.5.
|
4
|
+
version: 1.5.5
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Kiyoka Nishiyama
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-
|
11
|
+
date: 2014-07-10 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: eventmachine
|