Remove redundant unicodes in

category-setting.

3 files changed, 45 insertions, 186 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f306e471c89..f1e54b8496c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2002-06-12  Dave Love  <fx@gnu.org>
+
+        * language/thai-util.el: Remove redundant unicodes in
+        category-setting.
+
+        * language/lao-util.el: Remove redundant unicodes in
+        category-setting.
+
+        * international/mule-conf.el (japanese-jisx0213-1) 
+        (japanese-jisx0213-2): Add unify-map.
+
 2002-06-12  Kenichi Handa  <handa@etl.go.jp>
 
         * international/quail.el (quail-update-leim-list-file): Force
diff --git a/lisp/language/lao-util.el b/lisp/language/lao-util.el
index 1639b1bf78b..9a14e581e4a 100644
--- a/lisp/language/lao-util.el
+++ b/lisp/language/lao-util.el
@@ -4,7 +4,7 @@
 ;; Licensed to the Free Software Foundation.
 ;; Copyright (C) 2001 Free Software Foundation, Inc.
 
-;; Keywords: multilingual, Lao
+;; Keywords: multilingual, Lao, i18n
 
 ;; This file is part of GNU Emacs.
 
@@ -35,6 +35,8 @@
 (define-category ?v "Lao upper/lower vowel" lao-category-table)
 (define-category ?t "Lao tone" lao-category-table)
 
