From: tomo <tomo>
Date: Fri, 29 Jul 2005 00:23:23 +0000 (+0000)
Subject: - Use `->canonical' instead of `=decomposition' for canonical mapping
X-Git-Tag: r21-4-17-chise-0_22-4^20~355
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f9bc7c1e48f10d96e6f6ced451eec91609e77ee;p=chise%2Fxemacs-chise.git-

- Use `->canonical' instead of `=decomposition' for canonical mapping
  to single character.
- Use `=>decomposition@compat' instead of `=decomposition' for
  compatibility decomposition mapping.
---

diff --git a/lisp/utf-2000/u01F00-Greek-Extended.el b/lisp/utf-2000/u01F00-Greek-Extended.el
index aa13757..3939f08 100644
--- a/lisp/utf-2000/u01F00-Greek-Extended.el
+++ b/lisp/utf-2000/u01F00-Greek-Extended.el
@@ -1822,14 +1822,14 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (->canonical
+     ((name		  . "GREEK SMALL LETTER ALPHA WITH TONOS")
+      (=ucs		  . #x03AC)	; ά
+      ))
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER ALPHA WITH OXIA")
       (=ucs		  . #x1FBB)	; á¾»
       ))
-    (=decomposition
-     ((name		  . "GREEK SMALL LETTER ALPHA WITH TONOS")
-      (=ucs		  . #x03AC)	; ά
-      ))
     (=ucs		. #x1F71)	; á½±
     ))
 (define-char
@@ -1890,14 +1890,14 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (->canonical
+     ((name		  . "GREEK SMALL LETTER EPSILON WITH TONOS")
+      (=ucs		  . #x03AD)	; έ
+      ))
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER EPSILON WITH OXIA")
       (=ucs		  . #x1FC9)	; Έ
       ))
-    (=decomposition
-     ((name		  . "GREEK SMALL LETTER EPSILON WITH TONOS")
-      (=ucs		  . #x03AD)	; έ
-      ))
     (=ucs		. #x1F73)	; á½³
     ))
 (define-char
@@ -1942,14 +1942,14 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (->canonical
+     ((name		  . "GREEK SMALL LETTER ETA WITH TONOS")
+      (=ucs		  . #x03AE)	; ή
+      ))
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER ETA WITH OXIA")
       (=ucs		  . #x1FCB)	; Ή
       ))
-    (=decomposition
-     ((name		  . "GREEK SMALL LETTER ETA WITH TONOS")
-      (=ucs		  . #x03AE)	; ή
-      ))
     (=ucs		. #x1F75)	; á½µ
     ))
 (define-char
@@ -1975,14 +1975,14 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (->canonical
+     ((name		  . "GREEK SMALL LETTER IOTA WITH TONOS")
+      (=ucs		  . #x03AF)	; ί
+      ))
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER IOTA WITH OXIA")
       (=ucs		  . #x1FDB)	; Ί
       ))
-    (=decomposition
-     ((name		  . "GREEK SMALL LETTER IOTA WITH TONOS")
-      (=ucs		  . #x03AF)	; ί
-      ))
     (=ucs		. #x1F77)	; á½·
     ))
 (define-char
@@ -2008,14 +2008,14 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (->canonical
+     ((name		  . "GREEK SMALL LETTER OMICRON WITH TONOS")
+      (=ucs		  . #x03CC)	; ό
+      ))
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER OMICRON WITH OXIA")
       (=ucs		  . #x1FF9)	; Ό
       ))
-    (=decomposition
-     ((name		  . "GREEK SMALL LETTER OMICRON WITH TONOS")
-      (=ucs		  . #x03CC)	; ό
-      ))
     (=ucs		. #x1F79)	; á½¹
     ))
 (define-char
@@ -2041,14 +2041,14 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (->canonical
+     ((name		  . "GREEK SMALL LETTER UPSILON WITH TONOS")
+      (=ucs		  . #x03CD)	; ύ
+      ))
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER UPSILON WITH OXIA")
       (=ucs		  . #x1FEB)	; á¿«
       ))
-    (=decomposition
-     ((name		  . "GREEK SMALL LETTER UPSILON WITH TONOS")
-      (=ucs		  . #x03CD)	; ύ
-      ))
     (=ucs		. #x1F7B)	; á½»
     ))
 (define-char
@@ -2074,14 +2074,14 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (->canonical
+     ((name		  . "GREEK SMALL LETTER OMEGA WITH TONOS")
+      (=ucs		  . #x03CE)	; ώ
+      ))
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER OMEGA WITH OXIA")
       (=ucs		  . #x1FFB)	; á¿»
       ))
-    (=decomposition
-     ((name		  . "GREEK SMALL LETTER OMEGA WITH TONOS")
-      (=ucs		  . #x03CE)	; ώ
-      ))
     (=ucs		. #x1F7D)	; á½½
     ))
 (define-char
@@ -3117,14 +3117,14 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (->canonical
+     ((name		  . "GREEK CAPITAL LETTER ALPHA WITH TONOS")
+      (=ucs		  . #x0386)	; Ά
+      ))
     (->lowercase
      ((name		  . "GREEK SMALL LETTER ALPHA WITH OXIA")
       (=ucs		  . #x1F71)	; á½±
       ))
-    (=decomposition
-     ((name		  . "GREEK CAPITAL LETTER ALPHA WITH TONOS")
-      (=ucs		  . #x0386)	; Ά
-      ))
     (=ucs		. #x1FBB)	; á¾»
     ))
 (define-char
@@ -3150,8 +3150,7 @@
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (=decomposition
-     compat
+    (=>decomposition@compat
      ((name		  . "SPACE")
       (=ucs		  . #x0020)	;
       )
@@ -3165,14 +3164,14 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (->canonical
+     ((name		  . "GREEK SMALL LETTER IOTA")
+      (=ucs		  . #x03B9)	; ι
+      ))
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER IOTA")
       (=ucs		  . #x0399)	; Ι
       ))
-    (=decomposition
-     ((name		  . "GREEK SMALL LETTER IOTA")
-      (=ucs		  . #x03B9)	; ι
-      ))
     (=ucs		. #x1FBE)	; á¾¾
     ))
 (define-char
@@ -3180,8 +3179,7 @@
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (=decomposition
-     compat
+    (=>decomposition@compat
      ((name		  . "SPACE")
       (=ucs		  . #x0020)	;
       )
@@ -3195,8 +3193,7 @@
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (=decomposition
-     compat
+    (=>decomposition@compat
      ((name		  . "SPACE")
       (=ucs		  . #x0020)	;
       )
@@ -3316,14 +3313,14 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (->canonical
+     ((name		  . "GREEK CAPITAL LETTER EPSILON WITH TONOS")
+      (=ucs		  . #x0388)	; Έ
+      ))
     (->lowercase
      ((name		  . "GREEK SMALL LETTER EPSILON WITH OXIA")
       (=ucs		  . #x1F73)	; á½³
       ))
-    (=decomposition
-     ((name		  . "GREEK CAPITAL LETTER EPSILON WITH TONOS")
-      (=ucs		  . #x0388)	; Έ
-      ))
     (=ucs		. #x1FC9)	; Έ
     ))
 (define-char
@@ -3349,14 +3346,14 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (->canonical
+     ((name		  . "GREEK CAPITAL LETTER ETA WITH TONOS")
+      (=ucs		  . #x0389)	; Ή
+      ))
     (->lowercase
      ((name		  . "GREEK SMALL LETTER ETA WITH OXIA")
       (=ucs		  . #x1F75)	; á½µ
       ))
-    (=decomposition
-     ((name		  . "GREEK CAPITAL LETTER ETA WITH TONOS")
-      (=ucs		  . #x0389)	; Ή
-      ))
     (=ucs		. #x1FCB)	; Ή
     ))
 (define-char
@@ -3474,7 +3471,7 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (=decomposition
+    (->canonical
      ((name . "GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS")
       (=ucs		  . #x0390)	; ΐ
       ))
@@ -3567,14 +3564,14 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (->canonical
+     ((name		  . "GREEK CAPITAL LETTER IOTA WITH TONOS")
+      (=ucs		  . #x038A)	; Ί
+      ))
     (->lowercase
      ((name		  . "GREEK SMALL LETTER IOTA WITH OXIA")
       (=ucs		  . #x1F77)	; á½·
       ))
-    (=decomposition
-     ((name		  . "GREEK CAPITAL LETTER IOTA WITH TONOS")
-      (=ucs		  . #x038A)	; Ί
-      ))
     (=ucs		. #x1FDB)	; Ί
     ))
 (define-char
@@ -3674,7 +3671,7 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (=decomposition
+    (->canonical
      ((name . "GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS")
       (=ucs		  . #x03B0)	; ΰ
       ))
@@ -3799,14 +3796,14 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (->canonical
+     ((name		  . "GREEK CAPITAL LETTER UPSILON WITH TONOS")
+      (=ucs		  . #x038E)	; Ύ
+      ))
     (->lowercase
      ((name		  . "GREEK SMALL LETTER UPSILON WITH OXIA")
       (=ucs		  . #x1F7B)	; á½»
       ))
-    (=decomposition
-     ((name		  . "GREEK CAPITAL LETTER UPSILON WITH TONOS")
-      (=ucs		  . #x038E)	; Ύ
-      ))
     (=ucs		. #x1FEB)	; á¿«
     ))
 (define-char
@@ -3846,7 +3843,7 @@
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (=decomposition
+    (->canonical
      ((name		  . "GREEK DIALYTIKA TONOS")
       (=ucs		  . #x0385)	; ΅
       ))
@@ -3857,7 +3854,7 @@
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (=decomposition
+    (->canonical
      ((name		  . "GRAVE ACCENT")
       (=ucs		  . #x0060)	; `
       ))
@@ -3960,14 +3957,14 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (->canonical
+     ((name		  . "GREEK CAPITAL LETTER OMICRON WITH TONOS")
+      (=ucs		  . #x038C)	; Ό
+      ))
     (->lowercase
      ((name		  . "GREEK SMALL LETTER OMICRON WITH OXIA")
       (=ucs		  . #x1F79)	; á½¹
       ))
-    (=decomposition
-     ((name		  . "GREEK CAPITAL LETTER OMICRON WITH TONOS")
-      (=ucs		  . #x038C)	; Ό
-      ))
     (=ucs		. #x1FF9)	; Ό
     ))
 (define-char
@@ -3993,14 +3990,14 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (->canonical
+     ((name		  . "GREEK CAPITAL LETTER OMEGA WITH TONOS")
+      (=ucs		  . #x038F)	; Ώ
+      ))
     (->lowercase
      ((name		  . "GREEK SMALL LETTER OMEGA WITH OXIA")
       (=ucs		  . #x1F7D)	; á½½
       ))
-    (=decomposition
-     ((name		  . "GREEK CAPITAL LETTER OMEGA WITH TONOS")
-      (=ucs		  . #x038F)	; Ώ
-      ))
     (=ucs		. #x1FFB)	; á¿»
     ))
 (define-char
@@ -4026,7 +4023,7 @@
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (=decomposition
+    (->canonical
      ((name		  . "ACUTE ACCENT")
       (=ucs		  . #x00B4)	; ´
       ))
@@ -4037,8 +4034,7 @@
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (=decomposition
-     compat
+    (=>decomposition@compat
      ((name		  . "SPACE")
       (=ucs		  . #x0020)	;
       )