Commit a564ccf9 authored by Kenichi Handa's avatar Kenichi Handa
Browse files

("LANUGAGE-ENVIRONMENT"): Delete property setup-function or change

the value to setup-XXX-environment-internal.  Add properties
nonascii-translation, input-method, features, unibyte-syntax, and
unibyte-display.
parent 8f76845d
...@@ -112,10 +112,11 @@ ...@@ -112,10 +112,11 @@
nil)) nil))
(set-language-info-alist (set-language-info-alist
"Chinese-GB" '((setup-function . setup-chinese-gb-environment) "Chinese-GB" '((charset chinese-gb2312 chinese-sisheng)
(charset chinese-gb2312 chinese-sisheng)
(coding-system chinese-iso-8bit iso-2022-cn chinese-hz) (coding-system chinese-iso-8bit iso-2022-cn chinese-hz)
(coding-priority chinese-iso-8bit chinese-big5 iso-2022-cn) (coding-priority chinese-iso-8bit chinese-big5 iso-2022-cn)
(input-method . "chinese-py-punct")
(features china-util)
(sample-text . "Chinese ($AVPND(B,$AFUM(;0(B,$A::So(B) $ADc:C(B") (sample-text . "Chinese ($AVPND(B,$AFUM(;0(B,$A::So(B) $ADc:C(B")
(documentation . "Support for Chinese GB2312 character set.")) (documentation . "Support for Chinese GB2312 character set."))
'("Chinese")) '("Chinese"))
...@@ -152,10 +153,11 @@ ...@@ -152,10 +153,11 @@
(cons (cons "big5" ccl-encode-big5-font) font-ccl-encoder-alist)) (cons (cons "big5" ccl-encode-big5-font) font-ccl-encoder-alist))
(set-language-info-alist (set-language-info-alist
"Chinese-BIG5" '((setup-function . setup-chinese-big5-environment) "Chinese-BIG5" '((charset chinese-big5-1 chinese-big5-2)
(charset chinese-big5-1 chinese-big5-2)
(coding-system chinese-big5 chinese-iso-7bit) (coding-system chinese-big5 chinese-iso-7bit)
(coding-priority chinese-big5 iso-2022-cn chinese-iso-8bit) (coding-priority chinese-big5 iso-2022-cn chinese-iso-8bit)
(input-method . "chinese-py-punct-b5")
(features china-util)
(sample-text . "Cantonese ($(0GnM$(B,$(0N]0*Hd(B) $(0*/=((B, $(0+$)p(B") (sample-text . "Cantonese ($(0GnM$(B,$(0N]0*Hd(B) $(0*/=((B, $(0+$)p(B")
(documentation . "Support for Chinese Big5 character set.")) (documentation . "Support for Chinese Big5 character set."))
'("Chinese")) '("Chinese"))
...@@ -165,13 +167,14 @@ ...@@ -165,13 +167,14 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(set-language-info-alist (set-language-info-alist
"Chinese-CNS" '((setup-function . setup-chinese-cns-environment) "Chinese-CNS" '((charset chinese-cns11643-1 chinese-cns11643-2
(charset chinese-cns11643-1 chinese-cns11643-2
chinese-cns11643-3 chinese-cns11643-4 chinese-cns11643-3 chinese-cns11643-4
chinese-cns11643-5 chinese-cns11643-6 chinese-cns11643-5 chinese-cns11643-6
chinese-cns11643-7) chinese-cns11643-7)
(coding-system iso-2022-cn) (coding-system iso-2022-cn)
(coding-priority iso-2022-cn chinese-big5 chinese-iso-8bit) (coding-priority iso-2022-cn chinese-big5 chinese-iso-8bit)
(features china-util)
(input-method . "chinese-cns-quick")
(documentation . "Support for Chinese CNS character sets.")) (documentation . "Support for Chinese CNS character sets."))
'("Chinese")) '("Chinese"))
......
...@@ -44,10 +44,13 @@ ...@@ -44,10 +44,13 @@
(define-coding-system-alias 'iso-8859-5 'cyrillic-iso-8bit) (define-coding-system-alias 'iso-8859-5 'cyrillic-iso-8bit)
(set-language-info-alist (set-language-info-alist
"Cyrillic-ISO" '((setup-function . setup-cyrillic-iso-environment) "Cyrillic-ISO" '((charset cyrillic-iso8859-5)
(charset cyrillic-iso8859-5)
(coding-system cyrillic-iso-8bit) (coding-system cyrillic-iso-8bit)
(coding-priority cyrillic-iso-8bit) (coding-priority cyrillic-iso-8bit)
(input-method . "cyrillic-yawerty")
(nonascii-translation . cyrillic-iso8859-5)
(unibyte-display . cyrillic-iso-8bit)
(features cyril-util)
(sample-text . "Russian (,L@caaZXY(B) ,L7T`PRabRcYbU(B!") (sample-text . "Russian (,L@caaZXY(B) ,L7T`PRabRcYbU(B!")
(documentation . "Support for Cyrillic ISO-8859-5.")) (documentation . "Support for Cyrillic ISO-8859-5."))
'("Cyrillic")) '("Cyrillic"))
...@@ -138,14 +141,16 @@ ...@@ -138,14 +141,16 @@
"Value of `nonascii-translation-table' in Cyrillic-KOI8 language environment..") "Value of `nonascii-translation-table' in Cyrillic-KOI8 language environment..")
(set-language-info-alist (set-language-info-alist
"Cyrillic-KOI8" `((setup-function . setup-cyrillic-koi8-environment) "Cyrillic-KOI8" `((charset cyrillic-iso8859-5)
(charset cyrillic-iso8859-5) (nonascii-translation
(nonascii-translation-table
. ,cyrillic-koi8-r-nonascii-translation-table) . ,cyrillic-koi8-r-nonascii-translation-table)
(charset-origin-alist (charset-origin-alist
(cyrillic-iso8859-5 "KOI8-R" cyrillic-encode-koi8-r-char)) (cyrillic-iso8859-5 "KOI8-R" cyrillic-encode-koi8-r-char))
(coding-system cyrillic-koi8) (coding-system cyrillic-koi8)
(coding-priority cyrillic-koi8) (coding-priority cyrillic-koi8)
(input-method . "cyrillic-yawerty")
(features cyril-util)
(unibyte-display . cyrillic-koi8)
(sample-text . "Russian (,L@caaZXY(B) ,L7T`PRabRcYbU(B!") (sample-text . "Russian (,L@caaZXY(B) ,L7T`PRabRcYbU(B!")
(documentation . "Support for Cyrillic KOI8-R.")) (documentation . "Support for Cyrillic KOI8-R."))
'("Cyrillic")) '("Cyrillic"))
...@@ -232,15 +237,17 @@ ...@@ -232,15 +237,17 @@
"Value of `nonascii-translation-table' in Cyrillic-ALT language environment.") "Value of `nonascii-translation-table' in Cyrillic-ALT language environment.")
(set-language-info-alist (set-language-info-alist
"Cyrillic-ALT" '((setup-function . setup-cyrillic-alternativnyj-environment) "Cyrillic-ALT" `((charset cyrillic-iso8859-5)
(charset cyrillic-iso8859-5) (nonascii-translation
(nonascii-translation-table . ,cyrillic-alternativnyj-nonascii-translation-table)
. cyrillic-alternativnyj-nonascii-translation-table)
(charset-origin-alist (charset-origin-alist
(cyrillic-iso8859-5 "ALTERNATIVNYJ" (cyrillic-iso8859-5 "ALTERNATIVNYJ"
cyrillic-encode-koi8-char)) cyrillic-encode-koi8-r-char))
(coding-system cyrillic-alternativnyj) (coding-system cyrillic-alternativnyj)
(coding-priority cyrillic-alternativnyj) (coding-priority cyrillic-alternativnyj)
(input-method . "cyrillic-yawerty")
(features cyril-util)
(unibyte-display . cyrillic-alternativnyj)
(sample-text . "Russian (,L@caaZXY(B) ,L7T`PRabRcYbU(B!") (sample-text . "Russian (,L@caaZXY(B) ,L7T`PRabRcYbU(B!")
(documentation . "Support for Cyrillic ALTERNATIVNYJ.")) (documentation . "Support for Cyrillic ALTERNATIVNYJ."))
'("Cyrillic")) '("Cyrillic"))
......
...@@ -42,10 +42,11 @@ ...@@ -42,10 +42,11 @@
(define-coding-system-alias 'devanagari 'in-is13194-devanagari) (define-coding-system-alias 'devanagari 'in-is13194-devanagari)
(set-language-info-alist (set-language-info-alist
"Devanagari" '((setup-function . setup-devanagari-environment) "Devanagari" '((charset indian-is13194 indian-2-column indian-1-column)
(charset indian-is13194 indian-2-column indian-1-column)
(coding-system in-is13194-devanagari) (coding-system in-is13194-devanagari)
(coding-priority in-is13194-devanagari) (coding-priority in-is13194-devanagari)
(input-method . "devanagari-itrans")
(features devan-util)
(documentation . "\ (documentation . "\
Such languages using Devanagari script as Hindi and Marathi Such languages using Devanagari script as Hindi and Marathi
are supported in this language environment.")) are supported in this language environment."))
......
...@@ -49,11 +49,13 @@ ...@@ -49,11 +49,13 @@
(cons (cons "ethiopic" ccl-encode-ethio-font) font-ccl-encoder-alist)) (cons (cons "ethiopic" ccl-encode-ethio-font) font-ccl-encoder-alist))
(set-language-info-alist (set-language-info-alist
"Ethiopic" '((setup-function . setup-ethiopic-environment) "Ethiopic" '((setup-function . setup-ethiopic-environment-internal)
(exit-function . exit-ethiopic-environment) (exit-function . exit-ethiopic-environment)
(charset ethiopic) (charset ethiopic)
(coding-system iso-2022-7bit) (coding-system iso-2022-7bit)
(coding-priority iso-2022-7bit) (coding-priority iso-2022-7bit)
(input-method . "ethiopic")
(features ethio-util)
(sample-text . "$(3$Q#U!.(B") (sample-text . "$(3$Q#U!.(B")
(documentation . t))) (documentation . t)))
......
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
(define-coding-system-alias 'euc-jp 'japanese-iso-8bit) (define-coding-system-alias 'euc-jp 'japanese-iso-8bit)
(set-language-info-alist (set-language-info-alist
"Japanese" '((setup-function . setup-japanese-environment) "Japanese" '((setup-function . setup-japanese-environment-internal)
(exit-function . exit-japanese-environment) (exit-function . exit-japanese-environment)
(tutorial . "TUTORIAL.ja") (tutorial . "TUTORIAL.ja")
(charset japanese-jisx0208 japanese-jisx0208-1978 (charset japanese-jisx0208 japanese-jisx0208-1978
...@@ -86,6 +86,8 @@ ...@@ -86,6 +86,8 @@
japanese-shift-jis japanese-iso-7bit-1978-irv) japanese-shift-jis japanese-iso-7bit-1978-irv)
(coding-priority iso-2022-jp japanese-iso-8bit (coding-priority iso-2022-jp japanese-iso-8bit
japanese-shift-jis) japanese-shift-jis)
(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 ($BF|K\8l(B) $B$3$s$K$A$O(B, (I:]FAJ(B")
(documentation . t))) (documentation . t)))
......
...@@ -56,6 +56,8 @@ ...@@ -56,6 +56,8 @@
(tutorial . "TUTORIAL.ko") (tutorial . "TUTORIAL.ko")
(charset korean-ksc5601) (charset korean-ksc5601)
(coding-system iso-2022-kr korean-iso-8bit) (coding-system iso-2022-kr korean-iso-8bit)
(input-method . "korean-hangul")
(features korea-util)
(coding-priority korean-iso-8bit iso-2022-kr) (coding-priority korean-iso-8bit iso-2022-kr)
(sample-text . "Hangul ($(CGQ1[(B) $(C>H3gGO<<?d(B, $(C>H3gGO=J4O1n(B") (sample-text . "Hangul ($(CGQ1[(B) $(C>H3gGO<<?d(B, $(C>H3gGO=J4O1n(B")
(documentation . "\ (documentation . "\
......
...@@ -32,11 +32,13 @@ ...@@ -32,11 +32,13 @@
'((safe-charsets ascii lao))) '((safe-charsets ascii lao)))
(set-language-info-alist (set-language-info-alist
"Lao" '((setup-function . setup-lao-environment) "Lao" '((charset lao)
(charset lao)
(coding-system lao) (coding-system lao)
(coding-priority lao) (coding-priority lao)
(sample-text . "Lao((1>RJRERG(B) (1JP:R-04U1(B, 0(1"i1M-`0;Q190$[19ERG(B") (input-method . "lao")
(nonascii-translation . lao)
(unibyte-display . lao)
(features lao-util)
(documentation . t))) (documentation . t)))
(aset use-default-ascent ?(1;(B t) (aset use-default-ascent ?(1;(B t)
......
...@@ -42,10 +42,13 @@ ...@@ -42,10 +42,13 @@
(set-language-info-alist (set-language-info-alist
"Thai" '((tutorial . "TUTORIAL.th") "Thai" '((tutorial . "TUTORIAL.th")
(setup-function . setup-thai-environment)
(charset thai-tis620) (charset thai-tis620)
(coding-system thai-tis620) (coding-system thai-tis620)
(coding-priority thai-tis620) (coding-priority thai-tis620)
(nonascii-translation . thai-tis620)
(input-method . "thai-kesmanee")
(unibyte-display . thai-tis620)
(features thai-util)
(sample-text . "Thai (,T@RIRd7B(B) ,TJ(B0,TGQ(B1,TJ(B0,T4U(B1,T$(B0,TCQ(B1,T:(B, ,TJ(B0,TGQ(B1,TJ(B0,T4U(B10,T$h(B1,TP(B") (sample-text . "Thai (,T@RIRd7B(B) ,TJ(B0,TGQ(B1,TJ(B0,T4U(B1,T$(B0,TCQ(B1,T:(B, ,TJ(B0,TGQ(B1,TJ(B0,T4U(B10,T$h(B1,TP(B")
(documentation . t))) (documentation . t)))
......
...@@ -100,13 +100,14 @@ ...@@ -100,13 +100,14 @@
(define-coding-system-alias 'tibetan 'tibetan-iso-8bit) (define-coding-system-alias 'tibetan 'tibetan-iso-8bit)
(set-language-info-alist (set-language-info-alist
"Tibetan" '((setup-function . setup-tibetan-environment) "Tibetan" '((charset tibetan tibetan-1-column)
(charset tibetan tibetan-1-column)
(coding-system tibetan-iso-8bit) (coding-system tibetan-iso-8bit)
(coding-priority iso-2022-7bit tibetan-iso-8bit) (coding-priority iso-2022-7bit tibetan-iso-8bit)
(input-method . "tibetan-wylie")
(features tibet-util)
(documentation . t) (documentation . t)
(sample-text . (sample-text .
"Tibetan (2$(7"70"]1"2$(8!;2$(7%P`"Q1"2$(8!;(B) 2$(7#RP#SP#S1!>"72$P`"Q1$(8!;2$(7"E0"S1"G$(8!;$(7"72"20"[1$(8!;2$(7"D0"[1"#"G!>2"I0"]0"_1$(8!;2$(7"9`"Q1$(8!;2$(7"/0"S1$(8!;2$(7"5`"Q12#2`#90"[1$(8!;2$(7"H`#A`"U0"c1!>(B"))) "Tibetan (2$(7"70"](B1$(7"2$(8!;(B2$(7%P`"Q(B1$(7"2$(8!;(B) 2$(7#RP#SP#S(B1$(7!>"7(B2$(7$P`"Q(B1$(8!;(B2$(7"E0"S(B1$(7"G$(8!;$(7"7(B2$(7"20"[(B1$(8!;(B2$(7"D0"[(B1$(7"#"G!>(B2$(7"I0"]0"_(B1$(8!;(B2$(7"9`"Q(B1$(8!;(B2$(7"/0"S(B1$(8!;(B2$(7"5`"Q(B12$(7#2`#90"[(B1$(8!;(B2$(7"H`#A`"U0"c(B1$(7!>(B")))
;;; ;;;
...@@ -497,11 +498,11 @@ ...@@ -497,11 +498,11 @@
("$(7"`(B" . "$(8"`(B") ("$(7"`(B" . "$(8"`(B")
("$(7!;(B" . "$(8!;(B") ("$(7!;(B" . "$(8!;(B")
("$(7!D(B" . "$(8!D(B") ("$(7!D(B" . "$(8!D(B")
("$(7!>(B $(7!>(B" . "2$(7!>P(B P$(7!>1(B") ; Yes this is dirty. But ... ("$(7!>(B $(7!>(B" . "2$(7!>P(B P$(7!>(B1") ; Yes this is dirty. But ...
("$(7!4!5!5(B" . "2$(7#RP#SP#SP#S1(B") ("$(7!4!5!5(B" . "2$(7#RP#SP#SP#S(B1")
("$(7!4!5(B" . "2$(7#RP#SP#S1(B") ("$(7!4!5(B" . "2$(7#RP#SP#S(B1")
("$(7!6(B" . "2$(7#RP#S_!I1(B") ("$(7!6(B" . "2$(7#RP#S_!I(B1")
("$(7!4(B" . "2$(7#RP#S1(B"))) ("$(7!4(B" . "2$(7#RP#S(B1")))
(defvar tibetan-regexp (defvar tibetan-regexp
(let ((l (append tibetan-consonant-transcription-alist (let ((l (append tibetan-consonant-transcription-alist
......
...@@ -240,9 +240,8 @@ Both tables are indexed by the position code of Vietnamese characters.") ...@@ -240,9 +240,8 @@ Both tables are indexed by the position code of Vietnamese characters.")
"Value of `nonascii-translation-table' in Vietnamese language environment.") "Value of `nonascii-translation-table' in Vietnamese language environment.")
(set-language-info-alist (set-language-info-alist
"Vietnamese" `((setup-function . setup-vietnamese-environment) "Vietnamese" `((charset vietnamese-viscii-lower vietnamese-viscii-upper)
(charset vietnamese-viscii-lower vietnamese-viscii-upper) (nonascii-translation
(nonascii-translation-table
. ,viet-viscii-nonascii-translation-table) . ,viet-viscii-nonascii-translation-table)
(charset-origin-alist (charset-origin-alist
(vietnamese-viscii-lower "VISCII" viet-encode-viscii-char) (vietnamese-viscii-lower "VISCII" viet-encode-viscii-char)
...@@ -250,6 +249,9 @@ Both tables are indexed by the position code of Vietnamese characters.") ...@@ -250,6 +249,9 @@ Both tables are indexed by the position code of Vietnamese characters.")
(coding-system vietnamese-viscii vietnamese-vscii (coding-system vietnamese-viscii vietnamese-vscii
vietnamese-viqr) vietnamese-viqr)
(coding-priority vietnamese-viscii) (coding-priority vietnamese-viscii)
(input-method . "vietnamese-viqr")
(unibyte-display . vietnamese-viscii)
(features viet-util)
(sample-text . "Vietnamese (Ti,1*(Bng Vi,1.(Bt) Ch,1`(Bo b,1U(Bn") (sample-text . "Vietnamese (Ti,1*(Bng Vi,1.(Bt) Ch,1`(Bo b,1U(Bn")
(documentation . "\ (documentation . "\
For Vietnamese, Emacs uses special charasets internally. For Vietnamese, Emacs uses special charasets internally.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment