sekka 0.9.0 → 0.9.1

data/bin/sekka-path

@@ -2,13 +2,6 @@
 # -*- coding: utf-8 -*-
 
 require 'rubygems'
-arr = Gem.latest_load_paths.select { |x|
-  x.match( /\/sekka[-]/ )
-}
+require 'sekka/path'
 
-if 0 == arr.size 
-  STDERR.puts "Error: gem of sekka is not installed yet..."
-  exit( 1 )
-else
-  puts arr[0].sub( /\/lib$/, "" )
-end
+puts SekkaPath.path

data/bin/sekka-server

@@ -16,8 +16,9 @@ DICTURL = "http://sumibi.org/sekka/dict/" + SekkaVersion.version
 PIDFILE = DICTDIR + "/pid"
 
 TC_FILE = DICTDIR + "/SEKKA-JISYO.SMALL.tch"
+TSVFILE = DICTDIR + "/SEKKA-JISYO.SMALL.tsv"
 SUMFILE = DICTDIR + "/SEKKA-JISYO.SMALL.md5"
-TC_URL  = DICTURL + "/SEKKA-JISYO.SMALL.tch"
+TSVURL  = DICTURL + "/SEKKA-JISYO.SMALL.tsv"
 SUMURL  = DICTURL + "/SEKKA-JISYO.SMALL.md5"
 
 TC_FILE_LIST = [ DICTDIR + "/SEKKA-JISYO.CUSTOM.tch",
@@ -50,7 +51,7 @@ def main
   if not File.exist?( TC_FILE )
     STDERR.printf( "Info: Downloading SEKKA-JISYO\n" )
     # 辞書をダウンロードする
-    cmd = sprintf( "curl -o %s %s",    TC_FILE, TC_URL )
+    cmd = sprintf( "curl -o %s %s",    TSVFILE, TSVURL )
     STDERR.printf( "Command : %s\n", cmd )
     system( cmd )
     cmd = sprintf( "curl -o %s %s",    SUMFILE, SUMURL )
@@ -59,7 +60,7 @@ def main
 
     # チェックサムを確認する
     downloadSum = ""
-    open( TC_FILE ) { |f|
+    open( TSVFILE ) { |f|
       dataBody = f.read
       downloadSum = Digest::MD5.hexdigest( dataBody )
     }
@@ -68,13 +69,26 @@ def main
       STDERR.printf( "   downloaded file's MD5 : %s\n", downloadSum )
       STDERR.printf( "             correct MD5 : %s\n", correctSum   )
       if downloadSum == correctSum
-        STDERR.printf( "Info:  downloaded file [%s] verify OK.\n", TC_FILE )
+        STDERR.printf( "Info:  downloaded file [%s] verify OK.\n", TSVFILE )
       else
-        STDERR.printf( "Error: downloaded file [%s] verify NG.\n", TC_FILE )
-        File.unlink( TC_FILE )
+        STDERR.printf( "Error: downloaded file [%s] verify NG.\n", TSVFILE )
+        File.unlink( TSVFILE )
         exit( 1 )
       end
     }
+
+    # tsvファイルをTokyo CabinetのHashDB化する
+    STDERR.printf( "Info: Converting TSV file to Tokyo Cabinet *.tch\n" )
+    cmd = sprintf( "tchmgr importtsv %s %s", TC_FILE, TSVFILE )
+    STDERR.printf( "Command : %s\n", cmd )
+    system( cmd )
+
+    # 中身を確認する(tchmgrで読めるものができている)
+    STDERR.printf( "Info: inform *.tch\n" )
+    cmd = sprintf( "tchmgr inform %s", TC_FILE )
+    STDERR.printf( "Command : %s\n", cmd )
+    system( cmd )
+
   end
 
   # 辞書ディレクトリに存在している辞書ファイルリストを作る

data/emacs/sekka.el

@@ -730,8 +730,10 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
 
     (define-key map "\C-s"      'popup-isearch)
     (define-key map "\C-g"      'popup-close)
+    (define-key map "\C-r"      'popup-select)
     map))
 
+
 ;; 選択操作回数のインクリメント
 (defun sekka-select-operation-inc ()
   (incf sekka-select-operation-times)
@@ -856,7 +858,8 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
     (sekka-debug-print (format "filtered-lst = %S\n" (reverse lst)))
     (if (null lst)
 	nil
-      (car (reverse lst)))))
+      (reverse lst))))
+  
     
 ;; 指定された type の候補が存在するか調べる
 (defun sekka-include-typep ( _type )
@@ -865,7 +868,7 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
 ;; 指定された type の候補に強制的に切りかえる
 ;; 切りかえが成功したかどうかを t or nil で返す。
 (defun sekka-select-by-type ( _type )
-  (let ((kouho (sekka-select-by-type-filter _type)))
+  (let ((kouho (car (sekka-select-by-type-filter _type))))
     (if (not kouho)
 	(progn
 	 (cond
@@ -926,7 +929,7 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
 
 
 ;; 登録語リストからユーザーに該当単語を選択してもらう
-(defun sekka-add-new-word-sub (yomi lst)
+(defun sekka-add-new-word-sub (yomi lst hiragana-lst)
   (let* ((etc "(自分で入力する)")
 	 (lst (if (stringp lst) 
 		  (progn
@@ -934,7 +937,8 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
 		    '())
 		lst))
 	 (result (popup-menu*
-		  (append lst `(,etc))
+		  (append hiragana-lst
+			  (append lst `(,etc)))
 		  :margin t
 		  :keymap sekka-popup-menu-keymap))
 	 (b (copy-marker sekka-fence-start))
@@ -948,6 +952,11 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
       (sekka-replace-kakutei-word (marker-position b)
 				  (marker-position e)
 				  tango)
+
+      (when (member result hiragana-lst) ;; 平仮名フレーズの場合
+	(setq yomi  result)
+	(setq tango ""))
+
       ;; .sekka-jisyoとサーバーの両方に新しい単語を登録する
       (let ((added (sekka-add-new-word-to-jisyo sekka-jisyo-filename yomi tango)))
 	(if added
@@ -961,15 +970,40 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
   "変換候補のよみ(平仮名)に対応する新しい単語を追加する"
   (interactive)
   (setq case-fold-search nil)
-  (when (sekka-select-by-type 'h)
+  (let ((type
+	 (cond
+	  ((string-match-p "^[A-Z][^A-Z]+$" sekka-last-roman)
+	   (if (sekka-select-by-type 'h) ;; 平仮名候補に自動切り替え
+	       'H
+	     nil))
+	  ((string-match-p "^[a-z][^A-Z]+$" sekka-last-roman)
+	   'h)
+	  (t
+	   nil))))
     (let* ((kouho      (nth sekka-cand-cur sekka-henkan-kouho-list))
 	   (hiragana   (car kouho)))
       (sekka-debug-print (format "sekka-register-new-word: sekka-last-roman=[%s] hiragana=%s result=%S\n" sekka-last-roman hiragana (string-match-p "^[A-Z][^A-Z]+$" sekka-last-roman)))
-      (when (string-match-p "^[A-Z][^A-Z]+$" sekka-last-roman)
+      (cond
+       ;; 漢字語彙をgoogleimeで取得
+       ((eq 'H type)
 	(sekka-select-kakutei)
 	(sekka-add-new-word-sub
 	 hiragana
-	 (sekka-googleime-request hiragana))))))
+	 (sekka-googleime-request hiragana)
+	 '()))
+       ;; 平仮名フレーズから選択
+       ((eq 'h type)
+	(sekka-select-kakutei)
+	(let ((kouho (sekka-select-by-type-filter 'h)))
+	  (sekka-debug-print (format "sekka-register-new-word: kouho=%S\n" kouho))
+	  (sekka-add-new-word-sub
+	   hiragana
+	   '()
+	   (cons
+	    hiragana ;; 確定値の平仮名文言を先頭に追加。
+	    (mapcar
+	     (lambda (x) (car x)) kouho))))))
+      )))
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -1145,11 +1179,16 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
 	      (setq e (point))
 	      (sekka-display-function b e nil)
 	      (sekka-select-kakutei)
-	      (when sekka-use-googleime
-		(when (not (sekka-include-typep 'j))
-		  (sekka-add-new-word)))
-	      )))))
-     
+	      (cond
+	       ((string-match-p "^[A-Z][^A-Z]+$" sekka-last-roman)
+		;; 漢字語彙
+		(when sekka-use-googleime
+		  (if (not (sekka-include-typep 'j))
+		      (sekka-add-new-word))))
+	       (t
+		;; 平仮名フレーズはGoogleIMEの問い合わせの自動起動はしない
+		)))))))
+	      
      ((sekka-kanji (preceding-char))
       (sekka-debug-print (format "sekka-kanji(%s) => t\n" (preceding-char)))
     
@@ -1295,6 +1334,12 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
   (define-key sticky-map sticky-key '(lambda ()(interactive)(insert sticky-key))))
 
 
+(defun sekka-insert-space (times)
+  (if (null times)
+      (insert " ")
+    (dotimes(i times)
+      (insert " "))))
+
 (defun sekka-spacekey-init-function ()
   (define-key global-map (kbd "SPC")
     '(lambda (&optional arg)(interactive "P")
@@ -1302,21 +1347,16 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
 		   sekka-kakutei-with-spacekey)
 	      (cond
 	       ((string= " " (char-to-string (preceding-char)))
-		(insert " "))
+		(sekka-insert-space arg))
 	       ((eq       10                 (preceding-char))   ;; 直前に改行があった
-		(insert " "))
+		(sekka-insert-space arg))
 	       ((string= "/" (char-to-string (preceding-char)))
 		(delete-region (- (point) 1) (point))
-		(insert " "))
+		(sekka-insert-space arg))
 	       (t
 		(sekka-rK-trans))))
 	     (t
-	      (cond
-	       ((null arg)
-		(insert " "))
-	       (t
-		(dotimes(i arg)
-		  (insert " ")))))))))
+	      (sekka-insert-space arg))))))
 
 
 (defun sekka-realtime-guide ()
@@ -1490,7 +1530,7 @@ point から行頭方向に同種の文字列が続く間を漢字変換しま
 (setq default-input-method "japanese-sekka")
 
 (defconst sekka-version
-  "0.9.0" ;;SEKKA-VERSION
+  "0.9.1" ;;SEKKA-VERSION
   )
 (defun sekka-version (&optional arg)
   "入力モード変更"

data/lib/sekka/henkan.nnd

@@ -171,24 +171,32 @@
   (let ([num-list (to-list (keyword.scan #/[0-9]+/))]
         [replaced (keyword.gsub #/[0-9]+/ "#")])
     ;; 辞書引きした結果の # 部分を 再度数値に戻す。
-    (let1 result (henkan-okuri-nashi userid kvs replaced limit)
-      (map
-       (lambda (entry)
-         (let* ([type-list (to-list (. (car entry) scan #/[#][0-9]/))]
-                [converted-list 
-                 (map
-                  (lambda  (_type _num)
-                    (sekka-henkan-sharp-number _type _num))
-                  type-list
-                  num-list)]
-                [format-str (. (car entry) gsub #/[#][0-9]/ "%s")])
-           (cons
-            (apply sprintf
-                   (cons format-str
-                         converted-list))
-            (append (drop-right (cdr entry) 1)
-                    (list 'n)))))
-       result))))
+    (let* ([result1 (henkan-okuri-nashi userid kvs replaced limit)]
+           [result2 (map
+                     (lambda (entry)
+                       (let* ([type-list (to-list (. (car entry) scan #/[#][0-9]/))]
+                              [converted-list 
+                               (map
+                                (lambda  (_type _num)
+                                  (sekka-henkan-sharp-number _type _num))
+                                type-list
+                                num-list)]
+                              [format-str (. (car entry) gsub #/[#][0-9]/ "%s")])
+                         ;; ユーザ入力クエリ中の数字のリストと辞書の中の # の個数がマッチしないといけない
+                         (if (= (length num-list)
+                                (length type-list))
+                             (cons
+                              (apply sprintf
+                                     (cons format-str
+                                           converted-list))
+                              (append (drop-right (cdr entry) 1)
+                                      (list 'n)))
+                             #f)))
+                     result1)])
+      (filter
+       (lambda (x) x)
+       result2))))
+           
 
 
 ;; 送り仮名ありの変換

data/lib/sekka/jisyo-db.nnd

@@ -185,7 +185,7 @@
     (kvs.open filename)
     (for-each
      (lambda (key)
-       (f.puts (+ key " " (kvs.get key))))
+       (f.puts (+ key "\t" (kvs.get key))))
      (kvs.keys.sort))
     (kvs.close)))
 

data/lib/sekka/path.rb

@@ -0,0 +1,6 @@
+class SekkaPath
+  def self.path
+    libsekka = File.dirname( __FILE__ )
+    File.expand_path( libsekka + "/../.." )
+  end
+end

data/lib/sekka/sekkaversion.rb

@@ -1,6 +1,6 @@
 class SekkaVersion
   include Singleton
   def self.version
-    "0.9.0"
+    "0.9.1"
   end
 end

data/test/henkan-main.nnd

@@ -566,6 +566,36 @@
        '(("１０００〜２０００" #f "#から#" n))
        (henkan-okuri-nashi-and-number userid kvs "1000kara2000" 0))
 
+(test* "okuri nashi and number 8"
+       '(("２０１１年" #f "#ねん" n) ("2011年" #f "#ねん" n) ("二千十一年" #f "#ねん" n) ("二〇一一年" #f "#ねん" n))
+       (henkan-okuri-nashi-and-number userid kvs "2011nen" 0))
+
+(test* "okuri nashi and number 9"
+       '(("１００００年" #f "#ねん" n) ("10000年" #f "#ねん" n) ("一万年" #f "#ねん" n) ("一〇〇〇〇年" #f "#ねん" n))
+       (henkan-okuri-nashi-and-number userid kvs "10000nen" 0))
+
+(test* "okuri nashi and number 10"
+       '(("2011年10月10日" #f "#ねん#がつ#にち" n) ("２０１１年１０月１０日" #f "#ねん#がつ#にち" n))
+       (henkan-okuri-nashi-and-number userid kvs "2011nen10gatu10ka" 0))
+
+(test* "okuri nashi and number 11"
+       '()
+       (henkan-okuri-nashi-and-number userid kvs "2011nen10gatu" 0))
+
+(test* "okuri nashi and number 12"
+       '(("１０月１０日" #f "#がつ#か" n) ("10月10日" #f "#がつ#か" n) ("一〇月一〇日" #f "#がつ#か" n) ("一〇月１０日" #f "#がつ#か" n))
+       (henkan-okuri-nashi-and-number userid kvs "10gatu10ka" 0))
+
+(test* "okuri nashi and number 13"
+       '()
+       (henkan-okuri-nashi-and-number userid kvs "10ka" 0))
+
+(test* "okuri nashi and number 14"
+       '()
+       (henkan-okuri-nashi-and-number userid kvs "2011nen10ka" 0))
+
+
+
 
 ;;-------------------------------------------------------------------
 (test-section "henkan (number)")
@@ -1091,6 +1121,7 @@
        (sekkaHenkan userid kvs #f "3chi-mu" 0 "normal"))
 
 
+
 ;;-------------------------------------------------------------------
 (test-section "henkan kakutei")
 (test* "henkan kakutei(for Elisp) 1"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sekka
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - Kiyoka Nishiyama
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-24 00:00:00 Z
+date: 2011-09-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -259,6 +259,7 @@ files:
 - lib/sekka/henkan.nnd
 - lib/sekka/jisyo-db.nnd
 - lib/sekka/kvs.rb
+- lib/sekka/path.rb
 - lib/sekka/roman-lib.nnd
 - lib/sekka/sekkaversion.rb
 - lib/sekka/sharp-number.nnd