X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lisp%2Futf-2000%2Fu00300-Combining-Diacritical-Marks.el;h=785c76ce1ae237e8d15b2aa371cbf937bb815ab3;hb=6f8a91966f78f32c2150f434d378f7ac4d858bc0;hp=22aee7d3ac958c9e1d276024d691d1166c758e77;hpb=b22f12c28dbd2b07dad59272ef53c6ccfabf4a38;p=chise%2Fxemacs-chise.git

diff --git a/lisp/utf-2000/u00300-Combining-Diacritical-Marks.el b/lisp/utf-2000/u00300-Combining-Diacritical-Marks.el
index 22aee7d..785c76c 100644
--- a/lisp/utf-2000/u00300-Combining-Diacritical-Marks.el
+++ b/lisp/utf-2000/u00300-Combining-Diacritical-Marks.el
@@ -4,9 +4,9 @@
     (bidi-category	. "NSM")
     (mirrored		. nil)
     (iso-10646-comment	. "Varia")
-    (latin-tcvn5712		. #xB0)	; øº“™°
-    (japanese-jisx0213-1	. #x2B5C)	; ø»¢¢£
-    (ucs			. #x300)	; ̀
+    (latin-tcvn5712	. #xB0)	; øº“™°
+    (=jis-x0213-1-2000	. #x2B5C)	; ø»¢¢£
+    (=ucs		. #x0300)	; ̀
     ))
 (define-char
   '((name		. "COMBINING ACUTE ACCENT")
@@ -14,42 +14,41 @@
     (bidi-category	. "NSM")
     (mirrored		. nil)
     (iso-10646-comment	. "Oxia")
-    (latin-tcvn5712		. #xB3)	; øº“™³
-    (japanese-jisx0213-1	. #x2B5A)	; ø»¢¢¡
-    (ucs			. #x301)	; ́
+    (latin-tcvn5712	. #xB3)	; øº“™³
+    (=jis-x0213-1-2000	. #x2B5A)	; ø»¢¢¡
+    (=ucs		. #x0301)	; ́
     ))
 (define-char
   '((name		. "COMBINING CIRCUMFLEX ACCENT")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (japanese-jisx0213-1	. #x2B5F)	; ø»¢¢¦
-    (ucs			. #x302)	; ̂
+    (=jis-x0213-1-2000	. #x2B5F)	; ø»¢¢¦
+    (=ucs		. #x0302)	; ̂
     ))
 (define-char
   '((name		. "COMBINING TILDE")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (latin-tcvn5712		. #xB2)	; øº“™²
-    (japanese-jisx0213-1	. #x2B7D)	; ø»¢£„
-    (ucs			. #x303)	; ̃
+    (latin-tcvn5712	. #xB2)	; øº“™²
+    (=jis-x0213-1-2000	. #x2B7D)	; ø»¢£„
+    (=ucs		. #x0303)	; ̃
     ))
 (define-char
   '((name		. "COMBINING MACRON")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (japanese-jisx0213-1	. #x2B5B)	; ø»¢¢¢
-    (ucs			. #x304)	; ̄
+    (=jis-x0213-1-2000	. #x2B5B)	; ø»¢¢¢
+    (=ucs		. #x0304)	; ̄
     ))
 (define-char
   '((name		. "COMBINING OVERLINE")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (chinese-big5	. #xA1C2)	; øºŸœ 
-    (ucs		. #x305)	; ̅
+    (=ucs		. #x0305)	; ̅
     ))
 (define-char
   '((name		. "COMBINING BREVE")
@@ -57,15 +56,15 @@
     (bidi-category	. "NSM")
     (mirrored		. nil)
     (iso-10646-comment	. "Vrachy")
-    (japanese-jisx0213-1	. #x2B57)	; ø»¢¢ž
-    (ucs			. #x306)	; ̆
+    (=jis-x0213-1-2000	. #x2B57)	; ø»¢¢ž
+    (=ucs		. #x0306)	; ̆
     ))
 (define-char
   '((name		. "COMBINING DOT ABOVE")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (ucs		. #x307)	; ̇
+    (=ucs		. #x0307)	; ̇
     ))
 (define-char
   '((name		. "COMBINING DIAERESIS")
@@ -73,8 +72,8 @@
     (bidi-category	. "NSM")
     (mirrored		. nil)
     (iso-10646-comment	. "Dialytika")
-    (japanese-jisx0213-1	. #x2B6D)	; ø»¢¢´
-    (ucs			. #x308)	; ̈
+    (=jis-x0213-1-2000	. #x2B6D)	; ø»¢¢´
+    (=ucs		. #x0308)	; ̈
     ))
 (define-char
   '((name		. "COMBINING HOOK ABOVE")
@@ -82,30 +81,30 @@
     (bidi-category	. "NSM")
     (mirrored		. nil)
     (latin-tcvn5712	. #xB1)	; øº“™±
-    (ucs		. #x309)	; ̉
+    (=ucs		. #x0309)	; ̉
     ))
 (define-char
   '((name		. "COMBINING RING ABOVE")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (ucs		. #x30A)	; ̊
+    (=ucs		. #x030A)	; ̊
     ))
 (define-char
   '((name		. "COMBINING DOUBLE ACUTE ACCENT")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (japanese-jisx0213-1	. #x2B59)	; ø»¢¢ 
-    (ucs			. #x30B)	; ̋
+    (=jis-x0213-1-2000	. #x2B59)	; ø»¢¢ 
+    (=ucs		. #x030B)	; ̋
     ))
 (define-char
   '((name		. "COMBINING CARON")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (japanese-jisx0213-1	. #x2B5E)	; ø»¢¢¥
-    (ucs			. #x30C)	; ̌
+    (=jis-x0213-1-2000	. #x2B5E)	; ø»¢¢¥
+    (=ucs		. #x030C)	; ̌
     ))
 (define-char
   '((name		. "COMBINING VERTICAL LINE ABOVE")
@@ -113,43 +112,43 @@
     (bidi-category	. "NSM")
     (mirrored		. nil)
     (iso-10646-comment	. "Tonos")
-    (ucs		. #x30D)	; ̍
+    (=ucs		. #x030D)	; ̍
     ))
 (define-char
   '((name		. "COMBINING DOUBLE VERTICAL LINE ABOVE")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (ucs		. #x30E)	; ̎
+    (=ucs		. #x030E)	; ̎
     ))
 (define-char
   '((name		. "COMBINING DOUBLE GRAVE ACCENT")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (japanese-jisx0213-1	. #x2B5D)	; ø»¢¢¤
-    (ucs			. #x30F)	; ̏
+    (=jis-x0213-1-2000	. #x2B5D)	; ø»¢¢¤
+    (=ucs		. #x030F)	; ̏
     ))
 (define-char
   '((name		. "COMBINING CANDRABINDU")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (ucs		. #x310)	; ̐
+    (=ucs		. #x0310)	; ̐
     ))
 (define-char
   '((name		. "COMBINING INVERTED BREVE")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (ucs		. #x311)	; ̑
+    (=ucs		. #x0311)	; ̑
     ))
 (define-char
   '((name		. "COMBINING TURNED COMMA ABOVE")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (ucs		. #x312)	; ̒
+    (=ucs		. #x0312)	; ̒
     ))
 (define-char
   '((name		. "COMBINING COMMA ABOVE")
@@ -157,7 +156,7 @@
     (bidi-category	. "NSM")
     (mirrored		. nil)
     (iso-10646-comment	. "Psili")
-    (ucs		. #x313)	; ̓
+    (=ucs		. #x0313)	; ̓
     ))
 (define-char
   '((name		. "COMBINING REVERSED COMMA ABOVE")
@@ -165,113 +164,113 @@
     (bidi-category	. "NSM")
     (mirrored		. nil)
     (iso-10646-comment	. "Dasia")
-    (ucs		. #x314)	; ̔
+    (=ucs		. #x0314)	; ̔
     ))
 (define-char
   '((name		. "COMBINING COMMA ABOVE RIGHT")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (ucs		. #x315)	; ̕
+    (=ucs		. #x0315)	; ̕
     ))
 (define-char
   '((name		. "COMBINING GRAVE ACCENT BELOW")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (ucs		. #x316)	; ̖
+    (=ucs		. #x0316)	; ̖
     ))
 (define-char
   '((name		. "COMBINING ACUTE ACCENT BELOW")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (ucs		. #x317)	; ̗
+    (=ucs		. #x0317)	; ̗
     ))
 (define-char
   '((name		. "COMBINING LEFT TACK BELOW")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (japanese-jisx0213-1	. #x2B78)	; ø»¢¢¿
-    (ucs			. #x318)	; ̘
+    (=jis-x0213-1-2000	. #x2B78)	; ø»¢¢¿
+    (=ucs		. #x0318)	; ̘
     ))
 (define-char
   '((name		. "COMBINING RIGHT TACK BELOW")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (japanese-jisx0213-1	. #x2B79)	; ø»¢£€
-    (ucs			. #x319)	; ̙
+    (=jis-x0213-1-2000	. #x2B79)	; ø»¢£€
+    (=ucs		. #x0319)	; ̙
     ))
 (define-char
   '((name		. "COMBINING LEFT ANGLE ABOVE")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (japanese-jisx0213-1	. #x2B7E)	; ø»¢£…
-    (ucs			. #x31A)	; ̚
+    (=jis-x0213-1-2000	. #x2B7E)	; ø»¢£…
+    (=ucs		. #x031A)	; ̚
     ))
 (define-char
   '((name		. "COMBINING HORN")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (ucs		. #x31B)	; ̛
+    (=ucs		. #x031B)	; ̛
     ))
 (define-char
   '((name		. "COMBINING LEFT HALF RING BELOW")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (japanese-jisx0213-1	. #x2B6A)	; ø»¢¢±
-    (ucs			. #x31C)	; ̜
+    (=jis-x0213-1-2000	. #x2B6A)	; ø»¢¢±
+    (=ucs		. #x031C)	; ̜
     ))
 (define-char
   '((name		. "COMBINING UP TACK BELOW")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (japanese-jisx0213-1	. #x2B76)	; ø»¢¢½
-    (ucs			. #x31D)	; ̝
+    (=jis-x0213-1-2000	. #x2B76)	; ø»¢¢½
+    (=ucs		. #x031D)	; ̝
     ))
 (define-char
   '((name		. "COMBINING DOWN TACK BELOW")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (japanese-jisx0213-1	. #x2B77)	; ø»¢¢¾
-    (ucs			. #x31E)	; ̞
+    (=jis-x0213-1-2000	. #x2B77)	; ø»¢¢¾
+    (=ucs		. #x031E)	; ̞
     ))
 (define-char
   '((name		. "COMBINING PLUS SIGN BELOW")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (japanese-jisx0213-1	. #x2B6B)	; ø»¢¢²
-    (ucs			. #x31F)	; ̟
+    (=jis-x0213-1-2000	. #x2B6B)	; ø»¢¢²
+    (=ucs		. #x031F)	; ̟
     ))
 (define-char
   '((name		. "COMBINING MINUS SIGN BELOW")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (japanese-jisx0213-1	. #x2B6C)	; ø»¢¢³
-    (ucs			. #x320)	; Ì 
+    (=jis-x0213-1-2000	. #x2B6C)	; ø»¢¢³
+    (=ucs		. #x0320)	; Ì 
     ))
 (define-char
   '((name		. "COMBINING PALATALIZED HOOK BELOW")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (ucs		. #x321)	; Ì¡
+    (=ucs		. #x0321)	; Ì¡
     ))
 (define-char
   '((name		. "COMBINING RETROFLEX HOOK BELOW")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (ucs		. #x322)	; ̢
+    (=ucs		. #x0322)	; ̢
     ))
 (define-char
   '((name		. "COMBINING DOT BELOW")
@@ -279,216 +278,216 @@
     (bidi-category	. "NSM")
     (mirrored		. nil)
     (latin-tcvn5712	. #xB4)	; øº“™´
-    (ucs		. #x323)	; ̣
+    (=ucs		. #x0323)	; ̣
     ))
 (define-char
   '((name		. "COMBINING DIAERESIS BELOW")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (japanese-jisx0213-1	. #x2B72)	; ø»¢¢¹
-    (ucs			. #x324)	; ̤
+    (=jis-x0213-1-2000	. #x2B72)	; ø»¢¢¹
+    (=ucs		. #x0324)	; ̤
     ))
 (define-char
   '((name		. "COMBINING RING BELOW")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (japanese-jisx0213-1	. #x2B67)	; ø»¢¢®
-    (ucs			. #x325)	; ̥
+    (=jis-x0213-1-2000	. #x2B67)	; ø»¢¢®
+    (=ucs		. #x0325)	; ̥
     ))
 (define-char
   '((name		. "COMBINING COMMA BELOW")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (ucs		. #x326)	; ̦
+    (=ucs		. #x0326)	; ̦
     ))
 (define-char
   '((name		. "COMBINING CEDILLA")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (ucs		. #x327)	; ̧
+    (=ucs		. #x0327)	; ̧
     ))
 (define-char
   '((name		. "COMBINING OGONEK")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (ucs		. #x328)	; ̨
+    (=ucs		. #x0328)	; ̨
     ))
 (define-char
   '((name		. "COMBINING VERTICAL LINE BELOW")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (japanese-jisx0213-1	. #x2B6F)	; ø»¢¢¶
-    (ucs			. #x329)	; Ì©
+    (=jis-x0213-1-2000	. #x2B6F)	; ø»¢¢¶
+    (=ucs		. #x0329)	; Ì©
     ))
 (define-char
   '((name		. "COMBINING BRIDGE BELOW")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (japanese-jisx0213-1	. #x2B7A)	; ø»¢£
-    (ucs			. #x32A)	; ̪
+    (=jis-x0213-1-2000	. #x2B7A)	; ø»¢£
+    (=ucs		. #x032A)	; ̪
     ))
 (define-char
   '((name		. "COMBINING INVERTED DOUBLE ARCH BELOW")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (ucs		. #x32B)	; Ì«
+    (=ucs		. #x032B)	; Ì«
     ))
 (define-char
   '((name		. "COMBINING CARON BELOW")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (japanese-jisx0213-1	. #x2B68)	; ø»¢¢¯
-    (ucs			. #x32C)	; ̬
+    (=jis-x0213-1-2000	. #x2B68)	; ø»¢¢¯
+    (=ucs		. #x032C)	; ̬
     ))
 (define-char
   '((name		. "COMBINING CIRCUMFLEX ACCENT BELOW")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (ucs		. #x32D)	; Ì­
+    (=ucs		. #x032D)	; Ì­
     ))
 (define-char
   '((name		. "COMBINING BREVE BELOW")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (ucs		. #x32E)	; Ì®
+    (=ucs		. #x032E)	; Ì®
     ))
 (define-char
   '((name		. "COMBINING INVERTED BREVE BELOW")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (japanese-jisx0213-1	. #x2B70)	; ø»¢¢·
-    (ucs			. #x32F)	; ̯
+    (=jis-x0213-1-2000	. #x2B70)	; ø»¢¢·
+    (=ucs		. #x032F)	; ̯
     ))
 (define-char
   '((name		. "COMBINING TILDE BELOW")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (japanese-jisx0213-1	. #x2B73)	; ø»¢¢º
-    (ucs			. #x330)	; Ì°
+    (=jis-x0213-1-2000	. #x2B73)	; ø»¢¢º
+    (=ucs		. #x0330)	; Ì°
     ))
 (define-char
   '((name		. "COMBINING MACRON BELOW")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (ucs		. #x331)	; ̱
+    (=ucs		. #x0331)	; ̱
     ))
 (define-char
   '((name		. "COMBINING LOW LINE")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (ucs		. #x332)	; ̲
+    (=ucs		. #x0332)	; ̲
     ))
 (define-char
   '((name		. "COMBINING DOUBLE LOW LINE")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (ucs		. #x333)	; ̳
+    (=ucs		. #x0333)	; ̳
     ))
 (define-char
   '((name		. "COMBINING TILDE OVERLAY")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (japanese-jisx0213-1	. #x2B75)	; ø»¢¢¼
-    (ucs			. #x334)	; Ì´
+    (=jis-x0213-1-2000	. #x2B75)	; ø»¢¢¼
+    (=ucs		. #x0334)	; Ì´
     ))
 (define-char
   '((name		. "COMBINING SHORT STROKE OVERLAY")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (ucs		. #x335)	; ̵
+    (=ucs		. #x0335)	; ̵
     ))
 (define-char
   '((name		. "COMBINING LONG STROKE OVERLAY")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (ucs		. #x336)	; ̶
+    (=ucs		. #x0336)	; ̶
     ))
 (define-char
   '((name		. "COMBINING SHORT SOLIDUS OVERLAY")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (ucs		. #x337)	; Ì·
+    (=ucs		. #x0337)	; Ì·
     ))
 (define-char
   '((name		. "COMBINING LONG SOLIDUS OVERLAY")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (ucs		. #x338)	; ̸
+    (=ucs		. #x0338)	; ̸
     ))
 (define-char
   '((name		. "COMBINING RIGHT HALF RING BELOW")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (japanese-jisx0213-1	. #x2B69)	; ø»¢¢°
-    (ucs			. #x339)	; ̹
+    (=jis-x0213-1-2000	. #x2B69)	; ø»¢¢°
+    (=ucs		. #x0339)	; ̹
     ))
 (define-char
   '((name		. "COMBINING INVERTED BRIDGE BELOW")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (japanese-jisx0213-1	. #x2B7B)	; ø»¢£‚
-    (ucs			. #x33A)	; ̺
+    (=jis-x0213-1-2000	. #x2B7B)	; ø»¢£‚
+    (=ucs		. #x033A)	; ̺
     ))
 (define-char
   '((name		. "COMBINING SQUARE BELOW")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (japanese-jisx0213-1	. #x2B7C)	; ø»¢£ƒ
-    (ucs			. #x33B)	; Ì»
+    (=jis-x0213-1-2000	. #x2B7C)	; ø»¢£ƒ
+    (=ucs		. #x033B)	; Ì»
     ))
 (define-char
   '((name		. "COMBINING SEAGULL BELOW")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (japanese-jisx0213-1	. #x2B74)	; ø»¢¢»
-    (ucs			. #x33C)	; ̼
+    (=jis-x0213-1-2000	. #x2B74)	; ø»¢¢»
+    (=ucs		. #x033C)	; ̼
     ))
 (define-char
   '((name		. "COMBINING X ABOVE")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (japanese-jisx0213-1	. #x2B6E)	; ø»¢¢µ
-    (ucs			. #x33D)	; ̽
+    (=jis-x0213-1-2000	. #x2B6E)	; ø»¢¢µ
+    (=ucs		. #x033D)	; ̽
     ))
 (define-char
   '((name		. "COMBINING VERTICAL TILDE")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (ucs		. #x33E)	; ̾
+    (=ucs		. #x033E)	; ̾
     ))
 (define-char
   '((name		. "COMBINING DOUBLE OVERLINE")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (ucs		. #x33F)	; Ì¿
+    (=ucs		. #x033F)	; Ì¿
     ))
 (define-char
   '((name		. "COMBINING GRAVE TONE MARK")
@@ -497,7 +496,7 @@
     (mirrored		. nil)
     (iso-10646-comment	. "Vietnamese")
     (->decomposition	#x0300)
-    (ucs		. #x340)	; ̀
+    (=ucs		. #x0340)	; ̀
     ))
 (define-char
   '((name		. "COMBINING ACUTE TONE MARK")
@@ -506,14 +505,14 @@
     (mirrored		. nil)
     (iso-10646-comment	. "Vietnamese")
     (->decomposition	#x0301)
-    (ucs		. #x341)	; ́
+    (=ucs		. #x0341)	; ́
     ))
 (define-char
   '((name		. "COMBINING GREEK PERISPOMENI")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (ucs		. #x342)	; ͂
+    (=ucs		. #x0342)	; ͂
     ))
 (define-char
   '((name		. "COMBINING GREEK KORONIS")
@@ -521,7 +520,7 @@
     (bidi-category	. "NSM")
     (mirrored		. nil)
     (->decomposition	#x0313)
-    (ucs		. #x343)	; ̓
+    (=ucs		. #x0343)	; ̓
     ))
 (define-char
   '((name		. "COMBINING GREEK DIALYTIKA TONOS")
@@ -529,99 +528,101 @@
     (bidi-category	. "NSM")
     (mirrored		. nil)
     (->decomposition	#x0308 #x0301)
-    (ucs		. #x344)	; ̈́
+    (=ucs		. #x0344)	; ̈́
     ))
 (define-char
   '((name		. "COMBINING GREEK YPOGEGRAMMENI")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (->uppercase	#x0399)
-    (->titlecase	#x0399)
-    (ucs		. #x345)	; ͅ
+    (->uppercase
+     ((name		  . "GREEK CAPITAL LETTER IOTA")
+      (=ucs		  . #x0399)	; Ι
+      ))
+    (=ucs		. #x0345)	; ͅ
     ))
 (define-char
   '((name		. "COMBINING BRIDGE ABOVE")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (ucs		. #x346)	; ͆
+    (=ucs		. #x0346)	; ͆
     ))
 (define-char
   '((name		. "COMBINING EQUALS SIGN BELOW")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (ucs		. #x347)	; ͇
+    (=ucs		. #x0347)	; ͇
     ))
 (define-char
   '((name		. "COMBINING DOUBLE VERTICAL LINE BELOW")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (ucs		. #x348)	; ͈
+    (=ucs		. #x0348)	; ͈
     ))
 (define-char
   '((name		. "COMBINING LEFT ANGLE BELOW")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (ucs		. #x349)	; ͉
+    (=ucs		. #x0349)	; ͉
     ))
 (define-char
   '((name		. "COMBINING NOT TILDE ABOVE")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (ucs		. #x34A)	; ͊
+    (=ucs		. #x034A)	; ͊
     ))
 (define-char
   '((name		. "COMBINING HOMOTHETIC ABOVE")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (ucs		. #x34B)	; ͋
+    (=ucs		. #x034B)	; ͋
     ))
 (define-char
   '((name		. "COMBINING ALMOST EQUAL TO ABOVE")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (ucs		. #x34C)	; ͌
+    (=ucs		. #x034C)	; ͌
     ))
 (define-char
   '((name		. "COMBINING LEFT RIGHT ARROW BELOW")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (ucs		. #x34D)	; ͍
+    (=ucs		. #x034D)	; ͍
     ))
 (define-char
   '((name		. "COMBINING UPWARDS ARROW BELOW")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (ucs		. #x34E)	; ͎
+    (=ucs		. #x034E)	; ͎
     ))
 (define-char
   '((name		. "COMBINING DOUBLE TILDE")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (ucs		. #x360)	; Í 
+    (=ucs		. #x0360)	; Í 
     ))
 (define-char
   '((name		. "COMBINING DOUBLE INVERTED BREVE")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (japanese-jisx0213-1	. #x2B52)	; ø»¢¢™
-    (ucs			. #x361)	; Í¡
+    (=jis-x0213-1-2000	. #x2B52)	; ø»¢¢™
+    (=ucs		. #x0361)	; Í¡
     ))
 (define-char
   '((name		. "COMBINING DOUBLE RIGHTWARDS ARROW BELOW")
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (ucs		. #x362)	; ͢
+    (=ucs		. #x0362)	; ͢
     ))