X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fu01E00-Latin-Extended-Additional.el;h=bcabf4488f3255cf26280dfecadd4ff36edaf944;hb=cca485b92eaeea9f89a868fd4e17e0608a6df401;hp=99c5a84bc6afed6513b54089160b5ab6b45dcc72;hpb=c5acd0cbf1209288c4568cdb899f8b1fa56cadf1;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/u01E00-Latin-Extended-Additional.el b/lisp/utf-2000/u01E00-Latin-Extended-Additional.el
index 99c5a84..bcabf44 100644
--- a/lisp/utf-2000/u01E00-Latin-Extended-Additional.el
+++ b/lisp/utf-2000/u01E00-Latin-Extended-Additional.el
@@ -1,3 +1,4 @@
+;; -*- coding: utf-8-mcs-er -*-
 (define-char
   '((name		. "LATIN CAPITAL LETTER A WITH RING BELOW")
     (general-category	letter uppercase) ; Normative Category
@@ -587,8 +588,19 @@
     (=ucs		. #x1E30)	; Ḱ
     ))
 (define-char
-  '((=>ucs		. #x1E30)	; Ḱ
-    (=jef-china3	. #x85DC)	; øºˆ—œ
+  '((->decomposition	#xFF2B #x0301)
+    (->lowercase
+     ((=jef-china3	  . #x85F2)	; &JC3-85F2;
+      ))
+    (<-denotational
+     ((name		  . "LATIN CAPITAL LETTER K WITH ACUTE")
+      (=ucs		  . #x1E30)	; Ḱ
+      ))
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER K WITH ACUTE")
+      (=ucs		  . #x1E30)	; Ḱ
+      ))
+    (=jef-china3	. #x85DC)	; &JC3-85DC;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER K WITH ACUTE")
@@ -603,8 +615,19 @@
     (=ucs		. #x1E31)	; ḱ
     ))
 (define-char
-  '((=>ucs		. #x1E31)	; ḱ
-    (=jef-china3	. #x85F2)	; øºˆ—²
+  '((->decomposition	#xFF4B #x0301)
+    (->uppercase
+     ((=jef-china3	  . #x85DC)	; &JC3-85DC;
+      ))
+    (<-denotational
+     ((name		  . "LATIN SMALL LETTER K WITH ACUTE")
+      (=ucs		  . #x1E31)	; ḱ
+      ))
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER K WITH ACUTE")
+      (=ucs		  . #x1E31)	; ḱ
+      ))
+    (=jef-china3	. #x85F2)	; &JC3-85F2;
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER K WITH DOT BELOW")
@@ -756,10 +779,6 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	#x004D #x0301)
-    (->fullwidth
-     ((name . "fullwidth latin capital letter m with acute")
-      (=jis-x0213-1-2000  . #x2872)	; ø»¢žŸ
-      ))
     (->lowercase
      ((name		  . "LATIN SMALL LETTER M WITH ACUTE")
       (=ucs		  . #x1E3F)	; ḿ
@@ -767,25 +786,21 @@
     (=ucs		. #x1E3E)	; Ḿ
     ))
 (define-char
-  '((=>ucs		. #x1E3E)	; Ḿ
-    (=jef-china3	. #x85DE)	; øºˆ—ž
-    ))
-(define-char
-  '((name		. "fullwidth latin capital letter m with acute")
-    (=>ucs		. #x1E3E)	; Ḿ
-    (general-category	letter uppercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x1E3E)
+  '((->decomposition	#xFF2D #x0301)
     (->lowercase
-     ((name		  . "fullwidth latin small letter m with acute")
+     ((=jis-x0213-1-2000  . #x2873)	; &JX1-2873; [08-83]
+      ))
+    (<-denotational
+     ((name		  . "LATIN CAPITAL LETTER M WITH ACUTE")
+      (=ucs		  . #x1E3E)	; Ḿ
       ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER M WITH ACUTE")
       (=ucs		  . #x1E3E)	; Ḿ
       ))
-    (=jis-x0213-1-2000	. #x2872)	; ø»¢žŸ
-    (=ucs@jis		. #x1E3E)	; ø»¢žŸ
+    (=jis-x0213-1-2000	. #x2872)	; &JX1-2872; [08-82]
+    (=jef-china3	. #x85DE)	; &I-JC3-85DE;
+    (=ucs@jis/fw	. #x1E3E)	; &JX1-2872;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER M WITH ACUTE")
@@ -793,10 +808,6 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	#x006D #x0301)
-    (->fullwidth
-     ((name		  . "fullwidth latin small letter m with acute")
-      (=jis-x0213-1-2000  . #x2873)	; ø»¢ž 
-      ))
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER M WITH ACUTE")
       (=ucs		  . #x1E3E)	; Ḿ
@@ -804,25 +815,21 @@
     (=ucs		. #x1E3F)	; ḿ
     ))
 (define-char
-  '((=>ucs		. #x1E3F)	; ḿ
-    (=jef-china3	. #x85F4)	; øºˆ—´
-    ))
-(define-char
-  '((name		. "fullwidth latin small letter m with acute")
-    (=>ucs		. #x1E3F)	; ḿ
-    (general-category	letter lowercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x1E3F)
+  '((->decomposition	#xFF4D #x0301)
     (->uppercase
-     ((name . "fullwidth latin capital letter m with acute")
+     ((=jis-x0213-1-2000  . #x2872)	; &JX1-2872; [08-82]
+      ))
+    (<-denotational
+     ((name		  . "LATIN SMALL LETTER M WITH ACUTE")
+      (=ucs		  . #x1E3F)	; ḿ
       ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER M WITH ACUTE")
       (=ucs		  . #x1E3F)	; ḿ
       ))
-    (=jis-x0213-1-2000	. #x2873)	; ø»¢ž 
-    (=ucs@jis		. #x1E3F)	; ø»¢ž 
+    (=jis-x0213-1-2000	. #x2873)	; &JX1-2873; [08-83]
+    (=jef-china3	. #x85F4)	; &I-JC3-85F4;
+    (=ucs@jis/fw	. #x1E3F)	; &JX1-2873;
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER M WITH DOT ABOVE")
@@ -1077,8 +1084,19 @@
     (=ucs		. #x1E54)	; Ṕ
     ))
 (define-char
-  '((=>ucs		. #x1E54)	; Ṕ
-    (=jef-china3	. #x85E1)	; øºˆ—¡
+  '((->decomposition	#xFF30 #x0301)
+    (->lowercase
+     ((=jef-china3	  . #x85F7)	; &JC3-85F7;
+      ))
+    (<-denotational
+     ((name		  . "LATIN CAPITAL LETTER P WITH ACUTE")
+      (=ucs		  . #x1E54)	; Ṕ
+      ))
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER P WITH ACUTE")
+      (=ucs		  . #x1E54)	; Ṕ
+      ))
+    (=jef-china3	. #x85E1)	; &JC3-85E1;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER P WITH ACUTE")
@@ -1093,8 +1111,19 @@
     (=ucs		. #x1E55)	; ṕ
     ))
 (define-char
-  '((=>ucs		. #x1E55)	; ṕ
-    (=jef-china3	. #x85F7)	; øºˆ—·
+  '((->decomposition	#xFF50 #x0301)
+    (->uppercase
+     ((=jef-china3	  . #x85E1)	; &JC3-85E1;
+      ))
+    (<-denotational
+     ((name		  . "LATIN SMALL LETTER P WITH ACUTE")
+      (=ucs		  . #x1E55)	; ṕ
+      ))
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER P WITH ACUTE")
+      (=ucs		  . #x1E55)	; ṕ
+      ))
+    (=jef-china3	. #x85F7)	; &JC3-85F7;
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER P WITH DOT ABOVE")
@@ -1253,6 +1282,18 @@
     (=ucs		. #x1E62)	; á¹¢
     ))
 (define-char
+  '((->decomposition	#xFF33 #x0323)
+    (<-denotational
+     ((name		  . "LATIN CAPITAL LETTER S WITH DOT BELOW")
+      (=ucs		  . #x1E62)	; á¹¢
+      ))
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER S WITH DOT BELOW")
+      (=ucs		  . #x1E62)	; á¹¢
+      ))
+    (=jef-china3	. #x8AC2)	; &JC3-8AC2;
+    ))
+(define-char
   '((name		. "LATIN SMALL LETTER S WITH DOT BELOW")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
@@ -1637,8 +1678,19 @@
     (=ucs		. #x1E82)	; Ẃ
     ))
 (define-char
-  '((=>ucs		. #x1E82)	; Ẃ
-    (=jef-china3	. #x85E8)	; øºˆ—¨
+  '((->decomposition	#xFF37 #x0301)
+    (->lowercase
+     ((=jef-china3	  . #x85FE)	; &JC3-85FE;
+      ))
+    (<-denotational
+     ((name		  . "LATIN CAPITAL LETTER W WITH ACUTE")
+      (=ucs		  . #x1E82)	; Ẃ
+      ))
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER W WITH ACUTE")
+      (=ucs		  . #x1E82)	; Ẃ
+      ))
+    (=jef-china3	. #x85E8)	; &JC3-85E8;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER W WITH ACUTE")
@@ -1653,8 +1705,19 @@
     (=ucs		. #x1E83)	; ẃ
     ))
 (define-char
-  '((=>ucs		. #x1E83)	; ẃ
-    (=jef-china3	. #x85FE)	; øºˆ—¾
+  '((->decomposition	#xFF57 #x0301)
+    (->uppercase
+     ((=jef-china3	  . #x85E8)	; &JC3-85E8;
+      ))
+    (<-denotational
+     ((name		  . "LATIN SMALL LETTER W WITH ACUTE")
+      (=ucs		  . #x1E83)	; ẃ
+      ))
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER W WITH ACUTE")
+      (=ucs		  . #x1E83)	; ẃ
+      ))
+    (=jef-china3	. #x85FE)	; &JC3-85FE;
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER W WITH DIAERESIS")
@@ -1934,9 +1997,9 @@
      ((name		  . "LATIN SMALL LETTER A WITH DOT BELOW")
       (=ucs		  . #x1EA1)	; ạ
       ))
-    (latin-viscii-upper . #xD5)	; øº’ž•
-    (latin-viscii	. #x80)	; øº’ž•
     (=ucs		. #x1EA0)	; Ạ
+    (latin-viscii	. #x80)	; &I-MULE-VIET-U-55;
+    (latin-viscii-upper . #xD5)	; &I-MULE-VIET-U-55;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER A WITH DOT BELOW")
@@ -1948,10 +2011,10 @@
      ((name		  . "LATIN CAPITAL LETTER A WITH DOT BELOW")
       (=ucs		  . #x1EA0)	; Ạ
       ))
-    (latin-tcvn5712	. #xB9)	; øº“™¹
-    (latin-viscii-lower . #xD5)	; øº’œµ
-    (latin-viscii	. #xD5)	; øº’œµ
     (=ucs		. #x1EA1)	; ạ
+    (latin-tcvn5712	. #xB9)	; &I-VSCII2-39;
+    (latin-viscii	. #xD5)	; &I-MULE-VIET-L-55;
+    (latin-viscii-lower . #xD5)	; &I-MULE-VIET-L-55;
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER A WITH HOOK ABOVE")
@@ -1963,9 +2026,9 @@
      ((name		  . "LATIN SMALL LETTER A WITH HOOK ABOVE")
       (=ucs		  . #x1EA3)	; ả
       ))
-    (latin-viscii-upper . #xE4)	; øº’ž¤
-    (latin-viscii	. #xC4)	; øº’ž¤
     (=ucs		. #x1EA2)	; Ả
+    (latin-viscii	. #xC4)	; &I-MULE-VIET-U-64;
+    (latin-viscii-upper . #xE4)	; &I-MULE-VIET-U-64;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER A WITH HOOK ABOVE")
@@ -1977,10 +2040,10 @@
      ((name		  . "LATIN CAPITAL LETTER A WITH HOOK ABOVE")
       (=ucs		  . #x1EA2)	; Ả
       ))
-    (latin-tcvn5712	. #xB6)	; øº“™¶
-    (latin-viscii-lower . #xE4)	; øº’„
-    (latin-viscii	. #xE4)	; øº’„
     (=ucs		. #x1EA3)	; ả
+    (latin-tcvn5712	. #xB6)	; &I-VSCII2-36;
+    (latin-viscii	. #xE4)	; &I-MULE-VIET-L-64;
+    (latin-viscii-lower . #xE4)	; &I-MULE-VIET-L-64;
     ))
 (define-char
   '((name . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE")
@@ -1992,14 +2055,24 @@
      ((name . "LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE")
       (=ucs		  . #x1EA5)	; ấ
       ))
-    (latin-tcvn5712	. #xC4)	; øº“š„
-    (latin-viscii-upper . #xA4)	; øº’¤
-    (latin-viscii	. #x84)	; øº’¤
     (=ucs		. #x1EA4)	; Ấ
+    (latin-tcvn5712	. #xC4)	; &I-VSCII2-44;
+    (latin-viscii	. #x84)	; &I-MULE-VIET-U-24;
+    (latin-viscii-upper . #xA4)	; &I-MULE-VIET-U-24;
     ))
 (define-char
-  '((=>ucs		. #x1EA4)	; Ấ
-    (=jef-china3	. #x86A7)	; øºˆš§
+  '((->lowercase
+     ((=jef-china3	  . #x86AA)	; &JC3-86AA;
+      ))
+    (<-denotational
+     ((name . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE")
+      (=ucs		  . #x1EA4)	; Ấ
+      ))
+    (<-fullwidth
+     ((name . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE")
+      (=ucs		  . #x1EA4)	; Ấ
+      ))
+    (=jef-china3	. #x86A7)	; &JC3-86A7;
     ))
 (define-char
   '((name . "LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE")
@@ -2011,14 +2084,24 @@
      ((name . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE")
       (=ucs		  . #x1EA4)	; Ấ
       ))
-    (latin-tcvn5712	. #xCA)	; øº“šŠ
-    (latin-viscii-lower . #xA4)	; øº’œ„
-    (latin-viscii	. #xA4)	; øº’œ„
     (=ucs		. #x1EA5)	; ấ
+    (latin-tcvn5712	. #xCA)	; &I-VSCII2-4A;
+    (latin-viscii	. #xA4)	; &I-MULE-VIET-L-24;
+    (latin-viscii-lower . #xA4)	; &I-MULE-VIET-L-24;
     ))
 (define-char
-  '((=>ucs		. #x1EA5)	; ấ
-    (=jef-china3	. #x86AA)	; øºˆšª
+  '((->uppercase
+     ((=jef-china3	  . #x86A7)	; &JC3-86A7;
+      ))
+    (<-denotational
+     ((name . "LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE")
+      (=ucs		  . #x1EA5)	; ấ
+      ))
+    (<-fullwidth
+     ((name . "LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE")
+      (=ucs		  . #x1EA5)	; ấ
+      ))
+    (=jef-china3	. #x86AA)	; &JC3-86AA;
     ))
 (define-char
   '((name . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE")
@@ -2030,14 +2113,24 @@
      ((name . "LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE")
       (=ucs		  . #x1EA7)	; ầ
       ))
-    (latin-tcvn5712	. #xC1)	; øº“š
-    (latin-viscii-upper . #xA5)	; øº’¥
-    (latin-viscii	. #x85)	; øº’¥
     (=ucs		. #x1EA6)	; Ầ
+    (latin-tcvn5712	. #xC1)	; &I-VSCII2-41;
+    (latin-viscii	. #x85)	; &I-MULE-VIET-U-25;
+    (latin-viscii-upper . #xA5)	; &I-MULE-VIET-U-25;
     ))
 (define-char
-  '((=>ucs		. #x1EA6)	; Ầ
-    (=jef-china3	. #x85B1)	; øºˆ–±
+  '((->lowercase
+     ((=jef-china3	  . #x85B4)	; &JC3-85B4;
+      ))
+    (<-denotational
+     ((name . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE")
+      (=ucs		  . #x1EA6)	; Ầ
+      ))
+    (<-fullwidth
+     ((name . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE")
+      (=ucs		  . #x1EA6)	; Ầ
+      ))
+    (=jef-china3	. #x85B1)	; &JC3-85B1;
     ))
 (define-char
   '((name . "LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE")
@@ -2049,14 +2142,24 @@
      ((name . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE")
       (=ucs		  . #x1EA6)	; Ầ
       ))
-    (latin-tcvn5712	. #xC7)	; øº“š‡
-    (latin-viscii-lower . #xA5)	; øº’œ…
-    (latin-viscii	. #xA5)	; øº’œ…
     (=ucs		. #x1EA7)	; ầ
+    (latin-tcvn5712	. #xC7)	; &I-VSCII2-47;
+    (latin-viscii	. #xA5)	; &I-MULE-VIET-L-25;
+    (latin-viscii-lower . #xA5)	; &I-MULE-VIET-L-25;
     ))
 (define-char
-  '((=>ucs		. #x1EA7)	; ầ
-    (=jef-china3	. #x85B4)	; øºˆ–´
+  '((->uppercase
+     ((=jef-china3	  . #x85B1)	; &JC3-85B1;
+      ))
+    (<-denotational
+     ((name . "LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE")
+      (=ucs		  . #x1EA7)	; ầ
+      ))
+    (<-fullwidth
+     ((name . "LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE")
+      (=ucs		  . #x1EA7)	; ầ
+      ))
+    (=jef-china3	. #x85B4)	; &JC3-85B4;
     ))
 (define-char
   '((name . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE")
@@ -2068,10 +2171,10 @@
      ((name . "LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE")
       (=ucs		  . #x1EA9)	; ẩ
       ))
-    (latin-tcvn5712	. #xC2)	; øº“š‚
-    (latin-viscii-upper . #xA6)	; øº’¦
-    (latin-viscii	. #x86)	; øº’¦
     (=ucs		. #x1EA8)	; Ẩ
+    (latin-tcvn5712	. #xC2)	; &I-VSCII2-42;
+    (latin-viscii	. #x86)	; &I-MULE-VIET-U-26;
+    (latin-viscii-upper . #xA6)	; &I-MULE-VIET-U-26;
     ))
 (define-char
   '((name . "LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE")
@@ -2083,10 +2186,10 @@
      ((name . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE")
       (=ucs		  . #x1EA8)	; Ẩ
       ))
-    (latin-tcvn5712	. #xC8)	; øº“šˆ
-    (latin-viscii-lower . #xA6)	; øº’œ†
-    (latin-viscii	. #xA6)	; øº’œ†
     (=ucs		. #x1EA9)	; ẩ
+    (latin-tcvn5712	. #xC8)	; &I-VSCII2-48;
+    (latin-viscii	. #xA6)	; &I-MULE-VIET-L-26;
+    (latin-viscii-lower . #xA6)	; &I-MULE-VIET-L-26;
     ))
 (define-char
   '((name . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE")
@@ -2098,10 +2201,10 @@
      ((name . "LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE")
       (=ucs		  . #x1EAB)	; ẫ
       ))
-    (latin-tcvn5712	. #xC3)	; øº“šƒ
-    (latin-viscii-upper . #xE7)	; øº’ž§
-    (latin-viscii	. #x06)	; øº’ž§
     (=ucs		. #x1EAA)	; Ẫ
+    (latin-tcvn5712	. #xC3)	; &I-VSCII2-43;
+    (latin-viscii	. #x06)	; &I-MULE-VIET-U-67;
+    (latin-viscii-upper . #xE7)	; &I-MULE-VIET-U-67;
     ))
 (define-char
   '((name . "LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE")
@@ -2113,10 +2216,10 @@
      ((name . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE")
       (=ucs		  . #x1EAA)	; Ẫ
       ))
-    (latin-tcvn5712	. #xC9)	; øº“š‰
-    (latin-viscii-lower . #xE7)	; øº’‡
-    (latin-viscii	. #xE7)	; øº’‡
     (=ucs		. #x1EAB)	; ẫ
+    (latin-tcvn5712	. #xC9)	; &I-VSCII2-49;
+    (latin-viscii	. #xE7)	; &I-MULE-VIET-L-67;
+    (latin-viscii-lower . #xE7)	; &I-MULE-VIET-L-67;
     ))
 (define-char
   '((name . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW")
@@ -2128,9 +2231,9 @@
      ((name . "LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW")
       (=ucs		  . #x1EAD)	; ậ
       ))
-    (latin-viscii-upper . #xA7)	; øº’§
-    (latin-viscii	. #x87)	; øº’§
     (=ucs		. #x1EAC)	; Ậ
+    (latin-viscii	. #x87)	; &I-MULE-VIET-U-27;
+    (latin-viscii-upper . #xA7)	; &I-MULE-VIET-U-27;
     ))
 (define-char
   '((name . "LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW")
@@ -2142,10 +2245,10 @@
      ((name . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW")
       (=ucs		  . #x1EAC)	; Ậ
       ))
-    (latin-tcvn5712	. #xCB)	; øº“š‹
-    (latin-viscii-lower . #xA7)	; øº’œ‡
-    (latin-viscii	. #xA7)	; øº’œ‡
     (=ucs		. #x1EAD)	; ậ
+    (latin-tcvn5712	. #xCB)	; &I-VSCII2-4B;
+    (latin-viscii	. #xA7)	; &I-MULE-VIET-L-27;
+    (latin-viscii-lower . #xA7)	; &I-MULE-VIET-L-27;
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER A WITH BREVE AND ACUTE")
@@ -2157,10 +2260,10 @@
      ((name		  . "LATIN SMALL LETTER A WITH BREVE AND ACUTE")
       (=ucs		  . #x1EAF)	; ắ
       ))
-    (latin-tcvn5712	. #xC0)	; øº“š€
-    (latin-viscii-upper . #xA1)	; øº’¡
-    (latin-viscii	. #x81)	; øº’¡
     (=ucs		. #x1EAE)	; Ắ
+    (latin-tcvn5712	. #xC0)	; &I-VSCII2-40;
+    (latin-viscii	. #x81)	; &I-MULE-VIET-U-21;
+    (latin-viscii-upper . #xA1)	; &I-MULE-VIET-U-21;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER A WITH BREVE AND ACUTE")
@@ -2172,10 +2275,10 @@
      ((name . "LATIN CAPITAL LETTER A WITH BREVE AND ACUTE")
       (=ucs		  . #x1EAE)	; Ắ
       ))
-    (latin-tcvn5712	. #xBE)	; øº“™¾
-    (latin-viscii-lower . #xA1)	; øº’œ
-    (latin-viscii	. #xA1)	; øº’œ
     (=ucs		. #x1EAF)	; ắ
+    (latin-tcvn5712	. #xBE)	; &I-VSCII2-3E;
+    (latin-viscii	. #xA1)	; &I-MULE-VIET-L-21;
+    (latin-viscii-lower . #xA1)	; &I-MULE-VIET-L-21;
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER A WITH BREVE AND GRAVE")
@@ -2187,10 +2290,10 @@
      ((name		  . "LATIN SMALL LETTER A WITH BREVE AND GRAVE")
       (=ucs		  . #x1EB1)	; ằ
       ))
-    (latin-tcvn5712	. #xAF)	; øº“™¯
-    (latin-viscii-upper . #xA2)	; øº’¢
-    (latin-viscii	. #x82)	; øº’¢
     (=ucs		. #x1EB0)	; Ằ
+    (latin-tcvn5712	. #xAF)	; &I-VSCII2-2F;
+    (latin-viscii	. #x82)	; &I-MULE-VIET-U-22;
+    (latin-viscii-upper . #xA2)	; &I-MULE-VIET-U-22;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER A WITH BREVE AND GRAVE")
@@ -2202,10 +2305,10 @@
      ((name . "LATIN CAPITAL LETTER A WITH BREVE AND GRAVE")
       (=ucs		  . #x1EB0)	; Ằ
       ))
-    (latin-tcvn5712	. #xBB)	; øº“™»
-    (latin-viscii-lower . #xA2)	; øº’œ‚
-    (latin-viscii	. #xA2)	; øº’œ‚
     (=ucs		. #x1EB1)	; ằ
+    (latin-tcvn5712	. #xBB)	; &I-VSCII2-3B;
+    (latin-viscii	. #xA2)	; &I-MULE-VIET-L-22;
+    (latin-viscii-lower . #xA2)	; &I-MULE-VIET-L-22;
     ))
 (define-char
   '((name . "LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE")
@@ -2217,10 +2320,10 @@
      ((name . "LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE")
       (=ucs		  . #x1EB3)	; ẳ
       ))
-    (latin-tcvn5712	. #xBA)	; øº“™º
-    (latin-viscii-upper . #xC6)	; øº’ž†
-    (latin-viscii	. #x02)	; øº’ž†
     (=ucs		. #x1EB2)	; Ẳ
+    (latin-tcvn5712	. #xBA)	; &I-VSCII2-3A;
+    (latin-viscii	. #x02)	; &I-MULE-VIET-U-46;
+    (latin-viscii-upper . #xC6)	; &I-MULE-VIET-U-46;
     ))
 (define-char
   '((name . "LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE")
@@ -2232,10 +2335,10 @@
      ((name . "LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE")
       (=ucs		  . #x1EB2)	; Ẳ
       ))
-    (latin-tcvn5712	. #xBC)	; øº“™¼
-    (latin-viscii-lower . #xC6)	; øº’œ¦
-    (latin-viscii	. #xC6)	; øº’œ¦
     (=ucs		. #x1EB3)	; ẳ
+    (latin-tcvn5712	. #xBC)	; &I-VSCII2-3C;
+    (latin-viscii	. #xC6)	; &I-MULE-VIET-L-46;
+    (latin-viscii-lower . #xC6)	; &I-MULE-VIET-L-46;
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER A WITH BREVE AND TILDE")
@@ -2247,10 +2350,10 @@
      ((name		  . "LATIN SMALL LETTER A WITH BREVE AND TILDE")
       (=ucs		  . #x1EB5)	; ẵ
       ))
-    (latin-tcvn5712	. #xBF)	; øº“™¿
-    (latin-viscii-upper . #xC7)	; øº’ž‡
-    (latin-viscii	. #x05)	; øº’ž‡
     (=ucs		. #x1EB4)	; Ẵ
+    (latin-tcvn5712	. #xBF)	; &I-VSCII2-3F;
+    (latin-viscii	. #x05)	; &I-MULE-VIET-U-47;
+    (latin-viscii-upper . #xC7)	; &I-MULE-VIET-U-47;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER A WITH BREVE AND TILDE")
@@ -2262,10 +2365,10 @@
      ((name . "LATIN CAPITAL LETTER A WITH BREVE AND TILDE")
       (=ucs		  . #x1EB4)	; Ẵ
       ))
-    (latin-tcvn5712	. #xBD)	; øº“™½
-    (latin-viscii-lower . #xC7)	; øº’œ§
-    (latin-viscii	. #xC7)	; øº’œ§
     (=ucs		. #x1EB5)	; ẵ
+    (latin-tcvn5712	. #xBD)	; &I-VSCII2-3D;
+    (latin-viscii	. #xC7)	; &I-MULE-VIET-L-47;
+    (latin-viscii-lower . #xC7)	; &I-MULE-VIET-L-47;
     ))
 (define-char
   '((name . "LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW")
@@ -2277,9 +2380,9 @@
      ((name . "LATIN SMALL LETTER A WITH BREVE AND DOT BELOW")
       (=ucs		  . #x1EB7)	; ặ
       ))
-    (latin-viscii-upper . #xA3)	; øº’£
-    (latin-viscii	. #x83)	; øº’£
     (=ucs		. #x1EB6)	; Ặ
+    (latin-viscii	. #x83)	; &I-MULE-VIET-U-23;
+    (latin-viscii-upper . #xA3)	; &I-MULE-VIET-U-23;
     ))
 (define-char
   '((name . "LATIN SMALL LETTER A WITH BREVE AND DOT BELOW")
@@ -2291,10 +2394,10 @@
      ((name . "LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW")
       (=ucs		  . #x1EB6)	; Ặ
       ))
-    (latin-tcvn5712	. #xC6)	; øº“š†
-    (latin-viscii-lower . #xA3)	; øº’œƒ
-    (latin-viscii	. #xA3)	; øº’œƒ
     (=ucs		. #x1EB7)	; ặ
+    (latin-tcvn5712	. #xC6)	; &I-VSCII2-46;
+    (latin-viscii	. #xA3)	; &I-MULE-VIET-L-23;
+    (latin-viscii-lower . #xA3)	; &I-MULE-VIET-L-23;
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER E WITH DOT BELOW")
@@ -2306,9 +2409,9 @@
      ((name		  . "LATIN SMALL LETTER E WITH DOT BELOW")
       (=ucs		  . #x1EB9)	; ẹ
       ))
-    (latin-viscii-upper . #xA9)	; øº’©
-    (latin-viscii	. #x89)	; øº’©
     (=ucs		. #x1EB8)	; Ẹ
+    (latin-viscii	. #x89)	; &I-MULE-VIET-U-29;
+    (latin-viscii-upper . #xA9)	; &I-MULE-VIET-U-29;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER E WITH DOT BELOW")
@@ -2320,10 +2423,10 @@
      ((name		  . "LATIN CAPITAL LETTER E WITH DOT BELOW")
       (=ucs		  . #x1EB8)	; Ẹ
       ))
-    (latin-tcvn5712	. #xD1)	; øº“š‘
-    (latin-viscii-lower . #xA9)	; øº’œ‰
-    (latin-viscii	. #xA9)	; øº’œ‰
     (=ucs		. #x1EB9)	; ẹ
+    (latin-tcvn5712	. #xD1)	; &I-VSCII2-51;
+    (latin-viscii	. #xA9)	; &I-MULE-VIET-L-29;
+    (latin-viscii-lower . #xA9)	; &I-MULE-VIET-L-29;
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER E WITH HOOK ABOVE")
@@ -2335,9 +2438,9 @@
      ((name		  . "LATIN SMALL LETTER E WITH HOOK ABOVE")
       (=ucs		  . #x1EBB)	; ẻ
       ))
-    (latin-viscii-upper . #xEB)	; øº’ž«
-    (latin-viscii	. #xCB)	; øº’ž«
     (=ucs		. #x1EBA)	; Ẻ
+    (latin-viscii	. #xCB)	; &I-MULE-VIET-U-6B;
+    (latin-viscii-upper . #xEB)	; &I-MULE-VIET-U-6B;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER E WITH HOOK ABOVE")
@@ -2349,10 +2452,10 @@
      ((name		  . "LATIN CAPITAL LETTER E WITH HOOK ABOVE")
       (=ucs		  . #x1EBA)	; Ẻ
       ))
-    (latin-tcvn5712	. #xCE)	; øº“šŽ
-    (latin-viscii-lower . #xEB)	; øº’‹
-    (latin-viscii	. #xEB)	; øº’‹
     (=ucs		. #x1EBB)	; ẻ
+    (latin-tcvn5712	. #xCE)	; &I-VSCII2-4E;
+    (latin-viscii	. #xEB)	; &I-MULE-VIET-L-6B;
+    (latin-viscii-lower . #xEB)	; &I-MULE-VIET-L-6B;
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER E WITH TILDE")
@@ -2364,9 +2467,9 @@
      ((name		  . "LATIN SMALL LETTER E WITH TILDE")
       (=ucs		  . #x1EBD)	; ẽ
       ))
-    (latin-viscii-upper . #xA8)	; øº’¨
-    (latin-viscii	. #x88)	; øº’¨
     (=ucs		. #x1EBC)	; Ẽ
+    (latin-viscii	. #x88)	; &I-MULE-VIET-U-28;
+    (latin-viscii-upper . #xA8)	; &I-MULE-VIET-U-28;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER E WITH TILDE")
@@ -2378,10 +2481,10 @@
      ((name		  . "LATIN CAPITAL LETTER E WITH TILDE")
       (=ucs		  . #x1EBC)	; Ẽ
       ))
-    (latin-tcvn5712	. #xCF)	; øº“š
-    (latin-viscii-lower . #xA8)	; øº’œˆ
-    (latin-viscii	. #xA8)	; øº’œˆ
     (=ucs		. #x1EBD)	; ẽ
+    (latin-tcvn5712	. #xCF)	; &I-VSCII2-4F;
+    (latin-viscii	. #xA8)	; &I-MULE-VIET-L-28;
+    (latin-viscii-lower . #xA8)	; &I-MULE-VIET-L-28;
     ))
 (define-char
   '((name . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE")
@@ -2393,14 +2496,24 @@
      ((name . "LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE")
       (=ucs		  . #x1EBF)	; ế
       ))
-    (latin-tcvn5712	. #xDA)	; øº“šš
-    (latin-viscii-upper . #xAA)	; øº’ª
-    (latin-viscii	. #x8A)	; øº’ª
     (=ucs		. #x1EBE)	; Ế
+    (latin-tcvn5712	. #xDA)	; &I-VSCII2-5A;
+    (latin-viscii	. #x8A)	; &I-MULE-VIET-U-2A;
+    (latin-viscii-upper . #xAA)	; &I-MULE-VIET-U-2A;
     ))
 (define-char
-  '((=>ucs		. #x1EBE)	; Ế
-    (=jef-china3	. #x86A8)	; øºˆš¨
+  '((->lowercase
+     ((=jef-china3	  . #x86AB)	; &JC3-86AB;
+      ))
+    (<-denotational
+     ((name . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE")
+      (=ucs		  . #x1EBE)	; Ế
+      ))
+    (<-fullwidth
+     ((name . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE")
+      (=ucs		  . #x1EBE)	; Ế
+      ))
+    (=jef-china3	. #x86A8)	; &JC3-86A8;
     ))
 (define-char
   '((name . "LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE")
@@ -2412,14 +2525,24 @@
      ((name . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE")
       (=ucs		  . #x1EBE)	; Ế
       ))
-    (latin-tcvn5712	. #xD5)	; øº“š•
-    (latin-viscii-lower . #xAA)	; øº’œŠ
-    (latin-viscii	. #xAA)	; øº’œŠ
     (=ucs		. #x1EBF)	; ế
+    (latin-tcvn5712	. #xD5)	; &I-VSCII2-55;
+    (latin-viscii	. #xAA)	; &I-MULE-VIET-L-2A;
+    (latin-viscii-lower . #xAA)	; &I-MULE-VIET-L-2A;
     ))
 (define-char
-  '((=>ucs		. #x1EBF)	; ế
-    (=jef-china3	. #x86AB)	; øºˆš«
+  '((->uppercase
+     ((=jef-china3	  . #x86A8)	; &JC3-86A8;
+      ))
+    (<-denotational
+     ((name . "LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE")
+      (=ucs		  . #x1EBF)	; ế
+      ))
+    (<-fullwidth
+     ((name . "LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE")
+      (=ucs		  . #x1EBF)	; ế
+      ))
+    (=jef-china3	. #x86AB)	; &JC3-86AB;
     ))
 (define-char
   '((name . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE")
@@ -2431,14 +2554,24 @@
      ((name . "LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE")
       (=ucs		  . #x1EC1)	; ề
       ))
-    (latin-tcvn5712	. #xC5)	; øº“š…
-    (latin-viscii-upper . #xAB)	; øº’«
-    (latin-viscii	. #x8B)	; øº’«
     (=ucs		. #x1EC0)	; Ề
+    (latin-tcvn5712	. #xC5)	; &I-VSCII2-45;
+    (latin-viscii	. #x8B)	; &I-MULE-VIET-U-2B;
+    (latin-viscii-upper . #xAB)	; &I-MULE-VIET-U-2B;
     ))
 (define-char
-  '((=>ucs		. #x1EC0)	; Ề
-    (=jef-china3	. #x85B2)	; øºˆ–²
+  '((->lowercase
+     ((=jef-china3	  . #x85B5)	; &JC3-85B5;
+      ))
+    (<-denotational
+     ((name . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE")
+      (=ucs		  . #x1EC0)	; Ề
+      ))
+    (<-fullwidth
+     ((name . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE")
+      (=ucs		  . #x1EC0)	; Ề
+      ))
+    (=jef-china3	. #x85B2)	; &JC3-85B2;
     ))
 (define-char
   '((name . "LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE")
@@ -2450,14 +2583,24 @@
      ((name . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE")
       (=ucs		  . #x1EC0)	; Ề
       ))
-    (latin-tcvn5712	. #xD2)	; øº“š’
-    (latin-viscii-lower . #xAB)	; øº’œ‹
-    (latin-viscii	. #xAB)	; øº’œ‹
     (=ucs		. #x1EC1)	; ề
+    (latin-tcvn5712	. #xD2)	; &I-VSCII2-52;
+    (latin-viscii	. #xAB)	; &I-MULE-VIET-L-2B;
+    (latin-viscii-lower . #xAB)	; &I-MULE-VIET-L-2B;
     ))
 (define-char
-  '((=>ucs		. #x1EC1)	; ề
-    (=jef-china3	. #x85B5)	; øºˆ–µ
+  '((->uppercase
+     ((=jef-china3	  . #x85B2)	; &JC3-85B2;
+      ))
+    (<-denotational
+     ((name . "LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE")
+      (=ucs		  . #x1EC1)	; ề
+      ))
+    (<-fullwidth
+     ((name . "LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE")
+      (=ucs		  . #x1EC1)	; ề
+      ))
+    (=jef-china3	. #x85B5)	; &JC3-85B5;
     ))
 (define-char
   '((name . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE")
@@ -2469,10 +2612,10 @@
      ((name . "LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE")
       (=ucs		  . #x1EC3)	; ể
       ))
-    (latin-tcvn5712	. #xCD)	; øº“š
-    (latin-viscii-upper . #xAC)	; øº’¬
-    (latin-viscii	. #x8C)	; øº’¬
     (=ucs		. #x1EC2)	; Ể
+    (latin-tcvn5712	. #xCD)	; &I-VSCII2-4D;
+    (latin-viscii	. #x8C)	; &I-MULE-VIET-U-2C;
+    (latin-viscii-upper . #xAC)	; &I-MULE-VIET-U-2C;
     ))
 (define-char
   '((name . "LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE")
@@ -2484,10 +2627,10 @@
      ((name . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE")
       (=ucs		  . #x1EC2)	; Ể
       ))
-    (latin-tcvn5712	. #xD3)	; øº“š“
-    (latin-viscii-lower . #xAC)	; øº’œŒ
-    (latin-viscii	. #xAC)	; øº’œŒ
     (=ucs		. #x1EC3)	; ể
+    (latin-tcvn5712	. #xD3)	; &I-VSCII2-53;
+    (latin-viscii	. #xAC)	; &I-MULE-VIET-L-2C;
+    (latin-viscii-lower . #xAC)	; &I-MULE-VIET-L-2C;
     ))
 (define-char
   '((name . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE")
@@ -2499,10 +2642,10 @@
      ((name . "LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE")
       (=ucs		  . #x1EC5)	; ễ
       ))
-    (latin-tcvn5712	. #xD9)	; øº“š™
-    (latin-viscii-upper . #xAD)	; øº’­
-    (latin-viscii	. #x8D)	; øº’­
     (=ucs		. #x1EC4)	; Ễ
+    (latin-tcvn5712	. #xD9)	; &I-VSCII2-59;
+    (latin-viscii	. #x8D)	; &I-MULE-VIET-U-2D;
+    (latin-viscii-upper . #xAD)	; &I-MULE-VIET-U-2D;
     ))
 (define-char
   '((name . "LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE")
@@ -2514,10 +2657,10 @@
      ((name . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE")
       (=ucs		  . #x1EC4)	; Ễ
       ))
-    (latin-tcvn5712	. #xD4)	; øº“š”
-    (latin-viscii-lower . #xAD)	; øº’œ
-    (latin-viscii	. #xAD)	; øº’œ
     (=ucs		. #x1EC5)	; ễ
+    (latin-tcvn5712	. #xD4)	; &I-VSCII2-54;
+    (latin-viscii	. #xAD)	; &I-MULE-VIET-L-2D;
+    (latin-viscii-lower . #xAD)	; &I-MULE-VIET-L-2D;
     ))
 (define-char
   '((name . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW")
@@ -2529,9 +2672,9 @@
      ((name . "LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW")
       (=ucs		  . #x1EC7)	; ệ
       ))
-    (latin-viscii-upper . #xAE)	; øº’®
-    (latin-viscii	. #x8E)	; øº’®
     (=ucs		. #x1EC6)	; Ệ
+    (latin-viscii	. #x8E)	; &I-MULE-VIET-U-2E;
+    (latin-viscii-upper . #xAE)	; &I-MULE-VIET-U-2E;
     ))
 (define-char
   '((name . "LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW")
@@ -2543,10 +2686,10 @@
      ((name . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW")
       (=ucs		  . #x1EC6)	; Ệ
       ))
-    (latin-tcvn5712	. #xD6)	; øº“š–
-    (latin-viscii-lower . #xAE)	; øº’œŽ
-    (latin-viscii	. #xAE)	; øº’œŽ
     (=ucs		. #x1EC7)	; ệ
+    (latin-tcvn5712	. #xD6)	; &I-VSCII2-56;
+    (latin-viscii	. #xAE)	; &I-MULE-VIET-L-2E;
+    (latin-viscii-lower . #xAE)	; &I-MULE-VIET-L-2E;
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER I WITH HOOK ABOVE")
@@ -2558,9 +2701,9 @@
      ((name		  . "LATIN SMALL LETTER I WITH HOOK ABOVE")
       (=ucs		  . #x1EC9)	; ỉ
       ))
-    (latin-viscii-upper . #xEF)	; øº’ž¯
-    (latin-viscii	. #x9B)	; øº’ž¯
     (=ucs		. #x1EC8)	; Ỉ
+    (latin-viscii	. #x9B)	; &I-MULE-VIET-U-6F;
+    (latin-viscii-upper . #xEF)	; &I-MULE-VIET-U-6F;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER I WITH HOOK ABOVE")
@@ -2572,10 +2715,10 @@
      ((name		  . "LATIN CAPITAL LETTER I WITH HOOK ABOVE")
       (=ucs		  . #x1EC8)	; Ỉ
       ))
-    (latin-tcvn5712	. #xD8)	; øº“š˜
-    (latin-viscii-lower . #xEF)	; øº’
-    (latin-viscii	. #xEF)	; øº’
     (=ucs		. #x1EC9)	; ỉ
+    (latin-tcvn5712	. #xD8)	; &I-VSCII2-58;
+    (latin-viscii	. #xEF)	; &I-MULE-VIET-L-6F;
+    (latin-viscii-lower . #xEF)	; &I-MULE-VIET-L-6F;
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER I WITH DOT BELOW")
@@ -2587,9 +2730,9 @@
      ((name		  . "LATIN SMALL LETTER I WITH DOT BELOW")
       (=ucs		  . #x1ECB)	; ị
       ))
-    (latin-viscii-upper . #xB8)	; øº’¸
-    (latin-viscii	. #x98)	; øº’¸
     (=ucs		. #x1ECA)	; Ị
+    (latin-viscii	. #x98)	; &I-MULE-VIET-U-38;
+    (latin-viscii-upper . #xB8)	; &I-MULE-VIET-U-38;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER I WITH DOT BELOW")
@@ -2601,10 +2744,10 @@
      ((name		  . "LATIN CAPITAL LETTER I WITH DOT BELOW")
       (=ucs		  . #x1ECA)	; Ị
       ))
-    (latin-tcvn5712	. #xDE)	; øº“šž
-    (latin-viscii-lower . #xB8)	; øº’œ˜
-    (latin-viscii	. #xB8)	; øº’œ˜
     (=ucs		. #x1ECB)	; ị
+    (latin-tcvn5712	. #xDE)	; &I-VSCII2-5E;
+    (latin-viscii	. #xB8)	; &I-MULE-VIET-L-38;
+    (latin-viscii-lower . #xB8)	; &I-MULE-VIET-L-38;
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER O WITH DOT BELOW")
@@ -2616,9 +2759,9 @@
      ((name		  . "LATIN SMALL LETTER O WITH DOT BELOW")
       (=ucs		  . #x1ECD)	; ọ
       ))
-    (latin-viscii-upper . #xF7)	; øº’ž·
-    (latin-viscii	. #x9A)	; øº’ž·
     (=ucs		. #x1ECC)	; Ọ
+    (latin-viscii	. #x9A)	; &I-MULE-VIET-U-77;
+    (latin-viscii-upper . #xF7)	; &I-MULE-VIET-U-77;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER O WITH DOT BELOW")
@@ -2630,10 +2773,10 @@
      ((name		  . "LATIN CAPITAL LETTER O WITH DOT BELOW")
       (=ucs		  . #x1ECC)	; Ọ
       ))
-    (latin-tcvn5712	. #xE4)	; øº“š¤
-    (latin-viscii-lower . #xF7)	; øº’—
-    (latin-viscii	. #xF7)	; øº’—
     (=ucs		. #x1ECD)	; ọ
+    (latin-tcvn5712	. #xE4)	; &I-VSCII2-64;
+    (latin-viscii	. #xF7)	; &I-MULE-VIET-L-77;
+    (latin-viscii-lower . #xF7)	; &I-MULE-VIET-L-77;
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER O WITH HOOK ABOVE")
@@ -2645,9 +2788,9 @@
      ((name		  . "LATIN SMALL LETTER O WITH HOOK ABOVE")
       (=ucs		  . #x1ECF)	; ỏ
       ))
-    (latin-viscii-upper . #xF6)	; øº’ž¶
-    (latin-viscii	. #x99)	; øº’ž¶
     (=ucs		. #x1ECE)	; Ỏ
+    (latin-viscii	. #x99)	; &I-MULE-VIET-U-76;
+    (latin-viscii-upper . #xF6)	; &I-MULE-VIET-U-76;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER O WITH HOOK ABOVE")
@@ -2659,10 +2802,10 @@
      ((name		  . "LATIN CAPITAL LETTER O WITH HOOK ABOVE")
       (=ucs		  . #x1ECE)	; Ỏ
       ))
-    (latin-tcvn5712	. #xE1)	; øº“š¡
-    (latin-viscii-lower . #xF6)	; øº’–
-    (latin-viscii	. #xF6)	; øº’–
     (=ucs		. #x1ECF)	; ỏ
+    (latin-tcvn5712	. #xE1)	; &I-VSCII2-61;
+    (latin-viscii	. #xF6)	; &I-MULE-VIET-L-76;
+    (latin-viscii-lower . #xF6)	; &I-MULE-VIET-L-76;
     ))
 (define-char
   '((name . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE")
@@ -2674,14 +2817,24 @@
      ((name . "LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE")
       (=ucs		  . #x1ED1)	; ố
       ))
-    (latin-tcvn5712	. #xFF)	; øº“š¿
-    (latin-viscii-upper . #xAF)	; øº’¯
-    (latin-viscii	. #x8F)	; øº’¯
     (=ucs		. #x1ED0)	; Ố
+    (latin-tcvn5712	. #xFF)	; &I-VSCII2-7F;
+    (latin-viscii	. #x8F)	; &I-MULE-VIET-U-2F;
+    (latin-viscii-upper . #xAF)	; &I-MULE-VIET-U-2F;
     ))
 (define-char
-  '((=>ucs		. #x1ED0)	; Ố
-    (=jef-china3	. #x86A9)	; øºˆš©
+  '((->lowercase
+     ((=jef-china3	  . #x86AC)	; &JC3-86AC;
+      ))
+    (<-denotational
+     ((name . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE")
+      (=ucs		  . #x1ED0)	; Ố
+      ))
+    (<-fullwidth
+     ((name . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE")
+      (=ucs		  . #x1ED0)	; Ố
+      ))
+    (=jef-china3	. #x86A9)	; &JC3-86A9;
     ))
 (define-char
   '((name . "LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE")
@@ -2693,14 +2846,24 @@
      ((name . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE")
       (=ucs		  . #x1ED0)	; Ố
       ))
-    (latin-tcvn5712	. #xE8)	; øº“š¨
-    (latin-viscii-lower . #xAF)	; øº’œ
-    (latin-viscii	. #xAF)	; øº’œ
     (=ucs		. #x1ED1)	; ố
+    (latin-tcvn5712	. #xE8)	; &I-VSCII2-68;
+    (latin-viscii	. #xAF)	; &I-MULE-VIET-L-2F;
+    (latin-viscii-lower . #xAF)	; &I-MULE-VIET-L-2F;
     ))
 (define-char
-  '((=>ucs		. #x1ED1)	; ố
-    (=jef-china3	. #x86AC)	; øºˆš¬
+  '((->uppercase
+     ((=jef-china3	  . #x86A9)	; &JC3-86A9;
+      ))
+    (<-denotational
+     ((name . "LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE")
+      (=ucs		  . #x1ED1)	; ố
+      ))
+    (<-fullwidth
+     ((name . "LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE")
+      (=ucs		  . #x1ED1)	; ố
+      ))
+    (=jef-china3	. #x86AC)	; &JC3-86AC;
     ))
 (define-char
   '((name . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE")
@@ -2712,14 +2875,24 @@
      ((name . "LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE")
       (=ucs		  . #x1ED3)	; ồ
       ))
-    (latin-tcvn5712	. #xDB)	; øº“š›
-    (latin-viscii-upper . #xB0)	; øº’°
-    (latin-viscii	. #x90)	; øº’°
     (=ucs		. #x1ED2)	; Ồ
+    (latin-tcvn5712	. #xDB)	; &I-VSCII2-5B;
+    (latin-viscii	. #x90)	; &I-MULE-VIET-U-30;
+    (latin-viscii-upper . #xB0)	; &I-MULE-VIET-U-30;
     ))
 (define-char
-  '((=>ucs		. #x1ED2)	; Ồ
-    (=jef-china3	. #x85B3)	; øºˆ–³
+  '((->lowercase
+     ((=jef-china3	  . #x85B6)	; &JC3-85B6;
+      ))
+    (<-denotational
+     ((name . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE")
+      (=ucs		  . #x1ED2)	; Ồ
+      ))
+    (<-fullwidth
+     ((name . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE")
+      (=ucs		  . #x1ED2)	; Ồ
+      ))
+    (=jef-china3	. #x85B3)	; &JC3-85B3;
     ))
 (define-char
   '((name . "LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE")
@@ -2731,14 +2904,24 @@
      ((name . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE")
       (=ucs		  . #x1ED2)	; Ồ
       ))
-    (latin-tcvn5712	. #xE5)	; øº“š¥
-    (latin-viscii-lower . #xB0)	; øº’œ
-    (latin-viscii	. #xB0)	; øº’œ
     (=ucs		. #x1ED3)	; ồ
+    (latin-tcvn5712	. #xE5)	; &I-VSCII2-65;
+    (latin-viscii	. #xB0)	; &I-MULE-VIET-L-30;
+    (latin-viscii-lower . #xB0)	; &I-MULE-VIET-L-30;
     ))
 (define-char
-  '((=>ucs		. #x1ED3)	; ồ
-    (=jef-china3	. #x85B6)	; øºˆ–¶
+  '((->uppercase
+     ((=jef-china3	  . #x85B3)	; &JC3-85B3;
+      ))
+    (<-denotational
+     ((name . "LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE")
+      (=ucs		  . #x1ED3)	; ồ
+      ))
+    (<-fullwidth
+     ((name . "LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE")
+      (=ucs		  . #x1ED3)	; ồ
+      ))
+    (=jef-china3	. #x85B6)	; &JC3-85B6;
     ))
 (define-char
   '((name . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE")
@@ -2750,10 +2933,10 @@
      ((name . "LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE")
       (=ucs		  . #x1ED5)	; ổ
       ))
-    (latin-tcvn5712	. #xE0)	; øº“š 
-    (latin-viscii-upper . #xB1)	; øº’±
-    (latin-viscii	. #x91)	; øº’±
     (=ucs		. #x1ED4)	; Ổ
+    (latin-tcvn5712	. #xE0)	; &I-VSCII2-60;
+    (latin-viscii	. #x91)	; &I-MULE-VIET-U-31;
+    (latin-viscii-upper . #xB1)	; &I-MULE-VIET-U-31;
     ))
 (define-char
   '((name . "LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE")
@@ -2765,10 +2948,10 @@
      ((name . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE")
       (=ucs		  . #x1ED4)	; Ổ
       ))
-    (latin-tcvn5712	. #xE6)	; øº“š¦
-    (latin-viscii-lower . #xB1)	; øº’œ‘
-    (latin-viscii	. #xB1)	; øº’œ‘
     (=ucs		. #x1ED5)	; ổ
+    (latin-tcvn5712	. #xE6)	; &I-VSCII2-66;
+    (latin-viscii	. #xB1)	; &I-MULE-VIET-L-31;
+    (latin-viscii-lower . #xB1)	; &I-MULE-VIET-L-31;
     ))
 (define-char
   '((name . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE")
@@ -2780,10 +2963,10 @@
      ((name . "LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE")
       (=ucs		  . #x1ED7)	; ỗ
       ))
-    (latin-tcvn5712	. #xF0)	; øº“š°
-    (latin-viscii-upper . #xB2)	; øº’²
-    (latin-viscii	. #x92)	; øº’²
     (=ucs		. #x1ED6)	; Ỗ
+    (latin-tcvn5712	. #xF0)	; &I-VSCII2-70;
+    (latin-viscii	. #x92)	; &I-MULE-VIET-U-32;
+    (latin-viscii-upper . #xB2)	; &I-MULE-VIET-U-32;
     ))
 (define-char
   '((name . "LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE")
@@ -2795,10 +2978,10 @@
      ((name . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE")
       (=ucs		  . #x1ED6)	; Ỗ
       ))
-    (latin-tcvn5712	. #xE7)	; øº“š§
-    (latin-viscii-lower . #xB2)	; øº’œ’
-    (latin-viscii	. #xB2)	; øº’œ’
     (=ucs		. #x1ED7)	; ỗ
+    (latin-tcvn5712	. #xE7)	; &I-VSCII2-67;
+    (latin-viscii	. #xB2)	; &I-MULE-VIET-L-32;
+    (latin-viscii-lower . #xB2)	; &I-MULE-VIET-L-32;
     ))
 (define-char
   '((name . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW")
@@ -2810,9 +2993,9 @@
      ((name . "LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW")
       (=ucs		  . #x1ED9)	; ộ
       ))
-    (latin-viscii-upper . #xB5)	; øº’µ
-    (latin-viscii	. #x93)	; øº’µ
     (=ucs		. #x1ED8)	; Ộ
+    (latin-viscii	. #x93)	; &I-MULE-VIET-U-35;
+    (latin-viscii-upper . #xB5)	; &I-MULE-VIET-U-35;
     ))
 (define-char
   '((name . "LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW")
@@ -2824,10 +3007,10 @@
      ((name . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW")
       (=ucs		  . #x1ED8)	; Ộ
       ))
-    (latin-tcvn5712	. #xE9)	; øº“š©
-    (latin-viscii-lower . #xB5)	; øº’œ•
-    (latin-viscii	. #xB5)	; øº’œ•
     (=ucs		. #x1ED9)	; ộ
+    (latin-tcvn5712	. #xE9)	; &I-VSCII2-69;
+    (latin-viscii	. #xB5)	; &I-MULE-VIET-L-35;
+    (latin-viscii-lower . #xB5)	; &I-MULE-VIET-L-35;
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER O WITH HORN AND ACUTE")
@@ -2839,9 +3022,9 @@
      ((name		  . "LATIN SMALL LETTER O WITH HORN AND ACUTE")
       (=ucs		  . #x1EDB)	; ớ
       ))
-    (latin-viscii-upper . #xBE)	; øº’¾
-    (latin-viscii	. #x95)	; øº’¾
     (=ucs		. #x1EDA)	; Ớ
+    (latin-viscii	. #x95)	; &I-MULE-VIET-U-3E;
+    (latin-viscii-upper . #xBE)	; &I-MULE-VIET-U-3E;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER O WITH HORN AND ACUTE")
@@ -2853,10 +3036,10 @@
      ((name		  . "LATIN CAPITAL LETTER O WITH HORN AND ACUTE")
       (=ucs		  . #x1EDA)	; Ớ
       ))
-    (latin-tcvn5712	. #xED)	; øº“š­
-    (latin-viscii-lower . #xBE)	; øº’œž
-    (latin-viscii	. #xBE)	; øº’œž
     (=ucs		. #x1EDB)	; ớ
+    (latin-tcvn5712	. #xED)	; &I-VSCII2-6D;
+    (latin-viscii	. #xBE)	; &I-MULE-VIET-L-3E;
+    (latin-viscii-lower . #xBE)	; &I-MULE-VIET-L-3E;
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER O WITH HORN AND GRAVE")
@@ -2868,9 +3051,9 @@
      ((name		  . "LATIN SMALL LETTER O WITH HORN AND GRAVE")
       (=ucs		  . #x1EDD)	; ờ
       ))
-    (latin-viscii-upper . #xB6)	; øº’¶
-    (latin-viscii	. #x96)	; øº’¶
     (=ucs		. #x1EDC)	; Ờ
+    (latin-viscii	. #x96)	; &I-MULE-VIET-U-36;
+    (latin-viscii-upper . #xB6)	; &I-MULE-VIET-U-36;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER O WITH HORN AND GRAVE")
@@ -2882,10 +3065,10 @@
      ((name		  . "LATIN CAPITAL LETTER O WITH HORN AND GRAVE")
       (=ucs		  . #x1EDC)	; Ờ
       ))
-    (latin-tcvn5712	. #xEA)	; øº“šª
-    (latin-viscii-lower . #xB6)	; øº’œ–
-    (latin-viscii	. #xB6)	; øº’œ–
     (=ucs		. #x1EDD)	; ờ
+    (latin-tcvn5712	. #xEA)	; &I-VSCII2-6A;
+    (latin-viscii	. #xB6)	; &I-MULE-VIET-L-36;
+    (latin-viscii-lower . #xB6)	; &I-MULE-VIET-L-36;
     ))
 (define-char
   '((name . "LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE")
@@ -2897,9 +3080,9 @@
      ((name . "LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE")
       (=ucs		  . #x1EDF)	; ở
       ))
-    (latin-viscii-upper . #xB7)	; øº’·
-    (latin-viscii	. #x97)	; øº’·
     (=ucs		. #x1EDE)	; Ở
+    (latin-viscii	. #x97)	; &I-MULE-VIET-U-37;
+    (latin-viscii-upper . #xB7)	; &I-MULE-VIET-U-37;
     ))
 (define-char
   '((name . "LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE")
@@ -2911,10 +3094,10 @@
      ((name . "LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE")
       (=ucs		  . #x1EDE)	; Ở
       ))
-    (latin-tcvn5712	. #xEB)	; øº“š«
-    (latin-viscii-lower . #xB7)	; øº’œ—
-    (latin-viscii	. #xB7)	; øº’œ—
     (=ucs		. #x1EDF)	; ở
+    (latin-tcvn5712	. #xEB)	; &I-VSCII2-6B;
+    (latin-viscii	. #xB7)	; &I-MULE-VIET-L-37;
+    (latin-viscii-lower . #xB7)	; &I-MULE-VIET-L-37;
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER O WITH HORN AND TILDE")
@@ -2926,9 +3109,9 @@
      ((name		  . "LATIN SMALL LETTER O WITH HORN AND TILDE")
       (=ucs		  . #x1EE1)	; ỡ
       ))
-    (latin-viscii-upper . #xDE)	; øº’žž
-    (latin-viscii	. #xB3)	; øº’žž
     (=ucs		. #x1EE0)	; á» 
+    (latin-viscii	. #xB3)	; &I-MULE-VIET-U-5E;
+    (latin-viscii-upper . #xDE)	; &I-MULE-VIET-U-5E;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER O WITH HORN AND TILDE")
@@ -2940,10 +3123,10 @@
      ((name		  . "LATIN CAPITAL LETTER O WITH HORN AND TILDE")
       (=ucs		  . #x1EE0)	; á» 
       ))
-    (latin-tcvn5712	. #xEC)	; øº“š¬
-    (latin-viscii-lower . #xDE)	; øº’œ¾
-    (latin-viscii	. #xDE)	; øº’œ¾
     (=ucs		. #x1EE1)	; ỡ
+    (latin-tcvn5712	. #xEC)	; &I-VSCII2-6C;
+    (latin-viscii	. #xDE)	; &I-MULE-VIET-L-5E;
+    (latin-viscii-lower . #xDE)	; &I-MULE-VIET-L-5E;
     ))
 (define-char
   '((name . "LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW")
@@ -2955,9 +3138,9 @@
      ((name . "LATIN SMALL LETTER O WITH HORN AND DOT BELOW")
       (=ucs		  . #x1EE3)	; ợ
       ))
-    (latin-viscii-upper . #xFE)	; øº’ž¾
-    (latin-viscii	. #x94)	; øº’ž¾
     (=ucs		. #x1EE2)	; Ợ
+    (latin-viscii	. #x94)	; &I-MULE-VIET-U-7E;
+    (latin-viscii-upper . #xFE)	; &I-MULE-VIET-U-7E;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER O WITH HORN AND DOT BELOW")
@@ -2969,10 +3152,10 @@
      ((name . "LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW")
       (=ucs		  . #x1EE2)	; Ợ
       ))
-    (latin-tcvn5712	. #xEE)	; øº“š®
-    (latin-viscii-lower . #xFE)	; øº’ž
-    (latin-viscii	. #xFE)	; øº’ž
     (=ucs		. #x1EE3)	; ợ
+    (latin-tcvn5712	. #xEE)	; &I-VSCII2-6E;
+    (latin-viscii	. #xFE)	; &I-MULE-VIET-L-7E;
+    (latin-viscii-lower . #xFE)	; &I-MULE-VIET-L-7E;
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER U WITH DOT BELOW")
@@ -2984,9 +3167,9 @@
      ((name		  . "LATIN SMALL LETTER U WITH DOT BELOW")
       (=ucs		  . #x1EE5)	; ụ
       ))
-    (latin-viscii-upper . #xF8)	; øº’ž¸
-    (latin-viscii	. #x9E)	; øº’ž¸
     (=ucs		. #x1EE4)	; Ụ
+    (latin-viscii	. #x9E)	; &I-MULE-VIET-U-78;
+    (latin-viscii-upper . #xF8)	; &I-MULE-VIET-U-78;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER U WITH DOT BELOW")
@@ -2998,10 +3181,10 @@
      ((name		  . "LATIN CAPITAL LETTER U WITH DOT BELOW")
       (=ucs		  . #x1EE4)	; Ụ
       ))
-    (latin-tcvn5712	. #xF4)	; øº“š´
-    (latin-viscii-lower . #xF8)	; øº’˜
-    (latin-viscii	. #xF8)	; øº’˜
     (=ucs		. #x1EE5)	; ụ
+    (latin-tcvn5712	. #xF4)	; &I-VSCII2-74;
+    (latin-viscii	. #xF8)	; &I-MULE-VIET-L-78;
+    (latin-viscii-lower . #xF8)	; &I-MULE-VIET-L-78;
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER U WITH HOOK ABOVE")
@@ -3013,9 +3196,9 @@
      ((name		  . "LATIN SMALL LETTER U WITH HOOK ABOVE")
       (=ucs		  . #x1EE7)	; ủ
       ))
-    (latin-viscii-upper . #xFC)	; øº’ž¼
-    (latin-viscii	. #x9C)	; øº’ž¼
     (=ucs		. #x1EE6)	; Ủ
+    (latin-viscii	. #x9C)	; &I-MULE-VIET-U-7C;
+    (latin-viscii-upper . #xFC)	; &I-MULE-VIET-U-7C;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER U WITH HOOK ABOVE")
@@ -3027,10 +3210,10 @@
      ((name		  . "LATIN CAPITAL LETTER U WITH HOOK ABOVE")
       (=ucs		  . #x1EE6)	; Ủ
       ))
-    (latin-tcvn5712	. #xF1)	; øº“š±
-    (latin-viscii-lower . #xFC)	; øº’œ
-    (latin-viscii	. #xFC)	; øº’œ
     (=ucs		. #x1EE7)	; ủ
+    (latin-tcvn5712	. #xF1)	; &I-VSCII2-71;
+    (latin-viscii	. #xFC)	; &I-MULE-VIET-L-7C;
+    (latin-viscii-lower . #xFC)	; &I-MULE-VIET-L-7C;
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER U WITH HORN AND ACUTE")
@@ -3042,9 +3225,9 @@
      ((name		  . "LATIN SMALL LETTER U WITH HORN AND ACUTE")
       (=ucs		  . #x1EE9)	; ứ
       ))
-    (latin-viscii-upper . #xD1)	; øº’ž‘
-    (latin-viscii	. #xBA)	; øº’ž‘
     (=ucs		. #x1EE8)	; Ứ
+    (latin-viscii	. #xBA)	; &I-MULE-VIET-U-51;
+    (latin-viscii-upper . #xD1)	; &I-MULE-VIET-U-51;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER U WITH HORN AND ACUTE")
@@ -3056,10 +3239,10 @@
      ((name		  . "LATIN CAPITAL LETTER U WITH HORN AND ACUTE")
       (=ucs		  . #x1EE8)	; Ứ
       ))
-    (latin-tcvn5712	. #xF8)	; øº“š¸
-    (latin-viscii-lower . #xD1)	; øº’œ±
-    (latin-viscii	. #xD1)	; øº’œ±
     (=ucs		. #x1EE9)	; ứ
+    (latin-tcvn5712	. #xF8)	; &I-VSCII2-78;
+    (latin-viscii	. #xD1)	; &I-MULE-VIET-L-51;
+    (latin-viscii-lower . #xD1)	; &I-MULE-VIET-L-51;
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER U WITH HORN AND GRAVE")
@@ -3071,9 +3254,9 @@
      ((name		  . "LATIN SMALL LETTER U WITH HORN AND GRAVE")
       (=ucs		  . #x1EEB)	; ừ
       ))
-    (latin-viscii-upper . #xD7)	; øº’ž—
-    (latin-viscii	. #xBB)	; øº’ž—
     (=ucs		. #x1EEA)	; Ừ
+    (latin-viscii	. #xBB)	; &I-MULE-VIET-U-57;
+    (latin-viscii-upper . #xD7)	; &I-MULE-VIET-U-57;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER U WITH HORN AND GRAVE")
@@ -3085,10 +3268,10 @@
      ((name		  . "LATIN CAPITAL LETTER U WITH HORN AND GRAVE")
       (=ucs		  . #x1EEA)	; Ừ
       ))
-    (latin-tcvn5712	. #xF5)	; øº“šµ
-    (latin-viscii-lower . #xD7)	; øº’œ·
-    (latin-viscii	. #xD7)	; øº’œ·
     (=ucs		. #x1EEB)	; ừ
+    (latin-tcvn5712	. #xF5)	; &I-VSCII2-75;
+    (latin-viscii	. #xD7)	; &I-MULE-VIET-L-57;
+    (latin-viscii-lower . #xD7)	; &I-MULE-VIET-L-57;
     ))
 (define-char
   '((name . "LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE")
@@ -3100,9 +3283,9 @@
      ((name . "LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE")
       (=ucs		  . #x1EED)	; á»­
       ))
-    (latin-viscii-upper . #xD8)	; øº’ž˜
-    (latin-viscii	. #xBC)	; øº’ž˜
     (=ucs		. #x1EEC)	; Ử
+    (latin-viscii	. #xBC)	; &I-MULE-VIET-U-58;
+    (latin-viscii-upper . #xD8)	; &I-MULE-VIET-U-58;
     ))
 (define-char
   '((name . "LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE")
@@ -3114,10 +3297,10 @@
      ((name . "LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE")
       (=ucs		  . #x1EEC)	; Ử
       ))
-    (latin-tcvn5712	. #xF6)	; øº“š¶
-    (latin-viscii-lower . #xD8)	; øº’œ¸
-    (latin-viscii	. #xD8)	; øº’œ¸
     (=ucs		. #x1EED)	; á»­
+    (latin-tcvn5712	. #xF6)	; &I-VSCII2-76;
+    (latin-viscii	. #xD8)	; &I-MULE-VIET-L-58;
+    (latin-viscii-lower . #xD8)	; &I-MULE-VIET-L-58;
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER U WITH HORN AND TILDE")
@@ -3129,9 +3312,9 @@
      ((name		  . "LATIN SMALL LETTER U WITH HORN AND TILDE")
       (=ucs		  . #x1EEF)	; ữ
       ))
-    (latin-viscii-upper . #xE6)	; øº’ž¦
-    (latin-viscii	. #xFF)	; øº’ž¦
     (=ucs		. #x1EEE)	; á»®
+    (latin-viscii	. #xFF)	; &I-MULE-VIET-U-66;
+    (latin-viscii-upper . #xE6)	; &I-MULE-VIET-U-66;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER U WITH HORN AND TILDE")
@@ -3143,10 +3326,10 @@
      ((name		  . "LATIN CAPITAL LETTER U WITH HORN AND TILDE")
       (=ucs		  . #x1EEE)	; á»®
       ))
-    (latin-tcvn5712	. #xF7)	; øº“š·
-    (latin-viscii-lower . #xE6)	; øº’†
-    (latin-viscii	. #xE6)	; øº’†
     (=ucs		. #x1EEF)	; ữ
+    (latin-tcvn5712	. #xF7)	; &I-VSCII2-77;
+    (latin-viscii	. #xE6)	; &I-MULE-VIET-L-66;
+    (latin-viscii-lower . #xE6)	; &I-MULE-VIET-L-66;
     ))
 (define-char
   '((name . "LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW")
@@ -3158,9 +3341,9 @@
      ((name . "LATIN SMALL LETTER U WITH HORN AND DOT BELOW")
       (=ucs		  . #x1EF1)	; á»±
       ))
-    (latin-viscii-upper . #xF1)	; øº’ž±
-    (latin-viscii	. #xB9)	; øº’ž±
     (=ucs		. #x1EF0)	; á»°
+    (latin-viscii	. #xB9)	; &I-MULE-VIET-U-71;
+    (latin-viscii-upper . #xF1)	; &I-MULE-VIET-U-71;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER U WITH HORN AND DOT BELOW")
@@ -3172,10 +3355,10 @@
      ((name . "LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW")
       (=ucs		  . #x1EF0)	; á»°
       ))
-    (latin-tcvn5712	. #xF9)	; øº“š¹
-    (latin-viscii-lower . #xF1)	; øº’‘
-    (latin-viscii	. #xF1)	; øº’‘
     (=ucs		. #x1EF1)	; á»±
+    (latin-tcvn5712	. #xF9)	; &I-VSCII2-79;
+    (latin-viscii	. #xF1)	; &I-MULE-VIET-L-71;
+    (latin-viscii-lower . #xF1)	; &I-MULE-VIET-L-71;
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER Y WITH GRAVE")
@@ -3187,13 +3370,21 @@
      ((name		  . "LATIN SMALL LETTER Y WITH GRAVE")
       (=ucs		  . #x1EF3)	; ỳ
       ))
-    (latin-viscii-upper . #xCF)	; øº’ž
-    (latin-viscii	. #x9F)	; øº’ž
     (=ucs		. #x1EF2)	; Ỳ
+    (latin-viscii	. #x9F)	; &I-MULE-VIET-U-4F;
+    (latin-viscii-upper . #xCF)	; &I-MULE-VIET-U-4F;
     ))
 (define-char
-  '((=>ucs		. #x1EF2)	; Ỳ
-    (=jef-china3	. #x85C0)	; øºˆ—€
+  '((->decomposition	#xFF39 #x0300)
+    (<-denotational
+     ((name		  . "LATIN CAPITAL LETTER Y WITH GRAVE")
+      (=ucs		  . #x1EF2)	; Ỳ
+      ))
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER Y WITH GRAVE")
+      (=ucs		  . #x1EF2)	; Ỳ
+      ))
+    (=jef-china3	. #x85C0)	; &JC3-85C0;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER Y WITH GRAVE")
@@ -3205,10 +3396,10 @@
      ((name		  . "LATIN CAPITAL LETTER Y WITH GRAVE")
       (=ucs		  . #x1EF2)	; Ỳ
       ))
-    (latin-tcvn5712	. #xFA)	; øº“šº
-    (latin-viscii-lower . #xCF)	; øº’œ¯
-    (latin-viscii	. #xCF)	; øº’œ¯
     (=ucs		. #x1EF3)	; ỳ
+    (latin-tcvn5712	. #xFA)	; &I-VSCII2-7A;
+    (latin-viscii	. #xCF)	; &I-MULE-VIET-L-4F;
+    (latin-viscii-lower . #xCF)	; &I-MULE-VIET-L-4F;
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER Y WITH DOT BELOW")
@@ -3220,9 +3411,9 @@
      ((name		  . "LATIN SMALL LETTER Y WITH DOT BELOW")
       (=ucs		  . #x1EF5)	; ỵ
       ))
-    (latin-viscii-upper . #xDC)	; øº’žœ
-    (latin-viscii	. #x1E)	; øº’žœ
     (=ucs		. #x1EF4)	; á»´
+    (latin-viscii	. #x1E)	; &I-MULE-VIET-U-5C;
+    (latin-viscii-upper . #xDC)	; &I-MULE-VIET-U-5C;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER Y WITH DOT BELOW")
@@ -3234,10 +3425,10 @@
      ((name		  . "LATIN CAPITAL LETTER Y WITH DOT BELOW")
       (=ucs		  . #x1EF4)	; á»´
       ))
-    (latin-tcvn5712	. #xFE)	; øº“š¾
-    (latin-viscii-lower . #xDC)	; øº’œ¼
-    (latin-viscii	. #xDC)	; øº’œ¼
     (=ucs		. #x1EF5)	; ỵ
+    (latin-tcvn5712	. #xFE)	; &I-VSCII2-7E;
+    (latin-viscii	. #xDC)	; &I-MULE-VIET-L-5C;
+    (latin-viscii-lower . #xDC)	; &I-MULE-VIET-L-5C;
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER Y WITH HOOK ABOVE")
@@ -3249,9 +3440,9 @@
      ((name		  . "LATIN SMALL LETTER Y WITH HOOK ABOVE")
       (=ucs		  . #x1EF7)	; á»·
       ))
-    (latin-viscii-upper . #xD6)	; øº’ž–
-    (latin-viscii	. #x14)	; øº’ž–
     (=ucs		. #x1EF6)	; Ỷ
+    (latin-viscii	. #x14)	; &I-MULE-VIET-U-56;
+    (latin-viscii-upper . #xD6)	; &I-MULE-VIET-U-56;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER Y WITH HOOK ABOVE")
@@ -3263,10 +3454,10 @@
      ((name		  . "LATIN CAPITAL LETTER Y WITH HOOK ABOVE")
       (=ucs		  . #x1EF6)	; Ỷ
       ))
-    (latin-tcvn5712	. #xFB)	; øº“š»
-    (latin-viscii-lower . #xD6)	; øº’œ¶
-    (latin-viscii	. #xD6)	; øº’œ¶
     (=ucs		. #x1EF7)	; á»·
+    (latin-tcvn5712	. #xFB)	; &I-VSCII2-7B;
+    (latin-viscii	. #xD6)	; &I-MULE-VIET-L-56;
+    (latin-viscii-lower . #xD6)	; &I-MULE-VIET-L-56;
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER Y WITH TILDE")
@@ -3278,9 +3469,9 @@
      ((name		  . "LATIN SMALL LETTER Y WITH TILDE")
       (=ucs		  . #x1EF9)	; ỹ
       ))
-    (latin-viscii-upper . #xDB)	; øº’ž›
-    (latin-viscii	. #x19)	; øº’ž›
     (=ucs		. #x1EF8)	; Ỹ
+    (latin-viscii	. #x19)	; &I-MULE-VIET-U-5B;
+    (latin-viscii-upper . #xDB)	; &I-MULE-VIET-U-5B;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER Y WITH TILDE")
@@ -3292,8 +3483,8 @@
      ((name		  . "LATIN CAPITAL LETTER Y WITH TILDE")
       (=ucs		  . #x1EF8)	; Ỹ
       ))
-    (latin-tcvn5712	. #xFC)	; øº“š¼
-    (latin-viscii-lower . #xDB)	; øº’œ»
-    (latin-viscii	. #xDB)	; øº’œ»
     (=ucs		. #x1EF9)	; ỹ
+    (latin-tcvn5712	. #xFC)	; &I-VSCII2-7C;
+    (latin-viscii	. #xDB)	; &I-MULE-VIET-L-5B;
+    (latin-viscii-lower . #xDB)	; &I-MULE-VIET-L-5B;
     ))