XEmacs 21.2.19 "Shinjuku".

[chise/xemacs-chise.git.1] / lisp / mule / mule-misc.el

diff --git a/lisp/mule/mule-misc.el b/lisp/mule/mule-misc.el
index 5311b24..9b4906e 100644 (file)
--- a/lisp/mule/mule-misc.el
+++ b/lisp/mule/mule-misc.el
@@ -64,7 +64,7 @@ using a window system."
        (len (length string))
        (i 0))
     (while (< i len)
-      (setq col (+ col (charset-columns (char-charset (aref string i)))))
+      (setq col (+ col (charset-width (char-charset (aref string i)))))
       (setq i (1+ i)))
     col))
 
@@ -170,7 +170,7 @@ It returns only 1 in XEmacs.  It is for compatibility with MULE 2.3."
 
 (defun char-width (character)
   "Return number of columns a CHARACTER occupies when displayed."
-  (charset-columns (char-charset character)))
+  (charset-width (char-charset character)))
 
 (defalias 'char-columns 'char-width)
 (make-obsolete 'char-columns 'char-width)
@@ -314,4 +314,60 @@ when the language environment is made current."
 ;;   (put env-sym 'quail-environ-doc-string doc-string)
 ;;   (put env-sym 'set-quail-environ enable-function))
 
+
+;;; @ coding-system category
+;;;
+
+(defun coding-system-get (coding-system prop)
+  "Extract a value from CODING-SYSTEM's property list for property PROP."
+  (or (plist-get
+       (get (coding-system-name coding-system) 'coding-system-property)
+       prop)
+      (condition-case nil
+         (coding-system-property coding-system prop)
+       (error nil))))
+
+(defun coding-system-put (coding-system prop val)
+  "Change value in CODING-SYSTEM's property list PROP to VAL."
+  (put (coding-system-name coding-system)
+       'coding-system-property
+       (plist-put (get (coding-system-name coding-system)
+                      'coding-system-property)
+                 prop val)))
+
+(defun coding-system-category (coding-system)
+  "Return the coding category of CODING-SYSTEM."
+  (or (coding-system-get coding-system 'category)
+      (let ((type (coding-system-type coding-system)))
+       (cond ((eq type 'no-conversion)
+              'no-conversion)
+             ((eq type 'shift-jis)
+              'shift-jis)
+             ((eq type 'ucs-4)
+              'ucs-4)
+             ((eq type 'utf-8)
+              'utf-8)
+             ((eq type 'big5)
+              'big5)
+             ((eq type 'iso2022)
+              (cond ((coding-system-lock-shift coding-system)
+                     'iso-lock-shift)
+                    ((coding-system-seven coding-system)
+                     'iso-7)
+                    (t
+                     (let ((dim 0)
+                           ccs
+                           (i 0))
+                       (while (< i 4)
+                         (setq ccs (coding-system-charset coding-system i))
+                         (if (and ccs
+                                  (> (charset-dimension ccs) dim))
+                             (setq dim (charset-dimension ccs))
+                           )
+                         (setq i (1+ i)))
+                       (cond ((= dim 1) 'iso-8-1)
+                             ((= dim 2) 'iso-8-2)
+                             (t 'iso-8-designate))
+                       ))))))))
+           
 ;;; mule-misc.el ends here