Commit 14649c88 authored by Paul Eggert's avatar Paul Eggert
Browse files

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).
parent eeb138d3
......@@ -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:
;;
......
......@@ -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
......
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