Merged from miles@gnu.org--gnu-2005 (patch 45-55, 214-231)

[gnu-emacs] / lisp / international / subst-jis.el

diff --git a/lisp/international/subst-jis.el b/lisp/international/subst-jis.el
index 5d3330ef2b0945a0564ed7df6506ac2a5ab313bd..2dfe3297ba0a1ea310d487dbad4b70b2cd2a2763 100644 (file)
--- a/lisp/international/subst-jis.el
+++ b/lisp/international/subst-jis.el
@@ -1,5 +1,5 @@
 ;;; subst-jis.el --- Unicode/JISX translation    -*-coding: euc-jp;-*-
-;; Copyright (C) 2002  Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: i18n
@@ -23,7 +23,7 @@
 
 ;; Provides translation tables between Unicode and
 ;; japanese-jisx0208/japanese-jisx0212 charsets for use by the
-;; `utf-translate-cjk' option.
+;; `utf-translate-cjk-mode' option.
 
 ;;; Code:
 
@@ -45,10 +45,11 @@
 (mapc
  (lambda (pair)
    (let ((unicode (car pair))
-        (char (cadr pair)))
-     ;; exclude non-CJK components from decode table
-     (if (and (>= unicode #x2e80) (<= unicode #xd7a3))
-        (puthash unicode  char ucs-unicode-to-mule-cjk))
+        (char (cadr pair))
+        (tail utf-translate-cjk-unicode-range))
+     ;; exclude non-supporting components from decode table
+     (if (utf-translate-cjk-substitutable-p unicode)
+        (puthash unicode char ucs-unicode-to-mule-cjk))
      (puthash char unicode ucs-mule-cjk-to-unicode)))
  '(
    ;; jisx0208
@@ -13000,6 +13001,73 @@
    (#x9fa2 ?\8fíá)
    (#x9fa3 ?\8fíâ)
    (#x9fa5 ?\8fíã)
-   (#xff5e ?\8f¢·)))
+   (#xff5e ?\8f¢·)
 
+   ;; jisx0201
+   (#xFF61 ?\8e¡)
+   (#xFF62 ?\\8e¢)
+   (#xFF63 ?\\8e£)
+   (#xFF64 ?\8e¤)
+   (#xFF65 ?\8e¥)
+   (#xFF66 ?\8e¦)
+   (#xFF67 ?\8e§)
+   (#xFF68 ?\8e¨)
+   (#xFF69 ?\8e©)
+   (#xFF6A ?\8eª)
+   (#xFF6B ?\8e«)
+   (#xFF6C ?\8e¬)
+   (#xFF6D ?\8e­)
+   (#xFF6E ?\8e®)
+   (#xFF6F ?\8e¯)
+   (#xFF70 ?\8e°)
+   (#xFF71 ?\8e±)
+   (#xFF72 ?\8e²)
+   (#xFF73 ?\8e³)
+   (#xFF74 ?\8e´)
+   (#xFF75 ?\8eµ)
+   (#xFF76 ?\8e¶)
+   (#xFF77 ?\8e·)
+   (#xFF78 ?\8e¸)
+   (#xFF79 ?\8e¹)
+   (#xFF7A ?\8eº)
+   (#xFF7B ?\8e»)
+   (#xFF7C ?\8e¼)
+   (#xFF7D ?\8e½)
+   (#xFF7E ?\8e¾)
+   (#xFF7F ?\8e¿)
+   (#xFF80 ?\8eÀ)
+   (#xFF81 ?\8eÁ)
+   (#xFF82 ?\8eÂ)
+   (#xFF83 ?\8eÃ)
+   (#xFF84 ?\8eÄ)
+   (#xFF85 ?\8eÅ)
+   (#xFF86 ?\8eÆ)
+   (#xFF87 ?\8eÇ)
+   (#xFF88 ?\8eÈ)
+   (#xFF89 ?\8eÉ)
+   (#xFF8A ?\8eÊ)
+   (#xFF8B ?\8eË)
+   (#xFF8C ?\8eÌ)
+   (#xFF8D ?\8eÍ)
+   (#xFF8E ?\8eÎ)
+   (#xFF8F ?\8eÏ)
+   (#xFF90 ?\8eÐ)
+   (#xFF91 ?\8eÑ)
+   (#xFF92 ?\8eÒ)
+   (#xFF93 ?\8eÓ)
+   (#xFF94 ?\8eÔ)
+   (#xFF95 ?\8eÕ)
+   (#xFF96 ?\8eÖ)
+   (#xFF97 ?\8e×)
+   (#xFF98 ?\8eØ)
+   (#xFF99 ?\8eÙ)
+   (#xFF9A ?\8eÚ)
+   (#xFF9B ?\8eÛ)
+   (#xFF9C ?\8eÜ)
+   (#xFF9D ?\8eÝ)
+   (#xFF9E ?\8eÞ)
+   (#xFF9F ?\8eß)
+   ))
+
+;;; arch-tag: 7f320453-b293-4159-af5e-6f0bab03048c
 ;;; subst-jis.el ends here