Add 2010 to copyright years.

[bpt/emacs.git] / leim / quail / uni-input.el

diff --git a/leim/quail/uni-input.el b/leim/quail/uni-input.el
index 88f5ec6..4577150 100644 (file)
--- a/leim/quail/uni-input.el
+++ b/leim/quail/uni-input.el
@@ -1,8 +1,8 @@
 ;;; uni-input.el --- Hex Unicode input method
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 ;;   Free Software Foundation, Inc.
-;; Copyright (C) 2004, 2005, 2006, 2007
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
@@ -11,20 +11,18 @@
 
 ;; This file is part of GNU Emacs.
 
-;; This file is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
-;; This file is distributed in the hope that it will be useful,
+;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -34,42 +32,16 @@
 ;; This is not really a Quail method, but uses some Quail functions.
 ;; There is probably A Better Way.
 
-;; Compare `ucs-insert', which explicitly inserts a unicoded character
-;; rather than supplying an input method.
+;; You can get a similar effect by using C-q with
+;; `read-quoted-char-radix' set to 16.
+
+;; Note that this only allows you to enter BMP values unless someone
+;; extends it to use variable numbers of digits.
 
 ;;; Code:
 
 (require 'quail)
 
-;; Maybe stolen from Mule-UCS -- I don't remember.
-(define-ccl-program utf-8-ccl-encode
-  `(4 (if (r0 < ?\x80)
-       ((write r0))
-      (if (r0 < #x800)
-         ((write ((r0 >> 6) | ?\xC0))
-          (write ((r0 & ?\x3F) | ?\x80)))
-       (if (r0 < #x10000)
-           ((write ((r0 >> 12) | ?\xE0))
-            (write (((r0 >> 6) & ?\x3F) | ?\x80))
-            (write ((r0 & ?\x3F) | ?\x80)))
-         (if (r0 < #x200000)
-             ((write ((r0 >> 18) | ?\xF0))
-              (write (((r0 >> 12) & ?\x3F) | ?\x80))
-              (write (((r0 >> 6) & ?\x3F) | ?\x80))
-              (write ((r0 & ?\x3F) | ?\x80)))
-           (if (r0 < #x4000000)
-               ((write ((r0 >> 24) | ?\xF8))
-                (write (((r0 >> 18) & ?\x3F) | ?\x80))
-                (write (((r0 >> 12) & ?\x3F) | ?\x80))
-                (write (((r0 >> 6) & ?\x3F) | ?\x80))
-                (write ((r0 & ?\x3F) | ?\x80)))
-             ((write ((r0 >> 30) | ?\xFC))
-              (write (((r0 >> 24) & ?\x3F) | ?\x80))
-              (write (((r0 >> 18) & ?\x3F) | ?\x80))
-              (write (((r0 >> 12) & ?\x3F) | ?\x80))
-              (write (((r0 >> 6) & ?\x3F) | ?\x80))
-              (write ((r0 & ?\x3F) | ?\x80))))))))))
-
 (defun ucs-input-insert-char (char)
   (insert char)
   (move-overlay quail-overlay (overlay-start quail-overlay) (point)))
@@ -97,7 +69,7 @@
                           (= 1 (length seq))
                           (setq key (aref seq 0))
                           (memq key '(?0 ?1 ?2 ?3 ?4 ?5 ?6 ?7 ?8 ?9 ?a
-                                      ?b ?c ?d ?e ?f ?A ?B ?C ?D ?E ?F)))
+                                         ?b ?c ?d ?e ?f ?A ?B ?C ?D ?E ?F)))
                      (progn
                        (push key events)
                        (ucs-input-insert-char key))
@@ -105,20 +77,11 @@
                    (throw 'non-digit (append (reverse events)
                                              (listify-key-sequence seq))))))
              (quail-delete-region)
-             (let* ((n (string-to-number (apply 'string
-                                                (cdr (nreverse events)))
-                                         16))
-                    (c (decode-char 'ucs n)))
-               (if c
-                   (list c)
-                 ;; The intention of the following code is to insert
-                 ;; a correct UTF-8 sequence by raw bytes, but
-                 ;; currently it doesn't work.
-                 ;; (let ((status (make-vector 9 nil)))
-                 ;;   (aset status 0 n)
-                 ;;   (string-to-list (ccl-execute-on-string
-                 ;;                    'utf-8-ccl-encode status "")))
-                 (error "Character U+%04X is not yet supported" n)))))
+             (let ((n (string-to-number (apply 'string
+                                           (cdr (nreverse events)))
+                                    16)))
+               (if (characterp n)
+                   (list n)))))
        (quail-delete-overlays)
        (set-buffer-modified-p modified-p)
        (run-hooks 'input-method-after-insert-chunk-hook)))))
@@ -164,5 +127,5 @@ Input as Unicode: U<hex> or u<hex>, where <hex> is a four-digit hex number.")))
 
 (provide 'uni-input)
 
-;;; arch-tag: e0d91c7c-19a1-43d3-8f2b-28c0e031efaa
+;; arch-tag: e0d91c7c-19a1-43d3-8f2b-28c0e031efaa
 ;;; uni-input.el ends here