aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/language
diff options
context:
space:
mode:
authorStefan Monnier2019-01-07 21:18:40 -0500
committerStefan Monnier2019-01-07 21:18:40 -0500
commitb8c062eeb6e7091510ab0e16852917ee8e4d5f29 (patch)
tree837d51f3d623f2a25d176f9fa4a50e7e92f3532e /lisp/language
parentce08594b2ae9dd7cf79c49ac4e1a06bee1c9ee22 (diff)
downloademacs-b8c062eeb6e7091510ab0e16852917ee8e4d5f29.tar.gz
emacs-b8c062eeb6e7091510ab0e16852917ee8e4d5f29.zip
Use utf-8 coding system for all our Elisp files
* lisp/international/ja-dic-cnv.el: * lisp/international/ja-dic-utl.el: * lisp/international/kinsoku.el: * lisp/international/kkc.el: * lisp/language/japan-util.el: * lisp/language/japanese.el: * lisp/leim/quail/cyril-jis.el: * lisp/leim/quail/hanja-jis.el: * lisp/leim/quail/japanese.el: * lisp/leim/quail/py-punct.el: * lisp/leim/quail/pypunct-b5.el: Use utf-8 coding system. * lisp/international/titdic-cnv.el: Use utf-8-emacs coding system.
Diffstat (limited to 'lisp/language')
-rw-r--r--lisp/language/japan-util.el88
-rw-r--r--lisp/language/japanese.el4
2 files changed, 46 insertions, 46 deletions
diff --git a/lisp/language/japan-util.el b/lisp/language/japan-util.el
index fd27ae220bd..5d6f5374071 100644
--- a/lisp/language/japan-util.el
+++ b/lisp/language/japan-util.el
@@ -1,4 +1,4 @@
1;;; japan-util.el --- utilities for Japanese -*- coding: iso-2022-7bit; -*- 1;;; japan-util.el --- utilities for Japanese
2 2
3;; Copyright (C) 2001-2019 Free Software Foundation, Inc. 3;; Copyright (C) 2001-2019 Free Software Foundation, Inc.
4;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 4;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
@@ -37,28 +37,28 @@
37 (use-cjk-char-width-table 'ja_JP)) 37 (use-cjk-char-width-table 'ja_JP))
38 38
39(defconst japanese-kana-table 39(defconst japanese-kana-table
40 '((?$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) 40 '((?あ ?ア ?ア) (?い ?イ ?イ) (?う ?ウ ?ウ) (?え ?エ ?エ) (?お ?オ ?オ)
41 (?$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) 41 (?か ?カ ?カ) (?き ?キ ?キ) (?く ?ク ?ク) (?け ?ケ ?ケ) (?こ ?コ ?コ)
42 (?$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) 42 (?さ ?サ ?サ) (?し ?シ ?シ) (?す ?ス ?ス) (?せ ?セ ?セ) (?そ ?ソ ?ソ)
43 (?$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) 43 (?た ?タ ?タ) (?ち ?チ ?チ) (?つ ?ツ ?ツ) (?て ?テ ?テ) (?と ?ト ?ト)
44 (?$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) 44 (?な ?ナ ?ナ) (?に ?ニ ?ニ) (?ぬ ?ヌ ?ヌ) (?ね ?ネ ?ネ) (?の ?ノ ?ノ)
45 (?$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) 45 (?は ?ハ ?ハ) (?ひ ?ヒ ?ヒ) (?ふ ?フ ?フ) (?へ ?ヘ ?ヘ) (?ほ ?ホ ?ホ)
46 (?$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) 46 (?ま ?マ ?マ) (?み ?ミ ?ミ) (?む ?ム ?ム) (?め ?メ ?メ) (?も ?モ ?モ)
47 (?$B$d(B ?$B%d(B ?(IT(B) (?$B$f(B ?$B%f(B ?(IU(B) (?$B$h(B ?$B%h(B ?(IV(B) 47 (? ? ?) (? ? ?) (? ? ?)
48 (?$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) 48 (?ら ?ラ ?ラ) (?り ?リ ?リ) (?る ?ル ?ル) (?れ ?レ ?レ) (?ろ ?ロ ?ロ)
49 (?$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) 49 (?わ ?ワ ?ワ) (?ゐ ?ヰ "イ") (?ゑ ?ヱ "エ") (?を ?ヲ ?ヲ)
50 (?$B$s(B ?$B%s(B ?(I](B) 50 (? ? ?)
51 (?$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") 51 (?が ?ガ "ガ") (?ぎ ?ギ "ギ") (?ぐ ?グ "グ") (?げ ?ゲ "ゲ") (?ご ?ゴ "ゴ")
52 (?$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") 52 (?ざ ?ザ "ザ") (?じ ?ジ "ジ") (?ず ?ズ "ズ") (?ぜ ?ゼ "ゼ") (?ぞ ?ゾ "ゾ")
53 (?$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") 53 (?だ ?ダ "ダ") (?ぢ ?ヂ "ヂ") (?づ ?ヅ "ヅ") (?で ?デ "デ") (?ど ?ド "ド")
54 (?$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") 54 (?ば ?バ "バ") (?び ?ビ "ビ") (?ぶ ?ブ "ブ") (?べ ?ベ "ベ") (?ぼ ?ボ "ボ")
55 (?$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") 55 (?ぱ ?パ "パ") (?ぴ ?ピ "ピ") (?ぷ ?プ "プ") (?ぺ ?ペ "ペ") (?ぽ ?ポ "ポ")
56 (?$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) 56 (?ぁ ?ァ ?ァ) (?ぃ ?ィ ?ィ) (?ぅ ?ゥ ?ゥ) (?ぇ ?ェ ?ェ) (?ぉ ?ォ ?ォ)
57 (?$B$C(B ?$B%C(B ?(I/(B) 57 (? ? ?)
58 (?$B$c(B ?$B%c(B ?(I,(B) (?$B$e(B ?$B%e(B ?(I-(B) (?$B$g(B ?$B%g(B ?(I.(B) 58 (? ? ?) (? ? ?) (? ? ?)
59 (?$B$n(B ?$B%n(B "(I\(B") 59 (? ? "")
60 (?$B!5(B ?$B!3(B) (?$B!6(B ?$B!4(B) 60 (? ?) (? ?)
61 ("$B$&!+(B" ?$B%t(B "(I3^(B") (nil ?$B%u(B "(I6(B") (nil ?$B%v(B "(I9(B")) 61 ("う゛" ? "ヴ") (nil ? "") (nil ? ""))
62 "Japanese JISX0208 Kana character table. 62 "Japanese JISX0208 Kana character table.
63Each element is of the form (HIRAGANA KATAKANA HANKAKU-KATAKANA), where 63Each element is of the form (HIRAGANA KATAKANA HANKAKU-KATAKANA), where
64HIRAGANA and KATAKANA belong to `japanese-jisx0208', 64HIRAGANA and KATAKANA belong to `japanese-jisx0208',
@@ -98,15 +98,15 @@ HANKAKU-KATAKANA belongs to `japanese-jisx0201-kana'.")
98 (put-char-code-property jisx0201 'jisx0208 katakana))))) 98 (put-char-code-property jisx0201 'jisx0208 katakana)))))
99 99
100(defconst japanese-symbol-table 100(defconst japanese-symbol-table
101 '((?\$B!!(B ?\ ) (?$B!$(B ?, ?(I$(B) (?$B!%(B ?. ?(I!(B) (?$B!"(B ?, ?(I$(B) (?$B!#(B ?. ?(I!(B) (?$B!&(B nil ?(I%(B) 101 '((?\  ?\ ) (?, ?, ?、) (?. ?. ?。) (?、 ?, ?、) (?。 ?. ?。) (?・ nil ?・)
102 (?$B!'(B ?:) (?$B!((B ?\;) (?$B!)(B ??) (?$B!*(B ?!) (?$B!+(B nil ?(I^(B) (?$B!,(B nil ?(I_(B) 102 (? ?:) (? ?\;) (? ??) (? ?!) (? nil ?) (? nil ?)
103 (?$B!-(B ?') (?$B!.(B ?`) (?$B!0(B ?^) (?$B!2(B ?_) (?$B!<(B ?- ?(I0(B) (?$B!=(B ?-) (?$B!>(B ?-) 103 (?´ ?') (? ?`) (? ?^) (?_ ?_) (? ?- ?) (? ?-) (? ?-)
104 (?$B!?(B ?/) (?$B!@(B ?\\) (?$B!A(B ?~) (?$B!C(B ?|) (?$B!F(B ?`) (?$B!G(B ?') (?$B!H(B ?\") (?$B!I(B ?\") 104 (? ?/) (? ?\\) (? ?~) (? ?|) (? ?`) (? ?') (? ?\") (? ?\")
105 (?\$B!J(B ?\() (?\$B!K(B ?\)) (?\$B!N(B ?\[) (?\$B!O(B ?\]) (?\$B!P(B ?{) (?\$B!Q(B ?}) 105 (?\ ?\() (?\ ?\)) (?\ ?\[) (?\ ?\]) (?\ ?{) (?\ ?})
106 (?$B!R(B ?<) (?$B!S(B ?>) (?\$B!V(B nil ?\(I"(B) (?\$B!W(B nil ?\(I#(B) 106 (? ?<) (? ?>) (?\ nil ?\) (?\ nil ?\)
107 (?$B!\(B ?+) (?$B!](B ?-) (?$B!a(B ?=) (?$B!c(B ?<) (?$B!d(B ?>) 107 (? ?+) (? ?-) (? ?=) (? ?<) (? ?>)
108 (?$B!l(B ?') (?$B!m(B ?\") (?$B!o(B ?\\) (?$B!p(B ?$) (?$B!s(B ?%) (?$B!t(B ?#) (?$B!u(B ?&) (?$B!v(B ?*) 108 (? ?') (? ?\") (? ?\\) (? ?$) (? ?%) (? ?#) (? ?&) (? ?*)
109 (?$B!w(B ?@) 109 (? ?@)
110 ;; cp932-2-byte 110 ;; cp932-2-byte
111 (#x2015 ?-) (#xFF5E ?~) (#xFF0D ?-)) 111 (#x2015 ?-) (#xFF5E ?~) (#xFF0D ?-))
112 "Japanese JISX0208 and CP932 symbol character table. 112 "Japanese JISX0208 and CP932 symbol character table.
@@ -134,18 +134,18 @@ and HANKAKU belongs to `japanese-jisx0201-kana'.")
134 (put-char-code-property jisx0201 'jisx0208 jisx0208)))))) 134 (put-char-code-property jisx0201 'jisx0208 jisx0208))))))
135 135
136(defconst japanese-alpha-numeric-table 136(defconst japanese-alpha-numeric-table
137 '((?$B#0(B . ?0) (?$B#1(B . ?1) (?$B#2(B . ?2) (?$B#3(B . ?3) (?$B#4(B . ?4) 137 '((? . ?0) (? . ?1) (? . ?2) (? . ?3) (? . ?4)
138 (?$B#5(B . ?5) (?$B#6(B . ?6) (?$B#7(B . ?7) (?$B#8(B . ?8) (?$B#9(B . ?9) 138 (? . ?5) (? . ?6) (? . ?7) (? . ?8) (? . ?9)
139 (?$B#A(B . ?A) (?$B#B(B . ?B) (?$B#C(B . ?C) (?$B#D(B . ?D) (?$B#E(B . ?E) 139 (? . ?A) (? . ?B) (? . ?C) (? . ?D) (? . ?E)
140 (?$B#F(B . ?F) (?$B#G(B . ?G) (?$B#H(B . ?H) (?$B#I(B . ?I) (?$B#J(B . ?J) 140 (? . ?F) (? . ?G) (? . ?H) (? . ?I) (? . ?J)
141 (?$B#K(B . ?K) (?$B#L(B . ?L) (?$B#M(B . ?M) (?$B#N(B . ?N) (?$B#O(B . ?O) 141 (? . ?K) (? . ?L) (? . ?M) (? . ?N) (? . ?O)
142 (?$B#P(B . ?P) (?$B#Q(B . ?Q) (?$B#R(B . ?R) (?$B#S(B . ?S) (?$B#T(B . ?T) 142 (? . ?P) (? . ?Q) (? . ?R) (? . ?S) (? . ?T)
143 (?$B#U(B . ?U) (?$B#V(B . ?V) (?$B#W(B . ?W) (?$B#X(B . ?X) (?$B#Y(B . ?Y) (?$B#Z(B . ?Z) 143 (? . ?U) (? . ?V) (? . ?W) (? . ?X) (? . ?Y) (? . ?Z)
144 (?$B#a(B . ?a) (?$B#b(B . ?b) (?$B#c(B . ?c) (?$B#d(B . ?d) (?$B#e(B . ?e) 144 (? . ?a) (? . ?b) (? . ?c) (? . ?d) (? . ?e)
145 (?$B#f(B . ?f) (?$B#g(B . ?g) (?$B#h(B . ?h) (?$B#i(B . ?i) (?$B#j(B . ?j) 145 (? . ?f) (? . ?g) (? . ?h) (? . ?i) (? . ?j)
146 (?$B#k(B . ?k) (?$B#l(B . ?l) (?$B#m(B . ?m) (?$B#n(B . ?n) (?$B#o(B . ?o) 146 (? . ?k) (? . ?l) (? . ?m) (? . ?n) (? . ?o)
147 (?$B#p(B . ?p) (?$B#q(B . ?q) (?$B#r(B . ?r) (?$B#s(B . ?s) (?$B#t(B . ?t) 147 (? . ?p) (? . ?q) (? . ?r) (? . ?s) (? . ?t)
148 (?$B#u(B . ?u) (?$B#v(B . ?v) (?$B#w(B . ?w) (?$B#x(B . ?x) (?$B#y(B . ?y) (?$B#z(B . ?z)) 148 (? . ?u) (? . ?v) (? . ?w) (? . ?x) (? . ?y) (? . ?z))
149 "Japanese JISX0208 alpha numeric character table. 149 "Japanese JISX0208 alpha numeric character table.
150Each element is of the form (ALPHA-NUMERIC . ASCII), where ALPHA-NUMERIC 150Each element is of the form (ALPHA-NUMERIC . ASCII), where ALPHA-NUMERIC
151belongs to `japanese-jisx0208', ASCII belongs to `ascii'.") 151belongs to `japanese-jisx0208', ASCII belongs to `ascii'.")
diff --git a/lisp/language/japanese.el b/lisp/language/japanese.el
index 9c41a26f36c..fabeab89c12 100644
--- a/lisp/language/japanese.el
+++ b/lisp/language/japanese.el
@@ -1,4 +1,4 @@
1;;; japanese.el --- support for Japanese -*- coding: iso-2022-7bit -*- 1;;; japanese.el --- support for Japanese
2 2
3;; Copyright (C) 1997, 2001-2019 Free Software Foundation, Inc. 3;; Copyright (C) 1997, 2001-2019 Free Software Foundation, Inc.
4;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 4;; 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>."
210 iso-2022-jp-2) 210 iso-2022-jp-2)
211 (input-method . "japanese") 211 (input-method . "japanese")
212 (features japan-util) 212 (features japan-util)
213 (sample-text . "Japanese ($BF|K\8l(B) $B$3$s$K$A$O(B, (I:]FAJ(B") 213 (sample-text . "Japanese (日本語) こんにちは, コンニチハ")
214 (documentation . t))) 214 (documentation . t)))
215 215
216(let ((map 216(let ((map