From: tomo <tomo>
Date: Mon, 31 Dec 2001 16:22:13 +0000 (+0000)
Subject: (Q94x94x60): New variable.
X-Git-Tag: r21-2-43-utf-2000-0_18-n4~8
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42925f796a6f8c643f9ed40412d3069e1c09dc2a;p=chise%2Fxemacs-chise.git

(Q94x94x60): New variable.
(charset_code_point): Support conversion `94x94x60'.
(Fmake_charset): Likewise.
(syms_of_mule_charset): Add new symbol `94x94x60'.
---

diff --git a/src/mule-charset.c b/src/mule-charset.c
index c703970..cace922 100644
--- a/src/mule-charset.c
+++ b/src/mule-charset.c
@@ -386,7 +386,7 @@ Lisp_Object Qleading_byte;
 Lisp_Object Qshort_name, Qlong_name;
 #ifdef UTF2000
 Lisp_Object Qmin_code, Qmax_code, Qcode_offset;
-Lisp_Object Qmother, Qconversion, Q94x60;
+Lisp_Object Qmother, Qconversion, Q94x60, Q94x94x60;
 #endif
 
 Lisp_Object Qascii,
@@ -1107,6 +1107,18 @@ charset_code_point (Lisp_Object charset, Emchar ch)
 		row += 18 + 32;
 	      return (row << 8) | cell;
 	    }
+	  else if ( XCHARSET_CONVERSION (charset) == CONVERSION_94x94x60 )
+	    {
+	      int plane =  d / (94 * 60) + 33;
+	      int row   = (d % (94 * 60)) / 94;
+	      int cell  =  d %  94 + 33;
+
+	      if (row < 30)
+		row += 16 + 32;
+	      else
+		row += 18 + 32;
+	      return (plane << 16) | (row << 8) | cell;
+	    }
 	  else if (XCHARSET_CHARS (charset) == 94)
 	    {
 	      if (XCHARSET_DIMENSION (charset) == 1)
@@ -1608,6 +1620,10 @@ character set.  Recognized properties are:
 	  {
 	    if (EQ (value, Q94x60))
 	      conversion = CONVERSION_94x60;
+	    else if (EQ (value, Q94x94x60))
+	      conversion = CONVERSION_94x94x60;
+	    else
+	      signal_simple_error ("Unrecognized conversion", value);
 	  }
 
 #endif
@@ -2399,6 +2415,7 @@ syms_of_mule_charset (void)
   defsymbol (&Qcode_offset, "code-offset");
   defsymbol (&Qconversion, "conversion");
   defsymbol (&Q94x60, "94x60");
+  defsymbol (&Q94x94x60, "94x94x60");
 #endif
 
   defsymbol (&Ql2r, "l2r");