X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fu01E00-Latin-Extended-Additional.el;h=02bc19f6f43d178822067711006678fc8994f782;hb=348e63a08936312283028ff3702b0d15e8e3529d;hp=54ea42c1c59ae5a93ce116220c74c26519c56068;hpb=a522427bbe0f9fa5d10b43083b0caceee85d9e98;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 54ea42c..02bc19f 100644
--- a/lisp/utf-2000/u01E00-Latin-Extended-Additional.el
+++ b/lisp/utf-2000/u01E00-Latin-Extended-Additional.el
@@ -886,10 +886,6 @@
      ((name		  . "LATIN CAPITAL LETTER K WITH ACUTE")
       (=ucs		  . #x1E30)	; Ḱ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER K WITH ACUTE")
-      (=ucs		  . #x1E30)	; Ḱ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER K")
       (=ucs		  . #xFF2B)	; Ｋ
@@ -897,9 +893,13 @@
      ((name		  . "COMBINING ACUTE ACCENT")
       (=ucs		  . #x0301)	; ́
       ))
-    (=jef-china3	. #x85DC)	; &JC3-85DC;
+    (=jef-china3	. #x85DC)	; Ｋ́
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER K WITH ACUTE")
+      (=ucs		  . #x1E30)	; Ḱ
+      ))
     (->lowercase
-     ((=jef-china3	  . #x85F2)	; &JC3-85F2;
+     ((=jef-china3	  . #x85F2)	; ｋ́
       ))
     ))
 (define-char
@@ -925,10 +925,6 @@
      ((name		  . "LATIN SMALL LETTER K WITH ACUTE")
       (=ucs		  . #x1E31)	; ḱ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER K WITH ACUTE")
-      (=ucs		  . #x1E31)	; ḱ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER K")
       (=ucs		  . #xFF4B)	; ｋ
@@ -936,9 +932,13 @@
      ((name		  . "COMBINING ACUTE ACCENT")
       (=ucs		  . #x0301)	; ́
       ))
-    (=jef-china3	. #x85F2)	; &JC3-85F2;
+    (=jef-china3	. #x85F2)	; ｋ́
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER K WITH ACUTE")
+      (=ucs		  . #x1E31)	; ḱ
+      ))
     (->uppercase
-     ((=jef-china3	  . #x85DC)	; &JC3-85DC;
+     ((=jef-china3	  . #x85DC)	; Ｋ́
       ))
     ))
 (define-char
@@ -1180,10 +1180,6 @@
      ((name		  . "LATIN CAPITAL LETTER M WITH ACUTE")
       (=ucs		  . #x1E3E)	; Ḿ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER M WITH ACUTE")
-      (=ucs		  . #x1E3E)	; Ḿ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER M")
       (=ucs		  . #xFF2D)	; ï¼­
@@ -1191,11 +1187,16 @@
      ((name		  . "COMBINING ACUTE ACCENT")
       (=ucs		  . #x0301)	; ́
       ))
-    (=jis-x0213-1-2000	. #x2872)	; &JX1-2872; [08-82]
+    (=ucs@jis/fw	. #x1E3E)	; Ｍ́
+    (=jis-x0213-1	. #x2872)	; Ｍ́ [08-82]
     (=jef-china3	. #x85DE)	; &I-JC3-85DE;
-    (=ucs@jis/fw	. #x1E3E)	; &JX1-2872;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER M WITH ACUTE")
+      (=ucs		  . #x1E3E)	; Ḿ
+      ))
     (->lowercase
-     ((=jis-x0213-1-2000  . #x2873)	; &JX1-2873; [08-83]
+     ((=ucs@jis/fw	  . #x1E3F)	; ｍ́
+      (=jis-x0213-1	  . #x2873)	; ｍ́ [08-83]
       ))
     ))
 (define-char
@@ -1221,10 +1222,6 @@
      ((name		  . "LATIN SMALL LETTER M WITH ACUTE")
       (=ucs		  . #x1E3F)	; ḿ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER M WITH ACUTE")
-      (=ucs		  . #x1E3F)	; ḿ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER M")
       (=ucs		  . #xFF4D)	; ｍ
@@ -1232,11 +1229,16 @@
      ((name		  . "COMBINING ACUTE ACCENT")
       (=ucs		  . #x0301)	; ́
       ))
-    (=jis-x0213-1-2000	. #x2873)	; &JX1-2873; [08-83]
+    (=ucs@jis/fw	. #x1E3F)	; ｍ́
+    (=jis-x0213-1	. #x2873)	; ｍ́ [08-83]
     (=jef-china3	. #x85F4)	; &I-JC3-85F4;
-    (=ucs@jis/fw	. #x1E3F)	; &JX1-2873;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER M WITH ACUTE")
+      (=ucs		  . #x1E3F)	; ḿ
+      ))
     (->uppercase
-     ((=jis-x0213-1-2000  . #x2872)	; &JX1-2872; [08-82]
+     ((=ucs@jis/fw	  . #x1E3E)	; Ｍ́
+      (=jis-x0213-1	  . #x2872)	; Ｍ́ [08-82]
       ))
     ))
 (define-char
@@ -1622,10 +1624,6 @@
      ((name		  . "LATIN CAPITAL LETTER P WITH ACUTE")
       (=ucs		  . #x1E54)	; Ṕ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER P WITH ACUTE")
-      (=ucs		  . #x1E54)	; Ṕ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER P")
       (=ucs		  . #xFF30)	; ï¼°
@@ -1633,9 +1631,13 @@
      ((name		  . "COMBINING ACUTE ACCENT")
       (=ucs		  . #x0301)	; ́
       ))
-    (=jef-china3	. #x85E1)	; &JC3-85E1;
+    (=jef-china3	. #x85E1)	; Ｐ́
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER P WITH ACUTE")
+      (=ucs		  . #x1E54)	; Ṕ
+      ))
     (->lowercase
-     ((=jef-china3	  . #x85F7)	; &JC3-85F7;
+     ((=jef-china3	  . #x85F7)	; ｐ́
       ))
     ))
 (define-char
@@ -1661,10 +1663,6 @@
      ((name		  . "LATIN SMALL LETTER P WITH ACUTE")
       (=ucs		  . #x1E55)	; ṕ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER P WITH ACUTE")
-      (=ucs		  . #x1E55)	; ṕ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER P")
       (=ucs		  . #xFF50)	; ｐ
@@ -1672,9 +1670,13 @@
      ((name		  . "COMBINING ACUTE ACCENT")
       (=ucs		  . #x0301)	; ́
       ))
-    (=jef-china3	. #x85F7)	; &JC3-85F7;
+    (=jef-china3	. #x85F7)	; ｐ́
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER P WITH ACUTE")
+      (=ucs		  . #x1E55)	; ṕ
+      ))
     (->uppercase
-     ((=jef-china3	  . #x85E1)	; &JC3-85E1;
+     ((=jef-china3	  . #x85E1)	; Ｐ́
       ))
     ))
 (define-char
@@ -1916,10 +1918,6 @@
      ((name		  . "LATIN CAPITAL LETTER S WITH DOT BELOW")
       (=ucs		  . #x1E62)	; á¹¢
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER S WITH DOT BELOW")
-      (=ucs		  . #x1E62)	; á¹¢
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER S")
       (=ucs		  . #xFF33)	; ï¼³
@@ -1927,7 +1925,11 @@
      ((name		  . "COMBINING DOT BELOW")
       (=ucs		  . #x0323)	; ̣
       ))
-    (=jef-china3	. #x8AC2)	; &JC3-8AC2;
+    (=jef-china3	. #x8AC2)	; Ｓ̣
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER S WITH DOT BELOW")
+      (=ucs		  . #x1E62)	; á¹¢
+      ))
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER S WITH DOT BELOW")
@@ -2510,10 +2512,6 @@
      ((name		  . "LATIN CAPITAL LETTER W WITH ACUTE")
       (=ucs		  . #x1E82)	; Ẃ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER W WITH ACUTE")
-      (=ucs		  . #x1E82)	; Ẃ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER W")
       (=ucs		  . #xFF37)	; ï¼·
@@ -2521,9 +2519,13 @@
      ((name		  . "COMBINING ACUTE ACCENT")
       (=ucs		  . #x0301)	; ́
       ))
-    (=jef-china3	. #x85E8)	; &JC3-85E8;
+    (=jef-china3	. #x85E8)	; Ｗ́
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER W WITH ACUTE")
+      (=ucs		  . #x1E82)	; Ẃ
+      ))
     (->lowercase
-     ((=jef-china3	  . #x85FE)	; &JC3-85FE;
+     ((=jef-china3	  . #x85FE)	; ｗ́
       ))
     ))
 (define-char
@@ -2549,10 +2551,6 @@
      ((name		  . "LATIN SMALL LETTER W WITH ACUTE")
       (=ucs		  . #x1E83)	; ẃ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER W WITH ACUTE")
-      (=ucs		  . #x1E83)	; ẃ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN SMALL LETTER W")
       (=ucs		  . #xFF57)	; ｗ
@@ -2560,9 +2558,13 @@
      ((name		  . "COMBINING ACUTE ACCENT")
       (=ucs		  . #x0301)	; ́
       ))
-    (=jef-china3	. #x85FE)	; &JC3-85FE;
+    (=jef-china3	. #x85FE)	; ｗ́
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER W WITH ACUTE")
+      (=ucs		  . #x1E83)	; ẃ
+      ))
     (->uppercase
-     ((=jef-china3	  . #x85E8)	; &JC3-85E8;
+     ((=jef-china3	  . #x85E8)	; Ｗ́
       ))
     ))
 (define-char
@@ -3085,20 +3087,21 @@
      ((name . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE")
       (=ucs		  . #x1EA4)	; Ấ
       ))
-    (<-fullwidth
-     ((name . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE")
-      (=ucs		  . #x1EA4)	; Ấ
-      ))
     (=decomposition
-     ((=jis-x0212	  . #x2A24)	; &JX1-2939; [10-04]
-      (=jis-x0213-1-2000  . #x2939)	; &I-JX1-2939; [09-25]
+     ((=ucs@jis/fw	  . #x00C2)	; Ａ̂
+      (=jis-x0212	  . #x2A24)	; Ａ̂ [10-04]
+      (=jis-x0213-1	  . #x2939)	; &I-JX1-2939; [09-25]
       )
      ((name		  . "COMBINING ACUTE ACCENT")
       (=ucs		  . #x0301)	; ́
       ))
-    (=jef-china3	. #x86A7)	; &JC3-86A7;
+    (=jef-china3	. #x86A7)	; Ａ̂́
+    (<-fullwidth
+     ((name . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE")
+      (=ucs		  . #x1EA4)	; Ấ
+      ))
     (->lowercase
-     ((=jef-china3	  . #x86AA)	; &JC3-86AA;
+     ((=jef-china3	  . #x86AA)	; ａ̂́
       ))
     ))
 (define-char
@@ -3127,20 +3130,21 @@
      ((name . "LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE")
       (=ucs		  . #x1EA5)	; ấ
       ))
-    (<-fullwidth
-     ((name . "LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE")
-      (=ucs		  . #x1EA5)	; ấ
-      ))
     (=decomposition
-     ((=jis-x0212	  . #x2B24)	; &JX1-2958; [11-04]
-      (=jis-x0213-1-2000  . #x2958)	; &I-JX1-2958; [09-56]
+     ((=ucs@jis/fw	  . #x00E2)	; ａ̂
+      (=jis-x0212	  . #x2B24)	; ａ̂ [11-04]
+      (=jis-x0213-1	  . #x2958)	; &I-JX1-2958; [09-56]
       )
      ((name		  . "COMBINING ACUTE ACCENT")
       (=ucs		  . #x0301)	; ́
       ))
-    (=jef-china3	. #x86AA)	; &JC3-86AA;
+    (=jef-china3	. #x86AA)	; ａ̂́
+    (<-fullwidth
+     ((name . "LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE")
+      (=ucs		  . #x1EA5)	; ấ
+      ))
     (->uppercase
-     ((=jef-china3	  . #x86A7)	; &JC3-86A7;
+     ((=jef-china3	  . #x86A7)	; Ａ̂́
       ))
     ))
 (define-char
@@ -3169,20 +3173,21 @@
      ((name . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE")
       (=ucs		  . #x1EA6)	; Ầ
       ))
-    (<-fullwidth
-     ((name . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE")
-      (=ucs		  . #x1EA6)	; Ầ
-      ))
     (=decomposition
-     ((=jis-x0212	  . #x2A24)	; &JX1-2939; [10-04]
-      (=jis-x0213-1-2000  . #x2939)	; &I-JX1-2939; [09-25]
+     ((=ucs@jis/fw	  . #x00C2)	; Ａ̂
+      (=jis-x0212	  . #x2A24)	; Ａ̂ [10-04]
+      (=jis-x0213-1	  . #x2939)	; &I-JX1-2939; [09-25]
       )
      ((name		  . "COMBINING GRAVE ACCENT")
       (=ucs		  . #x0300)	; ̀
       ))
-    (=jef-china3	. #x85B1)	; &JC3-85B1;
+    (=jef-china3	. #x85B1)	; Ａ̂̀
+    (<-fullwidth
+     ((name . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE")
+      (=ucs		  . #x1EA6)	; Ầ
+      ))
     (->lowercase
-     ((=jef-china3	  . #x85B4)	; &JC3-85B4;
+     ((=jef-china3	  . #x85B4)	; ａ̂̀
       ))
     ))
 (define-char
@@ -3211,20 +3216,21 @@
      ((name . "LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE")
       (=ucs		  . #x1EA7)	; ầ
       ))
-    (<-fullwidth
-     ((name . "LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE")
-      (=ucs		  . #x1EA7)	; ầ
-      ))
     (=decomposition
-     ((=jis-x0212	  . #x2B24)	; &JX1-2958; [11-04]
-      (=jis-x0213-1-2000  . #x2958)	; &I-JX1-2958; [09-56]
+     ((=ucs@jis/fw	  . #x00E2)	; ａ̂
+      (=jis-x0212	  . #x2B24)	; ａ̂ [11-04]
+      (=jis-x0213-1	  . #x2958)	; &I-JX1-2958; [09-56]
       )
      ((name		  . "COMBINING GRAVE ACCENT")
       (=ucs		  . #x0300)	; ̀
       ))
-    (=jef-china3	. #x85B4)	; &JC3-85B4;
+    (=jef-china3	. #x85B4)	; ａ̂̀
+    (<-fullwidth
+     ((name . "LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE")
+      (=ucs		  . #x1EA7)	; ầ
+      ))
     (->uppercase
-     ((=jef-china3	  . #x85B1)	; &JC3-85B1;
+     ((=jef-china3	  . #x85B1)	; Ａ̂̀
       ))
     ))
 (define-char
@@ -3710,20 +3716,21 @@
      ((name . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE")
       (=ucs		  . #x1EBE)	; Ế
       ))
-    (<-fullwidth
-     ((name . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE")
-      (=ucs		  . #x1EBE)	; Ế
-      ))
     (=decomposition
-     ((=jis-x0212	  . #x2A34)	; &JX1-2941; [10-20]
-      (=jis-x0213-1-2000  . #x2941)	; &I-JX1-2941; [09-33]
+     ((=ucs@jis/fw	  . #x00CA)	; Ｅ̂
+      (=jis-x0212	  . #x2A34)	; Ｅ̂ [10-20]
+      (=jis-x0213-1	  . #x2941)	; &I-JX1-2941; [09-33]
       )
      ((name		  . "COMBINING ACUTE ACCENT")
       (=ucs		  . #x0301)	; ́
       ))
-    (=jef-china3	. #x86A8)	; &JC3-86A8;
+    (=jef-china3	. #x86A8)	; Ｅ̂́
+    (<-fullwidth
+     ((name . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE")
+      (=ucs		  . #x1EBE)	; Ế
+      ))
     (->lowercase
-     ((=jef-china3	  . #x86AB)	; &JC3-86AB;
+     ((=jef-china3	  . #x86AB)	; ｅ̂́
       ))
     ))
 (define-char
@@ -3752,21 +3759,23 @@
      ((name . "LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE")
       (=ucs		  . #x1EBF)	; ế
       ))
-    (<-fullwidth
-     ((name . "LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE")
-      (=ucs		  . #x1EBF)	; ế
-      ))
     (=decomposition
-     ((=gb2312		  . #x283A)	; &JX1-2960; [08-26]
+     ((=ucs@gb/fw	  . #x00EA)	; ｅ̂
+      (=ucs@jis/fw	  . #x00EA)	; ｅ̂
+      (=gb2312		  . #x283A)	; ｅ̂ [08-26]
       (=jis-x0212	  . #x2B34)	; &I-JSP-2B34; [11-20]
-      (=jis-x0213-1-2000  . #x2960)	; &I-JX1-2960; [09-64]
+      (=jis-x0213-1	  . #x2960)	; &I-JX1-2960; [09-64]
       )
      ((name		  . "COMBINING ACUTE ACCENT")
       (=ucs		  . #x0301)	; ́
       ))
-    (=jef-china3	. #x86AB)	; &JC3-86AB;
+    (=jef-china3	. #x86AB)	; ｅ̂́
+    (<-fullwidth
+     ((name . "LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE")
+      (=ucs		  . #x1EBF)	; ế
+      ))
     (->uppercase
-     ((=jef-china3	  . #x86A8)	; &JC3-86A8;
+     ((=jef-china3	  . #x86A8)	; Ｅ̂́
       ))
     ))
 (define-char
@@ -3795,20 +3804,21 @@
      ((name . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE")
       (=ucs		  . #x1EC0)	; Ề
       ))
-    (<-fullwidth
-     ((name . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE")
-      (=ucs		  . #x1EC0)	; Ề
-      ))
     (=decomposition
-     ((=jis-x0212	  . #x2A34)	; &JX1-2941; [10-20]
-      (=jis-x0213-1-2000  . #x2941)	; &I-JX1-2941; [09-33]
+     ((=ucs@jis/fw	  . #x00CA)	; Ｅ̂
+      (=jis-x0212	  . #x2A34)	; Ｅ̂ [10-20]
+      (=jis-x0213-1	  . #x2941)	; &I-JX1-2941; [09-33]
       )
      ((name		  . "COMBINING GRAVE ACCENT")
       (=ucs		  . #x0300)	; ̀
       ))
-    (=jef-china3	. #x85B2)	; &JC3-85B2;
+    (=jef-china3	. #x85B2)	; Ｅ̂̀
+    (<-fullwidth
+     ((name . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE")
+      (=ucs		  . #x1EC0)	; Ề
+      ))
     (->lowercase
-     ((=jef-china3	  . #x85B5)	; &JC3-85B5;
+     ((=jef-china3	  . #x85B5)	; ｅ̂̀
       ))
     ))
 (define-char
@@ -3837,21 +3847,23 @@
      ((name . "LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE")
       (=ucs		  . #x1EC1)	; ề
       ))
-    (<-fullwidth
-     ((name . "LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE")
-      (=ucs		  . #x1EC1)	; ề
-      ))
     (=decomposition
-     ((=gb2312		  . #x283A)	; &JX1-2960; [08-26]
+     ((=ucs@gb/fw	  . #x00EA)	; ｅ̂
+      (=ucs@jis/fw	  . #x00EA)	; ｅ̂
+      (=gb2312		  . #x283A)	; ｅ̂ [08-26]
       (=jis-x0212	  . #x2B34)	; &I-JSP-2B34; [11-20]
-      (=jis-x0213-1-2000  . #x2960)	; &I-JX1-2960; [09-64]
+      (=jis-x0213-1	  . #x2960)	; &I-JX1-2960; [09-64]
       )
      ((name		  . "COMBINING GRAVE ACCENT")
       (=ucs		  . #x0300)	; ̀
       ))
-    (=jef-china3	. #x85B5)	; &JC3-85B5;
+    (=jef-china3	. #x85B5)	; ｅ̂̀
+    (<-fullwidth
+     ((name . "LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE")
+      (=ucs		  . #x1EC1)	; ề
+      ))
     (->uppercase
-     ((=jef-china3	  . #x85B2)	; &JC3-85B2;
+     ((=jef-china3	  . #x85B2)	; Ｅ̂̀
       ))
     ))
 (define-char
@@ -4169,20 +4181,21 @@
      ((name . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE")
       (=ucs		  . #x1ED0)	; Ố
       ))
-    (<-fullwidth
-     ((name . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE")
-      (=ucs		  . #x1ED0)	; Ố
-      ))
     (=decomposition
-     ((=jis-x0212	  . #x2A54)	; &JX1-294B; [10-52]
-      (=jis-x0213-1-2000  . #x294B)	; &I-JX1-294B; [09-43]
+     ((=ucs@jis/fw	  . #x00D4)	; Ｏ̂
+      (=jis-x0212	  . #x2A54)	; Ｏ̂ [10-52]
+      (=jis-x0213-1	  . #x294B)	; &I-JX1-294B; [09-43]
       )
      ((name		  . "COMBINING ACUTE ACCENT")
       (=ucs		  . #x0301)	; ́
       ))
-    (=jef-china3	. #x86A9)	; &JC3-86A9;
+    (=jef-china3	. #x86A9)	; Ｏ̂́
+    (<-fullwidth
+     ((name . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE")
+      (=ucs		  . #x1ED0)	; Ố
+      ))
     (->lowercase
-     ((=jef-china3	  . #x86AC)	; &JC3-86AC;
+     ((=jef-china3	  . #x86AC)	; ｏ̂́
       ))
     ))
 (define-char
@@ -4211,20 +4224,21 @@
      ((name . "LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE")
       (=ucs		  . #x1ED1)	; ố
       ))
-    (<-fullwidth
-     ((name . "LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE")
-      (=ucs		  . #x1ED1)	; ố
-      ))
     (=decomposition
-     ((=jis-x0212	  . #x2B54)	; &JX1-296A; [11-52]
-      (=jis-x0213-1-2000  . #x296A)	; &I-JX1-296A; [09-74]
+     ((=ucs@jis/fw	  . #x00F4)	; ｏ̂
+      (=jis-x0212	  . #x2B54)	; ｏ̂ [11-52]
+      (=jis-x0213-1	  . #x296A)	; &I-JX1-296A; [09-74]
       )
      ((name		  . "COMBINING ACUTE ACCENT")
       (=ucs		  . #x0301)	; ́
       ))
-    (=jef-china3	. #x86AC)	; &JC3-86AC;
+    (=jef-china3	. #x86AC)	; ｏ̂́
+    (<-fullwidth
+     ((name . "LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE")
+      (=ucs		  . #x1ED1)	; ố
+      ))
     (->uppercase
-     ((=jef-china3	  . #x86A9)	; &JC3-86A9;
+     ((=jef-china3	  . #x86A9)	; Ｏ̂́
       ))
     ))
 (define-char
@@ -4253,20 +4267,21 @@
      ((name . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE")
       (=ucs		  . #x1ED2)	; Ồ
       ))
-    (<-fullwidth
-     ((name . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE")
-      (=ucs		  . #x1ED2)	; Ồ
-      ))
     (=decomposition
-     ((=jis-x0212	  . #x2A54)	; &JX1-294B; [10-52]
-      (=jis-x0213-1-2000  . #x294B)	; &I-JX1-294B; [09-43]
+     ((=ucs@jis/fw	  . #x00D4)	; Ｏ̂
+      (=jis-x0212	  . #x2A54)	; Ｏ̂ [10-52]
+      (=jis-x0213-1	  . #x294B)	; &I-JX1-294B; [09-43]
       )
      ((name		  . "COMBINING GRAVE ACCENT")
       (=ucs		  . #x0300)	; ̀
       ))
-    (=jef-china3	. #x85B3)	; &JC3-85B3;
+    (=jef-china3	. #x85B3)	; Ｏ̂̀
+    (<-fullwidth
+     ((name . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE")
+      (=ucs		  . #x1ED2)	; Ồ
+      ))
     (->lowercase
-     ((=jef-china3	  . #x85B6)	; &JC3-85B6;
+     ((=jef-china3	  . #x85B6)	; ｏ̂̀
       ))
     ))
 (define-char
@@ -4295,20 +4310,21 @@
      ((name . "LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE")
       (=ucs		  . #x1ED3)	; ồ
       ))
-    (<-fullwidth
-     ((name . "LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE")
-      (=ucs		  . #x1ED3)	; ồ
-      ))
     (=decomposition
-     ((=jis-x0212	  . #x2B54)	; &JX1-296A; [11-52]
-      (=jis-x0213-1-2000  . #x296A)	; &I-JX1-296A; [09-74]
+     ((=ucs@jis/fw	  . #x00F4)	; ｏ̂
+      (=jis-x0212	  . #x2B54)	; ｏ̂ [11-52]
+      (=jis-x0213-1	  . #x296A)	; &I-JX1-296A; [09-74]
       )
      ((name		  . "COMBINING GRAVE ACCENT")
       (=ucs		  . #x0300)	; ̀
       ))
-    (=jef-china3	. #x85B6)	; &JC3-85B6;
+    (=jef-china3	. #x85B6)	; ｏ̂̀
+    (<-fullwidth
+     ((name . "LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE")
+      (=ucs		  . #x1ED3)	; ồ
+      ))
     (->uppercase
-     ((=jef-china3	  . #x85B3)	; &JC3-85B3;
+     ((=jef-china3	  . #x85B3)	; Ｏ̂̀
       ))
     ))
 (define-char
@@ -4953,10 +4969,6 @@
      ((name		  . "LATIN CAPITAL LETTER Y WITH GRAVE")
       (=ucs		  . #x1EF2)	; Ỳ
       ))
-    (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER Y WITH GRAVE")
-      (=ucs		  . #x1EF2)	; Ỳ
-      ))
     (=decomposition
      ((name		  . "FULLWIDTH LATIN CAPITAL LETTER Y")
       (=ucs		  . #xFF39)	; ï¼¹
@@ -4964,7 +4976,11 @@
      ((name		  . "COMBINING GRAVE ACCENT")
       (=ucs		  . #x0300)	; ̀
       ))
-    (=jef-china3	. #x85C0)	; &JC3-85C0;
+    (=jef-china3	. #x85C0)	; Ｙ̀
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER Y WITH GRAVE")
+      (=ucs		  . #x1EF2)	; Ỳ
+      ))
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER Y WITH GRAVE")