diff options
Diffstat (limited to 'lisp/language')
-rw-r--r-- | lisp/language/china-util.el | 2 | ||||
-rw-r--r-- | lisp/language/cyrillic.el | 16 | ||||
-rw-r--r-- | lisp/language/english.el | 8 | ||||
-rw-r--r-- | lisp/language/ethio-util.el | 4 | ||||
-rw-r--r-- | lisp/language/european.el | 10 | ||||
-rw-r--r-- | lisp/language/georgian.el | 2 | ||||
-rw-r--r-- | lisp/language/hebrew.el | 11 | ||||
-rw-r--r-- | lisp/language/ind-util.el | 16 | ||||
-rw-r--r-- | lisp/language/indian.el | 2 | ||||
-rw-r--r-- | lisp/language/japan-util.el | 96 | ||||
-rw-r--r-- | lisp/language/japanese.el | 6 | ||||
-rw-r--r-- | lisp/language/lao-util.el | 6 | ||||
-rw-r--r-- | lisp/language/misc-lang.el | 4 | ||||
-rw-r--r-- | lisp/language/romanian.el | 2 | ||||
-rw-r--r-- | lisp/language/thai-util.el | 15 | ||||
-rw-r--r-- | lisp/language/thai-word.el | 2 | ||||
-rw-r--r-- | lisp/language/tibetan.el | 2 | ||||
-rw-r--r-- | lisp/language/tv-util.el | 2 | ||||
-rw-r--r-- | lisp/language/utf-8-lang.el | 32 | ||||
-rw-r--r-- | lisp/language/vietnamese.el | 4 |
20 files changed, 124 insertions, 118 deletions
diff --git a/lisp/language/china-util.el b/lisp/language/china-util.el index 70710bac18a..16385651335 100644 --- a/lisp/language/china-util.el +++ b/lisp/language/china-util.el @@ -168,7 +168,7 @@ Return the length of resulting text." ;; ESC ESC -> ESC (delete-char 1) (forward-char -1) - (if (looking-at iso2022-gb-designation) + (if (looking-at "\e\\$A") (progn (delete-region (match-beginning 0) (match-end 0)) (insert hz-gb-designation) diff --git a/lisp/language/cyrillic.el b/lisp/language/cyrillic.el index 7e714a43e3e..564ac5f5921 100644 --- a/lisp/language/cyrillic.el +++ b/lisp/language/cyrillic.el @@ -9,7 +9,7 @@ ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H13PRO009 -;; Author: Kenichi Handa <handa@etl.go.jp> +;; Author: Kenichi Handa <handa@gnu.org> ;; Keywords: multilingual, Cyrillic, i18n ;; This file is part of GNU Emacs. @@ -95,7 +95,7 @@ (define-coding-system-alias 'cp878 'cyrillic-koi8) (set-language-info-alist - "Cyrillic-KOI8" `((charset koi8) + "Cyrillic-KOI8" '((charset koi8) (coding-system cyrillic-koi8) (coding-priority cyrillic-koi8 cyrillic-iso-8bit) (ctext-non-standard-encodings "koi8-r") @@ -131,7 +131,7 @@ Support for Russian using koi8-r and the russian-computer input method.") :mime-charset 'koi8-u) (set-language-info-alist - "Ukrainian" `((charset koi8-u) + "Ukrainian" '((charset koi8-u) (coding-system koi8-u) (coding-priority koi8-u) (nonascii-translation . koi8-u) @@ -151,7 +151,7 @@ Support for Russian using koi8-r and the russian-computer input method.") (define-coding-system-alias 'alternativnyj 'cyrillic-alternativnyj) (set-language-info-alist - "Cyrillic-ALT" `((charset alternativnyj) + "Cyrillic-ALT" '((charset alternativnyj) (coding-system cyrillic-alternativnyj) (coding-priority cyrillic-alternativnyj) (nonascii-translation . alternativnyj) @@ -229,7 +229,7 @@ Support for Russian using koi8-r and the russian-computer input method.") ;; '("Cyrillic")) (set-language-info-alist - "Tajik" `((coding-system koi8-t) + "Tajik" '((coding-system koi8-t) (coding-priority koi8-t) (nonascii-translation . cyrillic-koi8-t) (charset koi8-t) @@ -239,7 +239,7 @@ Support for Russian using koi8-r and the russian-computer input method.") '("Cyrillic")) (set-language-info-alist - "Bulgarian" `((coding-system windows-1251) + "Bulgarian" '((coding-system windows-1251) (coding-priority windows-1251) (nonascii-translation . windows-1251) (charset windows-1251) @@ -250,7 +250,7 @@ Support for Russian using koi8-r and the russian-computer input method.") '("Cyrillic")) (set-language-info-alist - "Belarusian" `((coding-system windows-1251) + "Belarusian" '((coding-system windows-1251) (coding-priority windows-1251) (nonascii-translation . windows-1251) (charset windows-1251) @@ -262,7 +262,7 @@ Support for Russian using koi8-r and the russian-computer input method.") '("Cyrillic")) (set-language-info-alist - "Ukrainian" `((coding-system koi8-u) + "Ukrainian" '((coding-system koi8-u) (coding-priority koi8-u) (input-method . "ukrainian-computer") (documentation diff --git a/lisp/language/english.el b/lisp/language/english.el index ee458760dab..09ed423f2cc 100644 --- a/lisp/language/english.el +++ b/lisp/language/english.el @@ -62,6 +62,14 @@ Nothing special is needed to handle English.") :mnemonic ?*) (define-coding-system-alias 'cp1047 'ibm1047) +(define-coding-system 'ibm038 + "International version of EBCDIC" + :coding-type 'charset + :charset-list '(ibm038) + :mnemonic ?*) +(define-coding-system-alias 'ebcdic-int 'ibm038) +(define-coding-system-alias 'cp038 'ibm038) + ;; Make "ASCII" an alias of "English" language environment. (set-language-info-alist "ASCII" (cdr (assoc "English" language-info-alist))) diff --git a/lisp/language/ethio-util.el b/lisp/language/ethio-util.el index afc2239fbf5..2741538e68a 100644 --- a/lisp/language/ethio-util.el +++ b/lisp/language/ethio-util.el @@ -804,7 +804,7 @@ The 2nd and 3rd arguments BEGIN and END specify the region." ;; Special Ethiopic punctuation. (goto-char (point-min)) - (while (re-search-forward "\\ce[»\\.\\?]\\|«\\ce" nil t) + (while (re-search-forward "\\ce[».?]\\|«\\ce" nil t) (cond ((= (setq ch (preceding-char)) ?\») (delete-char -1) @@ -1014,7 +1014,7 @@ With ARG, insert that many delimiters." ;; ;;;###autoload -(defun ethio-composition-function (pos to font-object string) +(defun ethio-composition-function (pos to font-object string _direction) (setq pos (1- pos)) (let ((pattern "\\ce\\(፟\\|\\)")) (if string diff --git a/lisp/language/european.el b/lisp/language/european.el index a5bec8cf017..fedbca4eb69 100644 --- a/lisp/language/european.el +++ b/lisp/language/european.el @@ -525,7 +525,7 @@ method and applying Turkish case rules for the characters i, I, ı, İ."))) (set-case-syntax ?ı "w" table))) ;; Polish ISO 8859-2 environment. -;; Maintainer: Wlodek Bzyl <matwb@univ.gda.pl> +;; Maintainer: Włodek Bzyl <matwb@univ.gda.pl> ;; Keywords: multilingual, Polish (set-language-info-alist @@ -541,7 +541,7 @@ method and applying Turkish case rules for the characters i, I, ı, İ."))) '("European")) (set-language-info-alist - "Welsh" `((coding-system utf-8 latin-8) ; the input method is Unicode-based + "Welsh" '((coding-system utf-8 latin-8) ; the input method is Unicode-based (coding-priority utf-8 latin-8) (nonascii-translation . iso-8859-14) (input-method . "welsh") @@ -558,7 +558,7 @@ method and applying Turkish case rules for the characters i, I, ı, İ."))) '("European")) (set-language-info-alist - "Latin-7" `((coding-system latin-7) + "Latin-7" '((coding-system latin-7) (coding-priority latin-7) (nonascii-translation . iso-8859-13) (input-method . "latin-prefix") @@ -566,7 +566,7 @@ method and applying Turkish case rules for the characters i, I, ı, İ."))) '("European")) (set-language-info-alist - "Lithuanian" `((coding-system latin-7 windows-1257) + "Lithuanian" '((coding-system latin-7 windows-1257) (coding-priority latin-7) (nonascii-translation . iso-8859-13) (input-method . "lithuanian-keyboard") @@ -574,7 +574,7 @@ method and applying Turkish case rules for the characters i, I, ı, İ."))) '("European")) (set-language-info-alist - "Latvian" `((coding-system latin-7 windows-1257) + "Latvian" '((coding-system latin-7 windows-1257) (coding-priority latin-7) (nonascii-translation . iso-8859-13) (input-method . "latvian-keyboard") diff --git a/lisp/language/georgian.el b/lisp/language/georgian.el index 41c1ead8ca3..2c3d3fbc87b 100644 --- a/lisp/language/georgian.el +++ b/lisp/language/georgian.el @@ -37,7 +37,7 @@ :charset-list '(georgian-academy)) (set-language-info-alist - "Georgian" `((coding-system georgian-ps) + "Georgian" '((coding-system georgian-ps) (coding-priority georgian-ps) (input-method . "georgian") (nonascii-translation . georgian-ps) diff --git a/lisp/language/hebrew.el b/lisp/language/hebrew.el index ca3058b8eed..cda5765c7f6 100644 --- a/lisp/language/hebrew.el +++ b/lisp/language/hebrew.el @@ -152,7 +152,7 @@ Bidirectional editing is supported."))) ;; (3) If the font has precomposed glyphs, use them as far as ;; possible. Adjust the remaining glyphs artificially. -(defun hebrew-shape-gstring (gstring) +(defun hebrew-shape-gstring (gstring direction) (let* ((font (lgstring-font gstring)) (otf (font-get font :otf)) (nchars (lgstring-char-len gstring)) @@ -172,7 +172,7 @@ Bidirectional editing is supported."))) ((or (assq 'hebr (car otf)) (assq 'hebr (cdr otf))) ;; FONT has OpenType features for Hebrew. - (font-shape-gstring gstring)) + (font-shape-gstring gstring direction)) (t ;; FONT doesn't have OpenType features for Hebrew. @@ -217,7 +217,7 @@ Bidirectional editing is supported."))) ;; Now IDX is an index to the first non-precomposed glyph. ;; Adjust positions of the remaining glyphs artificially. (if (font-get font :combining-capability) - (font-shape-gstring gstring) + (font-shape-gstring gstring direction) (setq base-width (lglyph-width (lgstring-glyph gstring 0))) (while (< idx nglyphs) (setq glyph (lgstring-glyph gstring idx)) @@ -238,8 +238,9 @@ Bidirectional editing is supported."))) (setq idx (1+ idx))))))) gstring)) -(let* ((base "[\u05D0-\u05F2]") - (combining "[\u0591-\u05BD\u05BF\u05C1-\u05C2\u05C4-\u05C5\u05C7]+") +(let* ((base "[\u05D0-\u05F2\uFB1D\uFB1F-\uFB28\uFB2A-\uFB4F]") + (combining + "[\u0591-\u05BD\u05BF\u05C1-\u05C2\u05C4-\u05C5\u05C7\uFB1E]+") (pattern1 (concat base combining)) (pattern2 (concat base "\u200D" combining))) (set-char-table-range diff --git a/lisp/language/ind-util.el b/lisp/language/ind-util.el index 9b4af199858..beba2df1aeb 100644 --- a/lisp/language/ind-util.el +++ b/lisp/language/ind-util.el @@ -2,7 +2,6 @@ ;; Copyright (C) 2001-2019 Free Software Foundation, Inc. -;; Maintainer: KAWABATA, Taichi <kawabata@m17n.org> ;; Keywords: multilingual, Indian, Devanagari ;; This file is part of GNU Emacs. @@ -776,13 +775,13 @@ (defvar is13194-to-ucs-kannada-hashtbl nil) (defvar is13194-to-ucs-kannada-regexp nil) -(defvar ucs-to-is13194-regexp +(defvar indian-ucs-to-is13194-regexp ;; only Devanagari is supported now. (concat "[" (char-to-string #x0900) "-" (char-to-string #x097f) "]") "Regexp that matches to conversion") -(defun ucs-to-iscii-region (from to) +(defun indian-ucs-to-iscii-region (from to) "Converts the indian UCS characters in the region to ISCII. Returns new end position." (interactive "r") @@ -792,13 +791,13 @@ Returns new end position." (narrow-to-region from to) (goto-char (point-min)) (let* ((current-repertory is13194-default-repertory)) - (while (re-search-forward ucs-to-is13194-regexp nil t) + (while (re-search-forward indian-ucs-to-is13194-regexp nil t) (replace-match (get-char-code-property (string-to-char (match-string 0)) 'iscii)))) (point-max)))) -(defun iscii-to-ucs-region (from to) +(defun indian-iscii-to-ucs-region (from to) "Converts the ISCII characters in the region to UCS. Returns new end position." (interactive "r") @@ -829,6 +828,9 @@ Returns new end position." (let ((pos from) newpos func (max to)) (narrow-to-region from to) (while (< pos max) + ;; FIXME: The below seems to assume + ;; composition-function-table holds functions? That is no + ;; longer true, since long ago. (setq func (aref composition-function-table (char-after pos))) (if (fboundp func) (setq newpos (funcall func pos nil) @@ -846,7 +848,7 @@ Returns new end position." ;;;###autoload (defun in-is13194-post-read-conversion (len) (let ((pos (point)) endpos) - (setq endpos (iscii-to-ucs-region pos (+ pos len))) + (setq endpos (indian-iscii-to-ucs-region pos (+ pos len))) (- endpos pos))) ;;;###autoload @@ -856,7 +858,7 @@ Returns new end position." (if (stringp from) (insert from) (insert-buffer-substring buf from to)) - (ucs-to-iscii-region (point-min) (point-max)) + (indian-ucs-to-iscii-region (point-min) (point-max)) nil)) diff --git a/lisp/language/indian.el b/lisp/language/indian.el index d63e9b465fa..f1e61a354c2 100644 --- a/lisp/language/indian.el +++ b/lisp/language/indian.el @@ -5,8 +5,6 @@ ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 -;; Maintainer: Kenichi Handa <handa@m17n.org> -;; KAWABATA, Taichi <kawabata@m17n.org> ;; Keywords: multilingual, i18n, Indian ;; This file is part of GNU Emacs. diff --git a/lisp/language/japan-util.el b/lisp/language/japan-util.el index fd27ae220bd..b1eb3d9127b 100644 --- a/lisp/language/japan-util.el +++ b/lisp/language/japan-util.el @@ -1,4 +1,4 @@ -;;; japan-util.el --- utilities for Japanese -*- coding: iso-2022-7bit; -*- +;;; japan-util.el --- utilities for Japanese ;; Copyright (C) 2001-2019 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, @@ -29,36 +29,34 @@ ;;;###autoload (defun setup-japanese-environment-internal () - ;; By default, we use 'japanese-iso-8bit for file names. But, the - ;; following prefer-coding-system will override it. - (if (memq system-type '(windows-nt ms-dos cygwin)) - (prefer-coding-system 'japanese-shift-jis) - (prefer-coding-system 'japanese-iso-8bit)) + (prefer-coding-system (if (memq system-type '(windows-nt ms-dos cygwin)) + 'japanese-shift-jis + 'utf-8)) (use-cjk-char-width-table 'ja_JP)) (defconst japanese-kana-table - '((?$B$"(B ?$B%"(B ?(I1(B) (?$B$$(B ?$B%$(B ?(I2(B) (?$B$&(B ?$B%&(B ?(I3(B) (?$B$((B ?$B%((B ?(I4(B) (?$B$*(B ?$B%*(B ?(I5(B) - (?$B$+(B ?$B%+(B ?(I6(B) (?$B$-(B ?$B%-(B ?(I7(B) (?$B$/(B ?$B%/(B ?(I8(B) (?$B$1(B ?$B%1(B ?(I9(B) (?$B$3(B ?$B%3(B ?(I:(B) - (?$B$5(B ?$B%5(B ?(I;(B) (?$B$7(B ?$B%7(B ?(I<(B) (?$B$9(B ?$B%9(B ?(I=(B) (?$B$;(B ?$B%;(B ?(I>(B) (?$B$=(B ?$B%=(B ?(I?(B) - (?$B$?(B ?$B%?(B ?(I@(B) (?$B$A(B ?$B%A(B ?(IA(B) (?$B$D(B ?$B%D(B ?(IB(B) (?$B$F(B ?$B%F(B ?(IC(B) (?$B$H(B ?$B%H(B ?(ID(B) - (?$B$J(B ?$B%J(B ?(IE(B) (?$B$K(B ?$B%K(B ?(IF(B) (?$B$L(B ?$B%L(B ?(IG(B) (?$B$M(B ?$B%M(B ?(IH(B) (?$B$N(B ?$B%N(B ?(II(B) - (?$B$O(B ?$B%O(B ?(IJ(B) (?$B$R(B ?$B%R(B ?(IK(B) (?$B$U(B ?$B%U(B ?(IL(B) (?$B$X(B ?$B%X(B ?(IM(B) (?$B$[(B ?$B%[(B ?(IN(B) - (?$B$^(B ?$B%^(B ?(IO(B) (?$B$_(B ?$B%_(B ?(IP(B) (?$B$`(B ?$B%`(B ?(IQ(B) (?$B$a(B ?$B%a(B ?(IR(B) (?$B$b(B ?$B%b(B ?(IS(B) - (?$B$d(B ?$B%d(B ?(IT(B) (?$B$f(B ?$B%f(B ?(IU(B) (?$B$h(B ?$B%h(B ?(IV(B) - (?$B$i(B ?$B%i(B ?(IW(B) (?$B$j(B ?$B%j(B ?(IX(B) (?$B$k(B ?$B%k(B ?(IY(B) (?$B$l(B ?$B%l(B ?(IZ(B) (?$B$m(B ?$B%m(B ?(I[(B) - (?$B$o(B ?$B%o(B ?(I\(B) (?$B$p(B ?$B%p(B "(I2(B") (?$B$q(B ?$B%q(B "(I4(B") (?$B$r(B ?$B%r(B ?(I&(B) - (?$B$s(B ?$B%s(B ?(I](B) - (?$B$,(B ?$B%,(B "(I6^(B") (?$B$.(B ?$B%.(B "(I7^(B") (?$B$0(B ?$B%0(B "(I8^(B") (?$B$2(B ?$B%2(B "(I9^(B") (?$B$4(B ?$B%4(B "(I:^(B") - (?$B$6(B ?$B%6(B "(I;^(B") (?$B$8(B ?$B%8(B "(I<^(B") (?$B$:(B ?$B%:(B "(I=^(B") (?$B$<(B ?$B%<(B "(I>^(B") (?$B$>(B ?$B%>(B "(I?^(B") - (?$B$@(B ?$B%@(B "(I@^(B") (?$B$B(B ?$B%B(B "(IA^(B") (?$B$E(B ?$B%E(B "(IB^(B") (?$B$G(B ?$B%G(B "(IC^(B") (?$B$I(B ?$B%I(B "(ID^(B") - (?$B$P(B ?$B%P(B "(IJ^(B") (?$B$S(B ?$B%S(B "(IK^(B") (?$B$V(B ?$B%V(B "(IL^(B") (?$B$Y(B ?$B%Y(B "(IM^(B") (?$B$\(B ?$B%\(B "(IN^(B") - (?$B$Q(B ?$B%Q(B "(IJ_(B") (?$B$T(B ?$B%T(B "(IK_(B") (?$B$W(B ?$B%W(B "(IL_(B") (?$B$Z(B ?$B%Z(B "(IM_(B") (?$B$](B ?$B%](B "(IN_(B") - (?$B$!(B ?$B%!(B ?(I'(B) (?$B$#(B ?$B%#(B ?(I((B) (?$B$%(B ?$B%%(B ?(I)(B) (?$B$'(B ?$B%'(B ?(I*(B) (?$B$)(B ?$B%)(B ?(I+(B) - (?$B$C(B ?$B%C(B ?(I/(B) - (?$B$c(B ?$B%c(B ?(I,(B) (?$B$e(B ?$B%e(B ?(I-(B) (?$B$g(B ?$B%g(B ?(I.(B) - (?$B$n(B ?$B%n(B "(I\(B") - (?$B!5(B ?$B!3(B) (?$B!6(B ?$B!4(B) - ("$B$&!+(B" ?$B%t(B "(I3^(B") (nil ?$B%u(B "(I6(B") (nil ?$B%v(B "(I9(B")) + '((?あ ?ア ?ア) (?い ?イ ?イ) (?う ?ウ ?ウ) (?え ?エ ?エ) (?お ?オ ?オ) + (?か ?カ ?カ) (?き ?キ ?キ) (?く ?ク ?ク) (?け ?ケ ?ケ) (?こ ?コ ?コ) + (?さ ?サ ?サ) (?し ?シ ?シ) (?す ?ス ?ス) (?せ ?セ ?セ) (?そ ?ソ ?ソ) + (?た ?タ ?タ) (?ち ?チ ?チ) (?つ ?ツ ?ツ) (?て ?テ ?テ) (?と ?ト ?ト) + (?な ?ナ ?ナ) (?に ?ニ ?ニ) (?ぬ ?ヌ ?ヌ) (?ね ?ネ ?ネ) (?の ?ノ ?ノ) + (?は ?ハ ?ハ) (?ひ ?ヒ ?ヒ) (?ふ ?フ ?フ) (?へ ?ヘ ?ヘ) (?ほ ?ホ ?ホ) + (?ま ?マ ?マ) (?み ?ミ ?ミ) (?む ?ム ?ム) (?め ?メ ?メ) (?も ?モ ?モ) + (?や ?ヤ ?ヤ) (?ゆ ?ユ ?ユ) (?よ ?ヨ ?ヨ) + (?ら ?ラ ?ラ) (?り ?リ ?リ) (?る ?ル ?ル) (?れ ?レ ?レ) (?ろ ?ロ ?ロ) + (?わ ?ワ ?ワ) (?ゐ ?ヰ "イ") (?ゑ ?ヱ "エ") (?を ?ヲ ?ヲ) + (?ん ?ン ?ン) + (?が ?ガ "ガ") (?ぎ ?ギ "ギ") (?ぐ ?グ "グ") (?げ ?ゲ "ゲ") (?ご ?ゴ "ゴ") + (?ざ ?ザ "ザ") (?じ ?ジ "ジ") (?ず ?ズ "ズ") (?ぜ ?ゼ "ゼ") (?ぞ ?ゾ "ゾ") + (?だ ?ダ "ダ") (?ぢ ?ヂ "ヂ") (?づ ?ヅ "ヅ") (?で ?デ "デ") (?ど ?ド "ド") + (?ば ?バ "バ") (?び ?ビ "ビ") (?ぶ ?ブ "ブ") (?べ ?ベ "ベ") (?ぼ ?ボ "ボ") + (?ぱ ?パ "パ") (?ぴ ?ピ "ピ") (?ぷ ?プ "プ") (?ぺ ?ペ "ペ") (?ぽ ?ポ "ポ") + (?ぁ ?ァ ?ァ) (?ぃ ?ィ ?ィ) (?ぅ ?ゥ ?ゥ) (?ぇ ?ェ ?ェ) (?ぉ ?ォ ?ォ) + (?っ ?ッ ?ッ) + (?ゃ ?ャ ?ャ) (?ゅ ?ュ ?ュ) (?ょ ?ョ ?ョ) + (?ゎ ?ヮ "ワ") + (?ゝ ?ヽ) (?ゞ ?ヾ) + ("う゛" ?ヴ "ヴ") (nil ?ヵ "カ") (nil ?ヶ "ケ")) "Japanese JISX0208 Kana character table. Each element is of the form (HIRAGANA KATAKANA HANKAKU-KATAKANA), where HIRAGANA and KATAKANA belong to `japanese-jisx0208', @@ -98,15 +96,15 @@ HANKAKU-KATAKANA belongs to `japanese-jisx0201-kana'.") (put-char-code-property jisx0201 'jisx0208 katakana))))) (defconst japanese-symbol-table - '((?\$B!!(B ?\ ) (?$B!$(B ?, ?(I$(B) (?$B!%(B ?. ?(I!(B) (?$B!"(B ?, ?(I$(B) (?$B!#(B ?. ?(I!(B) (?$B!&(B nil ?(I%(B) - (?$B!'(B ?:) (?$B!((B ?\;) (?$B!)(B ??) (?$B!*(B ?!) (?$B!+(B nil ?(I^(B) (?$B!,(B nil ?(I_(B) - (?$B!-(B ?') (?$B!.(B ?`) (?$B!0(B ?^) (?$B!2(B ?_) (?$B!<(B ?- ?(I0(B) (?$B!=(B ?-) (?$B!>(B ?-) - (?$B!?(B ?/) (?$B!@(B ?\\) (?$B!A(B ?~) (?$B!C(B ?|) (?$B!F(B ?`) (?$B!G(B ?') (?$B!H(B ?\") (?$B!I(B ?\") - (?\$B!J(B ?\() (?\$B!K(B ?\)) (?\$B!N(B ?\[) (?\$B!O(B ?\]) (?\$B!P(B ?{) (?\$B!Q(B ?}) - (?$B!R(B ?<) (?$B!S(B ?>) (?\$B!V(B nil ?\(I"(B) (?\$B!W(B nil ?\(I#(B) - (?$B!\(B ?+) (?$B!](B ?-) (?$B!a(B ?=) (?$B!c(B ?<) (?$B!d(B ?>) - (?$B!l(B ?') (?$B!m(B ?\") (?$B!o(B ?\\) (?$B!p(B ?$) (?$B!s(B ?%) (?$B!t(B ?#) (?$B!u(B ?&) (?$B!v(B ?*) - (?$B!w(B ?@) + '((?\ ?\ ) (?, ?, ?、) (?. ?. ?。) (?、 ?, ?、) (?。 ?. ?。) (?・ nil ?・) + (?: ?:) (?; ?\;) (?? ??) (?! ?!) (?゛ nil ?゙) (?゜ nil ?゚) + (?´ ?') (?` ?`) (?^ ?^) (?_ ?_) (?ー ?- ?ー) (?— ?-) (?‐ ?-) + (?/ ?/) (?\ ?\\) (?〜 ?~) (?| ?|) (?‘ ?`) (?’ ?') (?“ ?\") (?” ?\") + (?\( ?\() (?\) ?\)) (?\[ ?\[) (?\] ?\]) (?\{ ?{) (?\} ?}) + (?〈 ?<) (?〉 ?>) (?\「 nil ?\「) (?\」 nil ?\」) + (?+ ?+) (?− ?-) (?= ?=) (?< ?<) (?> ?>) + (?′ ?') (?″ ?\") (?¥ ?\\) (?$ ?$) (?% ?%) (?# ?#) (?& ?&) (?* ?*) + (?@ ?@) ;; cp932-2-byte (#x2015 ?-) (#xFF5E ?~) (#xFF0D ?-)) "Japanese JISX0208 and CP932 symbol character table. @@ -134,18 +132,18 @@ and HANKAKU belongs to `japanese-jisx0201-kana'.") (put-char-code-property jisx0201 'jisx0208 jisx0208)))))) (defconst japanese-alpha-numeric-table - '((?$B#0(B . ?0) (?$B#1(B . ?1) (?$B#2(B . ?2) (?$B#3(B . ?3) (?$B#4(B . ?4) - (?$B#5(B . ?5) (?$B#6(B . ?6) (?$B#7(B . ?7) (?$B#8(B . ?8) (?$B#9(B . ?9) - (?$B#A(B . ?A) (?$B#B(B . ?B) (?$B#C(B . ?C) (?$B#D(B . ?D) (?$B#E(B . ?E) - (?$B#F(B . ?F) (?$B#G(B . ?G) (?$B#H(B . ?H) (?$B#I(B . ?I) (?$B#J(B . ?J) - (?$B#K(B . ?K) (?$B#L(B . ?L) (?$B#M(B . ?M) (?$B#N(B . ?N) (?$B#O(B . ?O) - (?$B#P(B . ?P) (?$B#Q(B . ?Q) (?$B#R(B . ?R) (?$B#S(B . ?S) (?$B#T(B . ?T) - (?$B#U(B . ?U) (?$B#V(B . ?V) (?$B#W(B . ?W) (?$B#X(B . ?X) (?$B#Y(B . ?Y) (?$B#Z(B . ?Z) - (?$B#a(B . ?a) (?$B#b(B . ?b) (?$B#c(B . ?c) (?$B#d(B . ?d) (?$B#e(B . ?e) - (?$B#f(B . ?f) (?$B#g(B . ?g) (?$B#h(B . ?h) (?$B#i(B . ?i) (?$B#j(B . ?j) - (?$B#k(B . ?k) (?$B#l(B . ?l) (?$B#m(B . ?m) (?$B#n(B . ?n) (?$B#o(B . ?o) - (?$B#p(B . ?p) (?$B#q(B . ?q) (?$B#r(B . ?r) (?$B#s(B . ?s) (?$B#t(B . ?t) - (?$B#u(B . ?u) (?$B#v(B . ?v) (?$B#w(B . ?w) (?$B#x(B . ?x) (?$B#y(B . ?y) (?$B#z(B . ?z)) + '((?0 . ?0) (?1 . ?1) (?2 . ?2) (?3 . ?3) (?4 . ?4) + (?5 . ?5) (?6 . ?6) (?7 . ?7) (?8 . ?8) (?9 . ?9) + (?A . ?A) (?B . ?B) (?C . ?C) (?D . ?D) (?E . ?E) + (?F . ?F) (?G . ?G) (?H . ?H) (?I . ?I) (?J . ?J) + (?K . ?K) (?L . ?L) (?M . ?M) (?N . ?N) (?O . ?O) + (?P . ?P) (?Q . ?Q) (?R . ?R) (?S . ?S) (?T . ?T) + (?U . ?U) (?V . ?V) (?W . ?W) (?X . ?X) (?Y . ?Y) (?Z . ?Z) + (?a . ?a) (?b . ?b) (?c . ?c) (?d . ?d) (?e . ?e) + (?f . ?f) (?g . ?g) (?h . ?h) (?i . ?i) (?j . ?j) + (?k . ?k) (?l . ?l) (?m . ?m) (?n . ?n) (?o . ?o) + (?p . ?p) (?q . ?q) (?r . ?r) (?s . ?s) (?t . ?t) + (?u . ?u) (?v . ?v) (?w . ?w) (?x . ?x) (?y . ?y) (?z . ?z)) "Japanese JISX0208 alpha numeric character table. Each element is of the form (ALPHA-NUMERIC . ASCII), where ALPHA-NUMERIC belongs to `japanese-jisx0208', ASCII belongs to `ascii'.") diff --git a/lisp/language/japanese.el b/lisp/language/japanese.el index 9c41a26f36c..7a0fd740e8e 100644 --- a/lisp/language/japanese.el +++ b/lisp/language/japanese.el @@ -1,4 +1,4 @@ -;;; japanese.el --- support for Japanese -*- coding: iso-2022-7bit -*- +;;; japanese.el --- support for Japanese ;; Copyright (C) 1997, 2001-2019 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, @@ -210,7 +210,7 @@ eucJP-ms is defined in <http://www.opengroup.or.jp/jvc/cde/appendix.html>." iso-2022-jp-2) (input-method . "japanese") (features japan-util) - (sample-text . "Japanese ($BF|K\8l(B) $B$3$s$K$A$O(B, (I:]FAJ(B") + (sample-text . "Japanese (日本語) こんにちは, コンニチハ") (documentation . t))) (let ((map @@ -248,7 +248,7 @@ eucJP-ms is defined in <http://www.opengroup.or.jp/jvc/cde/appendix.html>." (define-translation-table 'unicode-to-jisx0213 (char-table-extra-slot table 0))) -(defun compose-gstring-for-variation-glyph (gstring) +(defun compose-gstring-for-variation-glyph (gstring _direction) "Compose glyph-string GSTRING for graphic display. GSTRING must have two glyphs; the first is a glyph for a han character, and the second is a glyph for a variation selector." diff --git a/lisp/language/lao-util.el b/lisp/language/lao-util.el index 92b41e4f801..d2532030ce5 100644 --- a/lisp/language/lao-util.el +++ b/lisp/language/lao-util.el @@ -489,10 +489,10 @@ syllable. In that case, FROM and TO are indexes to STR." lao-str))) ;;;###autoload -(defun lao-composition-function (gstring) +(defun lao-composition-function (gstring direction) (if (= (lgstring-char-len gstring) 1) - (compose-gstring-for-graphic gstring) - (or (font-shape-gstring gstring) + (compose-gstring-for-graphic gstring direction) + (or (font-shape-gstring gstring direction) (let ((glyph-len (lgstring-glyph-len gstring)) (i 0) glyph) diff --git a/lisp/language/misc-lang.el b/lisp/language/misc-lang.el index c1aa79cae45..e25e63b4c5c 100644 --- a/lisp/language/misc-lang.el +++ b/lisp/language/misc-lang.el @@ -101,8 +101,8 @@ thin (i.e. 1-dot width) space." ;; Record error in arabic-change-gstring. (defvar arabic-shape-log nil) -(defun arabic-shape-gstring (gstring) - (setq gstring (font-shape-gstring gstring)) +(defun arabic-shape-gstring (gstring direction) + (setq gstring (font-shape-gstring gstring direction)) (condition-case err (when arabic-shaper-ZWNJ-handling (let ((font (lgstring-font gstring)) diff --git a/lisp/language/romanian.el b/lisp/language/romanian.el index 0a5d0ca0f94..55549c7e86e 100644 --- a/lisp/language/romanian.el +++ b/lisp/language/romanian.el @@ -2,7 +2,7 @@ ;; Copyright (C) 1998, 2001-2019 Free Software Foundation, Inc. -;; Author: Dan Nicolaescu <done@ece.arizona.edu> +;; Author: Dan Nicolaescu <done@ece.arizona.edu> ;; Keywords: multilingual, Romanian, i18n ;; This file is part of GNU Emacs. diff --git a/lisp/language/thai-util.el b/lisp/language/thai-util.el index ee2cf7398ad..e3303954c62 100644 --- a/lisp/language/thai-util.el +++ b/lisp/language/thai-util.el @@ -225,10 +225,10 @@ positions (integers or markers) specifying the region." (thai-compose-region (point-min) (point-max))) ;;;###autoload -(defun thai-composition-function (gstring) +(defun thai-composition-function (gstring direction) (if (= (lgstring-char-len gstring) 1) - (compose-gstring-for-graphic gstring) - (or (font-shape-gstring gstring) + (compose-gstring-for-graphic gstring direction) + (or (font-shape-gstring gstring direction) (let ((glyph-len (lgstring-glyph-len gstring)) (last-char (lgstring-char gstring (1- (lgstring-char-len gstring)))) @@ -256,11 +256,10 @@ positions (integers or markers) specifying the region." (define-minor-mode thai-word-mode "Minor mode to make word-oriented commands aware of Thai words. -With a prefix argument ARG, enable the mode if ARG is positive, -and disable it otherwise. If called from Lisp, enable the mode -if ARG is omitted or nil. The commands affected are -\\[forward-word], \\[backward-word], \\[kill-word], \\[backward-kill-word], -\\[transpose-words], and \\[fill-paragraph]." + +The commands affected are \\[forward-word], \\[backward-word], +\\[kill-word], \\[backward-kill-word], \\[transpose-words], and +\\[fill-paragraph]." :global t :group 'mule (cond (thai-word-mode ;; This enables linebreak between Thai characters. diff --git a/lisp/language/thai-word.el b/lisp/language/thai-word.el index e67dd093430..94c6ab98979 100644 --- a/lisp/language/thai-word.el +++ b/lisp/language/thai-word.el @@ -4,7 +4,7 @@ ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 -;; Author: Kenichi HANDA <handa@etl.go.jp> +;; Author: Kenichi Handa <handa@gnu.org> ;; Keywords: thai, word break, emacs diff --git a/lisp/language/tibetan.el b/lisp/language/tibetan.el index dac7a9519eb..4be25cecab9 100644 --- a/lisp/language/tibetan.el +++ b/lisp/language/tibetan.el @@ -451,7 +451,7 @@ ;;; (includes some punctuation conversion rules) ;;; (defconst tibetan-precomposition-rule-alist - `(("ཕྱྭ" . "") + '(("ཕྱྭ" . "") ("གྲྭ" . "") ("ཚྭ" . "") ("རྩྭ" . "") diff --git a/lisp/language/tv-util.el b/lisp/language/tv-util.el index a667956a060..7ce8ee1e500 100644 --- a/lisp/language/tv-util.el +++ b/lisp/language/tv-util.el @@ -128,7 +128,7 @@ ;;;###autoload -(defun tai-viet-composition-function (from to font-object string) +(defun tai-viet-composition-function (from to font-object string _direction) (if string (if (string-match tai-viet-re string from) (tai-viet-compose-string from (match-end 0) string)) diff --git a/lisp/language/utf-8-lang.el b/lisp/language/utf-8-lang.el index d31c1a8c5de..d4897c95964 100644 --- a/lisp/language/utf-8-lang.el +++ b/lisp/language/utf-8-lang.el @@ -25,24 +25,24 @@ ;;; Code: (set-language-info-alist - "UTF-8" `((coding-system utf-8) + "UTF-8" '((coding-system utf-8) (coding-priority utf-8) (charset unicode-bmp unicode) -;; Presumably not relevant now. -;; (setup-function -;; . (lambda () -;; ;; Use Unicode font under Windows. Jason Rumney fecit. -;; (if (and (fboundp 'w32-add-charset-info) -;; (not (boundp 'w32-unicode-charset-defined))) -;; (w32-add-charset-info "iso10646-1" 'w32-charset-ansi t)))) -;; Is this appropriate? -;; (exit-function -;; . (lambda () -;; (if (and (fboundp 'w32-add-charset-info) -;; (not (boundp 'w32-unicode-charset-defined))) -;; (setq w32-charset-info-alist -;; (delete (assoc "iso10646-1") -;; w32-charset-info-alist))))) + ;; Presumably not relevant now. + ;; (setup-function + ;; . (lambda () + ;; ;; Use Unicode font under Windows. Jason Rumney fecit. + ;; (if (and (fboundp 'w32-add-charset-info) + ;; (not (boundp 'w32-unicode-charset-defined))) + ;; (w32-add-charset-info "iso10646-1" 'w32-charset-ansi t)))) + ;; Is this appropriate? + ;; (exit-function + ;; . (lambda () + ;; (if (and (fboundp 'w32-add-charset-info) + ;; (not (boundp 'w32-unicode-charset-defined))) + ;; (setq w32-charset-info-alist + ;; (delete (assoc "iso10646-1") + ;; w32-charset-info-alist))))) (input-method . "rfc1345") ; maybe not the best choice (documentation . "\ This language environment is a generic one for the Unicode character set diff --git a/lisp/language/vietnamese.el b/lisp/language/vietnamese.el index bceefe04cc5..432dd3eb54e 100644 --- a/lisp/language/vietnamese.el +++ b/lisp/language/vietnamese.el @@ -72,9 +72,9 @@ (define-coding-system-alias 'viqr 'vietnamese-viqr) (set-language-info-alist - "Vietnamese" `((charset viscii) + "Vietnamese" '((charset viscii) (coding-system vietnamese-viscii vietnamese-vscii - vietnamese-tcvn vietnamese-viqr windows-1258) + vietnamese-tcvn vietnamese-viqr windows-1258) (nonascii-translation . viscii) (coding-priority vietnamese-viscii) (input-method . "vietnamese-viqr") |