[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/international/utf-8.el
From: |
Kenichi Handa |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/international/utf-8.el |
Date: |
Wed, 27 Oct 2004 08:56:00 -0400 |
Index: emacs/lisp/international/utf-8.el
diff -c emacs/lisp/international/utf-8.el:1.43
emacs/lisp/international/utf-8.el:1.44
*** emacs/lisp/international/utf-8.el:1.43 Wed Oct 27 06:01:59 2004
--- emacs/lisp/international/utf-8.el Wed Oct 27 12:50:09 2004
***************
*** 258,265 ****
(funcall decode-char-no-trans (car x))
(funcall decode-char-no-trans (cdr x))))
ranges "")))
! ;; This forces loading tables for utf-translate-cjk-mode.
! (setq utf-translate-cjk-lang-env nil))
(defcustom utf-translate-cjk-unicode-range '((#x2e80 . #xd7a3)
(#xff00 . #xffef))
--- 258,268 ----
(funcall decode-char-no-trans (car x))
(funcall decode-char-no-trans (cdr x))))
ranges "")))
! ;; These forces loading and settting tables for
! ;; utf-translate-cjk-mode.
! (setq utf-translate-cjk-lang-env nil
! ucs-mule-cjk-to-unicode (make-hash-table :test 'eq)
! ucs-unicode-to-mule-cjk (make-hash-table :test 'eq)))
(defcustom utf-translate-cjk-unicode-range '((#x2e80 . #xd7a3)
(#xff00 . #xffef))
***************
*** 492,516 ****
;; 2-byte encoding 00000yyyyyxxxxxx = 110yyyyy 10xxxxxx
((r1 &= #x3F)
(r1 |= ((r0 & #x1F) << 6))
! ;; Now r2 holds scalar value. We don't have to check
;; `overlong sequence' because r0 >= 0xC2.
(if (r1 >= 256)
;; mule-unicode-0100-24ff (< 0800)
! ((r0 = ,(charset-id 'mule-unicode-0100-24ff))
! (r1 -= #x0100)
! (r2 = (((r1 / 96) + 32) << 7))
! (r1 %= 96)
! (r1 += (r2 + 32))
! (translate-character
! utf-translation-table-for-decode r0 r1)
(write-multibyte-character r0 r1)
(read r0)
(repeat))
(if (r1 >= 160)
;; latin-iso8859-1
! ((r1 -= 128)
! (write-multibyte-character r6 r1)
(read r0)
(repeat))
;; eight-bit-control
--- 495,526 ----
;; 2-byte encoding 00000yyyyyxxxxxx = 110yyyyy 10xxxxxx
((r1 &= #x3F)
(r1 |= ((r0 & #x1F) << 6))
! ;; Now r1 holds scalar value. We don't have to check
;; `overlong sequence' because r0 >= 0xC2.
(if (r1 >= 256)
;; mule-unicode-0100-24ff (< 0800)
! ((r0 = r1)
! (lookup-integer utf-subst-table-for-decode r0 r1)
! (if (r7 == 0)
! ((r0 = ,(charset-id 'mule-unicode-0100-24ff))
! (r1 -= #x0100)
! (r2 = (((r1 / 96) + 32) << 7))
! (r1 %= 96)
! (r1 += (r2 + 32))
! (translate-character
! utf-translation-table-for-decode r0 r1)))
(write-multibyte-character r0 r1)
(read r0)
(repeat))
(if (r1 >= 160)
;; latin-iso8859-1
! ((r0 = r1)
! (lookup-integer utf-subst-table-for-decode r0 r1)
! (if (r7 == 0)
! ((r1 -= 128)
! (write-multibyte-character r6 r1))
! ((write-multibyte-character r0 r1)))
(read r0)
(repeat))
;; eight-bit-control
***************
*** 549,561 ****
(if (r3 < #x2500)
;; mule-unicode-0100-24ff (>= 0800)
! ((r0 = ,(charset-id 'mule-unicode-0100-24ff))
! (r3 -= #x0100)
! (r3 //= 96)
! (r1 = (r7 + 32))
! (r1 += ((r3 + 32) << 7))
! (translate-character
! utf-translation-table-for-decode r0 r1)
(write-multibyte-character r0 r1)
(read r0)
(repeat)))
--- 559,574 ----
(if (r3 < #x2500)
;; mule-unicode-0100-24ff (>= 0800)
! ((r0 = r3)
! (lookup-integer utf-subst-table-for-decode r0 r1)
! (if (r7 == 0)
! ((r0 = ,(charset-id 'mule-unicode-0100-24ff))
! (r3 -= #x0100)
! (r3 //= 96)
! (r1 = (r7 + 32))
! (r1 += ((r3 + 32) << 7))
! (translate-character
! utf-translation-table-for-decode r0 r1)))
(write-multibyte-character r0 r1)
(read r0)
(repeat)))
***************
*** 949,957 ****
(unless (eobp)
(utf-translate-cjk-load-tables)
(setq range
! (concat range utf-translate-cjk-unicode-range-string))))
! (setq hash-table (get 'utf-subst-table-for-decode
! 'translation-hash-table)))
(while (and (skip-chars-forward range)
(not (eobp)))
(setq ch (following-char))
--- 962,970 ----
(unless (eobp)
(utf-translate-cjk-load-tables)
(setq range
! (concat range utf-translate-cjk-unicode-range-string)))
! (setq hash-table (get 'utf-subst-table-for-decode
! 'translation-hash-table))))
(while (and (skip-chars-forward range)
(not (eobp)))
(setq ch (following-char))