From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 6 Jun 2016 17:43:10 +0000 (-0700)
Subject: Use standard Unicode names for Thai, Lao
X-Git-Tag: emacs-26.0.90~1842^2~16
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=14649c889083ba9cc685846e508864830bdc0c9f;p=emacs.git
Use standard Unicode names for Thai, Lao
* lisp/language/lao-util.el, lisp/language/thai-util.el:
Don’t override standard Unicode character name (Bug#23698).
---
diff --git a/lisp/language/lao-util.el b/lisp/language/lao-util.el
index 6103860a84a..a42904f5de4 100644
--- a/lisp/language/lao-util.el
+++ b/lisp/language/lao-util.el
@@ -38,100 +38,100 @@
(define-category ?v "Lao upper/lower vowel" lao-category-table)
(define-category ?t "Lao tone" lao-category-table)
-(let ((l '((?ຠconsonant "LETTER KOR KAI'" "CHICKEN")
- (?ຠconsonant "LETTER KHOR KHAI'" "EGG")
- (?ຠinvalid nil)
- (?ຠconsonant "LETTER QHOR QHWARGN" "BUFFALO")
- (?àº
invalid nil)
- (? invalid nil)
- (?ຠconsonant "LETTER NGOR NGUU" "SNAKE")
- (?ຠconsonant "LETTER JOR JUA" "BUDDHIST NOVICE")
- (?ຠinvalid nil)
- (?ຠconsonant "LETTER XOR X\"ARNG" "ELEPHANT")
- (?ຠinvalid nil)
- (?ຠinvalid nil)
- (?ຠconsonant "LETTER YOR YUNG" "MOSQUITO")
- (?ຠinvalid nil)
- (?ຠinvalid nil)
- (?ຠinvalid nil)
- (?ຠinvalid nil)
- (?ຠinvalid nil)
- (?ຠinvalid nil)
- (?ຠconsonant "LETTER DOR DANG" "NOSE")
- (?ຠconsonant "LETTER TOR TAR" "EYE")
- (?ຠconsonant "LETTER THOR THUNG" "TO ASK,QUESTION")
- (?ຠconsonant "LETTER DHOR DHARM" "FLAG")
- (?ຠinvalid nil)
- (?ຠconsonant "LETTER NOR NOK" "BIRD")
- (?ຠconsonant "LETTER BOR BED" "FISHHOOK")
- (?ຠconsonant "LETTER POR PAR" "FISH")
- (?ຠconsonant "LETTER HPOR HPER\"" "BEE")
- (?ຠconsonant "LETTER FHOR FHAR" "WALL")
- (?ຠconsonant "LETTER PHOR PHUU" "MOUNTAIN")
- (?ຠconsonant "LETTER FOR FAI" "FIRE")
- (?ຠinvalid nil)
- (?ມ consonant "LETTER MOR MAR\"" "HORSE")
- (?ຢ consonant "LETTER GNOR GNAR" "MEDICINE")
- (?ຣ consonant "LETTER ROR ROD" "CAR")
- (?຤ invalid nil)
- (?ລ consonant "LETTER LOR LIING" "MONKEY")
- (?຦ invalid nil)
- (?ວ consonant "LETTER WOR WII" "HAND FAN")
- (?ຨ invalid nil)
- (?ຩ invalid nil)
- (?ສ consonant "LETTER SOR SEA" "TIGER")
- (?ຫ consonant "LETTER HHOR HHAI" "JAR")
- (?ຬ invalid nil)
- (?ຠconsonant "LETTER OR OOW" "TAKE")
- (?ຮ consonant "LETTER HOR HEA" "BOAT")
- (?ຯ special "ELLIPSIS")
- (?ະ vowel-base "VOWEL SIGN SARA A")
- (?ັ vowel-upper "VOWEL SIGN MAI KAN")
- (?າ vowel-base "VOWEL SIGN SARA AR")
- (?ຳ vowel-base "VOWEL SIGN SARA AM")
- (?ິ vowel-upper "VOWEL SIGN SARA I")
- (?ີ vowel-upper "VOWEL SIGN SARA II")
- (?ຶ vowel-upper "VOWEL SIGN SARA EU")
- (?ື vowel-upper "VOWEL SIGN SARA UR")
- (?ຸ vowel-lower "VOWEL SIGN SARA U")
- (?ູ vowel-lower "VOWEL SIGN SARA UU")
- (?຺ invalid nil)
- (?ົ vowel-upper "VOWEL SIGN MAI KONG")
- (?ຼ semivowel-lower "SEMIVOWEL SIGN LO")
- (?ຽ vowel-base "SEMIVOWEL SIGN SARA IA")
- (?຾ invalid nil)
- (?຿ invalid nil)
- (?à» vowel-base "VOWEL SIGN SARA EE")
- (?à» vowel-base "VOWEL SIGN SARA AA")
- (?à» vowel-base "VOWEL SIGN SARA OO")
- (?à» vowel-base "VOWEL SIGN SARA EI MAI MUAN\"")
- (?à» vowel-base "VOWEL SIGN SARA AI MAI MAY")
- (?à»
invalid nil)
- (?à» special "KO LA (REPETITION)")
- (?à» invalid nil)
- (?à» tone "TONE MAI EK")
- (?à» tone "TONE MAI THO")
- (?à» tone "TONE MAI TI")
- (?à» tone "TONE MAI JADTAWAR")
- (?à» tone "CANCELLATION MARK")
- (?à» vowel-upper "VOWEL SIGN SARA OR")
- (?à» invalid nil)
- (?à» invalid nil)
- (?à» special "DIGIT ZERO")
- (?à» special "DIGIT ONE")
- (?à» special "DIGIT TWO")
- (?à» special "DIGIT THREE")
- (?à» special "DIGIT FOUR")
- (?à» special "DIGIT FIVE")
- (?à» special "DIGIT SIX")
- (?à» special "DIGIT SEVEN")
- (?à» special "DIGIT EIGHT")
- (?à» special "DIGIT NINE")
- (?à» invalid nil)
- (?à» invalid nil)
- (?à» consonant "LETTER NHOR NHUU" "MOUSE")
- (?à» consonant "LETTER MHOR MHAR" "DOG")
- (?à» invalid nil)))
+(let ((l '((?ຠconsonant "CHICKEN")
+ (?ຠconsonant "EGG")
+ (?ຠinvalid)
+ (?ຠconsonant "BUFFALO")
+ (?àº
invalid)
+ (? invalid)
+ (?ຠconsonant "SNAKE")
+ (?ຠconsonant "BUDDHIST NOVICE")
+ (?ຠinvalid)
+ (?ຠconsonant "ELEPHANT")
+ (?ຠinvalid)
+ (?ຠinvalid)
+ (?ຠconsonant "MOSQUITO")
+ (?ຠinvalid)
+ (?ຠinvalid)
+ (?ຠinvalid)
+ (?ຠinvalid)
+ (?ຠinvalid)
+ (?ຠinvalid)
+ (?ຠconsonant "NOSE")
+ (?ຠconsonant "EYE")
+ (?ຠconsonant "TO ASK,QUESTION")
+ (?ຠconsonant "FLAG")
+ (?ຠinvalid)
+ (?ຠconsonant "BIRD")
+ (?ຠconsonant "FISHHOOK")
+ (?ຠconsonant "FISH")
+ (?ຠconsonant "BEE")
+ (?ຠconsonant "WALL")
+ (?ຠconsonant "MOUNTAIN")
+ (?ຠconsonant "FIRE")
+ (?ຠinvalid)
+ (?ມ consonant "HORSE")
+ (?ຢ consonant "MEDICINE")
+ (?ຣ consonant "CAR")
+ (?຤ invalid)
+ (?ລ consonant "MONKEY")
+ (?຦ invalid)
+ (?ວ consonant "HAND FAN")
+ (?ຨ invalid)
+ (?ຩ invalid)
+ (?ສ consonant "TIGER")
+ (?ຫ consonant "JAR")
+ (?ຬ invalid)
+ (?ຠconsonant "TAKE")
+ (?ຮ consonant "BOAT")
+ (?ຯ special)
+ (?ະ vowel-base)
+ (?ັ vowel-upper)
+ (?າ vowel-base)
+ (?ຳ vowel-base)
+ (?ິ vowel-upper)
+ (?ີ vowel-upper)
+ (?ຶ vowel-upper)
+ (?ື vowel-upper)
+ (?ຸ vowel-lower)
+ (?ູ vowel-lower)
+ (?຺ invalid)
+ (?ົ vowel-upper)
+ (?ຼ semivowel-lower)
+ (?ຽ vowel-base)
+ (?຾ invalid)
+ (?຿ invalid)
+ (?à» vowel-base)
+ (?à» vowel-base)
+ (?à» vowel-base)
+ (?à» vowel-base)
+ (?à» vowel-base)
+ (?à»
invalid)
+ (?à» special)
+ (?à» invalid)
+ (?à» tone)
+ (?à» tone)
+ (?à» tone)
+ (?à» tone)
+ (?à» tone)
+ (?à» vowel-upper)
+ (?à» invalid)
+ (?à» invalid)
+ (?à» special)
+ (?à» special)
+ (?à» special)
+ (?à» special)
+ (?à» special)
+ (?à» special)
+ (?à» special)
+ (?à» special)
+ (?à» special)
+ (?à» special)
+ (?à» invalid)
+ (?à» invalid)
+ (?à» consonant "MOUSE")
+ (?à» consonant "DOG")
+ (?à» invalid)))
elm)
(while l
(setq elm (car l) l (cdr l))
@@ -146,8 +146,7 @@
((eq ptype 'tone)
(modify-category-entry char ?t lao-category-table)))
(put-char-code-property char 'phonetic-type ptype)
- (put-char-code-property char 'name (nth 2 elm))
- (put-char-code-property char 'meaning (nth 3 elm)))))
+ (put-char-code-property char 'meaning (nth 2 elm)))))
;; The general composing rules are as follows:
;;
diff --git a/lisp/language/thai-util.el b/lisp/language/thai-util.el
index a9af5cf9beb..618af572434 100644
--- a/lisp/language/thai-util.el
+++ b/lisp/language/thai-util.el
@@ -55,100 +55,100 @@
"\\cc\\(\\cu\\|\\cI\\cU\\|\\cv\\ct?\\)\\|\\cv\\ct\\|\\cI\\cU"
"Regular expression matching a Thai composite sequence.")
-(let ((l '((?ภconsonant "LETTER KO KAI") ; 0xA1
- (?ภconsonant "LETTER KHO KHAI") ; 0xA2
- (?ภconsonant "LETTER KHO KHUAT") ; 0xA3
- (?ภconsonant "LETTER KHO KHWAI") ; 0xA4
- (?à¸
consonant "LETTER KHO KHON") ; 0xA5
- (?ภconsonant "LETTER KHO RAKHANG") ; 0xA6
- (?ภconsonant "LETTER NGO NGU") ; 0xA7
- (?ภconsonant "LETTER CHO CHAN") ; 0xA8
- (?ภconsonant "LETTER CHO CHING") ; 0xA9
- (?ภconsonant "LETTER CHO CHANG") ; 0xAA
- (?ภconsonant "LETTER SO SO") ; 0xAB
- (?ภconsonant "LETTER CHO CHOE") ; 0xAC
- (?ภconsonant "LETTER YO YING") ; 0xAD
- (?ภconsonant "LETTER DO CHADA") ; 0xAE
- (?ภconsonant "LETTER TO PATAK") ; 0xAF
- (?ภconsonant "LETTER THO THAN") ; 0xB0
- (?ภconsonant "LETTER THO NANGMONTHO") ; 0xB1
- (?ภconsonant "LETTER THO PHUTHAO") ; 0xB2
- (?ภconsonant "LETTER NO NEN") ; 0xB3
- (?ภconsonant "LETTER DO DEK") ; 0xB4
- (?ภconsonant "LETTER TO TAO") ; 0xB5
- (?ภconsonant "LETTER THO THUNG") ; 0xB6
- (?ภconsonant "LETTER THO THAHAN") ; 0xB7
- (?ภconsonant "LETTER THO THONG") ; 0xB8
- (?ภconsonant "LETTER NO NU") ; 0xB9
- (?ภconsonant "LETTER BO BAIMAI") ; 0xBA
- (?ภconsonant "LETTER PO PLA") ; 0xBB
- (?ภconsonant "LETTER PHO PHUNG") ; 0xBC
- (?ภconsonant "LETTER FO FA") ; 0xBD
- (?ภconsonant "LETTER PHO PHAN") ; 0xBE
- (?ภconsonant "LETTER FO FAN") ; 0xBF
- (?ภconsonant "LETTER PHO SAMPHAO") ; 0xC0
- (?ม consonant "LETTER MO MA") ; 0xC1
- (?ย consonant "LETTER YO YAK") ; 0xC2
- (?ร consonant "LETTER RO RUA") ; 0xC3
- (?ฤ vowel-base "LETTER RU (Pali vowel letter)") ; 0xC4
- (?ล consonant "LETTER LO LING") ; 0xC5
- (?ฦ vowel-base "LETTER LU (Pali vowel letter)") ; 0xC6
- (?ว consonant "LETTER WO WAEN") ; 0xC7
- (?ศ consonant "LETTER SO SALA") ; 0xC8
- (?ษ consonant "LETTER SO RUSI") ; 0xC9
- (?ส consonant "LETTER SO SUA") ; 0xCA
- (?ห consonant "LETTER HO HIP") ; 0xCB
- (?ฬ consonant "LETTER LO CHULA") ; 0xCC
- (?ภconsonant "LETTER O ANG") ; 0xCD
- (?ฮ consonant "LETTER HO NOK HUK") ; 0xCE
- (?ฯ special "PAI YAN NOI (abbreviation)") ; 0xCF
- (?ะ vowel-base "VOWEL SIGN SARA A") ; 0xD0
- (?ั vowel-upper "VOWEL SIGN MAI HAN-AKAT N/S-T") ; 0xD1
- (?า vowel-base "VOWEL SIGN SARA AA") ; 0xD2
- (?ำ vowel-base "VOWEL SIGN SARA AM") ; 0xD3
- (?ิ vowel-upper "VOWEL SIGN SARA I N/S-T") ; 0xD4
- (?ี vowel-upper "VOWEL SIGN SARA II N/S-T") ; 0xD5
- (?ึ vowel-upper "VOWEL SIGN SARA UE N/S-T") ; 0xD6
- (?ื vowel-upper "VOWEL SIGN SARA UEE N/S-T") ; 0xD7
- (?ุ vowel-lower "VOWEL SIGN SARA U N/S-B") ; 0xD8
- (?ู vowel-lower "VOWEL SIGN SARA UU N/S-B") ; 0xD9
- (?ฺ vowel-lower "VOWEL SIGN PHINTHU N/S-B (Pali virama)") ; 0xDA
- (?฻ invalid nil) ; 0xDA
- (?฼ invalid nil) ; 0xDC
- (?฽ invalid nil) ; 0xDC
- (?฾ invalid nil) ; 0xDC
- (?฿ special "BAHT SIGN (currency symbol)") ; 0xDF
- (?๠vowel-base "VOWEL SIGN SARA E") ; 0xE0
- (?๠vowel-base "VOWEL SIGN SARA AE") ; 0xE1
- (?๠vowel-base "VOWEL SIGN SARA O") ; 0xE2
- (?๠vowel-base "VOWEL SIGN SARA MAI MUAN") ; 0xE3
- (?๠vowel-base "VOWEL SIGN SARA MAI MALAI") ; 0xE4
- (?à¹
vowel-base "LAK KHANG YAO") ; 0xE5
- (?๠special "MAI YAMOK (repetition)") ; 0xE6
- (?๠sign-upper "VOWEL SIGN MAI TAI KHU N/S-T") ; 0xE7
- (?๠tone "TONE MAI EK N/S-T") ; 0xE8
- (?๠tone "TONE MAI THO N/S-T") ; 0xE9
- (?๠tone "TONE MAI TRI N/S-T") ; 0xEA
- (?๠tone "TONE MAI CHATTAWA N/S-T") ; 0xEB
- (?๠sign-upper "THANTHAKHAT N/S-T (cancellation mark)") ; 0xEC
- (?๠sign-upper "NIKKHAHIT N/S-T (final nasal)") ; 0xED
- (?๠sign-upper "YAMAKKAN N/S-T") ; 0xEE
- (?๠special "FONRMAN") ; 0xEF
- (?๠special "DIGIT ZERO") ; 0xF0
- (?๠special "DIGIT ONE") ; 0xF1
- (?๠special "DIGIT TWO") ; 0xF2
- (?๠special "DIGIT THREE") ; 0xF3
- (?๠special "DIGIT FOUR") ; 0xF4
- (?๠special "DIGIT FIVE") ; 0xF5
- (?๠special "DIGIT SIX") ; 0xF6
- (?๠special "DIGIT SEVEN") ; 0xF7
- (?๠special "DIGIT EIGHT") ; 0xF8
- (?๠special "DIGIT NINE") ; 0xF9
- (?๠special "ANGKHANKHU (ellipsis)") ; 0xFA
- (?๠special "KHOMUT (beginning of religious texts)") ; 0xFB
- (?๠invalid nil) ; 0xFC
- (?๠invalid nil) ; 0xFD
- (?๠invalid nil) ; 0xFE
+(let ((l '((?ภconsonant) ; 0xA1
+ (?ภconsonant) ; 0xA2
+ (?ภconsonant) ; 0xA3
+ (?ภconsonant) ; 0xA4
+ (?à¸
consonant) ; 0xA5
+ (?ภconsonant) ; 0xA6
+ (?ภconsonant) ; 0xA7
+ (?ภconsonant) ; 0xA8
+ (?ภconsonant) ; 0xA9
+ (?ภconsonant) ; 0xAA
+ (?ภconsonant) ; 0xAB
+ (?ภconsonant) ; 0xAC
+ (?ภconsonant) ; 0xAD
+ (?ภconsonant) ; 0xAE
+ (?ภconsonant) ; 0xAF
+ (?ภconsonant) ; 0xB0
+ (?ภconsonant) ; 0xB1
+ (?ภconsonant) ; 0xB2
+ (?ภconsonant) ; 0xB3
+ (?ภconsonant) ; 0xB4
+ (?ภconsonant) ; 0xB5
+ (?ภconsonant) ; 0xB6
+ (?ภconsonant) ; 0xB7
+ (?ภconsonant) ; 0xB8
+ (?ภconsonant) ; 0xB9
+ (?ภconsonant) ; 0xBA
+ (?ภconsonant) ; 0xBB
+ (?ภconsonant) ; 0xBC
+ (?ภconsonant) ; 0xBD
+ (?ภconsonant) ; 0xBE
+ (?ภconsonant) ; 0xBF
+ (?ภconsonant) ; 0xC0
+ (?ม consonant) ; 0xC1
+ (?ย consonant) ; 0xC2
+ (?ร consonant) ; 0xC3
+ (?ฤ vowel-base) ; 0xC4
+ (?ล consonant) ; 0xC5
+ (?ฦ vowel-base) ; 0xC6
+ (?ว consonant) ; 0xC7
+ (?ศ consonant) ; 0xC8
+ (?ษ consonant) ; 0xC9
+ (?ส consonant) ; 0xCA
+ (?ห consonant) ; 0xCB
+ (?ฬ consonant) ; 0xCC
+ (?ภconsonant) ; 0xCD
+ (?ฮ consonant) ; 0xCE
+ (?ฯ special) ; 0xCF
+ (?ะ vowel-base) ; 0xD0
+ (?ั vowel-upper) ; 0xD1
+ (?า vowel-base) ; 0xD2
+ (?ำ vowel-base) ; 0xD3
+ (?ิ vowel-upper) ; 0xD4
+ (?ี vowel-upper) ; 0xD5
+ (?ึ vowel-upper) ; 0xD6
+ (?ื vowel-upper) ; 0xD7
+ (?ุ vowel-lower) ; 0xD8
+ (?ู vowel-lower) ; 0xD9
+ (?ฺ vowel-lower) ; 0xDA
+ (?฻ invalid) ; 0xDA
+ (?฼ invalid) ; 0xDC
+ (?฽ invalid) ; 0xDC
+ (?฾ invalid) ; 0xDC
+ (?฿ special) ; 0xDF
+ (?๠vowel-base) ; 0xE0
+ (?๠vowel-base) ; 0xE1
+ (?๠vowel-base) ; 0xE2
+ (?๠vowel-base) ; 0xE3
+ (?๠vowel-base) ; 0xE4
+ (?à¹
vowel-base) ; 0xE5
+ (?๠special) ; 0xE6
+ (?๠sign-upper) ; 0xE7
+ (?๠tone) ; 0xE8
+ (?๠tone) ; 0xE9
+ (?๠tone) ; 0xEA
+ (?๠tone) ; 0xEB
+ (?๠sign-upper) ; 0xEC
+ (?๠sign-upper) ; 0xED
+ (?๠sign-upper) ; 0xEE
+ (?๠special) ; 0xEF
+ (?๠special) ; 0xF0
+ (?๠special) ; 0xF1
+ (?๠special) ; 0xF2
+ (?๠special) ; 0xF3
+ (?๠special) ; 0xF4
+ (?๠special) ; 0xF5
+ (?๠special) ; 0xF6
+ (?๠special) ; 0xF7
+ (?๠special) ; 0xF8
+ (?๠special) ; 0xF9
+ (?๠special) ; 0xFA
+ (?๠special) ; 0xFB
+ (?๠invalid) ; 0xFC
+ (?๠invalid) ; 0xFD
+ (?๠invalid) ; 0xFE
))
elm)
(while l
@@ -170,8 +170,7 @@
(modify-category-entry char ?u thai-category-table)
(if (= char ?à¹)
;; Give category `U' to "THANTHAKHAT".
- (modify-category-entry char ?U thai-category-table))))
- (put-char-code-property char 'name (nth 2 elm)))))
+ (modify-category-entry char ?U thai-category-table)))))))
(defun thai-compose-syllable (beg end &optional category-set string)
(or category-set