X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fu00530-Armenian.el;h=529d7f81945d851cbd25dc424ecf7358a374ca84;hb=36ab42e855f7b8c2db80d3a3a38864bff18ae161;hp=dad31c18e807adc9ec5e9d486c9e7bc079a33705;hpb=dcdb09ceba33dafef889d5b01f97d0e576a89361;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/utf-2000/u00530-Armenian.el b/lisp/utf-2000/u00530-Armenian.el
index dad31c1..529d7f8 100644
--- a/lisp/utf-2000/u00530-Armenian.el
+++ b/lisp/utf-2000/u00530-Armenian.el
@@ -1,421 +1,421 @@
-;; -*- coding: utf-8-mcs -*-
+;; -*- coding: utf-8-mcs-er -*-
 (define-char
   '((name		. "ARMENIAN CAPITAL LETTER AYB")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0531)	; Ô±
     (->lowercase
      ((name		  . "ARMENIAN SMALL LETTER AYB")
       (=ucs		  . #x0561)	; Õ¡
       ))
-    (=ucs		. #x0531)	; Ô±
     ))
 (define-char
   '((name		. "ARMENIAN CAPITAL LETTER BEN")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0532)	; Ô²
     (->lowercase
      ((name		  . "ARMENIAN SMALL LETTER BEN")
       (=ucs		  . #x0562)	; Õ¢
       ))
-    (=ucs		. #x0532)	; Ô²
     ))
 (define-char
   '((name		. "ARMENIAN CAPITAL LETTER GIM")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0533)	; Ô³
     (->lowercase
      ((name		  . "ARMENIAN SMALL LETTER GIM")
       (=ucs		  . #x0563)	; Õ£
       ))
-    (=ucs		. #x0533)	; Ô³
     ))
 (define-char
   '((name		. "ARMENIAN CAPITAL LETTER DA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0534)	; Ô´
     (->lowercase
      ((name		  . "ARMENIAN SMALL LETTER DA")
       (=ucs		  . #x0564)	; Õ¤
       ))
-    (=ucs		. #x0534)	; Ô´
     ))
 (define-char
   '((name		. "ARMENIAN CAPITAL LETTER ECH")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0535)	; Ôµ
     (->lowercase
      ((name		  . "ARMENIAN SMALL LETTER ECH")
       (=ucs		  . #x0565)	; Õ¥
       ))
-    (=ucs		. #x0535)	; Ôµ
     ))
 (define-char
   '((name		. "ARMENIAN CAPITAL LETTER ZA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0536)	; Ô¶
     (->lowercase
      ((name		  . "ARMENIAN SMALL LETTER ZA")
       (=ucs		  . #x0566)	; Õ¦
       ))
-    (=ucs		. #x0536)	; Ô¶
     ))
 (define-char
   '((name		. "ARMENIAN CAPITAL LETTER EH")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0537)	; Ô·
     (->lowercase
      ((name		  . "ARMENIAN SMALL LETTER EH")
       (=ucs		  . #x0567)	; Õ§
       ))
-    (=ucs		. #x0537)	; Ô·
     ))
 (define-char
   '((name		. "ARMENIAN CAPITAL LETTER ET")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0538)	; Ô¸
     (->lowercase
      ((name		  . "ARMENIAN SMALL LETTER ET")
       (=ucs		  . #x0568)	; Õ¨
       ))
-    (=ucs		. #x0538)	; Ô¸
     ))
 (define-char
   '((name		. "ARMENIAN CAPITAL LETTER TO")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0539)	; Ô¹
     (->lowercase
      ((name		  . "ARMENIAN SMALL LETTER TO")
       (=ucs		  . #x0569)	; Õ©
       ))
-    (=ucs		. #x0539)	; Ô¹
     ))
 (define-char
   '((name		. "ARMENIAN CAPITAL LETTER ZHE")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x053A)	; Ôº
     (->lowercase
      ((name		  . "ARMENIAN SMALL LETTER ZHE")
       (=ucs		  . #x056A)	; Õª
       ))
-    (=ucs		. #x053A)	; Ôº
     ))
 (define-char
   '((name		. "ARMENIAN CAPITAL LETTER INI")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x053B)	; Ô»
     (->lowercase
      ((name		  . "ARMENIAN SMALL LETTER INI")
       (=ucs		  . #x056B)	; Õ«
       ))
-    (=ucs		. #x053B)	; Ô»
     ))
 (define-char
   '((name		. "ARMENIAN CAPITAL LETTER LIWN")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x053C)	; Ô¼
     (->lowercase
      ((name		  . "ARMENIAN SMALL LETTER LIWN")
       (=ucs		  . #x056C)	; Õ¬
       ))
-    (=ucs		. #x053C)	; Ô¼
     ))
 (define-char
   '((name		. "ARMENIAN CAPITAL LETTER XEH")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x053D)	; Ô½
     (->lowercase
      ((name		  . "ARMENIAN SMALL LETTER XEH")
       (=ucs		  . #x056D)	; Õ­
       ))
-    (=ucs		. #x053D)	; Ô½
     ))
 (define-char
   '((name		. "ARMENIAN CAPITAL LETTER CA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x053E)	; Ô¾
     (->lowercase
      ((name		  . "ARMENIAN SMALL LETTER CA")
       (=ucs		  . #x056E)	; Õ®
       ))
-    (=ucs		. #x053E)	; Ô¾
     ))
 (define-char
   '((name		. "ARMENIAN CAPITAL LETTER KEN")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x053F)	; Ô¿
     (->lowercase
      ((name		  . "ARMENIAN SMALL LETTER KEN")
       (=ucs		  . #x056F)	; Õ¯
       ))
-    (=ucs		. #x053F)	; Ô¿
     ))
 (define-char
   '((name		. "ARMENIAN CAPITAL LETTER HO")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0540)	; Հ
     (->lowercase
      ((name		  . "ARMENIAN SMALL LETTER HO")
       (=ucs		  . #x0570)	; Õ°
       ))
-    (=ucs		. #x0540)	; Հ
     ))
 (define-char
   '((name		. "ARMENIAN CAPITAL LETTER JA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0541)	; Ձ
     (->lowercase
      ((name		  . "ARMENIAN SMALL LETTER JA")
       (=ucs		  . #x0571)	; Õ±
       ))
-    (=ucs		. #x0541)	; Ձ
     ))
 (define-char
   '((name		. "ARMENIAN CAPITAL LETTER GHAD")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0542)	; Ղ
     (->lowercase
      ((name		  . "ARMENIAN SMALL LETTER GHAD")
       (=ucs		  . #x0572)	; Õ²
       ))
-    (=ucs		. #x0542)	; Ղ
     ))
 (define-char
   '((name		. "ARMENIAN CAPITAL LETTER CHEH")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0543)	; Ճ
     (->lowercase
      ((name		  . "ARMENIAN SMALL LETTER CHEH")
       (=ucs		  . #x0573)	; Õ³
       ))
-    (=ucs		. #x0543)	; Ճ
     ))
 (define-char
   '((name		. "ARMENIAN CAPITAL LETTER MEN")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0544)	; Մ
     (->lowercase
      ((name		  . "ARMENIAN SMALL LETTER MEN")
       (=ucs		  . #x0574)	; Õ´
       ))
-    (=ucs		. #x0544)	; Մ
     ))
 (define-char
   '((name		. "ARMENIAN CAPITAL LETTER YI")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0545)	; Յ
     (->lowercase
      ((name		  . "ARMENIAN SMALL LETTER YI")
       (=ucs		  . #x0575)	; Õµ
       ))
-    (=ucs		. #x0545)	; Յ
     ))
 (define-char
   '((name		. "ARMENIAN CAPITAL LETTER NOW")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0546)	; Ն
     (->lowercase
      ((name		  . "ARMENIAN SMALL LETTER NOW")
       (=ucs		  . #x0576)	; Õ¶
       ))
-    (=ucs		. #x0546)	; Ն
     ))
 (define-char
   '((name		. "ARMENIAN CAPITAL LETTER SHA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0547)	; Շ
     (->lowercase
      ((name		  . "ARMENIAN SMALL LETTER SHA")
       (=ucs		  . #x0577)	; Õ·
       ))
-    (=ucs		. #x0547)	; Շ
     ))
 (define-char
   '((name		. "ARMENIAN CAPITAL LETTER VO")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0548)	; Ո
     (->lowercase
      ((name		  . "ARMENIAN SMALL LETTER VO")
       (=ucs		  . #x0578)	; Õ¸
       ))
-    (=ucs		. #x0548)	; Ո
     ))
 (define-char
   '((name		. "ARMENIAN CAPITAL LETTER CHA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0549)	; Չ
     (->lowercase
      ((name		  . "ARMENIAN SMALL LETTER CHA")
       (=ucs		  . #x0579)	; Õ¹
       ))
-    (=ucs		. #x0549)	; Չ
     ))
 (define-char
   '((name		. "ARMENIAN CAPITAL LETTER PEH")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x054A)	; Պ
     (->lowercase
      ((name		  . "ARMENIAN SMALL LETTER PEH")
       (=ucs		  . #x057A)	; Õº
       ))
-    (=ucs		. #x054A)	; Պ
     ))
 (define-char
   '((name		. "ARMENIAN CAPITAL LETTER JHEH")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x054B)	; Ջ
     (->lowercase
      ((name		  . "ARMENIAN SMALL LETTER JHEH")
       (=ucs		  . #x057B)	; Õ»
       ))
-    (=ucs		. #x054B)	; Ջ
     ))
 (define-char
   '((name		. "ARMENIAN CAPITAL LETTER RA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x054C)	; Ռ
     (->lowercase
      ((name		  . "ARMENIAN SMALL LETTER RA")
       (=ucs		  . #x057C)	; Õ¼
       ))
-    (=ucs		. #x054C)	; Ռ
     ))
 (define-char
   '((name		. "ARMENIAN CAPITAL LETTER SEH")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x054D)	; Ս
     (->lowercase
      ((name		  . "ARMENIAN SMALL LETTER SEH")
       (=ucs		  . #x057D)	; Õ½
       ))
-    (=ucs		. #x054D)	; Ս
     ))
 (define-char
   '((name		. "ARMENIAN CAPITAL LETTER VEW")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x054E)	; Վ
     (->lowercase
      ((name		  . "ARMENIAN SMALL LETTER VEW")
       (=ucs		  . #x057E)	; Õ¾
       ))
-    (=ucs		. #x054E)	; Վ
     ))
 (define-char
   '((name		. "ARMENIAN CAPITAL LETTER TIWN")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x054F)	; Տ
     (->lowercase
      ((name		  . "ARMENIAN SMALL LETTER TIWN")
       (=ucs		  . #x057F)	; Õ¿
       ))
-    (=ucs		. #x054F)	; Տ
     ))
 (define-char
   '((name		. "ARMENIAN CAPITAL LETTER REH")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0550)	; Ր
     (->lowercase
      ((name		  . "ARMENIAN SMALL LETTER REH")
       (=ucs		  . #x0580)	; ր
       ))
-    (=ucs		. #x0550)	; Ր
     ))
 (define-char
   '((name		. "ARMENIAN CAPITAL LETTER CO")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0551)	; Ց
     (->lowercase
      ((name		  . "ARMENIAN SMALL LETTER CO")
       (=ucs		  . #x0581)	; ց
       ))
-    (=ucs		. #x0551)	; Ց
     ))
 (define-char
   '((name		. "ARMENIAN CAPITAL LETTER YIWN")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0552)	; Ւ
     (->lowercase
      ((name		  . "ARMENIAN SMALL LETTER YIWN")
       (=ucs		  . #x0582)	; ւ
       ))
-    (=ucs		. #x0552)	; Ւ
     ))
 (define-char
   '((name		. "ARMENIAN CAPITAL LETTER PIWR")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0553)	; Փ
     (->lowercase
      ((name		  . "ARMENIAN SMALL LETTER PIWR")
       (=ucs		  . #x0583)	; փ
       ))
-    (=ucs		. #x0553)	; Փ
     ))
 (define-char
   '((name		. "ARMENIAN CAPITAL LETTER KEH")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0554)	; Ք
     (->lowercase
      ((name		  . "ARMENIAN SMALL LETTER KEH")
       (=ucs		  . #x0584)	; ք
       ))
-    (=ucs		. #x0554)	; Ք
     ))
 (define-char
   '((name		. "ARMENIAN CAPITAL LETTER OH")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0555)	; Օ
     (->lowercase
      ((name		  . "ARMENIAN SMALL LETTER OH")
       (=ucs		  . #x0585)	; օ
       ))
-    (=ucs		. #x0555)	; Օ
     ))
 (define-char
   '((name		. "ARMENIAN CAPITAL LETTER FEH")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0556)	; Ֆ
     (->lowercase
      ((name		  . "ARMENIAN SMALL LETTER FEH")
       (=ucs		  . #x0586)	; ֆ
       ))
-    (=ucs		. #x0556)	; Ֆ
     ))
 (define-char
   '((name		. "ARMENIAN MODIFIER LETTER LEFT HALF RING")
@@ -471,425 +471,431 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0561)	; Õ¡
     (->uppercase
      ((name		  . "ARMENIAN CAPITAL LETTER AYB")
       (=ucs		  . #x0531)	; Ô±
       ))
-    (=ucs		. #x0561)	; Õ¡
     ))
 (define-char
   '((name		. "ARMENIAN SMALL LETTER BEN")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0562)	; Õ¢
     (->uppercase
      ((name		  . "ARMENIAN CAPITAL LETTER BEN")
       (=ucs		  . #x0532)	; Ô²
       ))
-    (=ucs		. #x0562)	; Õ¢
     ))
 (define-char
   '((name		. "ARMENIAN SMALL LETTER GIM")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0563)	; Õ£
     (->uppercase
      ((name		  . "ARMENIAN CAPITAL LETTER GIM")
       (=ucs		  . #x0533)	; Ô³
       ))
-    (=ucs		. #x0563)	; Õ£
     ))
 (define-char
   '((name		. "ARMENIAN SMALL LETTER DA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0564)	; Õ¤
     (->uppercase
      ((name		  . "ARMENIAN CAPITAL LETTER DA")
       (=ucs		  . #x0534)	; Ô´
       ))
-    (=ucs		. #x0564)	; Õ¤
     ))
 (define-char
   '((name		. "ARMENIAN SMALL LETTER ECH")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0565)	; Õ¥
     (->uppercase
      ((name		  . "ARMENIAN CAPITAL LETTER ECH")
       (=ucs		  . #x0535)	; Ôµ
       ))
-    (=ucs		. #x0565)	; Õ¥
     ))
 (define-char
   '((name		. "ARMENIAN SMALL LETTER ZA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0566)	; Õ¦
     (->uppercase
      ((name		  . "ARMENIAN CAPITAL LETTER ZA")
       (=ucs		  . #x0536)	; Ô¶
       ))
-    (=ucs		. #x0566)	; Õ¦
     ))
 (define-char
   '((name		. "ARMENIAN SMALL LETTER EH")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0567)	; Õ§
     (->uppercase
      ((name		  . "ARMENIAN CAPITAL LETTER EH")
       (=ucs		  . #x0537)	; Ô·
       ))
-    (=ucs		. #x0567)	; Õ§
     ))
 (define-char
   '((name		. "ARMENIAN SMALL LETTER ET")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0568)	; Õ¨
     (->uppercase
      ((name		  . "ARMENIAN CAPITAL LETTER ET")
       (=ucs		  . #x0538)	; Ô¸
       ))
-    (=ucs		. #x0568)	; Õ¨
     ))
 (define-char
   '((name		. "ARMENIAN SMALL LETTER TO")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0569)	; Õ©
     (->uppercase
      ((name		  . "ARMENIAN CAPITAL LETTER TO")
       (=ucs		  . #x0539)	; Ô¹
       ))
-    (=ucs		. #x0569)	; Õ©
     ))
 (define-char
   '((name		. "ARMENIAN SMALL LETTER ZHE")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x056A)	; Õª
     (->uppercase
      ((name		  . "ARMENIAN CAPITAL LETTER ZHE")
       (=ucs		  . #x053A)	; Ôº
       ))
-    (=ucs		. #x056A)	; Õª
     ))
 (define-char
   '((name		. "ARMENIAN SMALL LETTER INI")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x056B)	; Õ«
     (->uppercase
      ((name		  . "ARMENIAN CAPITAL LETTER INI")
       (=ucs		  . #x053B)	; Ô»
       ))
-    (=ucs		. #x056B)	; Õ«
     ))
 (define-char
   '((name		. "ARMENIAN SMALL LETTER LIWN")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x056C)	; Õ¬
     (->uppercase
      ((name		  . "ARMENIAN CAPITAL LETTER LIWN")
       (=ucs		  . #x053C)	; Ô¼
       ))
-    (=ucs		. #x056C)	; Õ¬
     ))
 (define-char
   '((name		. "ARMENIAN SMALL LETTER XEH")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x056D)	; Õ­
     (->uppercase
      ((name		  . "ARMENIAN CAPITAL LETTER XEH")
       (=ucs		  . #x053D)	; Ô½
       ))
-    (=ucs		. #x056D)	; Õ­
     ))
 (define-char
   '((name		. "ARMENIAN SMALL LETTER CA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x056E)	; Õ®
     (->uppercase
      ((name		  . "ARMENIAN CAPITAL LETTER CA")
       (=ucs		  . #x053E)	; Ô¾
       ))
-    (=ucs		. #x056E)	; Õ®
     ))
 (define-char
   '((name		. "ARMENIAN SMALL LETTER KEN")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x056F)	; Õ¯
     (->uppercase
      ((name		  . "ARMENIAN CAPITAL LETTER KEN")
       (=ucs		  . #x053F)	; Ô¿
       ))
-    (=ucs		. #x056F)	; Õ¯
     ))
 (define-char
   '((name		. "ARMENIAN SMALL LETTER HO")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0570)	; Õ°
     (->uppercase
      ((name		  . "ARMENIAN CAPITAL LETTER HO")
       (=ucs		  . #x0540)	; Հ
       ))
-    (=ucs		. #x0570)	; Õ°
     ))
 (define-char
   '((name		. "ARMENIAN SMALL LETTER JA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0571)	; Õ±
     (->uppercase
      ((name		  . "ARMENIAN CAPITAL LETTER JA")
       (=ucs		  . #x0541)	; Ձ
       ))
-    (=ucs		. #x0571)	; Õ±
     ))
 (define-char
   '((name		. "ARMENIAN SMALL LETTER GHAD")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0572)	; Õ²
     (->uppercase
      ((name		  . "ARMENIAN CAPITAL LETTER GHAD")
       (=ucs		  . #x0542)	; Ղ
       ))
-    (=ucs		. #x0572)	; Õ²
     ))
 (define-char
   '((name		. "ARMENIAN SMALL LETTER CHEH")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0573)	; Õ³
     (->uppercase
      ((name		  . "ARMENIAN CAPITAL LETTER CHEH")
       (=ucs		  . #x0543)	; Ճ
       ))
-    (=ucs		. #x0573)	; Õ³
     ))
 (define-char
   '((name		. "ARMENIAN SMALL LETTER MEN")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0574)	; Õ´
     (->uppercase
      ((name		  . "ARMENIAN CAPITAL LETTER MEN")
       (=ucs		  . #x0544)	; Մ
       ))
-    (=ucs		. #x0574)	; Õ´
     ))
 (define-char
   '((name		. "ARMENIAN SMALL LETTER YI")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0575)	; Õµ
     (->uppercase
      ((name		  . "ARMENIAN CAPITAL LETTER YI")
       (=ucs		  . #x0545)	; Յ
       ))
-    (=ucs		. #x0575)	; Õµ
     ))
 (define-char
   '((name		. "ARMENIAN SMALL LETTER NOW")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0576)	; Õ¶
     (->uppercase
      ((name		  . "ARMENIAN CAPITAL LETTER NOW")
       (=ucs		  . #x0546)	; Ն
       ))
-    (=ucs		. #x0576)	; Õ¶
     ))
 (define-char
   '((name		. "ARMENIAN SMALL LETTER SHA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0577)	; Õ·
     (->uppercase
      ((name		  . "ARMENIAN CAPITAL LETTER SHA")
       (=ucs		  . #x0547)	; Շ
       ))
-    (=ucs		. #x0577)	; Õ·
     ))
 (define-char
   '((name		. "ARMENIAN SMALL LETTER VO")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0578)	; Õ¸
     (->uppercase
      ((name		  . "ARMENIAN CAPITAL LETTER VO")
       (=ucs		  . #x0548)	; Ո
       ))
-    (=ucs		. #x0578)	; Õ¸
     ))
 (define-char
   '((name		. "ARMENIAN SMALL LETTER CHA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0579)	; Õ¹
     (->uppercase
      ((name		  . "ARMENIAN CAPITAL LETTER CHA")
       (=ucs		  . #x0549)	; Չ
       ))
-    (=ucs		. #x0579)	; Õ¹
     ))
 (define-char
   '((name		. "ARMENIAN SMALL LETTER PEH")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x057A)	; Õº
     (->uppercase
      ((name		  . "ARMENIAN CAPITAL LETTER PEH")
       (=ucs		  . #x054A)	; Պ
       ))
-    (=ucs		. #x057A)	; Õº
     ))
 (define-char
   '((name		. "ARMENIAN SMALL LETTER JHEH")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x057B)	; Õ»
     (->uppercase
      ((name		  . "ARMENIAN CAPITAL LETTER JHEH")
       (=ucs		  . #x054B)	; Ջ
       ))
-    (=ucs		. #x057B)	; Õ»
     ))
 (define-char
   '((name		. "ARMENIAN SMALL LETTER RA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x057C)	; Õ¼
     (->uppercase
      ((name		  . "ARMENIAN CAPITAL LETTER RA")
       (=ucs		  . #x054C)	; Ռ
       ))
-    (=ucs		. #x057C)	; Õ¼
     ))
 (define-char
   '((name		. "ARMENIAN SMALL LETTER SEH")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x057D)	; Õ½
     (->uppercase
      ((name		  . "ARMENIAN CAPITAL LETTER SEH")
       (=ucs		  . #x054D)	; Ս
       ))
-    (=ucs		. #x057D)	; Õ½
     ))
 (define-char
   '((name		. "ARMENIAN SMALL LETTER VEW")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x057E)	; Õ¾
     (->uppercase
      ((name		  . "ARMENIAN CAPITAL LETTER VEW")
       (=ucs		  . #x054E)	; Վ
       ))
-    (=ucs		. #x057E)	; Õ¾
     ))
 (define-char
   '((name		. "ARMENIAN SMALL LETTER TIWN")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x057F)	; Õ¿
     (->uppercase
      ((name		  . "ARMENIAN CAPITAL LETTER TIWN")
       (=ucs		  . #x054F)	; Տ
       ))
-    (=ucs		. #x057F)	; Õ¿
     ))
 (define-char
   '((name		. "ARMENIAN SMALL LETTER REH")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0580)	; ր
     (->uppercase
      ((name		  . "ARMENIAN CAPITAL LETTER REH")
       (=ucs		  . #x0550)	; Ր
       ))
-    (=ucs		. #x0580)	; ր
     ))
 (define-char
   '((name		. "ARMENIAN SMALL LETTER CO")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0581)	; ց
     (->uppercase
      ((name		  . "ARMENIAN CAPITAL LETTER CO")
       (=ucs		  . #x0551)	; Ց
       ))
-    (=ucs		. #x0581)	; ց
     ))
 (define-char
   '((name		. "ARMENIAN SMALL LETTER YIWN")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0582)	; ւ
     (->uppercase
      ((name		  . "ARMENIAN CAPITAL LETTER YIWN")
       (=ucs		  . #x0552)	; Ւ
       ))
-    (=ucs		. #x0582)	; ւ
     ))
 (define-char
   '((name		. "ARMENIAN SMALL LETTER PIWR")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0583)	; փ
     (->uppercase
      ((name		  . "ARMENIAN CAPITAL LETTER PIWR")
       (=ucs		  . #x0553)	; Փ
       ))
-    (=ucs		. #x0583)	; փ
     ))
 (define-char
   '((name		. "ARMENIAN SMALL LETTER KEH")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0584)	; ք
     (->uppercase
      ((name		  . "ARMENIAN CAPITAL LETTER KEH")
       (=ucs		  . #x0554)	; Ք
       ))
-    (=ucs		. #x0584)	; ք
     ))
 (define-char
   '((name		. "ARMENIAN SMALL LETTER OH")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0585)	; օ
     (->uppercase
      ((name		  . "ARMENIAN CAPITAL LETTER OH")
       (=ucs		  . #x0555)	; Օ
       ))
-    (=ucs		. #x0585)	; օ
     ))
 (define-char
   '((name		. "ARMENIAN SMALL LETTER FEH")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0586)	; ֆ
     (->uppercase
      ((name		  . "ARMENIAN CAPITAL LETTER FEH")
       (=ucs		  . #x0556)	; Ֆ
       ))
-    (=ucs		. #x0586)	; ֆ
     ))
 (define-char
   '((name		. "ARMENIAN SMALL LIGATURE ECH YIWN")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0565 #x0582)
+    (=>decomposition@compat
+     ((name		  . "ARMENIAN SMALL LETTER ECH")
+      (=ucs		  . #x0565)	; Õ¥
+      )
+     ((name		  . "ARMENIAN SMALL LETTER YIWN")
+      (=ucs		  . #x0582)	; ւ
+      ))
     (=ucs		. #x0587)	; և
     ))
 (define-char