RubyGems - sekka - Versions diffs - 0.8.4 → 0.8.5 - Mend

sekka 0.8.4 → 0.8.5

Files changed (12) hide show

data/emacs/sekka.el CHANGED Viewed

@@ -655,8 +655,8 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
 	  (setq sekka-last-fix insert-word)
 	  ;; 選択中の場所を装飾する。
-	  (overlay-put ov 'face 'default)
 	  (when select-mode
+	    (overlay-put ov 'face 'default)
 	    (overlay-put ov 'face 'highlight))
 	  (setq sekka-markers (cons start end))
 	  (sekka-debug-print (format "insert:[%s] point:%d-%d\n" insert-word (marker-position start) (marker-position end))))))
@@ -838,19 +838,21 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
 	 (when (eq sym _type)
 	   (push x lst))))
      sekka-henkan-kouho-list)
-    (sekka-debug-print (format "filterd-lst = %S\n" (reverse lst)))
-    (car (reverse lst))))
+    (sekka-debug-print (format "filtered-lst = %S\n" (reverse lst)))
+    (if (null lst)
+	nil
+      (car (reverse lst)))))
 ;; 指定された type の候補が存在するか調べる
 (defun sekka-include-typep ( _type )
-  (not (null (sekka-select-by-type-filter _type))))
+  (sekka-select-by-type-filter _type))
 ;; 指定された type の候補に強制的に切りかえる
 ;; 切りかえが成功したかどうかを t or nil で返す。
 (defun sekka-select-by-type ( _type )
   (let ((kouho (sekka-select-by-type-filter _type)))
-    (if (null kouho)
-	(begin
+    (if (not kouho)
+	(progn
 	 (cond
 	  ((eq _type 'j)
 	   (message "Sekka: 漢字の候補はありません。"))
@@ -862,7 +864,9 @@ non-nil で明示的に呼びだすまでGoogleIMEは起動しない。"
 	   (message "Sekka: 半角の候補はありません。"))
 	  ((eq _type 'z)
 	   (message "Sekka: 全角の候補はありません。"))
-	  nil))
+	  ((eq _type 'n)
+	   (message "Sekka: 数字混在の候補はありません．")))
+	 nil)
       (let ((num   (nth sekka-id-index kouho)))
 	(setq sekka-cand-cur num)
 	(sekka-select-update-display)
@@ -1413,7 +1417,7 @@ point から行頭方向に同種の文字列が続く間を漢字変換しま
 (setq default-input-method "japanese-sekka")
 (defconst sekka-version
-  "0.8.4" ;;SEKKA-VERSION
+  "0.8.5" ;;SEKKA-VERSION
   )
 (defun sekka-version (&optional arg)
   "入力モード変更"

data/lib/sekka/convert-jisyo.nnd CHANGED Viewed

@@ -95,10 +95,10 @@
         ;; フォーマットエラー
         #f)
        ((or (is-hiragana (first fields))
-            (rxmatch #/^([>あ-ん]+)$/ (first fields)))
+            (rxmatch #/^([>#あ-んー]+)$/ (first fields)))
         ;; 送り仮名なしデータ
         (expand-okuri-nashi-entry (first fields) (second fields)))
-       ((rxmatch #/^([>あ-ん]+)([a-z])$/ (first fields))
+       ((rxmatch #/^([>あ-んー]+)([a-z])$/ (first fields))
         => (lambda (m)
              ;; 送り仮名ありデータ
              (expand-okuri-ari-entry (rxmatch-substring m 1)
@@ -107,6 +107,9 @@
        ((rxmatch #/[亜-瑤]+/ (first fields))
         ;; 漢字が1文字でも含まれている
         #f)
+       ((rxmatch #/[#]+/ (first fields))
+        ;; # が1文字でも含まれている
+        #f)
        (else
         (list (cons (first fields) (second fields)))))))

data/lib/sekka/henkan.nnd CHANGED Viewed

@@ -39,6 +39,7 @@
 (use sekka.convert-jisyo)
 (use sekka.jisyo-db)
 (use sekka.alphabet-lib)
+(use sekka.sharp-number)
 (use sekka.google-ime)
 (require "sekka/approximatesearch")
@@ -163,6 +164,32 @@
           lst
           (take* lst limit)))))
+;; 送り仮名なし、かつ、数字で始まるキーワードの変換
+(define (henkan-okuri-nashi-and-number userid kvs keyword limit)
+  ;; 数字部分を抜きだして '#' に変換
+  (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))))
 ;; 送り仮名ありの変換
@@ -246,6 +273,16 @@
      kouho)))
+;; 数字だけで構成されるキーワードの変換
+(define (henkan-number kvs keyword)
+  ;; 数字部分を抜きだして '#' に変換
+  `(
+    (,(sekka-henkan-sharp-number "#1" keyword) nil ,keyword n)
+    (,(sekka-henkan-sharp-number "#0" keyword) nil ,keyword n)
+    (,(sekka-henkan-sharp-number "#2" keyword) nil ,keyword n)
+    (,(sekka-henkan-sharp-number "#3" keyword) nil ,keyword n)))
 ;; keyword には ローマ字のみを受け付ける
 (define (sekka-henkan userid kvs keyword limit roman-method)
   ;; 変換候補にindex番号を付加する
@@ -284,6 +321,14 @@
                '()
                (henkan-hiragana kvs (sekka-downcase k) roman-method)))
           (henkan-alphabet kvs keyword))))))
+    ;; 10進数数値のみで構成されるキーワード
+    ((rxmatch #/^[0-9]+$/ keyword)
+     (henkan-number kvs keyword))
+    ;; 10進数数値で始まるキーワード
+    ((rxmatch #/^[0-9]+[0-9a-zA-Z@-]+$/ keyword)
+     (append
+      (henkan-okuri-nashi-and-number userid kvs keyword limit)
+      (henkan-alphabet kvs keyword)))
     ((not (null? (gen-roman->hiragana keyword roman-method)))
      (append
       (append

data/lib/sekka/jisyo-db.nnd CHANGED Viewed

@@ -40,7 +40,7 @@
 (define masterid "MASTER")
 (define workid   "WORK")
-(define alphabet-string "abcdefghijklmnopqrstuvwxyz>@;")
+(define alphabet-string "abcdefghijklmnopqrstuvwxyz>@;#")
 (define alphabet-lower-list (to-list (alphabet-string.split "")))
 (define alphabet-upper-list (to-list (. (sekka-upcase alphabet-string) split "")))
 (define alphabet-pairs (append-map
@@ -77,7 +77,7 @@
   (define (create-hash keylist)
     (for-each
      (lambda (k)
-       (when (rxmatch #/^[a-zA-Z^>-@`;+:'\-]+$/ k)
+       (when (rxmatch #/^[a-zA-Z#^>-@`\;+:'\-]+$/ k)
          (let1 sliced (sekka-downcase (k.slice 0 2))
            (when (= 2 sliced.size)
              (if (rxmatch #/[A-Z`+]$/ k)

data/lib/sekka/roman-lib.nnd CHANGED Viewed

@@ -302,6 +302,8 @@
     ("っる"      "rru"                                "@ru"                      ";ru" )
     ("っれ"      "rre"                                "@re"                      ";re" )
     ("っろ"      "rro"                                "@ro"                      ";ro" )
+    ("#"         "#")
     ))
 ;; 子音が2音入ったテーブル

data/lib/sekka/sekkaversion.rb CHANGED Viewed

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

data/lib/sekka/sharp-number.nnd ADDED Viewed

@@ -0,0 +1,99 @@
+:; #-*- mode: nendo; syntax: scheme -*-;;
+;;;
+;;; sharp-number.nnd - #0から#9までtypeでアラビア数字を漢数字等に変換する
+;;;
+;;;   Copyright (c) 2011  Kiyoka Nishiyama  <kiyoka@sumibi.org>
+;;;
+;;;   Redistribution and use in source and binary forms, with or without
+;;;   modification, are permitted provided that the following conditions
+;;;   are met:
+;;;
+;;;   1. Redistributions of source code must retain the above copyright
+;;;      notice, this list of conditions and the following disclaimer.
+;;;
+;;;   2. Redistributions in binary form must reproduce the above copyright
+;;;      notice, this list of conditions and the following disclaimer in the
+;;;      documentation and/or other materials provided with the distribution.
+;;;
+;;;   3. Neither the name of the authors nor the names of its contributors
+;;;      may be used to endorse or promote products derived from this
+;;;      software without specific prior written permission.
+;;;
+;;;   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+;;;   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+;;;   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+;;;   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+;;;   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+;;;   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+;;;   TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+;;;   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+;;;   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+;;;   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+;;;   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+;;;
+;;;  $Id:
+;;;
+(use srfi-1)
+(use sekka.alphabet-lib)
+(define (sekka-henkan-kansuuji-sen num-str)
+  (let ([num-lst       (reverse (map (lambda (x) x.to_i) (to-list (num-str.split ""))))]
+        [kurai1-lst    (to-list (. "□十百千" split ""))]
+        [kan-vector    (. "〇一二三四五六七八九" split "")])
+    (string-join
+     (reverse
+      (map
+       (lambda (num kurai1)
+         (case num
+           ((0)
+            "")
+           ((1)
+            (+
+             (if (eq? "□" kurai1)
+                 (vector-ref kan-vector num)
+                 kurai1)))
+           (else
+            (+
+             (if (eq? "□" kurai1)
+                 (vector-ref kan-vector num)
+                 (+ (vector-ref kan-vector num)
+                    kurai1))))))
+       num-lst
+       kurai1-lst)))))
+(define (sekka-henkan-kansuuji num-str)
+  (let ([kurai2-lst    (cons "" (to-list (. "万億兆京" split "")))]
+        [sliced        (map
+                        (lambda (x) (x.reverse))
+                        (to-list (num-str.reverse.scan #/[0-9][0-9]?[0-9]?[0-9]?/)))])
+    (string-join
+     (reverse
+      (map
+       (lambda (sen kurai2)
+         (if (rxmatch #/^[0]+$/ sen)
+             ""
+             (+
+              (sekka-henkan-kansuuji-sen sen)
+              kurai2)))
+       sliced
+       kurai2-lst)))))
+;; #0 から #9 の変換
+(define (sekka-henkan-sharp-number type-str num-str)
+  ;; 平仮名->カタカナ 変換
+  (define (kurai-nashi str)
+    (str.tr "0123456789" "〇一二三四五六七八九"))
+  (case type-str
+    (("#1")
+     (gen-alphabet-han->zen num-str))
+    (("#2")
+     (kurai-nashi num-str))
+    (("#3")
+     (sekka-henkan-kansuuji num-str))
+    (else
+     num-str)))

data/test/henkan-main.nnd CHANGED Viewed

@@ -60,78 +60,44 @@
 ;;-------------------------------------------------------------------
 (test-section "Create jisyo for test suite")
-(let ((_input (StringIO.new
-               (string-join
-                '(
-                  "わたしh /私/"
-                  "おこなu /行/行な;※送り位置補正/"
-                  "へんかん /変換/返還/"
-                  "へんか /変化/返歌/"
-                  "へんかs /変化/"
-                  "しぜんげんご /自然言語/"
-                  "しぜんげんごしょり /自然言語処理/"
-                  "しぜんげんごりかい /自然言語理解/"
-                  "developer /デベロッパー/ディベロッパー/デベロッパ/"
-                  ">あん /案/"
-                  "{ /｛/"
-                  "かっこ /確固/括弧/各個/各戸/確乎/羯鼓;雅楽の打楽器/格好/『』/【】/［］/〔〕/〈〉/《》/｛｝/「」/（）/‘’/“”/"
-                  "こっか /国家;state/国歌;anthem.「-斉唱」/国花/骨化/國家;「国」旧字/黒化/刻下/】/）/］/』/"
-                  "! /！/感嘆符/"
-                  ". /．/・/。/…;.../"
-                  "* /＊/※/×/"
-                  "? /？/"
-                  "/ /／/÷/"
-                  "!= /≠/"
-                  "こーひー /コーヒー/"
-                  "かに /蟹/可児/蠏/"
-                  "かんい /簡易/官位/冠位;-十二階/漢医;漢方医/敢為/官医/寛衣/換位/簡意/"
-                  "いっち /一致/"
-                  "いっち /イッチ/"
-                  "えr /得/獲;NB:「とr」と同形/選;NB:「よr」「すぐr」と同形/"
-                  "を /小/緒/雄/男/牡/尾/悪/汚/惡;「悪」の旧字(人名用漢字)/"
-                  "みr /見/観;(字義:みわたす)/視;(字義:じっとみる)/診;(diagnose) 患者を診る/看;(nurse) 病母を看る/觀;「観」の旧字/"
-                  "wake /ウェイク/"
-                  "わけ /訳/和気;地名/理由;当て字/分け/分/譯;「訳」の旧字/戯奴/"
-                  "あu /合;(一致) 話が合う/会;人と会う/遭;(偶然、特によくないことにあう) 事故に遭う/逢;(人と|運命的にあう) 巡り逢う/遇;≒遭う/會;「会」の旧字/"
-                  "さく /策/柵/作/佐久;地名/朔;朔日 ⇔晦/槊;ほこ/搾;搾取/昨;昨夜/咋;(くう)/窄;狭窄/酢;酢酸/柞;いすのき/炸;炸裂/筰;山田耕筰/削;削除/索;検索/錯;錯誤/筴/縒;より/鑿/做;「作」の異体字/簀;す/嘖;さいな・む/捉;(漢音) とら・える/齪;齷齪/冊;(慣用音)竹冊/册;「冊」の旧字/辟;?/乍;?/"
-                  "さき /先/崎/左記/前/早紀/沙樹/早岐/沙貴/咲/埼/尖/嵜/碕/早記/"
-                  "いんにょう /飲尿/廴繞;[部首]/"
-                  "いんよう /引用/飲用/陰陽/"
-                  "かt /勝/買/飼/刈;(crop)草を刈る")
-                "\n")))
-      (sekka-jisyo-data
-       '("watashiH Cわたしh" "watasiH Cわたしh" "wtshiH Cわたしh" "wtsiH Cわたしh" "wtxiH Cわたしh" "わたしh /私" "okonaU Cおこなu" "おこなu /行/行な;※送り位置補正" "hdkn Cへんかん" "hdkz Cへんかん" "henkan Cへんかん" "henkann Cへんかん" "henkaq Cへんかん" "hennkan Cへんかん" "hennkann Cへんかん" "hennkaq Cへんかん" "heqkan Cへんかん" "heqkann Cへんかん" "heqkaq Cへんかん" "へんかん /変換/返還" "hdka Cへんか" "henka Cへんか" "hennka Cへんか" "heqka Cへんか" "へんか /変化/返歌" "hdkaS Cへんかs" "henkaS Cへんかs" "hennkaS Cへんかs" "heqkaS Cへんかs" "へんかs /変化" "shizdgdgo Cしぜんげんご" "shizengengo Cしぜんげんご" "shizengenngo Cしぜんげんご" "shizengeqgo Cしぜんげんご" "shizenngengo Cしぜんげんご" "shizenngenngo Cしぜんげんご" "shizenngeqgo Cしぜんげんご" "shizeqgengo Cしぜんげんご" "shizeqgenngo Cしぜんげんご" "shizeqgeqgo Cしぜんげんご" "shizfngengo Cしぜんげんご" "shizfngenngo Cしぜんげんご" "shizfngeqgo Cしぜんげんご" "shizfnngengo Cしぜんげんご" "shizfnngenngo Cしぜんげんご" "shizfnngeqgo Cしぜんげんご" "shizfqgengo Cしぜんげんご" "shizfqgenngo Cしぜんげんご" "shizfqgeqgo Cしぜんげんご" "sizdgdgo Cしぜんげんご" "sizengengo Cしぜんげんご" "sizengenngo Cしぜんげんご" "sizengeqgo Cしぜんげんご" "sizenngengo Cしぜんげんご" "sizenngenngo Cしぜんげんご" "sizenngeqgo Cしぜんげんご" "sizeqgengo Cしぜんげんご" "sizeqgenngo Cしぜんげんご" "sizeqgeqgo Cしぜんげんご" "sizfngengo Cしぜんげんご" "sizfngenngo Cしぜんげんご" "sizfngeqgo Cしぜんげんご" "sizfnngengo Cしぜんげんご" "sizfnngenngo Cしぜんげんご" "sizfnngeqgo Cしぜんげんご" "sizfqgengo Cしぜんげんご" "sizfqgenngo Cしぜんげんご" "sizfqgeqgo Cしぜんげんご" "xizdgdgo Cしぜんげんご" "しぜんげんご /自然言語" "shizdgdgoshori Cしぜんげんごしょり" "shizdgdgosyori Cしぜんげんごしょり" "shizdgdgoxori Cしぜんげんごしょり" "shizengengoshori Cしぜんげんごしょり" "shizengengosyori Cしぜんげんごしょり" "shizengenngoshori Cしぜんげんごしょり" "shizengenngosyori Cしぜんげんごしょり" "shizengeqgoshori Cしぜんげんごしょり" "shizengeqgosyori Cしぜんげんごしょり" "shizenngengoshori Cしぜんげんごしょり" "shizenngengosyori Cしぜんげんごしょり" "shizenngenngoshori Cしぜんげんごしょり" "shizenngenngosyori Cしぜんげんごしょり" "shizenngeqgoshori Cしぜんげんごしょり" "shizenngeqgosyori Cしぜんげんごしょり" "shizeqgengoshori Cしぜんげんごしょり" "shizeqgengosyori Cしぜんげんごしょり" "shizeqgenngoshori Cしぜんげんごしょり" "shizeqgenngosyori Cしぜんげんごしょり" "shizeqgeqgoshori Cしぜんげんごしょり" "shizeqgeqgosyori Cしぜんげんごしょり" "shizfngengoshori Cしぜんげんごしょり" "shizfngengosyori Cしぜんげんごしょり" "shizfngenngoshori Cしぜんげんごしょり" "shizfngenngosyori Cしぜんげんごしょり" "shizfngeqgoshori Cしぜんげんごしょり" "shizfngeqgosyori Cしぜんげんごしょり" "shizfnngengoshori Cしぜんげんごしょり" "shizfnngengosyori Cしぜんげんごしょり" "shizfnngenngoshori Cしぜんげんごしょり" "shizfnngenngosyori Cしぜんげんごしょり" "shizfnngeqgoshori Cしぜんげんごしょり" "shizfnngeqgosyori Cしぜんげんごしょり" "shizfqgengoshori Cしぜんげんごしょり" "shizfqgengosyori Cしぜんげんごしょり" "shizfqgenngoshori Cしぜんげんごしょり" "shizfqgenngosyori Cしぜんげんごしょり" "shizfqgeqgoshori Cしぜんげんごしょり" "shizfqgeqgosyori Cしぜんげんごしょり" "sizdgdgoshori Cしぜんげんごしょり" "sizdgdgosyori Cしぜんげんごしょり" "sizdgdgoxori Cしぜんげんごしょり" "sizengengoshori Cしぜんげんごしょり" "sizengengosyori Cしぜんげんごしょり" "sizengenngoshori Cしぜんげんごしょり" "sizengenngosyori Cしぜんげんごしょり" "sizengeqgoshori Cしぜんげんごしょり" "sizengeqgosyori Cしぜんげんごしょり" "sizenngengoshori Cしぜんげんごしょり" "sizenngengosyori Cしぜんげんごしょり" "sizenngenngoshori Cしぜんげんごしょり" "sizenngenngosyori Cしぜんげんごしょり" "sizenngeqgoshori Cしぜんげんごしょり" "sizenngeqgosyori Cしぜんげんごしょり" "sizeqgengoshori Cしぜんげんごしょり" "sizeqgengosyori Cしぜんげんごしょり" "sizeqgenngoshori Cしぜんげんごしょり" "sizeqgenngosyori Cしぜんげんごしょり" "sizeqgeqgoshori Cしぜんげんごしょり" "sizeqgeqgosyori Cしぜんげんごしょり" "sizfngengoshori Cしぜんげんごしょり" "sizfngengosyori Cしぜんげんごしょり" "sizfngenngoshori Cしぜんげんごしょり" "sizfngenngosyori Cしぜんげんごしょり" "sizfngeqgoshori Cしぜんげんごしょり" "sizfngeqgosyori Cしぜんげんごしょり" "sizfnngengoshori Cしぜんげんごしょり" "sizfnngengosyori Cしぜんげんごしょり" "sizfnngenngoshori Cしぜんげんごしょり" "sizfnngenngosyori Cしぜんげんごしょり" "sizfnngeqgoshori Cしぜんげんごしょり" "sizfnngeqgosyori Cしぜんげんごしょり" "sizfqgengoshori Cしぜんげんごしょり" "sizfqgengosyori Cしぜんげんごしょり" "sizfqgenngoshori Cしぜんげんごしょり" "sizfqgenngosyori Cしぜんげんごしょり" "sizfqgeqgoshori Cしぜんげんごしょり" "sizfqgeqgosyori Cしぜんげんごしょり" "xizdgdgoshori Cしぜんげんごしょり" "xizdgdgosyori Cしぜんげんごしょり" "xizdgdgoxori Cしぜんげんごしょり" "しぜんげんごしょり /自然言語処理" "shizdgdgorikq Cしぜんげんごりかい" "shizengengorikai Cしぜんげんごりかい" "shizengenngorikai Cしぜんげんごりかい" "shizengeqgorikai Cしぜんげんごりかい" "shizenngengorikai Cしぜんげんごりかい" "shizenngenngorikai Cしぜんげんごりかい" "shizenngeqgorikai Cしぜんげんごりかい" "shizeqgengorikai Cしぜんげんごりかい" "shizeqgenngorikai Cしぜんげんごりかい" "shizeqgeqgorikai Cしぜんげんごりかい" "shizfngengorikai Cしぜんげんごりかい" "shizfngenngorikai Cしぜんげんごりかい" "shizfngeqgorikai Cしぜんげんごりかい" "shizfnngengorikai Cしぜんげんごりかい" "shizfnngenngorikai Cしぜんげんごりかい" "shizfnngeqgorikai Cしぜんげんごりかい" "shizfqgengorikai Cしぜんげんごりかい" "shizfqgenngorikai Cしぜんげんごりかい" "shizfqgeqgorikai Cしぜんげんごりかい" "sizdgdgorikq Cしぜんげんごりかい" "sizengengorikai Cしぜんげんごりかい" "sizengenngorikai Cしぜんげんごりかい" "sizengeqgorikai Cしぜんげんごりかい" "sizenngengorikai Cしぜんげんごりかい" "sizenngenngorikai Cしぜんげんごりかい" "sizenngeqgorikai Cしぜんげんごりかい" "sizeqgengorikai Cしぜんげんごりかい" "sizeqgenngorikai Cしぜんげんごりかい" "sizeqgeqgorikai Cしぜんげんごりかい" "sizfngengorikai Cしぜんげんごりかい" "sizfngenngorikai Cしぜんげんごりかい" "sizfngeqgorikai Cしぜんげんごりかい" "sizfnngengorikai Cしぜんげんごりかい" "sizfnngenngorikai Cしぜんげんごりかい" "sizfnngeqgorikai Cしぜんげんごりかい" "sizfqgengorikai Cしぜんげんごりかい" "sizfqgenngorikai Cしぜんげんごりかい" "sizfqgeqgorikai Cしぜんげんごりかい" "xizdgdgorikq Cしぜんげんごりかい" "しぜんげんごりかい /自然言語理解" "developer /デベロッパー/ディベロッパー/デベロッパ" ">an C>あん" ">ann C>あん" ">aq C>あん" ">あん /案" "{ /｛" "ka;ko Cかっこ" "ka@ko Cかっこ" "kakko Cかっこ" "かっこ /確固/括弧/各個/各戸/確乎/羯鼓;雅楽の打楽器/格好/『』/【】/［］/〔〕/〈〉/《》/｛｝/「」/（）/‘’/“”" "ko;ka Cこっか" "ko@ka Cこっか" "kokka Cこっか" "こっか /国家;state/国歌;anthem.「-斉唱」/国花/骨化/國家;「国」旧字/黒化/刻下/】/）/］/』" "! /！/感嘆符" ". /．/・/。/…;..." "* /＊/※/×" "? /？" "/ /／/÷" "!= /≠" "ko'hi' Cこーひー" "ko'hi- Cこーひー" "ko'hi: Cこーひー" "ko'hi^ Cこーひー" "ko-hi' Cこーひー" "ko-hi- Cこーひー" "ko-hi: Cこーひー" "ko-hi^ Cこーひー" "ko:hi' Cこーひー" "ko:hi- Cこーひー" "ko:hi: Cこーひー" "ko:hi^ Cこーひー" "ko^hi' Cこーひー" "ko^hi- Cこーひー" "ko^hi: Cこーひー" "ko^hi^ Cこーひー" "こーひー /コーヒー" "kani Cかに" "かに /蟹/可児/蠏" "kani Cかんい" "kanni Cかんい" "kaqi Cかんい" "kni Cかんい" "kzi Cかんい" "かんい /簡易/官位/冠位;-十二階/漢医;漢方医/敢為/官医/寛衣/換位/簡意" "i;chi Cいっち" "i;ci Cいっち" "i;tyi Cいっち" "i@chi Cいっち" "i@ci Cいっち" "i@tyi Cいっち" "icchi Cいっち" "icci Cいっち" "ittyi Cいっち" "いっち /一致" "i;chi Cいっち" "i;ci Cいっち" "i;tyi Cいっち" "i@chi Cいっち" "i@ci Cいっち" "i@tyi Cいっち" "icchi Cいっち" "icci Cいっち" "ittyi Cいっち" "いっち /イッチ" "eR Cえr" "えr /得/獲;NB:「とr」と同形/選;NB:「よr」「すぐr」と同形" "wo Cを" "を /小/緒/雄/男/牡/尾/悪/汚/惡;「悪」の旧字(人名用漢字)" "miR Cみr" "みr /見/観;(字義:みわたす)/視;(字義:じっとみる)/診;(diagnose) 患者を診る/看;(nurse) 病母を看る/觀;「観」の旧字" "wake /ウェイク" "wake Cわけ" "わけ /訳/和気;地名/理由;当て字/分け/分/譯;「訳」の旧字/戯奴" "aU Cあu" "あu /合;(一致) 話が合う/会;人と会う/遭;(偶然、特によくないことにあう) 事故に遭う/逢;(人と|運命的にあう) 巡り逢う/遇;≒遭う/會;「会」の旧字" "saku Cさく" "さく /策/柵/作/佐久;地名/朔;朔日 ⇔晦/槊;ほこ/搾;搾取/昨;昨夜/咋;(くう)/窄;狭窄/酢;酢酸/柞;いすのき/炸;炸裂/筰;山田耕筰/削;削除/索;検索/錯;錯誤/筴/縒;より/鑿/做;「作」の異体字/簀;す/嘖;さいな・む/捉;(漢音) とら・える/齪;齷齪/冊;(慣用音)竹冊/册;「冊」の旧字/辟;?/乍;?" "sakf Cさき" "saki Cさき" "さき /先/崎/左記/前/早紀/沙樹/早岐/沙貴/咲/埼/尖/嵜/碕/早記" "inngp Cいんにょう" "innngp Cいんにょう" "innnyou Cいんにょう" "innnyowhu Cいんにょう" "innnyp Cいんにょう" "innyou Cいんにょう" "innyowhu Cいんにょう" "innyp Cいんにょう" "iqngp Cいんにょう" "iqnyou Cいんにょう" "iqnyowhu Cいんにょう" "iqnyp Cいんにょう" "いんにょう /飲尿/廴繞;[部首]" "innyou Cいんよう" "innyowhu Cいんよう" "innyp Cいんよう" "inyou Cいんよう" "inyowhu Cいんよう" "inyp Cいんよう" "iqyou Cいんよう" "iqyowhu Cいんよう" "iqyp Cいんよう" "いんよう /引用/飲用/陰陽" "kaT Cかt" "かt /勝/買/飼/刈;(crop)草を刈る" "ka` Cか`" "か` /勝/買/飼/刈;(crop)草を刈る" "ka+ Cか+" "か+ /勝/買/飼/刈;(crop)草を刈る")
-       ))
-  (test* "Create test jisyo"
-         sekka-jisyo-data
-         (convert-skk-jisyo-f _input))
-  (test* "default KVS type" 'tokyocabinet (get-kvs-type))
-  (set-kvs-type dbtype)
-  (test* "changed KVS type" dbtype (get-kvs-type))
-  (let1 sio (StringIO.new (string-join sekka-jisyo-data "\n"))
-    (sio.set_encoding "utf-8")
-    (load-sekka-jisyo-f sio target)))
+(with-open "./test/skk-jisyo-in-1.txt"
+           (lambda (_input)
+             (let1 sekka-jisyo-data
+                 (with-open "./test/sekka-jisyo-out-1.txt"
+                            (lambda (f)
+                              (read f)))
+               (test* "Create test jisyo"
+                      sekka-jisyo-data
+                      (convert-skk-jisyo-f _input))
+               (test* "default KVS type" 'tokyocabinet (get-kvs-type))
+               (set-kvs-type dbtype)
+               (test* "changed KVS type" dbtype (get-kvs-type))
+               (let1 sio (StringIO.new (string-join sekka-jisyo-data "\n"))
+                 (sio.set_encoding "utf-8")
+                 (load-sekka-jisyo-f sio target)))))
 ;;-------------------------------------------------------------------
-(when (eq? dbtype 'tokyocabinet)
-  (require "digest/sha1")
-  (test-section "dump db")
-  (let1 _output (StringIO.new)
-    (_output.set_encoding "utf-8")
-    (test* "dump DB to SEKKA jisyo file. (1)"
-           "442dac4a534cadcae60ccccbbae53752d6078e03"
-           (begin
-             (dump-sekka-jisyo-f _output target)
-             (Digest::SHA1.hexdigest (_output.string))
-             ;;(_output.string)
-             ))))
+(with-open "./test/sekka-dump-out-1.txt"
+           (lambda (f)
+             (let ((_input (f.read))
+                   (_output (StringIO.new)))
+               (_output.set_encoding "utf-8")
+               (when (eq? dbtype 'tokyocabinet)
+                   (test-section "dump db")
+                   (test* "dump DB to SEKKA jisyo file. (1)"
+                          _input
+                          (begin
+                            (dump-sekka-jisyo-f _output target)
+                            (with-open "./test/sekka-dump-out-1.tmp"
+                                       (lambda (f) (f.write (_output.string)))
+                                       "w")
+                            (_output.string)))))))
 (test-section "Open the test-suite DB")
 (define a-search (ApproximateSearch.new 0.94))
@@ -209,14 +175,18 @@
        (. (hash-table-get db "MASTER::(KA)" #f) force_encoding "UTF-8"))
 (test* "db fetch 8"
+       "#kaime #kara# #kqme #kr#"
+       (. (hash-table-get db "MASTER::(#k)" #f) force_encoding "UTF-8"))
+(test* "db fetch 9"
        "burogu+ buroguR buroguT burogu`"
        (. (hash-table-get db "dummy::(BU)" #f) force_encoding "UTF-8"))
-(test* "db fetch 9"
+(test* "db fetch 10"
        "/ユーザー辞書"
        (. (hash-table-get db "dummy::ゆーざーじしょ" #f) force_encoding "UTF-8"))
-(test* "db fetch 10"
+(test* "db fetch 11"
        "yu'za'jisho yu'za'jisyo yu'za'jixo yu'za'zisho yu'za'zisyo yu'za'zixo yu'za-jisho yu'za-jisyo yu'za-jixo yu'za-zisho yu'za-zisyo yu'za-zixo yu'za:jisho yu'za:jisyo yu'za:jixo yu'za:zisho yu'za:zisyo yu'za:zixo yu'za^jisho yu'za^jisyo yu'za^jixo yu'za^zisho yu'za^zisyo yu'za^zixo yu'zc'jisho yu'zc'jisyo yu'zc'jixo yu'zc'zisho yu'zc'zisyo yu'zc'zixo yu'zc-jisho yu'zc-jisyo yu'zc-jixo yu'zc-zisho yu'zc-zisyo yu'zc-zixo yu'zc:jisho yu'zc:jisyo yu'zc:jixo yu'zc:zisho yu'zc:zisyo yu'zc:zixo yu'zc^jisho yu'zc^jisyo yu'zc^jixo yu'zc^zisho yu'zc^zisyo yu'zc^zixo yu-za'jisho yu-za'jisyo yu-za'jixo yu-za'zisho yu-za'zisyo yu-za'zixo yu-za-jisho yu-za-jisyo yu-za-jixo yu-za-zisho yu-za-zisyo yu-za-zixo yu-za:jisho yu-za:jisyo yu-za:jixo yu-za:zisho yu-za:zisyo yu-za:zixo yu-za^jisho yu-za^jisyo yu-za^jixo yu-za^zisho yu-za^zisyo yu-za^zixo yu-zc'jisho yu-zc'jisyo yu-zc'jixo yu-zc'zisho yu-zc'zisyo yu-zc'zixo yu-zc-jisho yu-zc-jisyo yu-zc-jixo yu-zc-zisho yu-zc-zisyo yu-zc-zixo yu-zc:jisho yu-zc:jisyo yu-zc:jixo yu-zc:zisho yu-zc:zisyo yu-zc:zixo yu-zc^jisho yu-zc^jisyo yu-zc^jixo yu-zc^zisho yu-zc^zisyo yu-zc^zixo yu:za'jisho yu:za'jisyo yu:za'jixo yu:za'zisho yu:za'zisyo yu:za'zixo yu:za-jisho yu:za-jisyo yu:za-jixo yu:za-zisho yu:za-zisyo yu:za-zixo yu:za:jisho yu:za:jisyo yu:za:jixo yu:za:zisho yu:za:zisyo yu:za:zixo yu:za^jisho yu:za^jisyo yu:za^jixo yu:za^zisho yu:za^zisyo yu:za^zixo yu:zc'jisho yu:zc'jisyo yu:zc'jixo yu:zc'zisho yu:zc'zisyo yu:zc'zixo yu:zc-jisho yu:zc-jisyo yu:zc-jixo yu:zc-zisho yu:zc-zisyo yu:zc-zixo yu:zc:jisho yu:zc:jisyo yu:zc:jixo yu:zc:zisho yu:zc:zisyo yu:zc:zixo yu:zc^jisho yu:zc^jisyo yu:zc^jixo yu:zc^zisho yu:zc^zisyo yu:zc^zixo yu^za'jisho yu^za'jisyo yu^za'jixo yu^za'zisho yu^za'zisyo yu^za'zixo yu^za-jisho yu^za-jisyo yu^za-jixo yu^za-zisho yu^za-zisyo yu^za-zixo yu^za:jisho yu^za:jisyo yu^za:jixo yu^za:zisho yu^za:zisyo yu^za:zixo yu^za^jisho yu^za^jisyo yu^za^jixo yu^za^zisho yu^za^zisyo yu^za^zixo yu^zc'jisho yu^zc'jisyo yu^zc'jixo yu^zc'zisho yu^zc'zisyo yu^zc'zixo yu^zc-jisho yu^zc-jisyo yu^zc-jixo yu^zc-zisho yu^zc-zisyo yu^zc-zixo yu^zc:jisho yu^zc:jisyo yu^zc:jixo yu^zc:zisho yu^zc:zisyo yu^zc:zixo yu^zc^jisho yu^zc^jisyo yu^zc^jixo yu^zc^zisho yu^zc^zisyo yu^zc^zixo"
        (. (hash-table-get db "dummy::(yu)" #f) force_encoding "UTF-8"))
@@ -359,6 +329,16 @@
        (my-round-map
         (approximate-search userid kvs "innyou" #f 0)))
+(test* "approximate search 11"
+       '((0.981 "#gyoume" "C#ぎょうめ"))
+       (my-round-map
+        (approximate-search userid kvs "#gyoum" #f 0)))
+(test* "approximate search 12"
+       '((0.9722 "#kara#" "C#から#"))
+       (my-round-map
+        (approximate-search userid kvs "#kara" #f 0)))
 ;;-------------------------------------------------------------------
 (test-section "henkan (okuri nashi)")
@@ -455,6 +435,61 @@
        '(("ユーザー辞書" #f "ゆーざーじしょ" j))
        (henkan-okuri-nashi userid kvs "Yu'za'jisyo" 0))
+;;-------------------------------------------------------------------
+(test-section "henkan (okuri nashi and number)")
+(test* "okuri nashi and number 1"
+       '(("2行目" #f "#ぎょうめ" n) ("２行目" #f "#ぎょうめ" n))
+       (henkan-okuri-nashi-and-number userid kvs "2gyoume" 0))
+(test* "okuri nashi and number 2"
+       '(("10行目" #f "#ぎょうめ" n) ("１０行目" #f "#ぎょうめ" n))
+       (henkan-okuri-nashi-and-number userid kvs "10gyoume" 0))
+(test* "okuri nashi and number 3"
+       '(("100回目" #f "#かいめ" n) ("百回目" #f "#かいめ" n))
+       (henkan-okuri-nashi-and-number userid kvs "100kaime" 0))
+(test* "okuri nashi and number 4"
+       '(("３月３日" #f "#がつ#か" n) ("3月3日" #f "#がつ#か" n) ("三月三日" #f "#がつ#か" n) ("三月３日" #f "#がつ#か" n))
+       (henkan-okuri-nashi-and-number userid kvs "3gatu3ka" 0))
+(test* "okuri nashi and number 5"
+       '(("１２月３１日" #f "#がつ#にち" n) ("12月31日" #f "#がつ#にち" n) ("一二月三一日" #f "#がつ#にち" n) ("一二月３１日" #f "#がつ#にち" n))
+       (henkan-okuri-nashi-and-number userid kvs "12gatu31nichi" 0))
+(test* "okuri nashi and number 6"
+       '(("１〜１０" #f "#から#" n))
+       (henkan-okuri-nashi-and-number userid kvs "1kara10" 0))
+(test* "okuri nashi and number 7"
+       '(("１０００〜２０００" #f "#から#" n))
+       (henkan-okuri-nashi-and-number userid kvs "1000kara2000" 0))
+;;-------------------------------------------------------------------
+(test-section "henkan (number)")
+(test* "number 1"
+       '(("１" nil "1" n) ("1" nil "1" n) ("一" nil "1" n) ("一" nil "1" n))
+       (henkan-number kvs "1"))
+(test* "number 2"
+       '(("１０" nil "10" n) ("10" nil "10" n) ("一〇" nil "10" n) ("十" nil "10" n))
+       (henkan-number kvs "10"))
+(test* "number 3"
+       '(("１００" nil "100" n) ("100" nil "100" n) ("一〇〇" nil "100" n) ("百" nil "100" n))
+       (henkan-number kvs "100"))
+(test* "number 4"
+       '(("１２３４５６７８９０" nil "1234567890" n) ("1234567890" nil "1234567890" n) ("一二三四五六七八九〇" nil "1234567890" n) ("十二億三千四百五十六万七千八百九十" nil "1234567890" n))
+       (henkan-number kvs "1234567890"))
+(test* "number 5"
+       '(("１２３４５６７８９０" nil "1234567890" n) ("1234567890" nil "1234567890" n) ("一二三四五六七八九〇" nil "1234567890" n) ("十二億三千四百五十六万七千八百九十" nil "1234567890" n))
+       (henkan-number kvs "1234567890"))
 ;;-------------------------------------------------------------------
 (test-section "henkan (okuri ari)")
@@ -801,6 +836,10 @@
        '(("確固" #f "かっこ" j 0) ("かっこ" #f "ka;ko" h 1) ("カッコ" #f "ka;ko" k 2) ("Ｋａ；ｋｏ" #f "Ka;ko" z 3) ("Ka;ko" #f "Ka;ko" l 4))
        (sekka-henkan userid kvs "Ka;ko" 1 :normal))
+(test* "henkan toplevel 30"
+       '(("100回目" #f "#かいめ" n 0) ("百回目" #f "#かいめ" n 1) ("１００ｋａｉｍｅ" #f "100kaime" z 2) ("100kaime" #f "100kaime" l 3))
+       (sekka-henkan userid kvs "100kaime" 0 :normal))
 (test* "henkan toplevel(for Elisp) 1"
@@ -871,6 +910,21 @@
        '(("ユーザー辞書" nil "ゆーざーじしょ" j 0) ("ゆーざーじしょ" nil "yu-za-jisyo" h 1) ("ユーザージショ" nil "yu-za-jisyo" k 2) ("Ｙｕ－ｚａ－ｊｉｓｙｏ" nil "Yu-za-jisyo" z 3) ("Yu-za-jisyo" nil "Yu-za-jisyo" l 4))
        (sekkaHenkan userid kvs #f "Yu-za-jisyo" 2 "normal"))
+(test* "henkan toplevel(for Elisp) 18"
+       '(("２月２８日" nil "#がつ#にち" n 0) ("2月28日" nil "#がつ#にち" n 1) ("二月二八日" nil "#がつ#にち" n 2) ("二月２８日" nil "#がつ#にち" n 3) ("２ｇａｔｕ２８ｎｉｃｈｉ" nil "2gatu28nichi" z 4) ("2gatu28nichi" nil "2gatu28nichi" l 5))
+       (sekkaHenkan userid kvs #f "2gatu28nichi" 0 "normal"))
+(test* "henkan toplevel(for Elisp) 19"
+       '(("１００" nil "100" n 0) ("100" nil "100" n 1) ("一〇〇" nil "100" n 2) ("百" nil "100" n 3))
+       (sekkaHenkan userid kvs #f "100" 0 "normal"))
+(test* "henkan toplevel(for Elisp) 20"
+       '(("１００００２０００３" nil "1000020003" n 0) ("1000020003" nil "1000020003" n 1) ("一〇〇〇〇二〇〇〇三" nil "1000020003" n 2) ("十億二万三" nil "1000020003" n 3))
+       (sekkaHenkan userid kvs #f "1000020003" 0 "normal"))
+(test* "henkan toplevel(for Elisp) 21"
+       '(("3チーム" nil "#ちーむ" n 0) ("３ｃｈｉ－ｍｕ" nil "3chi-mu" z 1) ("3chi-mu" nil "3chi-mu" l 2))
+       (sekkaHenkan userid kvs #f "3chi-mu" 0 "normal"))
 ;;-------------------------------------------------------------------
 (test-section "henkan kakutei")

data/test/jisyo.nnd CHANGED Viewed

@@ -63,6 +63,18 @@
 (test* "expanding SKK(1) entry to SEKKA(n) entry. (送りあり1)"
        '(("shiroI" . "Cしろi") ("siroI" . "Cしろi") ("xiroI" . "Cしろi") ("しろi" . "/白"))
        (expand-okuri-ari-entry   "しろ" "i" "/白"))
+(test* "expanding SKK(1) entry to SEKKA(n) entry. (#付き1)"
+       '(("#ji" . "C#じ") ("#zi" . "C#じ") ("#じ" . "/#0時/#1時/#2時/#0次/#3次/#1次/"))
+       (expand-okuri-nashi-entry   "#じ" "/#0時/#1時/#2時/#0次/#3次/#1次/"))
+(test* "expanding SKK(1) entry to SEKKA(n) entry. (#付き2)"
+       '(("#gatsu#nichi" . "C#がつ#にち") ("#gatsu#nici" . "C#がつ#にち") ("#gatsu#niti" . "C#がつ#にち") ("#gatsu#nityi" . "C#がつ#にち") ("#gatsu#nt" . "C#がつ#にち") ("#gatu#nichi" . "C#がつ#にち") ("#gatu#nici" . "C#がつ#にち") ("#gatu#niti" . "C#がつ#にち") ("#gatu#nityi" . "C#がつ#にち") ("#gatu#nt" . "C#がつ#にち") ("#がつ#にち" . "/#1月#1日/#0月#0日/#2月#2日/#2月#1日/"))
+       (expand-okuri-nashi-entry   "#がつ#にち" "/#1月#1日/#0月#0日/#2月#2日/#2月#1日/"))
+(test* "expanding SKK(1) entry to SEKKA(n) entry. (#付き3)"
+       '(("#kara#" . "C#から#") ("#kr#" . "C#から#") ("#から#" . "/#1〜#1/"))
+       (expand-okuri-nashi-entry   "#から#" "/#1〜#1/"))
+(test* "expanding SKK(1) entry to SEKKA(n) entry. (#付き4)"
+       '(("#chi'mf" . "C#ちーむ") ("#chi'mu" . "C#ちーむ") ("#chi-mf" . "C#ちーむ") ("#chi-mu" . "C#ちーむ") ("#chi:mf" . "C#ちーむ") ("#chi:mu" . "C#ちーむ") ("#chi^mf" . "C#ちーむ") ("#chi^mu" . "C#ちーむ") ("#ci'mf" . "C#ちーむ") ("#ci'mu" . "C#ちーむ") ("#ci-mf" . "C#ちーむ") ("#ci-mu" . "C#ちーむ") ("#ci:mf" . "C#ちーむ") ("#ci:mu" . "C#ちーむ") ("#ci^mf" . "C#ちーむ") ("#ci^mu" . "C#ちーむ") ("#ti'mf" . "C#ちーむ") ("#ti'mu" . "C#ちーむ") ("#ti-mf" . "C#ちーむ") ("#ti-mu" . "C#ちーむ") ("#ti:mf" . "C#ちーむ") ("#ti:mu" . "C#ちーむ") ("#ti^mf" . "C#ちーむ") ("#ti^mu" . "C#ちーむ") ("#tyi'mf" . "C#ちーむ") ("#tyi'mu" . "C#ちーむ") ("#tyi-mf" . "C#ちーむ") ("#tyi-mu" . "C#ちーむ") ("#tyi:mf" . "C#ちーむ") ("#tyi:mu" . "C#ちーむ") ("#tyi^mf" . "C#ちーむ") ("#tyi^mu" . "C#ちーむ") ("#ちーむ" . "/#0チーム/"))
+       (expand-okuri-nashi-entry   "#ちーむ" "/#0チーム/"))
 (test* "expanding SKK(1) entry to SEKKA(n) entry. (送りあり2)"
        '(("kaK" . "Cかk") ("かk" . "/書/掛/欠/架/駆/懸"))
        (expand-okuri-ari-entry   "か" "k" "/書/掛/欠/架/駆/懸"))

data/test/roman-lib.nnd CHANGED Viewed

@@ -79,6 +79,9 @@
 (test* "kana->roman 5"
        '("-" "^" ":" "'")
        (hash-table-get sekka-kana->roman-hash-short "ー" #f))
+(test* "kana->roman 6"
+       '("#")
+       (hash-table-get sekka-kana->roman-hash-short "#" #f))
 ;;-------------------------------------------------------------------
 (test-section "kana->roman conversion hash (long)")
@@ -129,6 +132,9 @@
 (test* "roman->kana 11"
        '("ぁ")
        (hash-table-get sekka-roman->kana-hash-short "xxa" #f))
+(test* "roman->kana 12"
+       '("#")
+       (hash-table-get sekka-roman->kana-hash-short "#" #f))
 ;;-------------------------------------------------------------------
 (test-section "roman->kana conversion hash (long)")
@@ -268,8 +274,8 @@
 (let1 hira-list
     (hash-table-keys sekka-kana->roman-hash-long)
-  (test* "kana->roman table length"        523 (length hira-list))
-  (test* "kana->roman key duplicate check" 523 (length (uniq (sort hira-list)))))
+  (test* "kana->roman table length"        524 (length hira-list))
+  (test* "kana->roman key duplicate check" 524 (length (uniq (sort hira-list)))))
 (test* "hiragana -> roman-pattern0"
        '(
@@ -332,6 +338,14 @@
        '("tsumikf" "tsumiki" "tumikf" "tumiki")
        (gen-hiragana->roman-list "つみき"))
+(test* "hiragana -> roman-list6"
+       '("gyoume" "gyowhume" "gypme")
+       (gen-hiragana->roman-list "ぎょうめ"))
+(test* "hiragana -> roman-list7"
+       '("#gyoume" "#gyowhume" "#gypme")
+       (gen-hiragana->roman-list "#ぎょうめ"))
 ;;-------------------------------------------------------------------
 (test-section "roman->kana conversion functions")

data/test/sharp-number.nnd ADDED Viewed

@@ -0,0 +1,206 @@
+;;-*- mode: nendo; syntax: scheme -*-
+;;;
+;;; sharp-number.nnd - 数字を漢数字等に変換するライブラリのテストスイート
+;;;
+;;;   Copyright (c) 2010  Kiyoka Nishiyama  <kiyoka@sumibi.org>
+;;;
+;;;   Redistribution and use in source and binary forms, with or without
+;;;   modification, are permitted provided that the following conditions
+;;;   are met:
+;;;
+;;;   1. Redistributions of source code must retain the above copyright
+;;;      notice, this list of conditions and the following disclaimer.
+;;;
+;;;   2. Redistributions in binary form must reproduce the above copyright
+;;;      notice, this list of conditions and the following disclaimer in the
+;;;      documentation and/or other materials provided with the distribution.
+;;;
+;;;   3. Neither the name of the authors nor the names of its contributors
+;;;      may be used to endorse or promote products derived from this
+;;;      software without specific prior written permission.
+;;;
+;;;   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+;;;   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+;;;   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+;;;   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+;;;   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+;;;   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+;;;   TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+;;;   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+;;;   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+;;;   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+;;;   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+;;;
+;;;  $Id:
+;;;
+(use nendo.test)
+(use sekka.sharp-number)
+(test-start "sharp-number")
+;;===================================================================
+;;-------------------------------------------------------------------
+(test-section "type #0")
+(test* "type #0 (1)"
+       "1"
+       (sekka-henkan-sharp-number "#0" "1"))
+(test* "type #0 (2)"
+       "0123456789"
+       (sekka-henkan-sharp-number "#0" "0123456789"))
+(test* "type #0 (3)"
+       "01234567890123456789"
+       (sekka-henkan-sharp-number "#0" "01234567890123456789"))
+;;-------------------------------------------------------------------
+(test-section "type #1")
+(test* "type #1 (1)"
+       "１"
+       (sekka-henkan-sharp-number "#1" "1"))
+(test* "type #1 (2)"
+       "０１２３４５６７８９"
+       (sekka-henkan-sharp-number "#1" "0123456789"))
+(test* "type #1 (3)"
+       "０１２３４５６７８９０１２３４５６７８９"
+       (sekka-henkan-sharp-number "#1" "01234567890123456789"))
+;;-------------------------------------------------------------------
+(test-section "type #2")
+(test* "type #2 (1)"
+       "一"
+       (sekka-henkan-sharp-number "#2" "1"))
+(test* "type #2 (2)"
+       "五五〇〇"
+       (sekka-henkan-sharp-number "#2" "5500"))
+(test* "type #2 (3)"
+       "〇一二三四五六七八九"
+       (sekka-henkan-sharp-number "#2" "0123456789"))
+;;-------------------------------------------------------------------
+(test-section "kansuuji henkan sen")
+(test* "kansuuji sen (1)"
+       "一"
+       (sekka-henkan-kansuuji-sen "1"))
+(test* "kansuuji sen (2)"
+       "十"
+       (sekka-henkan-kansuuji-sen "10"))
+(test* "kansuuji sen (3)"
+       "百"
+       (sekka-henkan-kansuuji-sen "100"))
+(test* "kansuuji sen (4)"
+       "千"
+       (sekka-henkan-kansuuji-sen "1000"))
+(test* "kansuuji sen (5)"
+       "五千五百"
+       (sekka-henkan-kansuuji-sen "5500"))
+(test* "kansuuji sen (6)"
+       "五千五百五十五"
+       (sekka-henkan-kansuuji-sen "5555"))
+(test* "kansuuji sen (7)"
+       "九千九百九十九"
+       (sekka-henkan-kansuuji-sen "9999"))
+;;-------------------------------------------------------------------
+(test-section "kansuuji henkan")
+(test* "kansuuji (1)"
+       "一"
+       (sekka-henkan-kansuuji "1"))
+(test* "kansuuji (2)"
+       "十"
+       (sekka-henkan-kansuuji "10"))
+(test* "kansuuji (3)"
+       "百"
+       (sekka-henkan-kansuuji "100"))
+(test* "kansuuji (4)"
+       "千"
+       (sekka-henkan-kansuuji "1000"))
+(test* "kansuuji (5)"
+       "五千五百"
+       (sekka-henkan-kansuuji "5500"))
+(test* "kansuuji (6)"
+       "五千五百五十五"
+       (sekka-henkan-kansuuji "5555"))
+(test* "kansuuji (7)"
+       "九千九百九十九"
+       (sekka-henkan-kansuuji "9999"))
+(test* "kansuuji (8)"
+       "一万"
+       (sekka-henkan-kansuuji "10000"))
+(test* "kansuuji (9)"
+       "一億"
+       (sekka-henkan-kansuuji "100000000"))
+(test* "kansuuji (10)"
+       "十億"
+       (sekka-henkan-kansuuji "1000000000"))
+(test* "kansuuji (11)"
+       "一兆"
+       (sekka-henkan-kansuuji "1000000000000"))
+(test* "kansuuji (12)"
+       "一兆二"
+       (sekka-henkan-kansuuji "1000000000002"))
+(test* "kansuuji (13)"
+       "一億二千三百四十五万六千七百八十九"
+       (sekka-henkan-kansuuji "0123456789"))
+(test* "kansuuji (14)"
+       "九千八百七十六京五千四百三十二兆千九十八億七千六百五十四万三千二百十"
+       (sekka-henkan-kansuuji "98765432109876543210"))
+;;-------------------------------------------------------------------
+(test-section "type #3")
+(test* "type #3 (1)"
+       "一"
+       (sekka-henkan-sharp-number "#3" "1"))
+(test* "type #3 (2)"
+       "十"
+       (sekka-henkan-sharp-number "#3" "10"))
+(test* "type #3 (3)"
+       "百"
+       (sekka-henkan-sharp-number "#3" "100"))
+(test* "type #3 (4)"
+       "五千五百"
+       (sekka-henkan-sharp-number "#3" "5500"))
+(test* "type #3 (5)"
+       "五万五千五百五十五"
+       (sekka-henkan-sharp-number "#3" "55555"))
+(test* "type #3 (6)"
+       "一億二千三百四十五万六千七百八十九"
+       (sekka-henkan-sharp-number "#3" "0123456789"))
+;;===================================================================
+(test-end)

metadata CHANGED Viewed

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments:
   - 0
   - 8
-  - 4
-  version: 0.8.4
+  - 5
+  version: 0.8.5
 platform: ruby
 authors:
 - Kiyoka Nishiyama
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-02-24 00:00:00 +09:00
+date: 2011-03-10 00:00:00 +09:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -155,6 +155,7 @@ files:
 - lib/sekka/kvs.rb
 - lib/sekka/roman-lib.nnd
 - lib/sekka/sekkaversion.rb
+- lib/sekka/sharp-number.nnd
 - lib/sekka/util.nnd
 - lib/sekkaconfig.rb
 - lib/sekkaserver.rb
@@ -167,6 +168,7 @@ files:
 - test/henkan-main.nnd
 - test/jisyo.nnd
 - test/roman-lib.nnd
+- test/sharp-number.nnd
 - test/skk-azik-table.nnd
 - test/util.nnd
 has_rdoc: true