From: handa <handa>
Date: Fri, 21 May 2010 05:26:27 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: REL-1-6-2~49
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=f24e3efd557f0a841367962a18fb08a78bcbe93c;p=m17n%2Fm17n-db.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index 2e21460..35a3d64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-05-21  Kenichi Handa  <handa@m17n.org>
+
+	* MIM/ko-han2.mim (map:L-or-T-head): Remove conflicting key
+	sequences.
+	(map:L): Likewise.  Add "rr", "ee", "qq" , "tt".
+	(map:T-or-TL): Renamed from T. Set T1 in rules.
+	(state:init): Remove branch T.
+	(state:state-LV): Remove branch T.  Add branch T-or-TL.
+	(state:state-LVT-or-LVTL): New state.
+
 2010-05-20  Gheyret T. Kenji  <gheyret@gmail.com>  (tiny change)
 
 	* MIM/ug-kbd.mim: Add three punctuations.
diff --git a/MIM/ko-han2.mim b/MIM/ko-han2.mim
index 6925fb2..bc888cb 100644
--- a/MIM/ko-han2.mim
+++ b/MIM/ko-han2.mim
@@ -94,84 +94,91 @@ This input method uses this keyboard layout:
   ("x" (set L1 ?á) (set T ?á) ?ã (compose))
   ("v" (set L1 ?á) (set T ?á) ?ã (compose))
   ("g" (set L1 ?á) (set T ?á) ?ã (compose))
