Sync up with r21-4-10-utf-2000-0_20-ucs-ks-l.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9b983a7..64aa38b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,12 @@
+2003-03-02  MORIOKA Tomohiko  <tomo@mousai.as.wakwak.ne.jp>
+
+       * mule/mule-conf.el (ucs-ks): New coded-charsets when `utf-2000'
+       is provided [was builtin coded-charsets].
+
 2003-03-01  MORIOKA Tomohiko  <tomo@mousai.as.wakwak.ne.jp>
 
        * mule/mule-conf.el (ideograph-daikanwa-2): New coded-charsets
-       when `utf-2000' is provided
-       [was builtin coded-charsets].
+       when `utf-2000' is provided [was builtin coded-charsets].
 
 2003-02-28  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 

diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el
index 03026c7..7c7f64d 100644 (file)
--- a/lisp/mule/mule-conf.el
+++ b/lisp/mule/mule-conf.el
@@ -157,6 +157,15 @@
                  graphic       2
                  direction     l2r
                  mother        ucs-jis))
+  (make-charset 'ucs-ks
+               "UCS for KS"
+               `(long-name     "ISO/IEC 10646 for Korean Standards"
+                 chars         256
+                 dimension     3
+                 columns       2
+                 graphic       2
+                 direction     l2r
+                 mother        ucs))
   (make-charset 'ucs-big5
                "UCS for Big5"
                `(long-name     "ISO/IEC 10646 for Big5"

diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog
index 95a4231..b456aa5 100644 (file)
--- a/lisp/utf-2000/ChangeLog
+++ b/lisp/utf-2000/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-02  MORIOKA Tomohiko  <tomo@mousai.as.wakwak.ne.jp>
+
+       * Ideograph-R072-Sun.el: Reformatted.
+
 2003-02-28  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
        * Ideograph-R189-Tall.el, Ideograph-R210-Even.el,

diff --git a/lisp/utf-2000/Ideograph-R072-Sun.el b/lisp/utf-2000/Ideograph-R072-Sun.el
index 08020e0..a6b317a 100644 (file)
--- a/lisp/utf-2000/Ideograph-R072-Sun.el
+++ b/lisp/utf-2000/Ideograph-R072-Sun.el
@@ -3245,8 +3245,8 @@
     (korean-ksc5601    . #x4F7C)       ; ø»‰Ÿ‹
     (japanese-jisx0212 . #x4247)       ; ø»‹•”
     (ideograph-daikanwa . 14005)       ; ø¸ƒšµ
-    (ucs-ks            . #x6677)       ; ø»‰Ÿ‹
     (=ucs-jis-1990     . #x6677)       ; ø»‰Ÿ‹
+    (ucs-ks            . #x6677)       ; ø»‰Ÿ‹
     ))
 (define-char
   '((morohashi-daikanwa        14005 0 1)

diff --git a/src/ChangeLog b/src/ChangeLog
index 0f5c7bf..90200b8 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2003-03-02  MORIOKA Tomohiko  <tomo@mousai.as.wakwak.ne.jp>
+
+       * char-ucs.h (LEADING_BYTE_UCS_KS): Deleted.
+
+       * mule-charset.c (Vcharset_ucs_ks): Deleted.
+       (Qucs_ks): Deleted.
+       (syms_of_mule_charset): Delete `ucs-ks'.
+       (complex_vars_of_mule_charset): Likewise.
+
 2003-03-01  MORIOKA Tomohiko  <tomo@mousai.as.wakwak.ne.jp>
 
        * mule-charset.c (Vcharset_ideograph_daikanwa_2): Deleted.

diff --git a/src/char-ucs.h b/src/char-ucs.h
index 893ff6f..658888c 100644 (file)
--- a/src/char-ucs.h
+++ b/src/char-ucs.h
@@ -85,9 +85,6 @@ typedef short Charset_ID;
 /* ISO/IEC 10646 for JIS */
 #define LEADING_BYTE_UCS_JIS           (MIN_LEADING_BYTE + 8)
 
-/* ISO/IEC 10646 for KS */
-#define LEADING_BYTE_UCS_KS            (MIN_LEADING_BYTE + 9)
-
 /* Japanese JIS X0208 Common   2/4 2/{(8),9,10,11} 4/2 (B) */
 #define LEADING_BYTE_JIS_X0208                 (MIN_LEADING_BYTE + 11)
 

diff --git a/src/mule-charset.c b/src/mule-charset.c
index 296a025..11f6d76 100644 (file)
--- a/src/mule-charset.c
+++ b/src/mule-charset.c
@@ -71,7 +71,6 @@ Lisp_Object Vcharset_ucs_sip;
 Lisp_Object Vcharset_ucs_gb;
 Lisp_Object Vcharset_ucs_cns;
 Lisp_Object Vcharset_ucs_jis;
-Lisp_Object Vcharset_ucs_ks;
 Lisp_Object Vcharset_latin_viscii;
 Lisp_Object Vcharset_latin_tcvn5712;
 Lisp_Object Vcharset_latin_viscii_lower;
@@ -314,7 +313,6 @@ Lisp_Object Qascii,
   Qucs_gb,
   Qucs_cns,
   Qucs_jis,
-  Qucs_ks,
   Qlatin_viscii,
   Qlatin_tcvn5712,
   Qlatin_viscii_lower,
@@ -2386,7 +2384,6 @@ syms_of_mule_charset (void)
   defsymbol (&Qucs_gb,                 "ucs-gb");
   defsymbol (&Qucs_cns,                        "ucs-cns");
   defsymbol (&Qucs_jis,                        "ucs-jis");
-  defsymbol (&Qucs_ks,                 "ucs-ks");
   defsymbol (&Qlatin_viscii,           "latin-viscii");
   defsymbol (&Qlatin_tcvn5712,         "latin-tcvn5712");
   defsymbol (&Qlatin_viscii_lower,     "latin-viscii-lower");
@@ -2533,15 +2530,6 @@ complex_vars_of_mule_charset (void)
                  ("ISO/IEC 10646 for JIS X 0208, 0212 and 0213"),
                  build_string (""),
                  Qnil, 0, 0, 0, 0, Vcharset_ucs, CONVERSION_IDENTICAL);
-  staticpro (&Vcharset_ucs_ks);
-  Vcharset_ucs_ks =
-    make_charset (LEADING_BYTE_UCS_KS, Qucs_ks, 256, 3,
-                 2, 2, 0, CHARSET_LEFT_TO_RIGHT,
-                 build_string ("UCS for KS"),
-                 build_string ("UCS for CCS defined by KS"),
-                 build_string ("ISO/IEC 10646 for Korean Standards"),
-                 build_string (""),
-                 Qnil, 0, 0, 0, 0, Vcharset_ucs, CONVERSION_IDENTICAL);
 #else
 # define MIN_CHAR_THAI 0
 # define MAX_CHAR_THAI 0