roman-lib.nnd in sekka-0.8.4

- old
+ new

@@ -39,24 +39,24 @@
 ;; このテーブルはruby-romkan から変換し、一部不足を追加した。
 ;;  クンレイ、日本式、ヘボン式もデータ中に併記し全てを網羅している。
 (define sekka-kana->roman-alist-short
   '(
     ;; normal roman                                ---AZIK---
-    ("ぁ"                                            "la" "xxa")
+    ("ぁ"                                            "la" "xa" "xxa")
     ("あ"        "a")
-    ("ぃ"                                            "li" "xxi")
+    ("ぃ"                                            "li" "xi" "xxi")
     ("い"        "i")
-    ("ぅ"                                            "lu" "xxu")
+    ("ぅ"                                            "lu" "xu" "xxu")
     ("う"        "u"                                 "whu")
     ("う゛"      "vu")
     ("う゛ぁ"    "va")
     ("う゛ぃ"    "vi")
     ("う゛ぇ"    "ve")
     ("う゛ぉ"    "vo")
-    ("ぇ"                                            "le" "xxe")
+    ("ぇ"                                            "le" "xe" "xxe")
     ("え"        "e")
-    ("ぉ"                                            "lo" "xxo")
+    ("ぉ"                                            "lo" "xo" "xxo")
     ("お"        "o")
     ("か"        "ka")
     ("が"        "ga")
     ("き"        "ki"                                "kf")
     ("きゃ"      "kya"                               "kga")
@@ -74,16 +74,16 @@
     ("げ"        "ge")
     ("こ"        "ko")
     ("ご"        "go")
     ("さ"        "sa")
     ("ざ"        "za"                                "zc") ;; AZIKザ行の特別措置
-    ("し"        "shi"                               "si" "xi")
-    ("しゃ"      "sha" "sya"                         "xa" "xc")
+    ("し"        "shi"                               "si")
+    ("しゃ"      "sha" "sya"                         )
     ;; hu の例外処理: shu は sfu になってはいけない
-    ("しゅ"      "shu" "syu"                         "xu")
-    ("しぇ"      "she" "sye"                         "xe")
-    ("しょ"      "sho" "syo"                         "xo")
+    ("しゅ"      "shu" "syu"                         )
+    ("しぇ"      "she" "sye"                         )
+    ("しょ"      "sho" "syo"                         )
     ("じ"        "ji" "zi")
     ("じゃ"      "ja" "jya"                          "zya")
     ("じゅ"      "ju" "jyu"                          "zyu" "jf")
     ("じぇ"      "je" "jye"                          "zye")
     ("じょ"      "jo" "jyo"                          "zyo")
@@ -105,11 +105,11 @@
     ("ぢ"        "di")
     ("ぢゃ"      "dya")
     ("ぢゅ"      "dyu")
     ("ぢぇ"      "dye")
     ("ぢょ"      "dyo")
-    ("っ"        "tt"                                 "@" ";" "ltu")
+    ("っ"        "tt"                                 "@" ";" "ltu" "xtu")
     ;; normal roman                                ---AZIK---
     ("つ"        "tsu"                                "tu")
     ("づ"        "du")
     ("て"        "te")
     ("で"        "de"                                 "df")
@@ -163,25 +163,25 @@
     ("みょ"      "myo"                                 "mgo")
     ("む"        "mu"                                  "mf")
     ("め"        "me")
     ("も"        "mo")
     ;; normal roman                                ---AZIK---
-    ("ゃ"                                             "lya")
+    ("ゃ"        "xya"                                "lya")
     ("や"        "ya")
-    ("ゅ"                                             "lyu")
+    ("ゅ"        "xyu"                                "lyu")
     ("ゆ"        "yu"                                 "yf")
-    ("ょ"                                             "lyo")
+    ("ょ"        "xyo"                                "lyo")
     ("よ"        "yo")
     ("ら"        "ra")
     ("り"        "ri")
     ("りゃ"      "rya")
     ("りゅ"      "ryu")
     ("りょ"      "ryo")
     ("る"        "ru")
     ("れ"        "re")
     ("ろ"        "ro")
-    ("ゎ"                                             "lwa")
+    ("ゎ"        "xwa"                                "lwa")
     ("わ"        "wa")
     ("うぃ"      "wi"                                 "whi")
     ("うぇ"      "we"                                 "whe")
     ("を"        "wo")
     ("うぉ"      "wso"                                "who")
@@ -313,9 +313,17 @@
     ("にぇ"      "nye"                                "nge")
     ("にょ"      "nyo"                                "ngo")
 
     ;; 非AZIKで "cc" で 撥音「っ」から始まるかなを表現を消す可能性があるので "cc" はAZIK側だけに定義する
     ("ちゃ"      "cha" "tya"                          "ca" "cc")
+
+    ;; 非AZIKで "xa" "xi" "xu" "ae" "ao" の捨て仮名を ぁぃぅぇぉ の入力に使うため以下の定義を
+    ;; 非AZIKとAZIKで分割する
+    ("し"        "shi"                               "si" "xi")
+    ("しゃ"      "sha" "sya"                         "xa" "xc")
+    ("しゅ"      "shu" "syu"                         "xu")
+    ("しぇ"      "she" "sye"                         "xe")
+    ("しょ"      "sho" "syo"                         "xo")
 
     ;; ---以下AZIK---
     ;; ------ AZIK 撥音拡張
     ("かん"       "kz" "kn")
     ("きん"       "kk" "kv")