-  ("sr" (set L1 ?á) (set T ?á) ?á (compose))
-  ("se" (set L1 ?á) (set T ?á) ?ã¦ (compose))
-  ("er" (set L1 ?á) (set T ?á) ?á (compose))
-  ("fs" (set L1 ?á) (set T ?á) ?á (compose))
-  ("F" (set L1 ?á) (set T ?á) ?á (compose))
-  ("fg" (set L1 ?á) (set T ?á¶) ?ã (compose))
-  ("aq" (set L1 ?á) (set T ?á) ?ã® (compose))
-  ("ad" (set L1 ?á) (set T ?á¢) ?ã± (compose))
-  ("qt" (set L1 ?á¡) (set T ?á¹) ?ã (compose))
-  ("qv" (set L1 ?áª) (set T ?á¤) ?áª (compose))
-  ("qd" (set L1 ?á«) (set T ?á¦) ?ã¸ (compose))
-  ("tr" (set L1 ?á­) (set T ?á§) ?ãº (compose))
-  ("te" (set L1 ?á¯) (set T ?á¨) ?ã¼ (compose))
-  ("tf" (set L1 ?á°) (set T ?á©) ?á° (compose))
-  ("tq" (set L1 ?á²) (set T ?áª) ?ã½ (compose))
-  ("t/" (set L1 ?á) (set T ?á«) ?ã¿ (compose))
-  ("dr" (set L1 ?á) (set T ?á¬) ?á (compose))
-  ("dt" (set L1 ?á) (set T ?á±) ?ã (compose))
-  ("dt/" (set L1 ?á) (set T ?á²) ?ã (compose))
-  ("d/" (set L1 ?á) (set T ?á°) ?ã (compose))
-  ("vq" (set L1 ?á) (set T ?á³) ?á (compose))
-  ("vd" (set L1 ?á) (set T ?á´) ?ã (compose))
-  ("g/" (set L1 ?á) (set T ?á¹) ?ã (compose)))
+  ;;("sr" (set L1 ?á) (set T ?á) ?á (compose))
+  ;;("se" (set L1 ?á) (set T ?á) ?ã¦ (compose))
+  ;;("er" (set L1 ?á) (set T ?á) ?á (compose))
+  ;;("fs" (set L1 ?á) (set T ?á) ?á (compose))
+  ;;("F" (set L1 ?á) (set T ?á) ?á (compose))
+  ;;("fg" (set L1 ?á) (set T ?á¶) ?ã (compose))
+  ;;("aq" (set L1 ?á) (set T ?á) ?ã® (compose))
+  ;;("ad" (set L1 ?á) (set T ?á¢) ?ã± (compose))
+  ;;("qt" (set L1 ?á¡) (set T ?á¹) ?ã (compose))
+  ;;("qv" (set L1 ?áª) (set T ?á¤) ?áª (compose))
+  ;;("qd" (set L1 ?á«) (set T ?á¦) ?ã¸ (compose))
+  ;;("tr" (set L1 ?á­) (set T ?á§) ?ãº (compose))
+  ;;("te" (set L1 ?á¯) (set T ?á¨) ?ã¼ (compose))
+  ;;("tf" (set L1 ?á°) (set T ?á©) ?á° (compose))
+  ;;("tq" (set L1 ?á²) (set T ?áª) ?ã½ (compose))
+  ;;("t/" (set L1 ?á) (set T ?á«) ?ã¿ (compose))
+  ;;("dr" (set L1 ?á) (set T ?á¬) ?á (compose))
+  ;;("dt" (set L1 ?á) (set T ?á±) ?ã (compose))
+  ;;("dt/" (set L1 ?á) (set T ?á²) ?ã (compose))
+  ;;("d/" (set L1 ?á) (set T ?á°) ?ã (compose))
+  ;;("vq" (set L1 ?á) (set T ?á³) ?á (compose))
+  ;;("vd" (set L1 ?á) (set T ?á´) ?ã (compose))
+  ;;("g/" (set L1 ?á) (set T ?á¹) ?ã (compose))
+  )
 
  (L
   ;; Set L to CHOSEONG.
+  ("rr" (set L ?á) ?ã²)
   ("E" (set L ?á) ?ã¸)
+  ("ee" (set L ?á) ?ã¸)
   ("Q" (set L ?á) ?ã)
+  ("qq" (set L ?á) ?ã)
+  ("tt" (set L ?á) ?ã)
   ("W" (set L ?á) ?ã)
-  ("S" (set L ?á) ?ã¥)
-  ("sq" (set L ?á) ?á)
-  ("fd" (set L ?á) ?á)
-  ("qr" (set L ?á) ?ã²)
-  ("qs" (set L ?á) ?á)
-  ("qe" (set L ?á ) ?ã³)
-  ("qtr" (set L ?á¢) ?ã´)
-  ("qte" (set L ?á£) ?ãµ)
-  ("qtq" (set L ?á¤) ?á¤)
-  ("qtt" (set L ?á¥) ?á¥)
-  ("qtw" (set L ?á¦) ?á¦)
-  ("qw" (set L ?á§) ?ã¶)
-  ("qc" (set L ?á¨) ?á¨)
-  ("qx" (set L ?á©) ?ã·)
-  ("Qd" (set L ?á¬) ?ã¹)
-  ("ts" (set L ?á®) ?ã»)
-  ("ta" (set L ?á±) ?á±)
-  ("tqr" (set L ?á³) ?á³)
-  ("tT" (set L ?á´) ?á´)
-  ("td" (set L ?áµ) ?áµ)
-  ("tw" (set L ?á¶) ?ã¾)
-  ("tc" (set L ?á·) ?á·)
-  ("tz" (set L ?á¸) ?á¸)
-  ("tx" (set L ?á¹) ?á¹)
-  ("tv" (set L ?áº) ?áº)
-  ("tg" (set L ?á») ?á»)
-  ("tt" (set L ?á¼) ?á¼)
-  ("TT" (set L ?á½) ?á½)
-  ("tt/" (set L ?á¾) ?á¾)
-  ("TT/'" (set L ?á¿) ?á¿)
-  ("ds" (set L ?á) ?á)
-  ("da" (set L ?á) ?á)
-  ("dq" (set L ?á) ?á)
-  ("D" (set L ?á) ?ã)
-  ("dw" (set L ?á) ?á)
-  ("dc" (set L ?á) ?á)
-  ("dx" (set L ?á) ?á)
-  ("dv" (set L ?á) ?á)
-  ("wd" (set L ?á) ?á)
-  ("ww" (set L ?á) ?á)
-  ("WW" (set L ?á) ?á)
-  ("ww/" (set L ?á) ?á)
-  ("WW/" (set L ?á) ?á)
-  ("cz" (set L ?á) ?á)
-  ("cg" (set L ?á) ?á)
-  ("cc" (set L ?á) ?á)
-  ("cc/" (set L ?á) ?á)
-  ("G" (set L ?á) ?ã)
-  ("C" (set L ?á) ?á))
+  ("ww" (set L ?á) ?ã)
+  ;;("S" (set L ?á) ?ã¥)
+  ;;("sq" (set L ?á) ?á)
+  ;;("fd" (set L ?á) ?á)
+  ;;("qr" (set L ?á) ?ã²)
+  ;;("qs" (set L ?á) ?á)
+  ;;("qe" (set L ?á ) ?ã³)
+  ;;("qtr" (set L ?á¢) ?ã´)
+  ;;("qte" (set L ?á£) ?ãµ)
+  ;;("qtq" (set L ?á¤) ?á¤)
+  ;;("qtt" (set L ?á¥) ?á¥)
+  ;;("qtw" (set L ?á¦) ?á¦)
+  ;;("qw" (set L ?á§) ?ã¶)
+  ;;("qc" (set L ?á¨) ?á¨)
+  ;;("qx" (set L ?á©) ?ã·)
+  ;;("Qd" (set L ?á¬) ?ã¹)
+  ;;("ts" (set L ?á®) ?ã»)
+  ;;("ta" (set L ?á±) ?á±)
+  ;;("tqr" (set L ?á³) ?á³)
+  ;;("tT" (set L ?á´) ?á´)
+  ;;("td" (set L ?áµ) ?áµ)
+  ;;("tw" (set L ?á¶) ?ã¾)
+  ;;("tc" (set L ?á·) ?á·)
+  ;;("tz" (set L ?á¸) ?á¸)
+  ;;("tx" (set L ?á¹) ?á¹)
+  ;;("tv" (set L ?áº) ?áº)
+  ;;("tg" (set L ?á») ?á»)
+  ;;("tt" (set L ?á¼) ?á¼)
+  ;;("TT" (set L ?á½) ?á½)
+  ;;("tt/" (set L ?á¾) ?á¾)
+  ;;("TT/'" (set L ?á¿) ?á¿)
+  ;;("ds" (set L ?á) ?á)
+  ;;("da" (set L ?á) ?á)
+  ;;("dq" (set L ?á) ?á)
+  ;;("D" (set L ?á) ?ã)
+  ;;("dw" (set L ?á) ?á)
+  ;;("dc" (set L ?á) ?á)
+  ;;("dx" (set L ?á) ?á)
+  ;;("dv" (set L ?á) ?á)
+  ;;("wd" (set L ?á) ?á)
+  ;;("ww" (set L ?á) ?á)
+  ;;("WW" (set L ?á) ?á)
+  ;;("ww/" (set L ?á) ?á)
+  ;;("WW/" (set L ?á) ?á)
+  ;;("cz" (set L ?á) ?á)
+  ;;("cg" (set L ?á) ?á)
+  ;;("cc" (set L ?á) ?á)
+  ;;("cc/" (set L ?á) ?á)
+  ;;("G" (set L ?á) ?ã)
+  ;;("C" (set L ?á) ?á)
+  )
 
  (V-head
   ("y") ("u") ("i") ("o") ("p") ("O") ("P")
@@ -201,97 +208,103 @@ This input method uses this keyboard layout:
   ("m" (set V ?á³) ?ã¡ (compose))
   ("ml" (set V ?á´) ?ã¢ (compose))
   ("l" (set V ?áµ) ?ã£ (compose))
-  ("kh" (set V ?á¶) ?á¶ (compose))
-  ("kn" (set V ?á·) ?á· (compose))
-  ("ih" (set V ?á¸) ?á¸ (compose))
-  ("iy" (set V ?á¹) ?á¹ (compose))
-  ("jh" (set V ?áº) ?áº (compose))
-  ("jn" (set V ?á») ?á» (compose))
-  ("jm" (set V ?á¼) ?á¼ (compose))
-  ("uh" (set V ?á½) ?á½ (compose))
-  ("un" (set V ?á¾) ?á¾ (compose))
-  ("hj" (set V ?á¿) ?á¿ (compose))
-  ("hp" (set V ?á) ?á (compose))
-  ("hP" (set V ?á) ?á (compose))
-  ("hh" (set V ?á) ?á (compose))
-  ("hn" (set V ?á) ?á (compose))
-  ("yi" (set V ?á) ?ã (compose))
-  ("yO" (set V ?á) ?ã (compose))
-  ("yu" (set V ?á) ?á (compose))
-  ("yh" (set V ?á) ?á (compose))
-  ("yl" (set V ?á) ?ã (compose))
-  ("nk" (set V ?á) ?á (compose))
-  ("no" (set V ?á) ?á (compose))
-  ("njm" (set V ?á) ?á (compose))
-  ("nu" (set V ?á) ?á (compose))
-  ("nn" (set V ?á) ?á (compose))
-  ("bk" (set V ?á) ?á (compose))
-  ("bj" (set V ?á) ?á (compose))
-  ("bp" (set V ?á) ?á (compose))
-  ("bu" (set V ?á) ?ã (compose))
-  ("bP" (set V ?á) ?ã (compose))
-  ("bn" (set V ?á) ?á (compose))
-  ("bl" (set V ?á) ?ã (compose))
-  ("mn" (set V ?á) ?á (compose))
-  ("mm" (set V ?á) ?á (compose))
-  ("mln" (set V ?á) ?á (compose))
-  ("lk" (set V ?á) ?á (compose))
-  ("li" (set V ?á) ?á (compose))
-  ("lh" (set V ?á) ?á (compose))
-  ("ln" (set V ?á) ?á (compose))
-  ("lm" (set V ?á) ?á (compose))
-  ("lK" (set V ?á) ?á (compose))
-  ("K" (set V ?á) ?á (compose))
-  ("Kj" (set V ?á) ?á (compose))
-  ("Kn" (set V ?á ) ?á  (compose))
-  ("Kl" (set V ?á¡) ?á¡ (compose))
-  ("KK" (set V ?á¢) ?á¢ (compose)))
+  ;;("kh" (set V ?á¶) ?á¶ (compose))
+  ;;("kn" (set V ?á·) ?á· (compose))
+  ;;("ih" (set V ?á¸) ?á¸ (compose))
+  ;;("iy" (set V ?á¹) ?á¹ (compose))
+  ;;("jh" (set V ?áº) ?áº (compose))
+  ;;("jn" (set V ?á») ?á» (compose))
+  ;;("jm" (set V ?á¼) ?á¼ (compose))
+  ;;("uh" (set V ?á½) ?á½ (compose))
+  ;;("un" (set V ?á¾) ?á¾ (compose))
+  ;;("hj" (set V ?á¿) ?á¿ (compose))
+  ;;("hp" (set V ?á) ?á (compose))
+  ;;("hP" (set V ?á) ?á (compose))
+  ;;("hh" (set V ?á) ?á (compose))
+  ;;("hn" (set V ?á) ?á (compose))
+  ;;("yi" (set V ?á) ?ã (compose))
+  ;;("yO" (set V ?á) ?ã (compose))
+  ;;("yu" (set V ?á) ?á (compose))
+  ;;("yh" (set V ?á) ?á (compose))
+  ;;("yl" (set V ?á) ?ã (compose))
+  ;;("nk" (set V ?á) ?á (compose))
+  ;;("no" (set V ?á) ?á (compose))
+  ;;("njm" (set V ?á) ?á (compose))
+  ;;("nu" (set V ?á) ?á (compose))
+  ;;("nn" (set V ?á) ?á (compose))
+  ;;("bk" (set V ?á) ?á (compose))
+  ;;("bj" (set V ?á) ?á (compose))
+  ;;("bp" (set V ?á) ?á (compose))
+  ;;("bu" (set V ?á) ?ã (compose))
+  ;;("bP" (set V ?á) ?ã (compose))
+  ;;("bn" (set V ?á) ?á (compose))
+  ;;("bl" (set V ?á) ?ã (compose))
+  ;;("mn" (set V ?á) ?á (compose))
+  ;;("mm" (set V ?á) ?á (compose))
+  ;;("mln" (set V ?á) ?á (compose))
+  ;;("lk" (set V ?á) ?á (compose))
+  ;;("li" (set V ?á) ?á (compose))
+  ;;("lh" (set V ?á) ?á (compose))
+  ;;("ln" (set V ?á) ?á (compose))
+  ;;("lm" (set V ?á) ?á (compose))
+  ;;("lK" (set V ?á) ?á (compose))
+  ;;("K" (set V ?á) ?á (compose))
+  ;;("Kj" (set V ?á) ?á (compose))
+  ;;("Kn" (set V ?á ) ?á  (compose))
+  ;;("Kl" (set V ?á¡) ?á¡ (compose))
+  ;;("KK" (set V ?á¢) ?á¢ (compose))
+  )
 
