diff lisp/mule/vietnamese.el @ 4690:257b468bf2ca

Move the #'query-coding-region implementation to C. This is necessary because there is no reasonable way to access the corresponding mswindows-multibyte functionality from Lisp, and we need such functionality if we're going to have a reliable and portable #'query-coding-region implementation. However, this change doesn't yet provide #'query-coding-region for the mswindow-multibyte coding systems, there should be no functional differences between an XEmacs with this change and one without it. src/ChangeLog addition: 2009-09-19 Aidan Kehoe <kehoea@parhasard.net> Move the #'query-coding-region implementation to C. This is necessary because there is no reasonable way to access the corresponding mswindows-multibyte functionality from Lisp, and we need such functionality if we're going to have a reliable and portable #'query-coding-region implementation. However, this change doesn't yet provide #'query-coding-region for the mswindow-multibyte coding systems, there should be no functional differences between an XEmacs with this change and one without it. * mule-coding.c (struct fixed_width_coding_system): Add a new coding system type, fixed_width, and implement it. It uses the CCL infrastructure but has a much simpler creation API, and its own query_method, formerly in lisp/mule/mule-coding.el. * unicode.c: Move the Unicode query method implementation here from unicode.el. * lisp.h: Declare Fmake_coding_system_internal, Fcopy_range_table here. * intl-win32.c (complex_vars_of_intl_win32): Use Fmake_coding_system_internal, not Fmake_coding_system. * general-slots.h: Add Qsucceeded, Qunencodable, Qinvalid_sequence here. * file-coding.h (enum coding_system_variant): Add fixed_width_coding_system here. (struct coding_system_methods): Add query_method and query_lstream_method to the coding system methods. Provide flags for the query methods. Declare the default query method; initialise it correctly in INITIALIZE_CODING_SYSTEM_TYPE. * file-coding.c (default_query_method): New function, the default query method for coding systems that do not set it. Moved from coding.el. (make_coding_system_1): Accept new elements in PROPS in #'make-coding-system; aliases, a list of aliases; safe-chars and safe-charsets (these were previously accepted but not saved); and category. (Fmake_coding_system_internal): New function, what used to be #'make-coding-system--on Mule builds, we've now moved some of the functionality of this to Lisp. (Fcoding_system_canonical_name_p): Move this earlier in the file, since it's now called from within make_coding_system_1. (Fquery_coding_region): Move the implementation of this here, from coding.el. (complex_vars_of_file_coding): Call Fmake_coding_system_internal, not Fmake_coding_system; specify safe-charsets properties when we're a mule build. * extents.h (mouse_highlight_priority, Fset_extent_priority, Fset_extent_face, Fmap_extents): Make these available to other C files. lisp/ChangeLog addition: 2009-09-19 Aidan Kehoe <kehoea@parhasard.net> Move the #'query-coding-region implementation to C. * coding.el: Consolidate code that depends on the presence or absence of Mule at the end of this file. (default-query-coding-region, query-coding-region): Move these functions to C. (default-query-coding-region-safe-charset-skip-chars-map): Remove this variable, the corresponding C variable is Vdefault_query_coding_region_chartab_cache in file-coding.c. (query-coding-string): Update docstring to reflect actual multiple values, be more careful about not modifying a range table that we're currently mapping over. (encode-coding-char): Make the implementation of this simpler. (featurep 'mule): Autoload #'make-coding-system from mule/make-coding-system.el if we're a mule build; provide an appropriate compiler macro. Do various non-mule compatibility things if we're not a mule build. * update-elc.el (additional-dump-dependencies): Add mule/make-coding-system as a dump time dependency if we're a mule build. * unicode.el (ccl-encode-to-ucs-2): (decode-char): (encode-char): Move these earlier in the file, for the sake of some byte compile warnings. (unicode-query-coding-region): Move this to unicode.c * mule/make-coding-system.el: New file, not dumped. Contains the functionality to rework the arguments necessary for fixed-width coding systems, and contains the implementation of #'make-coding-system, which now calls #'make-coding-system-internal. * mule/vietnamese.el (viscii): * mule/latin.el (iso-8859-2): (windows-1250): (iso-8859-3): (iso-8859-4): (iso-8859-14): (iso-8859-15): (iso-8859-16): (iso-8859-9): (macintosh): (windows-1252): * mule/hebrew.el (iso-8859-8): * mule/greek.el (iso-8859-7): (windows-1253): * mule/cyrillic.el (iso-8859-5): (koi8-r): (koi8-u): (windows-1251): (alternativnyj): (koi8-ru): (koi8-t): (koi8-c): (koi8-o): * mule/arabic.el (iso-8859-6): (windows-1256): Move all these coding systems to being of type fixed-width, not of type CCL. This allows the distinct query-coding-region for them to be in C, something which will eventually allow us to implement query-coding-region for the mswindows-multibyte coding systems. * mule/general-late.el (posix-charset-to-coding-system-hash): Document why we're pre-emptively persuading the byte compiler that the ELC for this file needs to be written using escape-quoted. Call #'set-unicode-query-skip-chars-args, now the Unicode query-coding-region implementation is in C. * mule/thai-xtis.el (tis-620): Don't bother checking whether we're XEmacs or not here. * mule/mule-coding.el: Move the eight bit fixed-width functionality from this file to make-coding-system.el. tests/ChangeLog addition: 2009-09-19 Aidan Kehoe <kehoea@parhasard.net> * automated/mule-tests.el: Check a coding system's type, not an 8-bit-fixed property, for whether that coding system should be treated as a fixed-width coding system. * automated/query-coding-tests.el: Don't test the query coding functionality for mswindows-multibyte coding systems, it's not yet implemented.
author Aidan Kehoe <kehoea@parhasard.net>
date Sat, 19 Sep 2009 22:53:13 +0100
parents e0a8715fdb1f
children 29fb3baea939
line wrap: on
line diff
--- a/lisp/mule/vietnamese.el	Sat Sep 19 17:56:23 2009 +0200
+++ b/lisp/mule/vietnamese.el	Sat Sep 19 22:53:13 2009 +0100
@@ -64,144 +64,144 @@
 (modify-category-entry 'vietnamese-viscii-lower ?v)
 (modify-category-entry 'vietnamese-viscii-upper ?v)
 
-(make-8-bit-coding-system 
- 'viscii
- '((#x02 ?\u1EB2) ;; CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
-   (#x05 ?\u1EB4) ;; CAPITAL LETTER A WITH BREVE AND TILDE
-   (#x06 ?\u1EAA) ;; CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
-   (#x14 ?\u1EF6) ;; CAPITAL LETTER Y WITH HOOK ABOVE
-   (#x19 ?\u1EF8) ;; CAPITAL LETTER Y WITH TILDE
-   (#x1E ?\u1EF4) ;; CAPITAL LETTER Y WITH DOT BELOW
-   (#x80 ?\u1EA0) ;; CAPITAL LETTER A WITH DOT BELOW
-   (#x81 ?\u1EAE) ;; CAPITAL LETTER A WITH BREVE AND ACUTE
-   (#x82 ?\u1EB0) ;; CAPITAL LETTER A WITH BREVE AND GRAVE
-   (#x83 ?\u1EB6) ;; CAPITAL LETTER A WITH BREVE AND DOT BELOW
-   (#x84 ?\u1EA4) ;; CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
-   (#x85 ?\u1EA6) ;; CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
-   (#x86 ?\u1EA8) ;; CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
-   (#x87 ?\u1EAC) ;; CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
-   (#x88 ?\u1EBC) ;; CAPITAL LETTER E WITH TILDE
-   (#x89 ?\u1EB8) ;; CAPITAL LETTER E WITH DOT BELOW
-   (#x8A ?\u1EBE) ;; CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
-   (#x8B ?\u1EC0) ;; CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
-   (#x8C ?\u1EC2) ;; CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
-   (#x8D ?\u1EC4) ;; CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
-   (#x8E ?\u1EC6) ;; CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
-   (#x8F ?\u1ED0) ;; CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
-   (#x90 ?\u1ED2) ;; CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
-   (#x91 ?\u1ED4) ;; CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
-   (#x92 ?\u1ED6) ;; CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
-   (#x93 ?\u1ED8) ;; CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
-   (#x94 ?\u1EE2) ;; CAPITAL LETTER O WITH HORN AND DOT BELOW
-   (#x95 ?\u1EDA) ;; CAPITAL LETTER O WITH HORN AND ACUTE
-   (#x96 ?\u1EDC) ;; CAPITAL LETTER O WITH HORN AND GRAVE
-   (#x97 ?\u1EDE) ;; CAPITAL LETTER O WITH HORN AND HOOK ABOVE
-   (#x98 ?\u1ECA) ;; CAPITAL LETTER I WITH DOT BELOW
-   (#x99 ?\u1ECE) ;; CAPITAL LETTER O WITH HOOK ABOVE
-   (#x9A ?\u1ECC) ;; CAPITAL LETTER O WITH DOT BELOW
-   (#x9B ?\u1EC8) ;; CAPITAL LETTER I WITH HOOK ABOVE
-   (#x9C ?\u1EE6) ;; CAPITAL LETTER U WITH HOOK ABOVE
-   (#x9D ?\u0168) ;; CAPITAL LETTER U WITH TILDE
-   (#x9E ?\u1EE4) ;; CAPITAL LETTER U WITH DOT BELOW
-   (#x9F ?\u1EF2) ;; CAPITAL LETTER Y WITH GRAVE
-   (#xA0 ?\u00D5) ;; CAPITAL LETTER O WITH TILDE
-   (#xA1 ?\u1EAF) ;; SMALL LETTER A WITH BREVE AND ACUTE
-   (#xA2 ?\u1EB1) ;; SMALL LETTER A WITH BREVE AND GRAVE
-   (#xA3 ?\u1EB7) ;; SMALL LETTER A WITH BREVE AND DOT BELOW
-   (#xA4 ?\u1EA5) ;; SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
-   (#xA5 ?\u1EA7) ;; SMALL LETTER A WITH CIRCUMFLEX AND GRAVE
-   (#xA6 ?\u1EA8) ;; CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
-   (#xA7 ?\u1EAD) ;; SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
-   (#xA8 ?\u1EBD) ;; SMALL LETTER E WITH TILDE
-   (#xA9 ?\u1EB9) ;; SMALL LETTER E WITH DOT BELOW
-   (#xAA ?\u1EBF) ;; SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
-   (#xAB ?\u1EC1) ;; SMALL LETTER E WITH CIRCUMFLEX AND GRAVE
-   (#xAC ?\u1EC3) ;; SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
-   (#xAD ?\u1EC5) ;; SMALL LETTER E WITH CIRCUMFLEX AND TILDE
-   (#xAE ?\u1EC7) ;; SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
-   (#xAF ?\u1ED1) ;; SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
-   (#xB0 ?\u1ED3) ;; SMALL LETTER O WITH CIRCUMFLEX AND GRAVE
-   (#xB1 ?\u1ED5) ;; SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
-   (#xB2 ?\u1ED7) ;; SMALL LETTER O WITH CIRCUMFLEX AND TILDE
-   (#xB3 ?\u1EE0) ;; CAPITAL LETTER O WITH HORN AND TILDE
-   (#xB4 ?\u01A0) ;; CAPITAL LETTER O WITH HORN
-   (#xB5 ?\u1ED9) ;; SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
-   (#xB6 ?\u1EDD) ;; SMALL LETTER O WITH HORN AND GRAVE
-   (#xB7 ?\u1EDF) ;; SMALL LETTER O WITH HORN AND HOOK ABOVE
-   (#xB8 ?\u1ECB) ;; SMALL LETTER I WITH DOT BELOW
-   (#xB9 ?\u1EF0) ;; CAPITAL LETTER U WITH HORN AND DOT BELOW
-   (#xBA ?\u1EE8) ;; CAPITAL LETTER U WITH HORN AND ACUTE
-   (#xBB ?\u1EEA) ;; CAPITAL LETTER U WITH HORN AND GRAVE
-   (#xBC ?\u1EEC) ;; CAPITAL LETTER U WITH HORN AND HOOK ABOVE
-   (#xBD ?\u01A1) ;; SMALL LETTER O WITH HORN
-   (#xBE ?\u1EDB) ;; SMALL LETTER O WITH HORN AND ACUTE
-   (#xBF ?\u01AF) ;; CAPITAL LETTER U WITH HORN
-   (#xC0 ?\u00C0) ;; CAPITAL LETTER A WITH GRAVE
-   (#xC1 ?\u00C1) ;; CAPITAL LETTER A WITH ACUTE
-   (#xC2 ?\u00C2) ;; CAPITAL LETTER A WITH CIRCUMFLEX
-   (#xC3 ?\u00C3) ;; CAPITAL LETTER A WITH TILDE
-   (#xC4 ?\u1EA2) ;; CAPITAL LETTER A WITH HOOK ABOVE
-   (#xC5 ?\u0102) ;; CAPITAL LETTER A WITH BREVE
-   (#xC6 ?\u1EB3) ;; SMALL LETTER A WITH BREVE AND HOOK ABOVE
-   (#xC7 ?\u1EB5) ;; SMALL LETTER A WITH BREVE AND TILDE
-   (#xC8 ?\u00C8) ;; CAPITAL LETTER E WITH GRAVE
-   (#xC9 ?\u00C9) ;; CAPITAL LETTER E WITH ACUTE
-   (#xCA ?\u00CA) ;; CAPITAL LETTER E WITH CIRCUMFLEX
-   (#xCB ?\u1EBA) ;; CAPITAL LETTER E WITH HOOK ABOVE
-   (#xCC ?\u00CC) ;; CAPITAL LETTER I WITH GRAVE
-   (#xCD ?\u00CD) ;; CAPITAL LETTER I WITH ACUTE
-   (#xCE ?\u0128) ;; CAPITAL LETTER I WITH TILDE
-   (#xCF ?\u1EF3) ;; SMALL LETTER Y WITH GRAVE
-   (#xD0 ?\u0110) ;; CAPITAL LETTER D WITH STROKE
-   (#xD1 ?\u1EE9) ;; SMALL LETTER U WITH HORN AND ACUTE
-   (#xD2 ?\u00D2) ;; CAPITAL LETTER O WITH GRAVE
-   (#xD3 ?\u00D3) ;; CAPITAL LETTER O WITH ACUTE
-   (#xD4 ?\u00D4) ;; CAPITAL LETTER O WITH CIRCUMFLEX
-   (#xD5 ?\u1EA1) ;; SMALL LETTER A WITH DOT BELOW
-   (#xD6 ?\u1EF7) ;; SMALL LETTER Y WITH HOOK ABOVE
-   (#xD7 ?\u1EEB) ;; SMALL LETTER U WITH HORN AND GRAVE
-   (#xD8 ?\u1EED) ;; SMALL LETTER U WITH HORN AND HOOK ABOVE
-   (#xD9 ?\u00D9) ;; CAPITAL LETTER U WITH GRAVE
-   (#xDA ?\u00DA) ;; CAPITAL LETTER U WITH ACUTE
-   (#xDB ?\u1EF9) ;; SMALL LETTER Y WITH TILDE
-   (#xDC ?\u1EF5) ;; SMALL LETTER Y WITH DOT BELOW
-   (#xDD ?\u00DD) ;; CAPITAL LETTER Y WITH ACUTE
-   (#xDE ?\u1EE1) ;; SMALL LETTER O WITH HORN AND TILDE
-   (#xDF ?\u01B0) ;; SMALL LETTER U WITH HORN
-   (#xE0 ?\u00E0) ;; SMALL LETTER A WITH GRAVE
-   (#xE1 ?\u00E1) ;; SMALL LETTER A WITH ACUTE
-   (#xE2 ?\u00E2) ;; SMALL LETTER A WITH CIRCUMFLEX
-   (#xE3 ?\u00E3) ;; SMALL LETTER A WITH TILDE
-   (#xE4 ?\u1EA3) ;; SMALL LETTER A WITH HOOK ABOVE
-   (#xE5 ?\u0103) ;; SMALL LETTER A WITH BREVE
-   (#xE6 ?\u1EEF) ;; SMALL LETTER U WITH HORN AND TILDE
-   (#xE7 ?\u1EAB) ;; SMALL LETTER A WITH CIRCUMFLEX AND TILDE
-   (#xE8 ?\u00E8) ;; SMALL LETTER E WITH GRAVE
-   (#xE9 ?\u00E9) ;; SMALL LETTER E WITH ACUTE
-   (#xEA ?\u00EA) ;; SMALL LETTER E WITH CIRCUMFLEX
-   (#xEB ?\u1EBB) ;; SMALL LETTER E WITH HOOK ABOVE
-   (#xEC ?\u00EC) ;; SMALL LETTER I WITH GRAVE
-   (#xED ?\u00ED) ;; SMALL LETTER I WITH ACUTE
-   (#xEE ?\u0129) ;; SMALL LETTER I WITH TILDE
-   (#xEF ?\u1EC9) ;; SMALL LETTER I WITH HOOK ABOVE
-   (#xF0 ?\u0111) ;; SMALL LETTER D WITH STROKE
-   (#xF1 ?\u1EF1) ;; SMALL LETTER U WITH HORN AND DOT BELOW
-   (#xF2 ?\u00F2) ;; SMALL LETTER O WITH GRAVE
-   (#xF3 ?\u00F3) ;; SMALL LETTER O WITH ACUTE
-   (#xF4 ?\u00F4) ;; SMALL LETTER O WITH CIRCUMFLEX
-   (#xF5 ?\u00F5) ;; SMALL LETTER O WITH TILDE
-   (#xF6 ?\u1ECF) ;; SMALL LETTER O WITH HOOK ABOVE
-   (#xF7 ?\u1ECD) ;; SMALL LETTER O WITH DOT BELOW
-   (#xF8 ?\u1EE5) ;; SMALL LETTER U WITH DOT BELOW
-   (#xF9 ?\u00F9) ;; SMALL LETTER U WITH GRAVE
-   (#xFA ?\u00FA) ;; SMALL LETTER U WITH ACUTE
-   (#xFB ?\u0169) ;; SMALL LETTER U WITH TILDE
-   (#xFC ?\u1EE7) ;; SMALL LETTER U WITH HOOK ABOVE
-   (#xFD ?\u00FD) ;; SMALL LETTER Y WITH ACUTE
-   (#xFE ?\u1EE3) ;; SMALL LETTER O WITH HORN AND DOT BELOW
-   (#xFF ?\u1EEE)) ;; CAPITAL LETTER U WITH HORN AND TILDE
- "VISCII 1.1 (Vietnamese)"
- '(mnemonic "VISCII"))
+(make-coding-system 
+ 'viscii 'fixed-width "VISCII 1.1 (Vietnamese)"
+ '(unicode-map
+   ((#x02 ?\u1EB2) ;; CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
+    (#x05 ?\u1EB4) ;; CAPITAL LETTER A WITH BREVE AND TILDE
+    (#x06 ?\u1EAA) ;; CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
+    (#x14 ?\u1EF6) ;; CAPITAL LETTER Y WITH HOOK ABOVE
+    (#x19 ?\u1EF8) ;; CAPITAL LETTER Y WITH TILDE
+    (#x1E ?\u1EF4) ;; CAPITAL LETTER Y WITH DOT BELOW
+    (#x80 ?\u1EA0) ;; CAPITAL LETTER A WITH DOT BELOW
+    (#x81 ?\u1EAE) ;; CAPITAL LETTER A WITH BREVE AND ACUTE
+    (#x82 ?\u1EB0) ;; CAPITAL LETTER A WITH BREVE AND GRAVE
+    (#x83 ?\u1EB6) ;; CAPITAL LETTER A WITH BREVE AND DOT BELOW
+    (#x84 ?\u1EA4) ;; CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
+    (#x85 ?\u1EA6) ;; CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
+    (#x86 ?\u1EA8) ;; CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
+    (#x87 ?\u1EAC) ;; CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
+    (#x88 ?\u1EBC) ;; CAPITAL LETTER E WITH TILDE
+    (#x89 ?\u1EB8) ;; CAPITAL LETTER E WITH DOT BELOW
+    (#x8A ?\u1EBE) ;; CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
+    (#x8B ?\u1EC0) ;; CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
+    (#x8C ?\u1EC2) ;; CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
+    (#x8D ?\u1EC4) ;; CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
+    (#x8E ?\u1EC6) ;; CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
+    (#x8F ?\u1ED0) ;; CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
+    (#x90 ?\u1ED2) ;; CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
+    (#x91 ?\u1ED4) ;; CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
+    (#x92 ?\u1ED6) ;; CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
+    (#x93 ?\u1ED8) ;; CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
+    (#x94 ?\u1EE2) ;; CAPITAL LETTER O WITH HORN AND DOT BELOW
+    (#x95 ?\u1EDA) ;; CAPITAL LETTER O WITH HORN AND ACUTE
+    (#x96 ?\u1EDC) ;; CAPITAL LETTER O WITH HORN AND GRAVE
+    (#x97 ?\u1EDE) ;; CAPITAL LETTER O WITH HORN AND HOOK ABOVE
+    (#x98 ?\u1ECA) ;; CAPITAL LETTER I WITH DOT BELOW
+    (#x99 ?\u1ECE) ;; CAPITAL LETTER O WITH HOOK ABOVE
+    (#x9A ?\u1ECC) ;; CAPITAL LETTER O WITH DOT BELOW
+    (#x9B ?\u1EC8) ;; CAPITAL LETTER I WITH HOOK ABOVE
+    (#x9C ?\u1EE6) ;; CAPITAL LETTER U WITH HOOK ABOVE
+    (#x9D ?\u0168) ;; CAPITAL LETTER U WITH TILDE
+    (#x9E ?\u1EE4) ;; CAPITAL LETTER U WITH DOT BELOW
+    (#x9F ?\u1EF2) ;; CAPITAL LETTER Y WITH GRAVE
+    (#xA0 ?\u00D5) ;; CAPITAL LETTER O WITH TILDE
+    (#xA1 ?\u1EAF) ;; SMALL LETTER A WITH BREVE AND ACUTE
+    (#xA2 ?\u1EB1) ;; SMALL LETTER A WITH BREVE AND GRAVE
+    (#xA3 ?\u1EB7) ;; SMALL LETTER A WITH BREVE AND DOT BELOW
+    (#xA4 ?\u1EA5) ;; SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
+    (#xA5 ?\u1EA7) ;; SMALL LETTER A WITH CIRCUMFLEX AND GRAVE
+    (#xA6 ?\u1EA8) ;; CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
+    (#xA7 ?\u1EAD) ;; SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
+    (#xA8 ?\u1EBD) ;; SMALL LETTER E WITH TILDE
+    (#xA9 ?\u1EB9) ;; SMALL LETTER E WITH DOT BELOW
+    (#xAA ?\u1EBF) ;; SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
+    (#xAB ?\u1EC1) ;; SMALL LETTER E WITH CIRCUMFLEX AND GRAVE
+    (#xAC ?\u1EC3) ;; SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
+    (#xAD ?\u1EC5) ;; SMALL LETTER E WITH CIRCUMFLEX AND TILDE
+    (#xAE ?\u1EC7) ;; SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
+    (#xAF ?\u1ED1) ;; SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
+    (#xB0 ?\u1ED3) ;; SMALL LETTER O WITH CIRCUMFLEX AND GRAVE
+    (#xB1 ?\u1ED5) ;; SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
+    (#xB2 ?\u1ED7) ;; SMALL LETTER O WITH CIRCUMFLEX AND TILDE
+    (#xB3 ?\u1EE0) ;; CAPITAL LETTER O WITH HORN AND TILDE
+    (#xB4 ?\u01A0) ;; CAPITAL LETTER O WITH HORN
+    (#xB5 ?\u1ED9) ;; SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
+    (#xB6 ?\u1EDD) ;; SMALL LETTER O WITH HORN AND GRAVE
+    (#xB7 ?\u1EDF) ;; SMALL LETTER O WITH HORN AND HOOK ABOVE
+    (#xB8 ?\u1ECB) ;; SMALL LETTER I WITH DOT BELOW
+    (#xB9 ?\u1EF0) ;; CAPITAL LETTER U WITH HORN AND DOT BELOW
+    (#xBA ?\u1EE8) ;; CAPITAL LETTER U WITH HORN AND ACUTE
+    (#xBB ?\u1EEA) ;; CAPITAL LETTER U WITH HORN AND GRAVE
+    (#xBC ?\u1EEC) ;; CAPITAL LETTER U WITH HORN AND HOOK ABOVE
+    (#xBD ?\u01A1) ;; SMALL LETTER O WITH HORN
+    (#xBE ?\u1EDB) ;; SMALL LETTER O WITH HORN AND ACUTE
+    (#xBF ?\u01AF) ;; CAPITAL LETTER U WITH HORN
+    (#xC0 ?\u00C0) ;; CAPITAL LETTER A WITH GRAVE
+    (#xC1 ?\u00C1) ;; CAPITAL LETTER A WITH ACUTE
+    (#xC2 ?\u00C2) ;; CAPITAL LETTER A WITH CIRCUMFLEX
+    (#xC3 ?\u00C3) ;; CAPITAL LETTER A WITH TILDE
+    (#xC4 ?\u1EA2) ;; CAPITAL LETTER A WITH HOOK ABOVE
+    (#xC5 ?\u0102) ;; CAPITAL LETTER A WITH BREVE
+    (#xC6 ?\u1EB3) ;; SMALL LETTER A WITH BREVE AND HOOK ABOVE
+    (#xC7 ?\u1EB5) ;; SMALL LETTER A WITH BREVE AND TILDE
+    (#xC8 ?\u00C8) ;; CAPITAL LETTER E WITH GRAVE
+    (#xC9 ?\u00C9) ;; CAPITAL LETTER E WITH ACUTE
+    (#xCA ?\u00CA) ;; CAPITAL LETTER E WITH CIRCUMFLEX
+    (#xCB ?\u1EBA) ;; CAPITAL LETTER E WITH HOOK ABOVE
+    (#xCC ?\u00CC) ;; CAPITAL LETTER I WITH GRAVE
+    (#xCD ?\u00CD) ;; CAPITAL LETTER I WITH ACUTE
+    (#xCE ?\u0128) ;; CAPITAL LETTER I WITH TILDE
+    (#xCF ?\u1EF3) ;; SMALL LETTER Y WITH GRAVE
+    (#xD0 ?\u0110) ;; CAPITAL LETTER D WITH STROKE
+    (#xD1 ?\u1EE9) ;; SMALL LETTER U WITH HORN AND ACUTE
+    (#xD2 ?\u00D2) ;; CAPITAL LETTER O WITH GRAVE
+    (#xD3 ?\u00D3) ;; CAPITAL LETTER O WITH ACUTE
+    (#xD4 ?\u00D4) ;; CAPITAL LETTER O WITH CIRCUMFLEX
+    (#xD5 ?\u1EA1) ;; SMALL LETTER A WITH DOT BELOW
+    (#xD6 ?\u1EF7) ;; SMALL LETTER Y WITH HOOK ABOVE
+    (#xD7 ?\u1EEB) ;; SMALL LETTER U WITH HORN AND GRAVE
+    (#xD8 ?\u1EED) ;; SMALL LETTER U WITH HORN AND HOOK ABOVE
+    (#xD9 ?\u00D9) ;; CAPITAL LETTER U WITH GRAVE
+    (#xDA ?\u00DA) ;; CAPITAL LETTER U WITH ACUTE
+    (#xDB ?\u1EF9) ;; SMALL LETTER Y WITH TILDE
+    (#xDC ?\u1EF5) ;; SMALL LETTER Y WITH DOT BELOW
+    (#xDD ?\u00DD) ;; CAPITAL LETTER Y WITH ACUTE
+    (#xDE ?\u1EE1) ;; SMALL LETTER O WITH HORN AND TILDE
+    (#xDF ?\u01B0) ;; SMALL LETTER U WITH HORN
+    (#xE0 ?\u00E0) ;; SMALL LETTER A WITH GRAVE
+    (#xE1 ?\u00E1) ;; SMALL LETTER A WITH ACUTE
+    (#xE2 ?\u00E2) ;; SMALL LETTER A WITH CIRCUMFLEX
+    (#xE3 ?\u00E3) ;; SMALL LETTER A WITH TILDE
+    (#xE4 ?\u1EA3) ;; SMALL LETTER A WITH HOOK ABOVE
+    (#xE5 ?\u0103) ;; SMALL LETTER A WITH BREVE
+    (#xE6 ?\u1EEF) ;; SMALL LETTER U WITH HORN AND TILDE
+    (#xE7 ?\u1EAB) ;; SMALL LETTER A WITH CIRCUMFLEX AND TILDE
+    (#xE8 ?\u00E8) ;; SMALL LETTER E WITH GRAVE
+    (#xE9 ?\u00E9) ;; SMALL LETTER E WITH ACUTE
+    (#xEA ?\u00EA) ;; SMALL LETTER E WITH CIRCUMFLEX
+    (#xEB ?\u1EBB) ;; SMALL LETTER E WITH HOOK ABOVE
+    (#xEC ?\u00EC) ;; SMALL LETTER I WITH GRAVE
+    (#xED ?\u00ED) ;; SMALL LETTER I WITH ACUTE
+    (#xEE ?\u0129) ;; SMALL LETTER I WITH TILDE
+    (#xEF ?\u1EC9) ;; SMALL LETTER I WITH HOOK ABOVE
+    (#xF0 ?\u0111) ;; SMALL LETTER D WITH STROKE
+    (#xF1 ?\u1EF1) ;; SMALL LETTER U WITH HORN AND DOT BELOW
+    (#xF2 ?\u00F2) ;; SMALL LETTER O WITH GRAVE
+    (#xF3 ?\u00F3) ;; SMALL LETTER O WITH ACUTE
+    (#xF4 ?\u00F4) ;; SMALL LETTER O WITH CIRCUMFLEX
+    (#xF5 ?\u00F5) ;; SMALL LETTER O WITH TILDE
+    (#xF6 ?\u1ECF) ;; SMALL LETTER O WITH HOOK ABOVE
+    (#xF7 ?\u1ECD) ;; SMALL LETTER O WITH DOT BELOW
+    (#xF8 ?\u1EE5) ;; SMALL LETTER U WITH DOT BELOW
+    (#xF9 ?\u00F9) ;; SMALL LETTER U WITH GRAVE
+    (#xFA ?\u00FA) ;; SMALL LETTER U WITH ACUTE
+    (#xFB ?\u0169) ;; SMALL LETTER U WITH TILDE
+    (#xFC ?\u1EE7) ;; SMALL LETTER U WITH HOOK ABOVE
+    (#xFD ?\u00FD) ;; SMALL LETTER Y WITH ACUTE
+    (#xFE ?\u1EE3) ;; SMALL LETTER O WITH HORN AND DOT BELOW
+    (#xFF ?\u1EEE)) ;; CAPITAL LETTER U WITH HORN AND TILDE
+   mnemonic "VISCII"))
 
 (set-language-info-alist
  "Vietnamese" '((charset vietnamese-viscii-lower vietnamese-viscii-upper)