From: tomo <tomo>
Date: Mon, 16 Dec 2002 16:37:32 +0000 (+0000)
Subject: Sync with r21-2-19-utf-2000-0_8-0.
X-Git-Tag: r21-4-10-kanon-0_8-0
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=15c49baab0fc619042dd25ffe5e5db96d92518e5;p=chise%2Fxemacs-chise.git

Sync with r21-2-19-utf-2000-0_8-0.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 964375d..2e91401 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,13 @@
 1999-09-14  MORIOKA Tomohiko  <tomo@etl.go.jp>
 
+	* mule-charset.c: Update `utf-2000-version' to 0.8 (Kami).
+
+1999-09-14  MORIOKA Tomohiko  <tomo@etl.go.jp>
+
+	* char-ucs.h (MAKE_CHAR): Fix problem in 2-dimension charset.
+
+1999-09-14  MORIOKA Tomohiko  <tomo@etl.go.jp>
+
 	* mule-charset.c (latin_iso8859_2_to_ucs NULL): Add pseudo
 	definition for non-UTF-2000 Mule.
 	(latin_iso8859_3_to_ucs): Likewise.
diff --git a/src/char-ucs.h b/src/char-ucs.h
index 0418aea..b243fbd 100644
--- a/src/char-ucs.h
+++ b/src/char-ucs.h
@@ -371,7 +371,13 @@ MAKE_CHAR (Lisp_Object charset, int c1, int c2)
       /* return MIN_CHAR_94 + ('I' - '0') * 94 + (c1 - 33); */
       return ' ';
   else if (CHARSET_UCS_MAX (XCHARSET (charset)))
-    return c1 - CHARSET_CODE_OFFSET (XCHARSET (charset))
+    return (XCHARSET_DIMENSION (charset) == 1
+	    ?
+	    c1 - CHARSET_CODE_OFFSET (XCHARSET (charset))
+	    :
+	    (c1 - CHARSET_CODE_OFFSET (XCHARSET (charset)))
+	    * XCHARSET_CHARS (charset)
+	    + c2  - CHARSET_CODE_OFFSET (XCHARSET (charset)))
       + CHARSET_UCS_MIN (XCHARSET (charset));
   else if (XCHARSET_DIMENSION (charset) == 1)
     {
diff --git a/src/mule-charset.c b/src/mule-charset.c
index b1e791f..f0cb41e 100644
--- a/src/mule-charset.c
+++ b/src/mule-charset.c
@@ -2509,7 +2509,7 @@ Leading-code of private TYPE9N charset of column-width 1.
 #endif
 
 #ifdef UTF2000
-  Vutf_2000_version = build_string("0.7 (Hirano)");
+  Vutf_2000_version = build_string("0.8 (Kami)");
   DEFVAR_LISP ("utf-2000-version", &Vutf_2000_version /*
 Version number of UTF-2000.
 */ );