- (T
-  ;; Set T to JONGSEONG.
-  ("rt" (set T ?áª) ?ã³ (compose))
-  ("sw" (set T ?á¬) ?á¬ (compose))
-  ("sg" (set T ?á­) ?á­ (compose))
-  ("fr" (set T ?á°) ?ãº (compose))
-  ("fa" (set T ?á±) ?ã» (compose))
-  ("fq" (set T ?á²) ?ã¼ (compose))
-  ("ft" (set T ?á³) ?ã½ (compose))
-  ("fx" (set T ?á´) ?ã¾ (compose))
-  ("fv" (set T ?áµ) ?ã¿ (compose))
-  ("rf" (set T ?á) ?á (compose))
-  ("rtr" (set T ?á) ?á (compose))
-  ("st" (set T ?á) ?ã§ (compose))
-  ("st/" (set T ?á) ?ã¨ (compose))
-  ("sx" (set T ?á) ?á (compose))
-  ("ef" (set T ?á) ?á (compose))
-  ("frt" (set T ?á) ?á (compose))
-  ("fe" (set T ?á) ?ãª (compose))
-  ("feg" (set T ?á) ?á (compose))
-  ("far" (set T ?á) ?á (compose))
-  ("fat" (set T ?á) ?á (compose))
-  ("fqt" (set T ?á) ?ã« (compose))
-  ("fqg" (set T ?á) ?á (compose))
-  ("fqd" (set T ?á) ?á (compose))
-  ("ftt" (set T ?á) ?á (compose))
-  ("ft/" (set T ?á) ?ã¬ (compose))
-  ("fz" (set T ?á) ?á (compose))
-  ("fMd" (set T ?á) ?ã­ (compose))
-  ("ar" (set T ?á) ?á (compose))
-  ("af" (set T ?á) ?á (compose))
-  ("at" (set T ?á) ?ã¯ (compose))
-  ("aT" (set T ?á) ?á (compose))
-  ("at/" (set T ?á) ?ã° (compose))
-  ("ac" (set T ?á ) ?á  (compose))
-  ("ag" (set T ?á¡) ?á¡ (compose))
-  ("qf" (set T ?á£) ?á£ (compose))
-  ("qg" (set T ?á¥) ?á¥ (compose))
-  ("dR" (set T ?á­) ?á­ (compose))
-  ("dt/" (set T ?á®) ?ã (compose))
-  ("dz" (set T ?á¯) ?á¯ (compose))
-  ("gs" (set T ?áµ) ?áµ (compose))
-  ("gf" (set T ?á¶) ?á¶ (compose))
-  ("ga" (set T ?á·) ?á· (compose))
-  ("gq" (set T ?á¸) ?á¸ (compose)))
+ (T-or-TL
+  ;; Set T to JONGSEONG, T1 to the alternate JONGSEONG.
+  ("rr" (set T ?á©) (set T1 ?á¨) ?ã² (compose))
+  ("rt" (set T ?áª) (set T1 ?á¨) ?ã³ (compose))
+  ("sw" (set T ?á¬) (set T1 ?á«) ?ãµ (compose))
+  ("sg" (set T ?á­) (set T1 ?á«) ?ã¶ (compose))
+  ("fr" (set T ?á°) (set T1 ?á¯) ?ãº (compose))
+  ("fa" (set T ?á±) (set T1 ?á¯) ?ã» (compose))
+  ("fq" (set T ?á²) (set T1 ?á¯) ?ã¼ (compose))
+  ("ft" (set T ?á³) (set T1 ?á¯) ?ã½ (compose))
+  ("fx" (set T ?á´) (set T1 ?á¯) ?ã¾ (compose))
+  ("fv" (set T ?áµ) (set T1 ?á¯) ?ã¿ (compose))
+  ("fg" (set T ?á¶) (set T1 ?á¯) ?ã (compose))
+  ("qt" (set T ?á¹) (set T1 ?á¸) ?ã (compose))
+  ("tt" (set T ?á») (set T1 ?áº) ?ã (compose))
+  ;;("rf" (set T ?á) ?á (compose))
+  ;;("rtr" (set T ?á) ?á (compose))
+  ;;("st" (set T ?á) ?ã§ (compose))
+  ;;("st/" (set T ?á) ?ã¨ (compose))
+  ;;("sx" (set T ?á) ?á (compose))
+  ;;("ef" (set T ?á) ?á (compose))
+  ;;("frt" (set T ?á) ?á (compose))
+  ;;("fe" (set T ?á) ?ãª (compose))
+  ;;("feg" (set T ?á) ?á (compose))
+  ;;("far" (set T ?á) ?á (compose))
+  ;;("fat" (set T ?á) ?á (compose))
+  ;;("fqt" (set T ?á) ?ã« (compose))
+  ;;("fqg" (set T ?á) ?á (compose))
+  ;;("fqd" (set T ?á) ?á (compose))
+  ;;("ftt" (set T ?á) ?á (compose))
+  ;;("ft/" (set T ?á) ?ã¬ (compose))
+  ;;("fz" (set T ?á) ?á (compose))
+  ;;("fMd" (set T ?á) ?ã­ (compose))
+  ;;("ar" (set T ?á) ?á (compose))
+  ;;("af" (set T ?á) ?á (compose))
+  ;;("at" (set T ?á) ?ã¯ (compose))
+  ;;("aT" (set T ?á) ?á (compose))
+  ;;("at/" (set T ?á) ?ã° (compose))
+  ;;("ac" (set T ?á ) ?á  (compose))
+  ;;("ag" (set T ?á¡) ?á¡ (compose))
+  ;;("qf" (set T ?á£) ?á£ (compose))
+  ;;("qg" (set T ?á¥) ?á¥ (compose))
+  ;;("dR" (set T ?á­) ?á­ (compose))
+  ;;("dt/" (set T ?á®) ?ã (compose))
+  ;;("dz" (set T ?á¯) ?á¯ (compose))
+  ;;("gs" (set T ?áµ) ?áµ (compose))
+  ;;("gf" (set T ?á¶) ?á¶ (compose))
+  ;;("ga" (set T ?á·) ?á· (compose))
+  ;;("gq" (set T ?á¸) ?á¸ (compose))
+  )
 
  (special
   ("J" (set V ?á ) ?á  (compose)))