+;; Fixme: Should `invalid' entries below be preserved?  (See also
+;; thai-util.el.)
 (let ((l '((?(1!(B consonant "LETTER KOR  KAI'" "CHICKEN")
            (?(1"(B consonant "LETTER KHOR KHAI'" "EGG")
            (?(1#(B invalid nil)
@@ -128,73 +130,7 @@
            (?(1{(B invalid nil)
            (?(1|(B consonant "LETTER NHOR NHUU" "MOUSE")
            (?(1}(B consonant "LETTER MHOR MHAR" "DOG")
-           (?(1~(B invalid nil)
-           ;; Unicode equivalents
-           (?$,1D!(B consonant "LETTER KOR  KAI'" "CHICKEN")
-           (?$,1D"(B consonant "LETTER KHOR KHAI'" "EGG")
-           (?$,1D$(B consonant "LETTER QHOR QHWARGN" "BUFFALO")
-           (?$,1D'(B consonant "LETTER NGOR NGUU" "SNAKE")
-           (?$,1D((B consonant "LETTER JOR JUA" "BUDDHIST NOVICE")
-           (?$,1D*(B consonant "LETTER XOR X\"ARNG" "ELEPHANT")
-           (?$,1D-(B consonant "LETTER YOR YUNG" "MOSQUITO")
-           (?$,1D4(B consonant "LETTER DOR DANG" "NOSE")
-           (?$,1D5(B consonant "LETTER TOR TAR" "EYE")
-           (?$,1D6(B consonant "LETTER THOR THUNG" "TO ASK,QUESTION")
-           (?$,1D7(B consonant "LETTER DHOR DHARM" "FLAG")
-           (?$,1D9(B consonant "LETTER NOR NOK" "BIRD")
-           (?$,1D:(B consonant "LETTER BOR BED" "FISHHOOK")
-           (?$,1D;(B consonant "LETTER POR PAR" "FISH")
-           (?$,1D<(B consonant "LETTER HPOR HPER\"" "BEE")
-           (?$,1D=(B consonant "LETTER FHOR FHAR" "WALL")
-           (?$,1D>(B consonant "LETTER PHOR PHUU" "MOUNTAIN")
-           (?$,1D?(B consonant "LETTER FOR FAI" "FIRE")
-           (?$,1DA(B consonant "LETTER MOR MAR\"" "HORSE")
-           (?$,1DB(B consonant "LETTER GNOR GNAR" "MEDICINE")
-           (?$,1DC(B consonant "LETTER ROR ROD" "CAR")
-           (?$,1DE(B consonant "LETTER LOR LIING" "MONKEY")
-           (?$,1DG(B consonant "LETTER WOR WII" "HAND FAN")
-           (?$,1DJ(B consonant "LETTER SOR SEA" "TIGER")
-           (?$,1DK(B consonant "LETTER HHOR HHAI" "JAR")
-           (?$,1DM(B consonant "LETTER OR OOW" "TAKE")
-           (?$,1DN(B consonant "LETTER HOR HEA" "BOAT")
-           (?$,1DO(B special "ELLIPSIS")
-           (?$,1DP(B vowel-base "VOWEL SIGN SARA A")
-           (?$,1DQ(B vowel-upper "VOWEL SIGN MAI KAN")
-           (?$,1DR(B vowel-base "VOWEL SIGN SARA AR")
-           (?$,1DS(B vowel-base "VOWEL SIGN SARA AM")
-           (?$,1DT(B vowel-upper "VOWEL SIGN SARA I") 
-           (?$,1DU(B vowel-upper "VOWEL SIGN SARA II")
-           (?$,1DV(B vowel-upper "VOWEL SIGN SARA EU")
-           (?$,1DW(B vowel-upper "VOWEL SIGN SARA UR")
-           (?$,1DX(B vowel-lower "VOWEL SIGN SARA U")
-           (?$,1DY(B vowel-lower "VOWEL SIGN SARA UU")
-           (?$,1D[(B vowel-upper "VOWEL SIGN MAI KONG")
-           (?$,1D\(B semivowel-lower "SEMIVOWEL SIGN LO")
-           (?$,1D](B vowel-base "SEMIVOWEL SIGN SARA IA")
-           (?$,1D`(B vowel-base "VOWEL SIGN SARA EE")
-           (?$,1Da(B vowel-base "VOWEL SIGN SARA AA")
-           (?$,1Db(B vowel-base "VOWEL SIGN SARA OO")
-           (?$,1Dc(B vowel-base "VOWEL SIGN SARA EI MAI MUAN\"")
-           (?$,1Dd(B vowel-base "VOWEL SIGN SARA AI MAI MAY")
-           (?$,1Df(B special "KO LA (REPETITION)")
-           (?$,1Dh(B tone "TONE MAI EK")
-           (?$,1Di(B tone "TONE MAI THO")
-           (?$,1Dj(B tone "TONE MAI TI")
-           (?$,1Dk(B tone "TONE MAI JADTAWAR")
-           (?$,1Dl(B tone "CANCELLATION MARK")
-           (?$,1Dm(B vowel-upper "VOWEL SIGN SARA OR")
-           (?$,1Dp(B special "DIGIT ZERO")
-           (?$,1Dq(B special "DIGIT ONE")
-           (?$,1Dr(B special "DIGIT TWO")
-           (?$,1Ds(B special "DIGIT THREE")
-           (?$,1Dt(B special "DIGIT FOUR")
-           (?$,1Du(B special "DIGIT FIVE")
-           (?$,1Dv(B special "DIGIT SIX")
-           (?$,1Dw(B special "DIGIT SEVEN")
-           (?$,1Dx(B special "DIGIT EIGHT")
-           (?$,1Dy(B special "DIGIT NINE")
-           (?$,1D|(B consonant "LETTER NHOR NHUU" "MOUSE")
-           (?$,1D}(B consonant "LETTER MHOR MHAR" "DOG")))
+           (?(1~(B invalid nil)))
       elm)
   (while l
     (setq elm (car l) l (cdr l))
@@ -425,34 +361,34 @@
     ("(1S(B" (0 ?(1S(B))
 
     ;; Unicode equivalents
-    ("$,1DP(B" (0 ?$,1DP(B) (0 ?$,1DQ(B))
-    ("$,1DR(B" (0 ?$,1DR(B))
-    ("$,1DT(B" (0 ?$,1DU(B))
-    ("$,1DU(B" (0 ?$,1DU(B))
-    ("$,1DV(B" (0 ?$,1DV(B))
-    ("$,1DW(B" (0 ?$,1DW(B))
-    ("$,1DX(B" (0 ?$,1DX(B))
-    ("$,1DY(B" (0 ?$,1DY(B))
-    ("$,1D`DP(B" (?$,1D`(B 0 ?$,1DP(B) (?$,1D`(B 0 ?$,1DQ(B))
-    ("$,1D`(B" (?$,1D`(B 0))
-    ("$,1DaDP(B" (?$,1Da(B 0 ?$,1DP(B) (?$,1Da(B 0 ?$,1DQ(B))
-    ("$,1Da(B" (?$,1Da(B 0))
-    ("$,1DbDP(B" (?$,1Db(B 0 ?$,1DP(B) (0 ?$,1D[(B) (?$,1D-(B ?$,1Db(B 0 ?$,1DQ(B) (?$,1DG(B ?$,1Db(B 0 ?$,1DQ(B))
-    ("$,1Db(B" (?$,1Db(B 0))
-    ("$,1D`DRDP(B" (?$,1D`(B 0 ?$,1DR(B ?$,1DP(B) (0 ?$,1DQ(B ?$,1DM(B))
-    ("$,1Dm(B" (0 ?$,1Dm(B) (0 ?$,1DM(B))
-    ("$,1D`DT(B" (?$,1D`(B 0 ?$,1DT(B))
-    ("$,1D`DU(B" (?$,1D`(B 0 ?$,1DU(B))
-    ("$,1D[DGDP(B" (0 ?$,1D[(B ?$,1DG(B ?$,1DP(B) (0 ?$,1DQ(B ?$,1DG(B))
-    ("$,1D[DG(B" (0 ?$,1D[(B ?$,1DG(B) (0 ?$,1DG(B))
-    ("$,1D`DQD]DP(B" (?$,1D`(B 0 ?$,1DQ(B ?$,1D](B ?$,1DP(B) (0 ?$,1DQ(B ?$,1D](B))
-    ("$,1D`DQD](B" (?$,1D`(B 0 ?$,1DQ(B ?$,1D](B) (0 ?$,1D](B))
-    ("$,1D`DVDM(B" (?$,1D`(B 0 ?$,1DV(B ?$,1DM(B))
-    ("$,1D`DWDM(B" (?$,1D`(B 0 ?$,1DW(B ?$,1DM(B))
-    ("$,1Dd(B" (?$,1Dd(B 0))
-    ("$,1Dc(B" (?$,1Dc(B 0))
-    ("$,1D`D[DR(B" (?$,1D`(B 0 ?$,1D[(B ?$,1DR(B))
-    ("$,1DS(B" (0 ?$,1DS(B)))
+    ("(1P(B" (0 ?(1P(B) (0 ?(1Q(B))
+    ("(1R(B" (0 ?(1R(B))
+    ("(1T(B" (0 ?(1U(B))
+    ("(1U(B" (0 ?(1U(B))
+    ("(1V(B" (0 ?(1V(B))
+    ("(1W(B" (0 ?(1W(B))
+    ("(1X(B" (0 ?(1X(B))
+    ("(1Y(B" (0 ?(1Y(B))
+    ("(1`P(B" (?(1`(B 0 ?(1P(B) (?(1`(B 0 ?(1Q(B))
+    ("(1`(B" (?(1`(B 0))
+    ("(1aP(B" (?(1a(B 0 ?(1P(B) (?(1a(B 0 ?(1Q(B))
+    ("(1a(B" (?(1a(B 0))
+    ("(1bP(B" (?(1b(B 0 ?(1P(B) (0 ?(1[(B) (?(1-(B ?(1b(B 0 ?(1Q(B) (?(1G(B ?(1b(B 0 ?(1Q(B))
+    ("(1b(B" (?(1b(B 0))
+    ("(1`RP(B" (?(1`(B 0 ?(1R(B ?(1P(B) (0 ?(1Q(B ?(1M(B))
+    ("(1m(B" (0 ?(1m(B) (0 ?(1M(B))
+    ("(1`T(B" (?(1`(B 0 ?(1T(B))
+    ("(1`U(B" (?(1`(B 0 ?(1U(B))
+    ("(1[GP(B" (0 ?(1[(B ?(1G(B ?(1P(B) (0 ?(1Q(B ?(1G(B))
+    ("(1[G(B" (0 ?(1[(B ?(1G(B) (0 ?(1G(B))
+    ("(1`Q]P(B" (?(1`(B 0 ?(1Q(B ?(1](B ?(1P(B) (0 ?(1Q(B ?(1](B))
+    ("(1`Q](B" (?(1`(B 0 ?(1Q(B ?(1](B) (0 ?(1](B))
+    ("(1`VM(B" (?(1`(B 0 ?(1V(B ?(1M(B))
+    ("(1`WM(B" (?(1`(B 0 ?(1W(B ?(1M(B))
+    ("(1d(B" (?(1d(B 0))
+    ("(1c(B" (?(1c(B 0))
+    ("(1`[R(B" (?(1`(B 0 ?(1[(B ?(1R(B))
+    ("(1S(B" (0 ?(1S(B)))
   "Alist of Lao vowel string vs the corresponding re-ordering rule.
 Each element has this form:
         (VOWEL NO-MAA-SAKOD-RULE WITH-MAA-SAKOD-RULE (MAA-SAKOD-0 RULE-0) ...)
diff --git a/lisp/language/thai-util.el b/lisp/language/thai-util.el
index 35914c2cc5b..eaae6601c7d 100644
--- a/lisp/language/thai-util.el
+++ b/lisp/language/thai-util.el
@@ -2,8 +2,9 @@
 
 ;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
+;; Copyright (C) 2001 Free Software Foundation, Inc.
 
-;; Keywords: mule, multilingual, thai
+;; Keywords: mule, multilingual, Thai, i18n
 
 ;; This file is part of GNU Emacs.
 
@@ -139,95 +140,6 @@
            (?,T|(B invalid nil)                                               ; 0xFC
            (?,T}(B invalid nil)                                               ; 0xFD
            (?,T~(B invalid nil)                                               ; 0xFE
-
-           ;; Unicode equivalents
-           (?$,1Ba(B consonant "LETTER KO KAI")
-           (?$,1Bb(B consonant "LETTER KHO KHAI")
-           (?$,1Bc(B consonant "LETTER KHO KHUAT")
-           (?$,1Bd(B consonant "LETTER KHO KHWAI")
-           (?$,1Be(B consonant "LETTER KHO KHON")
-           (?$,1Bf(B consonant "LETTER KHO RAKHANG")
-           (?$,1Bg(B consonant "LETTER NGO NGU")
-           (?$,1Bh(B consonant "LETTER CHO CHAN")
-           (?$,1Bi(B consonant "LETTER CHO CHING")
-           (?$,1Bj(B consonant "LETTER CHO CHANG")
-           (?$,1Bk(B consonant "LETTER SO SO")
-           (?$,1Bl(B consonant "LETTER CHO CHOE")
-           (?$,1Bm(B consonant "LETTER YO YING")
-           (?$,1Bn(B consonant "LETTER DO CHADA")
-           (?$,1Bo(B consonant "LETTER TO PATAK")
-           (?$,1Bp(B consonant "LETTER THO THAN")
-           (?$,1Bq(B consonant "LETTER THO NANGMONTHO")
-           (?$,1Br(B consonant "LETTER THO PHUTHAO")
-           (?$,1Bs(B consonant "LETTER NO NEN")
-           (?$,1Bt(B consonant "LETTER DO DEK")
-           (?$,1Bu(B consonant "LETTER TO TAO")
-           (?$,1Bv(B consonant "LETTER THO THUNG")
-           (?$,1Bw(B consonant "LETTER THO THAHAN")
-           (?$,1Bx(B consonant "LETTER THO THONG")
-           (?$,1By(B consonant "LETTER NO NU")
-           (?$,1Bz(B consonant "LETTER BO BAIMAI")
-           (?$,1B{(B consonant "LETTER PO PLA")
-           (?$,1B|(B consonant "LETTER PHO PHUNG")
-           (?$,1B}(B consonant "LETTER FO FA")
-           (?$,1B~(B consonant "LETTER PHO PHAN")
-           (?$,1B(B consonant "LETTER FO FAN")
-           (?$,1C (B consonant "LETTER PHO SAMPHAO")
-           (?$,1C!(B consonant "LETTER MO MA")
-           (?$,1C"(B consonant "LETTER YO YAK")
-           (?$,1C#(B consonant "LETTER RO RUA")
-           (?$,1C$(B vowel-base "LETTER RU (Pali vowel letter)")
-           (?$,1C%(B consonant "LETTER LO LING")
-           (?$,1C&(B vowel-base "LETTER LU (Pali vowel letter)")
-           (?$,1C'(B consonant "LETTER WO WAEN")
-           (?$,1C((B consonant "LETTER SO SALA")
-           (?$,1C)(B consonant "LETTER SO RUSI")
-           (?$,1C*(B consonant "LETTER SO SUA")
-           (?$,1C+(B consonant "LETTER HO HIP")
-           (?$,1C,(B consonant "LETTER LO CHULA")
-           (?$,1C-(B consonant "LETTER O ANG")
-           (?$,1C.(B consonant "LETTER HO NOK HUK")
-           (?$,1C/(B special "PAI YAN NOI (abbreviation)")
-           (?$,1C0(B vowel-base "VOWEL SIGN SARA A")
-           (?$,1C1(B vowel-upper "VOWEL SIGN MAI HAN-AKAT N/S-T")
-           (?$,1C2(B vowel-base "VOWEL SIGN SARA AA")
-           (?$,1C3(B vowel-base "VOWEL SIGN SARA AM")
-           (?$,1C4(B vowel-upper "VOWEL SIGN SARA I N/S-T")
-           (?$,1C5(B vowel-upper "VOWEL SIGN SARA II N/S-T")
-           (?$,1C6(B vowel-upper "VOWEL SIGN SARA UE N/S-T")
-           (?$,1C7(B vowel-upper "VOWEL SIGN SARA UEE N/S-T")
-           (?$,1C8(B vowel-lower "VOWEL SIGN SARA U N/S-B")
-           (?$,1C9(B vowel-lower "VOWEL SIGN SARA UU N/S-B")
-           (?$,1C:(B vowel-lower "VOWEL SIGN PHINTHU N/S-B (Pali virama)")
-           (?$,1C?(B special "BAHT SIGN (currency symbol)")
-           (?$,1C@(B vowel-base "VOWEL SIGN SARA E")
-           (?$,1CA(B vowel-base "VOWEL SIGN SARA AE")
-           (?$,1CB(B vowel-base "VOWEL SIGN SARA O")
-           (?$,1CC(B vowel-base "VOWEL SIGN SARA MAI MUAN")
-           (?$,1CD(B vowel-base "VOWEL SIGN SARA MAI MALAI")
-           (?$,1CE(B vowel-base "LAK KHANG YAO")
-           (?$,1CF(B special "MAI YAMOK (repetion)")
-           (?$,1CG(B vowel-upper "VOWEL SIGN MAI TAI KHU N/S-T")
-           (?$,1CH(B tone "TONE MAI EK N/S-T")
-           (?$,1CI(B tone "TONE MAI THO N/S-T")
-           (?$,1CJ(B tone "TONE MAI TRI N/S-T")
-           (?$,1CK(B tone "TONE MAI CHATTAWA N/S-T")
-           (?$,1CL(B tone "THANTHAKHAT N/S-T (cancellation mark)")
-           (?$,1CM(B tone "NIKKHAHIT N/S-T (final nasal)")
-           (?$,1CN(B vowel-upper "YAMAKKAN N/S-T")
-           (?$,1CO(B special "FONRMAN")
-           (?$,1CP(B special "DIGIT ZERO")
-           (?$,1CQ(B special "DIGIT ONE")
-           (?$,1CR(B special "DIGIT TWO")
-           (?$,1CS(B special "DIGIT THREE")
-           (?$,1CT(B special "DIGIT FOUR")
-           (?$,1CU(B special "DIGIT FIVE")
-           (?$,1CV(B special "DIGIT SIX")
-           (?$,1CW(B special "DIGIT SEVEN")
-           (?$,1CX(B special "DIGIT EIGHT")
-           (?$,1CY(B special "DIGIT NINE")
-           (?$,1CZ(B special "ANGKHANKHU (ellipsis)")
-           (?$,1C[(B special "KHOMUT (beginning of religious texts)")
            ))
       elm)
   (while l