From: tomo <tomo>
Date: Tue, 9 Nov 2004 06:58:14 +0000 (+0000)
Subject: In each *fullwidth* variant:
X-Git-Tag: r21-4-15-u2km-0_21-32-a~2^2~66
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=cc2c39dedefec6c9ba974a4b43bdca0f3ba7a2ec;p=chise%2Fxemacs-chise.git.1

In each *fullwidth* variant:
- Use `<-denotational' instead of `=>ucs'.
- Omit features defined in the mother.
- Use `=ucs@jis/fw' instead of `=ucs@jis' in principle.
In each ucs character:
- Omit `->fullwidth' for non-UCS objects.
---

diff --git a/lisp/utf-2000/u00180-Latin-Extended-B.el b/lisp/utf-2000/u00180-Latin-Extended-B.el
index aacfd75..a738828 100644
--- a/lisp/utf-2000/u00180-Latin-Extended-B.el
+++ b/lisp/utf-2000/u00180-Latin-Extended-B.el
@@ -205,10 +205,6 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->fullwidth
-     ((name		  . "fullwidth latin capital letter g with hook")
-      (=jis-x0213-1-2000  . #x2B29)	; &JX1-2B29; [11-09]
-      ))
     (->lowercase
      ((name		  . "LATIN SMALL LETTER G WITH HOOK")
       (=ucs		  . #x0260)	; É 
@@ -216,21 +212,19 @@
     (=ucs		. #x0193)	; Ɠ
     ))
 (define-char
-  '((name		. "fullwidth latin capital letter g with hook")
-    (=>ucs		. #x0193)	; Ɠ
-    (general-category	letter uppercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x0193)
-    (->lowercase
-     ((name		  . "fullwidth latin small letter g with hook")
+  '((->lowercase
+     ((=jis-x0213-1-2000  . #x2B28)	; &JX1-2B28; [11-08]
+      ))
+    (<-denotational
+     ((name		  . "LATIN CAPITAL LETTER G WITH HOOK")
+      (=ucs		  . #x0193)	; Ɠ
       ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER G WITH HOOK")
       (=ucs		  . #x0193)	; Ɠ
       ))
     (=jis-x0213-1-2000	. #x2B29)	; &JX1-2B29; [11-09]
-    (=ucs@jis		. #x0193)	; &JX1-2B29;
+    (=ucs@jis/fw	. #x0193)	; &JX1-2B29;
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER GAMMA")
@@ -365,8 +359,8 @@
       ))
     (=ucs		. #x01A0)	; Æ 
     (latin-tcvn5712	. #xA5)	; &I-VSCII2-25;
-    (latin-viscii	. #xB4)	; &MCS-00E9277D;
-    (latin-viscii-upper . #xBD)	; &MCS-00E9277D;
+    (latin-viscii	. #xB4)	; &I-MULE-VIET-U-3D;
+    (latin-viscii-upper . #xBD)	; &I-MULE-VIET-U-3D;
     ))
 (define-char
   '((=>ucs		. #x01A0)	; Æ 
@@ -384,8 +378,8 @@
       ))
     (=ucs		. #x01A1)	; Æ¡
     (latin-tcvn5712	. #xAC)	; &I-VSCII2-2C;
-    (latin-viscii	. #xBD)	; &MCS-00E9271D;
-    (latin-viscii-lower . #xBD)	; &MCS-00E9271D;
+    (latin-viscii	. #xBD)	; &I-MULE-VIET-L-3D;
+    (latin-viscii-lower . #xBD)	; &I-MULE-VIET-L-3D;
     ))
 (define-char
   '((=>ucs		. #x01A1)	; Æ¡
@@ -540,8 +534,8 @@
       ))
     (=ucs		. #x01AF)	; Ư
     (latin-tcvn5712	. #xA6)	; &I-VSCII2-26;
-    (latin-viscii	. #xBF)	; &MCS-00E9279F;
-    (latin-viscii-upper . #xDF)	; &MCS-00E9279F;
+    (latin-viscii	. #xBF)	; &I-MULE-VIET-U-5F;
+    (latin-viscii-upper . #xDF)	; &I-MULE-VIET-U-5F;
     ))
 (define-char
   '((=>ucs		. #x01AF)	; Ư
@@ -559,8 +553,8 @@
       ))
     (=ucs		. #x01B0)	; Æ°
     (latin-tcvn5712	. #xAD)	; &I-VSCII2-2D;
-    (latin-viscii	. #xDF)	; &MCS-00E9273F;
-    (latin-viscii-lower . #xDF)	; &MCS-00E9273F;
+    (latin-viscii	. #xDF)	; &I-MULE-VIET-L-5F;
+    (latin-viscii-lower . #xDF)	; &I-MULE-VIET-L-5F;
     ))
 (define-char
   '((=>ucs		. #x01B0)	; Æ°
@@ -898,11 +892,6 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	#x0041 #x030C)
-    (->fullwidth
-     ((name . "fullwidth latin capital letter a with caron")
-      (=jis-x0212	  . #x2A26)	; &JX1-286F; [10-06]
-      (=jis-x0213-1-2000  . #x286F)	; &I-JX1-286F; [08-79]
-      ))
     (->lowercase
      ((name		  . "LATIN SMALL LETTER A WITH CARON")
       (=ucs		  . #x01CE)	; ǎ
@@ -910,14 +899,15 @@
     (=ucs		. #x01CD)	; Ǎ
     ))
 (define-char
-  '((name		. "fullwidth latin capital letter a with caron")
-    (=>ucs		. #x01CD)	; Ǎ
-    (general-category	letter uppercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x01CD)
+  '((->decomposition	#xFF21 #x030C)
     (->lowercase
-     ((name		  . "fullwidth latin small letter a with caron")
+     ((=gb2312		  . #x2823)	; &JX1-2870; [08-03]
+      (=jis-x0212	  . #x2B26)	; &I-JSP-2B26; [11-06]
+      (=jis-x0213-1-2000  . #x2870)	; &I-JX1-2870; [08-80]
+      ))
+    (<-denotational
+     ((name		  . "LATIN CAPITAL LETTER A WITH CARON")
+      (=ucs		  . #x01CD)	; Ǎ
       ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER A WITH CARON")
@@ -926,7 +916,7 @@
     (=jis-x0212		. #x2A26)	; &JX1-286F; [10-06]
     (=jis-x0213-1-2000	. #x286F)	; &I-JX1-286F; [08-79]
     (=jef-china3	. #x88DF)	; &I-JC3-88DF;
-    (=ucs@jis		. #x01CD)	; &JX1-286F;
+    (=ucs@jis/fw	. #x01CD)	; &JX1-286F;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER A WITH CARON")
@@ -934,12 +924,6 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	#x0061 #x030C)
-    (->fullwidth
-     ((name		  . "fullwidth latin small letter a with caron")
-      (=gb2312		  . #x2823)	; &JX1-2870; [08-03]
-      (=jis-x0212	  . #x2B26)	; &I-JSP-2B26; [11-06]
-      (=jis-x0213-1-2000  . #x2870)	; &I-JX1-2870; [08-80]
-      ))
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER A WITH CARON")
       (=ucs		  . #x01CD)	; Ǎ
@@ -947,14 +931,14 @@
     (=ucs		. #x01CE)	; ǎ
     ))
 (define-char
-  '((name		. "fullwidth latin small letter a with caron")
-    (=>ucs		. #x01CE)	; ǎ
-    (general-category	letter lowercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x01CE)
+  '((->decomposition	#xFF41 #x030C)
     (->uppercase
-     ((name . "fullwidth latin capital letter a with caron")
+     ((=jis-x0212	  . #x2A26)	; &JX1-286F; [10-06]
+      (=jis-x0213-1-2000  . #x286F)	; &I-JX1-286F; [08-79]
+      ))
+    (<-denotational
+     ((name		  . "LATIN SMALL LETTER A WITH CARON")
+      (=ucs		  . #x01CE)	; ǎ
       ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER A WITH CARON")
@@ -964,7 +948,7 @@
     (=jis-x0212		. #x2B26)	; &I-JSP-2B26; [11-06]
     (=jis-x0213-1-2000	. #x2870)	; &I-JX1-2870; [08-80]
     (=jef-china3	. #x88EE)	; &I-JC3-88EE;
-    (=ucs@jis		. #x01CE)	; &JX1-2870;
+    (=ucs@jis/fw	. #x01CE)	; &JX1-2870;
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER I WITH CARON")
@@ -972,11 +956,6 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	#x0049 #x030C)
-    (->fullwidth
-     ((name . "fullwidth latin capital letter i with caron")
-      (=jis-x0212	  . #x2A43)	; &JSP-2A43; [10-35]
-      (=jef-china3	  . #x88E4)	; &I-JC3-88E4;
-      ))
     (->lowercase
      ((name		  . "LATIN SMALL LETTER I WITH CARON")
       (=ucs		  . #x01D0)	; ǐ
@@ -984,14 +963,15 @@
     (=ucs		. #x01CF)	; Ǐ
     ))
 (define-char
-  '((name		. "fullwidth latin capital letter i with caron")
-    (=>ucs		. #x01CF)	; Ǐ
-    (general-category	letter uppercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x01CF)
+  '((->decomposition	#xFF29 #x030C)
     (->lowercase
-     ((name		  . "fullwidth latin small letter i with caron")
+     ((=gb2312		  . #x282B)	; &JX1-2871; [08-11]
+      (=jis-x0212	  . #x2B43)	; &I-JSP-2B43; [11-35]
+      (=jis-x0213-1-2000  . #x2871)	; &I-JX1-2871; [08-81]
+      ))
+    (<-denotational
+     ((name		  . "LATIN CAPITAL LETTER I WITH CARON")
+      (=ucs		  . #x01CF)	; Ǐ
       ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER I WITH CARON")
@@ -999,7 +979,7 @@
       ))
     (=jis-x0212		. #x2A43)	; &JSP-2A43; [10-35]
     (=jef-china3	. #x88E4)	; &I-JC3-88E4;
-    (=ucs@jis		. #x01CF)	; &JSP-2A43;
+    (=ucs@jis/fw	. #x01CF)	; &JSP-2A43;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER I WITH CARON")
@@ -1007,12 +987,6 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	#x0069 #x030C)
-    (->fullwidth
-     ((name		  . "fullwidth latin small letter i with caron")
-      (=gb2312		  . #x282B)	; &JX1-2871; [08-11]
-      (=jis-x0212	  . #x2B43)	; &I-JSP-2B43; [11-35]
-      (=jis-x0213-1-2000  . #x2871)	; &I-JX1-2871; [08-81]
-      ))
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER I WITH CARON")
       (=ucs		  . #x01CF)	; Ǐ
@@ -1020,14 +994,13 @@
     (=ucs		. #x01D0)	; ǐ
     ))
 (define-char
-  '((name		. "fullwidth latin small letter i with caron")
-    (=>ucs		. #x01D0)	; ǐ
-    (general-category	letter lowercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x01D0)
+  '((->decomposition	#xFF49 #x030C)
     (->uppercase
-     ((name . "fullwidth latin capital letter i with caron")
+     ((=jis-x0212	  . #x2A43)	; &JSP-2A43; [10-35]
+      ))
+    (<-denotational
+     ((name		  . "LATIN SMALL LETTER I WITH CARON")
+      (=ucs		  . #x01D0)	; ǐ
       ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER I WITH CARON")
@@ -1036,7 +1009,7 @@
     (=gb2312		. #x282B)	; &JX1-2871; [08-11]
     (=jis-x0212		. #x2B43)	; &I-JSP-2B43; [11-35]
     (=jis-x0213-1-2000	. #x2871)	; &I-JX1-2871; [08-81]
-    (=ucs@jis		. #x01D0)	; &JX1-2871;
+    (=ucs@jis/fw	. #x01D0)	; &JX1-2871;
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER O WITH CARON")
@@ -1044,11 +1017,6 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	#x004F #x030C)
-    (->fullwidth
-     ((name . "fullwidth latin capital letter o with caron")
-      (=jis-x0212	  . #x2A55)	; &JX1-2876; [10-53]
-      (=jis-x0213-1-2000  . #x2876)	; &I-JX1-2876; [08-86]
-      ))
     (->lowercase
      ((name		  . "LATIN SMALL LETTER O WITH CARON")
       (=ucs		  . #x01D2)	; ǒ
@@ -1056,14 +1024,15 @@
     (=ucs		. #x01D1)	; Ǒ
     ))
 (define-char
-  '((name		. "fullwidth latin capital letter o with caron")
-    (=>ucs		. #x01D1)	; Ǒ
-    (general-category	letter uppercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x01D1)
+  '((->decomposition	#xFF2F #x030C)
     (->lowercase
-     ((name		  . "fullwidth latin small letter o with caron")
+     ((=gb2312		  . #x282F)	; &JX1-2877; [08-15]
+      (=jis-x0212	  . #x2B55)	; &I-JSP-2B55; [11-53]
+      (=jis-x0213-1-2000  . #x2877)	; &I-JX1-2877; [08-87]
+      ))
+    (<-denotational
+     ((name		  . "LATIN CAPITAL LETTER O WITH CARON")
+      (=ucs		  . #x01D1)	; Ǒ
       ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER O WITH CARON")
@@ -1072,7 +1041,7 @@
     (=jis-x0212		. #x2A55)	; &JX1-2876; [10-53]
     (=jis-x0213-1-2000	. #x2876)	; &I-JX1-2876; [08-86]
     (=jef-china3	. #x88E8)	; &I-JC3-88E8;
-    (=ucs@jis		. #x01D1)	; &JX1-2876;
+    (=ucs@jis/fw	. #x01D1)	; &JX1-2876;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER O WITH CARON")
@@ -1080,12 +1049,6 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	#x006F #x030C)
-    (->fullwidth
-     ((name		  . "fullwidth latin small letter o with caron")
-      (=gb2312		  . #x282F)	; &JX1-2877; [08-15]
-      (=jis-x0212	  . #x2B55)	; &I-JSP-2B55; [11-53]
-      (=jis-x0213-1-2000  . #x2877)	; &I-JX1-2877; [08-87]
-      ))
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER O WITH CARON")
       (=ucs		  . #x01D1)	; Ǒ
@@ -1093,14 +1056,14 @@
     (=ucs		. #x01D2)	; ǒ
     ))
 (define-char
-  '((name		. "fullwidth latin small letter o with caron")
-    (=>ucs		. #x01D2)	; ǒ
-    (general-category	letter lowercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x01D2)
+  '((->decomposition	#xFF4F #x030C)
     (->uppercase
-     ((name . "fullwidth latin capital letter o with caron")
+     ((=jis-x0212	  . #x2A55)	; &JX1-2876; [10-53]
+      (=jis-x0213-1-2000  . #x2876)	; &I-JX1-2876; [08-86]
+      ))
+    (<-denotational
+     ((name		  . "LATIN SMALL LETTER O WITH CARON")
+      (=ucs		  . #x01D2)	; ǒ
       ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER O WITH CARON")
@@ -1110,7 +1073,7 @@
     (=jis-x0212		. #x2B55)	; &I-JSP-2B55; [11-53]
     (=jis-x0213-1-2000	. #x2877)	; &I-JX1-2877; [08-87]
     (=jef-china3	. #x88F7)	; &I-JC3-88F7;
-    (=ucs@jis		. #x01D2)	; &JX1-2877;
+    (=ucs@jis/fw	. #x01D2)	; &JX1-2877;
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER U WITH CARON")
@@ -1118,11 +1081,6 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	#x0055 #x030C)
-    (->fullwidth
-     ((name . "fullwidth latin capital letter u with caron")
-      (=jis-x0212	  . #x2A67)	; &JSP-2A67; [10-71]
-      (=jef-china3	  . #x88EC)	; &I-JC3-88EC;
-      ))
     (->lowercase
      ((name		  . "LATIN SMALL LETTER U WITH CARON")
       (=ucs		  . #x01D4)	; ǔ
@@ -1130,14 +1088,15 @@
     (=ucs		. #x01D3)	; Ǔ
     ))
 (define-char
-  '((name		. "fullwidth latin capital letter u with caron")
-    (=>ucs		. #x01D3)	; Ǔ
-    (general-category	letter uppercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x01D3)
+  '((->decomposition	#xFF35 #x030C)
     (->lowercase
-     ((name		  . "fullwidth latin small letter u with caron")
+     ((=gb2312		  . #x2833)	; &JX1-2878; [08-19]
+      (=jis-x0212	  . #x2B67)	; &I-JSP-2B67; [11-71]
+      (=jis-x0213-1-2000  . #x2878)	; &I-JX1-2878; [08-88]
+      ))
+    (<-denotational
+     ((name		  . "LATIN CAPITAL LETTER U WITH CARON")
+      (=ucs		  . #x01D3)	; Ǔ
       ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER U WITH CARON")
@@ -1145,7 +1104,7 @@
       ))
     (=jis-x0212		. #x2A67)	; &JSP-2A67; [10-71]
     (=jef-china3	. #x88EC)	; &I-JC3-88EC;
-    (=ucs@jis		. #x01D3)	; &JSP-2A67;
+    (=ucs@jis/fw	. #x01D3)	; &JSP-2A67;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER U WITH CARON")
@@ -1153,12 +1112,6 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	#x0075 #x030C)
-    (->fullwidth
-     ((name		  . "fullwidth latin small letter u with caron")
-      (=gb2312		  . #x2833)	; &JX1-2878; [08-19]
-      (=jis-x0212	  . #x2B67)	; &I-JSP-2B67; [11-71]
-      (=jis-x0213-1-2000  . #x2878)	; &I-JX1-2878; [08-88]
-      ))
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER U WITH CARON")
       (=ucs		  . #x01D3)	; Ǔ
@@ -1166,14 +1119,13 @@
     (=ucs		. #x01D4)	; ǔ
     ))
 (define-char
-  '((name		. "fullwidth latin small letter u with caron")
-    (=>ucs		. #x01D4)	; ǔ
-    (general-category	letter lowercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x01D4)
+  '((->decomposition	#xFF55 #x030C)
     (->uppercase
-     ((name . "fullwidth latin capital letter u with caron")
+     ((=jis-x0212	  . #x2A67)	; &JSP-2A67; [10-71]
+      ))
+    (<-denotational
+     ((name		  . "LATIN SMALL LETTER U WITH CARON")
+      (=ucs		  . #x01D4)	; ǔ
       ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER U WITH CARON")
@@ -1183,7 +1135,7 @@
     (=jis-x0212		. #x2B67)	; &I-JSP-2B67; [11-71]
     (=jis-x0213-1-2000	. #x2878)	; &I-JX1-2878; [08-88]
     (=jef-china3	. #x88FB)	; &I-JC3-88FB;
-    (=ucs@jis		. #x01D4)	; &JX1-2878;
+    (=ucs@jis/fw	. #x01D4)	; &JX1-2878;
     ))
 (define-char
   '((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON")
@@ -1191,11 +1143,6 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	#x00DC #x0304)
-    (->fullwidth
-     ((name . "fullwidth latin capital letter u with diaeresis and macron")
-      (=jis-x0212	  . #x2A70)	; &JSP-2A70; [10-80]
-      (=ucs@jis		  . #x01D5)	; &JSP-2A70;
-      ))
     (->lowercase
      ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND MACRON")
       (=ucs		  . #x01D6)	; ǖ
@@ -1203,21 +1150,21 @@
     (=ucs		. #x01D5)	; Ǖ
     ))
 (define-char
-  '((name . "fullwidth latin capital letter u with diaeresis and macron")
-    (=>ucs		. #x01D5)	; Ǖ
-    (general-category	letter uppercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x01D5)
-    (->lowercase
-     ((name . "fullwidth latin small letter u with diaeresis and macron")
+  '((->lowercase
+     ((=gb2312		  . #x2835)	; &JX1-2879; [08-21]
+      (=jis-x0212	  . #x2B70)	; &I-JSP-2B70; [11-80]
+      (=jis-x0213-1-2000  . #x2879)	; &I-JX1-2879; [08-89]
+      ))
+    (<-denotational
+     ((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON")
+      (=ucs		  . #x01D5)	; Ǖ
       ))
     (<-fullwidth
      ((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON")
       (=ucs		  . #x01D5)	; Ǖ
       ))
     (=jis-x0212		. #x2A70)	; &JSP-2A70; [10-80]
-    (=ucs@jis		. #x01D5)	; &JSP-2A70;
+    (=ucs@jis/fw	. #x01D5)	; &JSP-2A70;
     ))
 (define-char
   '((name . "LATIN SMALL LETTER U WITH DIAERESIS AND MACRON")
@@ -1225,12 +1172,6 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	#x00FC #x0304)
-    (->fullwidth
-     ((name . "fullwidth latin small letter u with diaeresis and macron")
-      (=gb2312		  . #x2835)	; &JX1-2879; [08-21]
-      (=jis-x0212	  . #x2B70)	; &I-JSP-2B70; [11-80]
-      (=jis-x0213-1-2000  . #x2879)	; &I-JX1-2879; [08-89]
-      ))
     (->uppercase
      ((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON")
       (=ucs		  . #x01D5)	; Ǖ
@@ -1238,14 +1179,12 @@
     (=ucs		. #x01D6)	; ǖ
     ))
 (define-char
-  '((name . "fullwidth latin small letter u with diaeresis and macron")
-    (=>ucs		. #x01D6)	; ǖ
-    (general-category	letter lowercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x01D6)
-    (->uppercase
-     ((name . "fullwidth latin capital letter u with diaeresis and macron")
+  '((->uppercase
+     ((=jis-x0212	  . #x2A70)	; &JSP-2A70; [10-80]
+      ))
+    (<-denotational
+     ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND MACRON")
+      (=ucs		  . #x01D6)	; ǖ
       ))
     (<-fullwidth
      ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND MACRON")
@@ -1254,7 +1193,7 @@
     (=gb2312		. #x2835)	; &JX1-2879; [08-21]
     (=jis-x0212		. #x2B70)	; &I-JSP-2B70; [11-80]
     (=jis-x0213-1-2000	. #x2879)	; &I-JX1-2879; [08-89]
-    (=ucs@jis		. #x01D6)	; &JX1-2879;
+    (=ucs@jis/fw	. #x01D6)	; &JX1-2879;
     ))
 (define-char
   '((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE")
@@ -1262,11 +1201,6 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	#x00DC #x0301)
-    (->fullwidth
-     ((name . "fullwidth latin capital letter u with diaeresis and acute")
-      (=jis-x0212	  . #x2A6D)	; &JSP-2A6D; [10-77]
-      (=ucs@jis		  . #x01D7)	; &JSP-2A6D;
-      ))
     (->lowercase
      ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE")
       (=ucs		  . #x01D8)	; ǘ
@@ -1274,21 +1208,21 @@
     (=ucs		. #x01D7)	; Ǘ
     ))
 (define-char
-  '((name . "fullwidth latin capital letter u with diaeresis and acute")
-    (=>ucs		. #x01D7)	; Ǘ
-    (general-category	letter uppercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x01D7)
-    (->lowercase
-     ((name . "fullwidth latin small letter u with diaeresis and acute")
+  '((->lowercase
+     ((=gb2312		  . #x2836)	; &JX1-287A; [08-22]
+      (=jis-x0212	  . #x2B6D)	; &I-JSP-2B6D; [11-77]
+      (=jis-x0213-1-2000  . #x287A)	; &I-JX1-287A; [08-90]
+      ))
+    (<-denotational
+     ((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE")
+      (=ucs		  . #x01D7)	; Ǘ
       ))
     (<-fullwidth
      ((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE")
       (=ucs		  . #x01D7)	; Ǘ
       ))
     (=jis-x0212		. #x2A6D)	; &JSP-2A6D; [10-77]
-    (=ucs@jis		. #x01D7)	; &JSP-2A6D;
+    (=ucs@jis/fw	. #x01D7)	; &JSP-2A6D;
     ))
 (define-char
   '((name . "LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE")
@@ -1296,12 +1230,6 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	#x00FC #x0301)
-    (->fullwidth
-     ((name . "fullwidth latin small letter u with diaeresis and acute")
-      (=gb2312		  . #x2836)	; &JX1-287A; [08-22]
-      (=jis-x0212	  . #x2B6D)	; &I-JSP-2B6D; [11-77]
-      (=jis-x0213-1-2000  . #x287A)	; &I-JX1-287A; [08-90]
-      ))
     (->uppercase
      ((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE")
       (=ucs		  . #x01D7)	; Ǘ
@@ -1309,14 +1237,12 @@
     (=ucs		. #x01D8)	; ǘ
     ))
 (define-char
-  '((name . "fullwidth latin small letter u with diaeresis and acute")
-    (=>ucs		. #x01D8)	; ǘ
-    (general-category	letter lowercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x01D8)
-    (->uppercase
-     ((name . "fullwidth latin capital letter u with diaeresis and acute")
+  '((->uppercase
+     ((=jis-x0212	  . #x2A6D)	; &JSP-2A6D; [10-77]
+      ))
+    (<-denotational
+     ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE")
+      (=ucs		  . #x01D8)	; ǘ
       ))
     (<-fullwidth
      ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE")
@@ -1325,7 +1251,7 @@
     (=gb2312		. #x2836)	; &JX1-287A; [08-22]
     (=jis-x0212		. #x2B6D)	; &I-JSP-2B6D; [11-77]
     (=jis-x0213-1-2000	. #x287A)	; &I-JX1-287A; [08-90]
-    (=ucs@jis		. #x01D8)	; &JX1-287A;
+    (=ucs@jis/fw	. #x01D8)	; &JX1-287A;
     ))
 (define-char
   '((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON")
@@ -1333,11 +1259,6 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	#x00DC #x030C)
-    (->fullwidth
-     ((name . "fullwidth latin capital letter u with diaeresis and caron")
-      (=jis-x0212	  . #x2A6F)	; &JSP-2A6F; [10-79]
-      (=ucs@jis		  . #x01D9)	; &JSP-2A6F;
-      ))
     (->lowercase
      ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND CARON")
       (=ucs		  . #x01DA)	; ǚ
@@ -1345,21 +1266,21 @@
     (=ucs		. #x01D9)	; Ǚ
     ))
 (define-char
-  '((name . "fullwidth latin capital letter u with diaeresis and caron")
-    (=>ucs		. #x01D9)	; Ǚ
-    (general-category	letter uppercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x01D9)
-    (->lowercase
-     ((name . "fullwidth latin small letter u with diaeresis and caron")
+  '((->lowercase
+     ((=gb2312		  . #x2837)	; &JX1-287B; [08-23]
+      (=jis-x0212	  . #x2B6F)	; &I-JSP-2B6F; [11-79]
+      (=jis-x0213-1-2000  . #x287B)	; &I-JX1-287B; [08-91]
+      ))
+    (<-denotational
+     ((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON")
+      (=ucs		  . #x01D9)	; Ǚ
       ))
     (<-fullwidth
      ((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON")
       (=ucs		  . #x01D9)	; Ǚ
       ))
     (=jis-x0212		. #x2A6F)	; &JSP-2A6F; [10-79]
-    (=ucs@jis		. #x01D9)	; &JSP-2A6F;
+    (=ucs@jis/fw	. #x01D9)	; &JSP-2A6F;
     ))
 (define-char
   '((name . "LATIN SMALL LETTER U WITH DIAERESIS AND CARON")
@@ -1367,12 +1288,6 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	#x00FC #x030C)
-    (->fullwidth
-     ((name . "fullwidth latin small letter u with diaeresis and caron")
-      (=gb2312		  . #x2837)	; &JX1-287B; [08-23]
-      (=jis-x0212	  . #x2B6F)	; &I-JSP-2B6F; [11-79]
-      (=jis-x0213-1-2000  . #x287B)	; &I-JX1-287B; [08-91]
-      ))
     (->uppercase
      ((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON")
       (=ucs		  . #x01D9)	; Ǚ
@@ -1380,14 +1295,12 @@
     (=ucs		. #x01DA)	; ǚ
     ))
 (define-char
-  '((name . "fullwidth latin small letter u with diaeresis and caron")
-    (=>ucs		. #x01DA)	; ǚ
-    (general-category	letter lowercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x01DA)
-    (->uppercase
-     ((name . "fullwidth latin capital letter u with diaeresis and caron")
+  '((->uppercase
+     ((=jis-x0212	  . #x2A6F)	; &JSP-2A6F; [10-79]
+      ))
+    (<-denotational
+     ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND CARON")
+      (=ucs		  . #x01DA)	; ǚ
       ))
     (<-fullwidth
      ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND CARON")
@@ -1396,7 +1309,7 @@
     (=gb2312		. #x2837)	; &JX1-287B; [08-23]
     (=jis-x0212		. #x2B6F)	; &I-JSP-2B6F; [11-79]
     (=jis-x0213-1-2000	. #x287B)	; &I-JX1-287B; [08-91]
-    (=ucs@jis		. #x01DA)	; &JX1-287B;
+    (=ucs@jis/fw	. #x01DA)	; &JX1-287B;
     ))
 (define-char
   '((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE")
@@ -1404,11 +1317,6 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	#x00DC #x0300)
-    (->fullwidth
-     ((name . "fullwidth latin capital letter u with diaeresis and grave")
-      (=jis-x0212	  . #x2A6E)	; &JSP-2A6E; [10-78]
-      (=ucs@jis		  . #x01DB)	; &JSP-2A6E;
-      ))
     (->lowercase
      ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE")
       (=ucs		  . #x01DC)	; ǜ
@@ -1416,21 +1324,21 @@
     (=ucs		. #x01DB)	; Ǜ
     ))
 (define-char
-  '((name . "fullwidth latin capital letter u with diaeresis and grave")
-    (=>ucs		. #x01DB)	; Ǜ
-    (general-category	letter uppercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x01DB)
-    (->lowercase
-     ((name . "fullwidth latin small letter u with diaeresis and grave")
+  '((->lowercase
+     ((=gb2312		  . #x2838)	; &JX1-287C; [08-24]
+      (=jis-x0212	  . #x2B6E)	; &I-JSP-2B6E; [11-78]
+      (=jis-x0213-1-2000  . #x287C)	; &I-JX1-287C; [08-92]
+      ))
+    (<-denotational
+     ((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE")
+      (=ucs		  . #x01DB)	; Ǜ
       ))
     (<-fullwidth
      ((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE")
       (=ucs		  . #x01DB)	; Ǜ
       ))
     (=jis-x0212		. #x2A6E)	; &JSP-2A6E; [10-78]
-    (=ucs@jis		. #x01DB)	; &JSP-2A6E;
+    (=ucs@jis/fw	. #x01DB)	; &JSP-2A6E;
     ))
 (define-char
   '((name . "LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE")
@@ -1438,12 +1346,6 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	#x00FC #x0300)
-    (->fullwidth
-     ((name . "fullwidth latin small letter u with diaeresis and grave")
-      (=gb2312		  . #x2838)	; &JX1-287C; [08-24]
-      (=jis-x0212	  . #x2B6E)	; &I-JSP-2B6E; [11-78]
-      (=jis-x0213-1-2000  . #x287C)	; &I-JX1-287C; [08-92]
-      ))
     (->uppercase
      ((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE")
       (=ucs		  . #x01DB)	; Ǜ
@@ -1451,14 +1353,12 @@
     (=ucs		. #x01DC)	; ǜ
     ))
 (define-char
-  '((name . "fullwidth latin small letter u with diaeresis and grave")
-    (=>ucs		. #x01DC)	; ǜ
-    (general-category	letter lowercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x01DC)
-    (->uppercase
-     ((name . "fullwidth latin capital letter u with diaeresis and grave")
+  '((->uppercase
+     ((=jis-x0212	  . #x2A6E)	; &JSP-2A6E; [10-78]
+      ))
+    (<-denotational
+     ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE")
+      (=ucs		  . #x01DC)	; ǜ
       ))
     (<-fullwidth
      ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE")
@@ -1467,7 +1367,7 @@
     (=gb2312		. #x2838)	; &JX1-287C; [08-24]
     (=jis-x0212		. #x2B6E)	; &I-JSP-2B6E; [11-78]
     (=jis-x0213-1-2000	. #x287C)	; &I-JX1-287C; [08-92]
-    (=ucs@jis		. #x01DC)	; &JX1-287C;
+    (=ucs@jis/fw	. #x01DC)	; &JX1-287C;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER TURNED E")
@@ -1774,11 +1674,6 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	#x0067 #x0301)
-    (->fullwidth
-     ((name		  . "fullwidth latin small letter g with acute")
-      (=jis-x0212	  . #x2B39)	; &JSP-2B39; [11-25]
-      (=jef-china3	  . #x85EF)	; &I-JC3-85EF;
-      ))
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER G WITH ACUTE")
       (=ucs		  . #x01F4)	; Ç´
@@ -1786,22 +1681,21 @@
     (=ucs		. #x01F5)	; ǵ
     ))
 (define-char
-  '((name		. "fullwidth latin small letter g with acute")
-    (=>ucs		. #x01F5)	; ǵ
-    (general-category	letter lowercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x01F5)
+  '((->decomposition	#xFF47 #x0301)
     (->uppercase
      ((name . "fullwidth latin capital letter g with acute")
       ))
+    (<-denotational
+     ((name		  . "LATIN SMALL LETTER G WITH ACUTE")
+      (=ucs		  . #x01F5)	; ǵ
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER G WITH ACUTE")
       (=ucs		  . #x01F5)	; ǵ
       ))
     (=jis-x0212		. #x2B39)	; &JSP-2B39; [11-25]
     (=jef-china3	. #x85EF)	; &I-JC3-85EF;
-    (=ucs@jis		. #x01F5)	; &JSP-2B39;
+    (=ucs@jis/fw	. #x01F5)	; &JSP-2B39;
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER HWAIR")
@@ -1831,9 +1725,6 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	#x004E #x0300)
-    (->fullwidth
-     ((=jis-x0213-1-2000  . #x2874)	; &JX1-2874; [08-84]
-      ))
     (->lowercase
      ((name		  . "LATIN SMALL LETTER N WITH GRAVE")
       (=ucs		  . #x01F9)	; ǹ
@@ -1841,20 +1732,21 @@
     (=ucs		. #x01F8)	; Ǹ
     ))
 (define-char
-  '((name		. "fullwidth latin capital letter n with grave")
-    (=>ucs		. #x01F8)	; Ǹ
-    (general-category	letter uppercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
+  '((->decomposition	#xFF2E #x0300)
     (->lowercase
      ((=jis-x0213-1-2000  . #x2875)	; &JX1-2875; [08-85]
       ))
+    (<-denotational
+     ((name		  . "LATIN CAPITAL LETTER N WITH GRAVE")
+      (=ucs		  . #x01F8)	; Ǹ
+      ))
     (<-fullwidth
-     ((=ucs		  . #x01F8)	; Ǹ
+     ((name		  . "LATIN CAPITAL LETTER N WITH GRAVE")
+      (=ucs		  . #x01F8)	; Ǹ
       ))
     (=jis-x0213-1-2000	. #x2874)	; &JX1-2874; [08-84]
     (=jef-china3	. #x85BC)	; &I-JC3-85BC;
-    (=ucs@jis		. #x01F8)	; &JX1-2874;
+    (=ucs@jis/fw	. #x01F8)	; &JX1-2874;
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER N WITH GRAVE")
@@ -1862,10 +1754,6 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	#x006E #x0300)
-    (->fullwidth
-     ((name		  . "fullwidth latin small letter n with grave")
-      (=jis-x0213-1-2000  . #x2875)	; &JX1-2875; [08-85]
-      ))
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER N WITH GRAVE")
       (=ucs		  . #x01F8)	; Ǹ
@@ -1873,21 +1761,20 @@
     (=ucs		. #x01F9)	; ǹ
     ))
 (define-char
-  '((name		. "fullwidth latin small letter n with grave")
-    (=>ucs		. #x01F9)	; ǹ
-    (general-category	letter lowercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x01F9)
+  '((->decomposition	#xFF4E #x0300)
     (->uppercase
      ((=jis-x0213-1-2000  . #x2874)	; &JX1-2874; [08-84]
       ))
+    (<-denotational
+     ((name		  . "LATIN SMALL LETTER N WITH GRAVE")
+      (=ucs		  . #x01F9)	; ǹ
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER N WITH GRAVE")
       (=ucs		  . #x01F9)	; ǹ
       ))
     (=jis-x0213-1-2000	. #x2875)	; &JX1-2875; [08-85]
-    (=ucs@jis		. #x01F9)	; &JX1-2875;
+    (=ucs@jis/fw	. #x01F9)	; &JX1-2875;
     ))
 (define-char
   '((name . "LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE")
@@ -1933,10 +1820,6 @@
     (mirrored		. nil)
     (iso-10646-comment	. "ash *")
     (->decomposition	#x00E6 #x0301)
-    (->fullwidth
-     ((name		  . "fullwidth latin small letter ae with acute")
-      (=jis-x0213-1-2000  . #x2B45)	; &JX1-2B45; [11-37]
-      ))
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER AE WITH ACUTE")
       (=ucs		  . #x01FC)	; Ǽ
@@ -1944,21 +1827,19 @@
     (=ucs		. #x01FD)	; ǽ
     ))
 (define-char
-  '((name		. "fullwidth latin small letter ae with acute")
-    (=>ucs		. #x01FD)	; ǽ
-    (general-category	letter lowercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x01FD)
-    (->uppercase
+  '((->uppercase
      ((name . "fullwidth latin capital letter ae with acute")
       ))
+    (<-denotational
+     ((name		  . "LATIN SMALL LETTER AE WITH ACUTE")
+      (=ucs		  . #x01FD)	; ǽ
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER AE WITH ACUTE")
       (=ucs		  . #x01FD)	; ǽ
       ))
     (=jis-x0213-1-2000	. #x2B45)	; &JX1-2B45; [11-37]
-    (=ucs@jis		. #x01FD)	; &JX1-2B45;
+    (=ucs@jis/fw	. #x01FD)	; &JX1-2B45;
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER O WITH STROKE AND ACUTE")