@@ -306,7 +319,6 @@ This input method uses this keyboard layout:
   (L-or-T (set L L1) (set T 0x11A7) (shift state-L))
   (L (set T 0x11A7) (shift state-L))
   (V)
-  (T)
   (special)
   (backspace))
  (state-L
@@ -314,8 +326,9 @@ This input method uses this keyboard layout:
   (backspace))
  (state-LV
   (L-or-T (shift state-LVL-or-LVT))
-  (T)
+  (T-or-TL (shift state-LVT-or-LVTL))
   (backspace))
+
  (state-LVL-or-LVT
   (L-or-T-head (delete @<) (pushback 0) (set L 0) (shift state-fix-LVT))
   (V-head (delete @<) (pushback 0) (set L 0) (shift state-fix-LV))
@@ -331,7 +344,15 @@ This input method uses this keyboard layout:
   (L-or-T (set L L1) (set T 0x11A7) (shift state-fix-LV-2))
   (L (set T 0x11A7) (shift state-fix-LV-2)))
  (state-fix-LV-2
-  (V (shift init))))
+  (V (shift init)))
+
+ ;; e.g. "rkrt"
+ (state-LVT-or-LVTL
+  (L-or-T-head ;; e.g. "rkrtr"; make the last "r" start a new composing.
+   (pushback 1) (shift init))
+  (V-head ;; e.g. "rkrth"; make the last "th" start a new composing.
+   (delete @<) (set T T1) (compose) (pushback 2) (shift init)))
+)
 
 ;; Local Variables:
 ;; coding: utf-8
