Use uni* names for most Arabic glyphs.

diff --git a/ttxt.c b/ttxt.c
index bd6a297e6e7a047b763288f89aeb3161eff253e2..e02062874803dda632069a35b3fd30c825781b18 100644 (file)
--- a/ttxt.c
+++ b/ttxt.c
@@ -366,73 +366,73 @@ struct glyph {
   * letter.
   */
  /* ASV-CODAR glyphs from Appendix 3 */
- {{001,001,001,001,001,001,000,000,000}, 0x0627, "asvcodar-alef" },
- {{000,000,000,001,001,077,000,004,000}, 0x0628, "asvcodar-beh" },
- {{000,012,000,001,001,077,000,000,000}, 0x062a, "asvcodar-teh" },
- {{004,012,000,001,001,077,000,000,000}, 0x062b, "asvcodar-theh" },
- {{000,000,010,024,002,077,000,004,000}, 0x062c, "asvcodar-jeem" },
- {{000,000,010,024,002,077,000,000,000}, 0x062d, "asvcodar-hah" },
- {{004,000,010,024,002,077,000,000,000}, 0x062e, "asvcodar-khah" },
- {{000,004,002,001,001,017,000,000,000}, 0x062f, "asvcodar-dal" },
- {{001,004,002,001,001,017,000,000,000}, 0x0630, "asvcodar-thal" },
- {{000,000,000,001,001,001,002,004,010}, 0x0631, "asvcodar-ra" },
- {{000,004,000,001,001,001,002,004,010}, 0x0632, "asvcodar-zain" },
- {{000,000,000,025,025,077,000,000,000}, 0x0633, "asvcodar-seen" },
- {{004,012,000,025,025,077,000,000,000}, 0x0634, "asvcodar-sheen" },
- {{000,000,000,007,011,077,000,000,000}, 0x0635, "asvcodar-sad" },
- {{000,004,000,007,011,077,000,000,000}, 0x0636, "asvcodar-dad" },
- {{010,010,010,017,011,077,000,000,000}, 0x0637, "asvcodar-tah" },
- {{010,012,010,017,011,077,000,000,000}, 0x0638, "asvcodar-zah" },
- {{000,000,006,010,010,077,000,000,000}, 0x0639, "asvcodar-ain" },
- {{004,000,006,010,010,077,000,000,000}, 0x063a, "asvcodar-ghain" },
- {{002,000,002,005,003,077,000,000,000}, 0x0641, "asvcodar-feh" },
- {{012,000,002,005,003,077,000,000,000}, 0x0642, "asvcodar-qaf" },
- {{001,002,004,016,001,077,000,000,000}, 0x0643, "asvcodar-kaf" },
- {{001,001,001,001,001,077,000,000,000}, 0x0644, "asvcodar-lam" },
- {{000,000,000,000,006,071,006,000,000}, 0x0645, "asvcodar-meem" },
- {{000,004,000,001,001,077,000,000,000}, 0x0646, "asvcodar-noon" },
- {{000,006,001,015,013,077,000,000,000}, 0xfeeb, "asvcodar-hehinitial" },
- {{000,000,000,003,005,007,001,001,016}, 0x0648, "asvcodar-waw" },
- {{000,000,000,001,001,077,000,012,000}, 0x064a, "asvcodar-yeh" },
- {{000,000,006,010,010,006,010,000,000}, 0x0621, "asvcodar-hamza" },
- {{000,000,000,003,025,025,034,000,012}, 0xfef2, "asvcodar-yehfinal" },
- {{000,000,000,003,025,025,034,000,000}, 0x0649, "asvcodar-alefmaksura" },
- {{000,000,001,003,005,017,000,000,000}, 0x0647, "asvcodar-heh" },
- {{000,024,001,003,005,017,000,000,000}, 0x0629, "asvcodar-tehmarbuta" },
-
- {{015,011,015,001,001,001,000,000,000}, 0x0623, "asvcodar-hamzaonalef" },
- {{001,001,001,001,015,011,014,000,000}, 0x0625, "asvcodar-hamzaunderalef" },
- {{017,010,001,001,001,001,001,000,000}, 0x0622, "asvcodar-maddaonalef" },
- {{014,010,014,001,001,077,000,000,000}, -1, "asvcodar-37" },
- {{014,010,014,000,003,005,024,022,036}, 0x0626, "asvcodar-hamzaonyeh" },
- {{030,020,030,003,005,007,001,001,016}, 0x0624, "asvcodar-hamzaonwaw" },
-
- {{007,000,000,000,000,000,000,000,000}, 0xfe76, "asvcodar-fatha" },
- {{007,000,000,000,000,077,000,000,000}, 0xfe77, "asvcodar-fathatatweel" },
- {{003,001,002,000,000,000,000,000,000}, 0xfe78, "asvcodar-damma" },
- {{003,001,002,000,000,077,000,000,000}, 0xfe79, "asvcodar-dammatatweel" },
- {{000,000,000,000,000,000,000,000,007}, 0xfe7a, "asvcodar-kasra" },
- {{000,000,000,000,000,077,000,000,007}, 0xfe7b, "asvcodar-kasratatweel" },
- {{007,000,005,007,000,000,000,000,000}, -1, "asvcodar-46" },
- {{003,001,002,000,005,007,000,000,000}, -1, "asvcodar-47" },
- {{005,007,000,007,000,000,000,000,000}, -1, "asvcodar-48" },
- {{005,007,000,007,000,077,000,000,000}, -1, "asvcodar-49" },
- {{007,000,005,007,000,077,000,000,000}, -1, "asvcodar-50" },
- {{005,007,000,000,000,077,000,000,000}, 0xfe7d, "asvcodar-shaddatatweel" },
- {{005,007,000,000,000,000,000,000,000}, 0xfe7c, "asvcodar-shadda" },
- {{002,005,002,000,000,000,000,000,000}, 0xfe7e, "asvcodar-sukun" },
- {{002,005,002,000,000,077,000,000,000}, 0xfe7f, "asvcodar-sukuntatweel" },
- {{016,016,000,000,000,000,000,000,000}, 0xfe70, "asvcodar-fathatan" },
- {{033,011,022,000,000,000,000,000,000}, -1, "asvcodar-56" },
- {{000,000,000,000,000,000,000,016,016}, 0xfe74, "asvcodar-kasratan" },
- {{030,010,025,007,000,077,000,000,000}, -1, "asvcodar-58" },
- {{007,007,005,007,000,000,000,000,000}, -1, "asvcodar-59" },
- {{033,011,022,000,005,007,000,000,000}, -1, "asvcodar-60" },
- {{012,016,000,016,016,000,000,000,000}, -1, "asvcodar-61" },
-
- {{014,010,002,005,003,077,000,000,000}, -1, "asvcodar-62" },
- {{000,000,000,001,001,077,000,012,004}, -1, "asvcodar-63" },
- {{005,012,024,016,001,077,000,000,000}, -1, "asvcodar-64" },
+ {{001,001,001,001,001,001,000,000,000}, 0x0627 }, /* alef */
+ {{000,000,000,001,001,077,000,004,000}, 0x0628 }, /* beh */
+ {{000,012,000,001,001,077,000,000,000}, 0x062a }, /* teh */
+ {{004,012,000,001,001,077,000,000,000}, 0x062b }, /* theh */
+ {{000,000,010,024,002,077,000,004,000}, 0x062c }, /* jeem */
+ {{000,000,010,024,002,077,000,000,000}, 0x062d }, /* hah */
+ {{004,000,010,024,002,077,000,000,000}, 0x062e }, /* khah */
+ {{000,004,002,001,001,017,000,000,000}, 0x062f }, /* dal */
+ {{001,004,002,001,001,017,000,000,000}, 0x0630 }, /* thal */
+ {{000,000,000,001,001,001,002,004,010}, 0x0631 }, /* ra */
+ {{000,004,000,001,001,001,002,004,010}, 0x0632 }, /* zain */
+ {{000,000,000,025,025,077,000,000,000}, 0x0633 }, /* seen */
+ {{004,012,000,025,025,077,000,000,000}, 0x0634 }, /* sheen */
+ {{000,000,000,007,011,077,000,000,000}, 0x0635 }, /* sad */
+ {{000,004,000,007,011,077,000,000,000}, 0x0636 }, /* dad */
+ {{010,010,010,017,011,077,000,000,000}, 0x0637 }, /* tah */
+ {{010,012,010,017,011,077,000,000,000}, 0x0638 }, /* zah */
+ {{000,000,006,010,010,077,000,000,000}, 0x0639 }, /* ain */
+ {{004,000,006,010,010,077,000,000,000}, 0x063a }, /* ghain */
+ {{002,000,002,005,003,077,000,000,000}, 0x0641 }, /* feh */
+ {{012,000,002,005,003,077,000,000,000}, 0x0642 }, /* qaf */
+ {{001,002,004,016,001,077,000,000,000}, 0x0643 }, /* kaf */
+ {{001,001,001,001,001,077,000,000,000}, 0x0644 }, /* lam */
+ {{000,000,000,000,006,071,006,000,000}, 0x0645 }, /* meem */
+ {{000,004,000,001,001,077,000,000,000}, 0x0646 }, /* noon */
+ {{000,006,001,015,013,077,000,000,000}, 0x0647 }, /* heh */
+ {{000,000,000,003,005,007,001,001,016}, 0x0648 }, /* waw */
+ {{000,000,000,001,001,077,000,012,000}, 0x064a }, /* yeh */
+ {{000,000,006,010,010,006,010,000,000}, 0x0621 }, /* hamza */
+ {{000,000,000,003,025,025,034,000,012}, 0xfef2, "uni064A.fina" }, /* yeh */
+ {{000,000,000,003,025,025,034,000,000}, 0x0649 }, /* alef maksura */
+ {{000,000,001,003,005,017,000,000,000}, 0xfeea, "uni0647.fina" }, /* heh */
+ {{000,024,001,003,005,017,000,000,000}, 0x0629 }, /* teh marbuta */
+
+ {{015,011,015,001,001,001,000,000,000}, 0x0623 }, /* hamza on alef */
+ {{001,001,001,001,015,011,014,000,000}, 0x0625 }, /* hamza under alef */
+ {{017,010,001,001,001,001,001,000,000}, 0x0622 }, /* madda on alef */
+ {{014,010,014,001,001,077,000,000,000}, -1, "asvcodar37" },
+ {{014,010,014,000,003,005,024,022,036}, 0x0626 }, /* hamza on yeh */
+ {{030,020,030,003,005,007,001,001,016}, 0x0624 }, /* hamza on waw */
+
+ {{007,000,000,000,000,000,000,000,000}, 0xfe76, "uni0020064E.isol" },
+ {{007,000,000,000,000,077,000,000,000}, 0xfe77, "uni0640064E.medi" },
+ {{003,001,002,000,000,000,000,000,000}, 0xfe78, "uni0020064F.isol" },
+ {{003,001,002,000,000,077,000,000,000}, 0xfe79, "uni0640064F.medi" },
+ {{000,000,000,000,000,000,000,000,007}, 0xfe7a, "uni00200650.isol" },
+ {{000,000,000,000,000,077,000,000,007}, 0xfe7b, "uni06400650.medi" },
+ {{007,000,005,007,000,000,000,000,000}, -1, "asvcodar46" },
+ {{003,001,002,000,005,007,000,000,000}, -1, "asvcodar47" },
+ {{005,007,000,007,000,000,000,000,000}, -1, "asvcodar48" },
+ {{005,007,000,007,000,077,000,000,000}, -1, "asvcodar49" },
+ {{007,000,005,007,000,077,000,000,000}, -1, "asvcodar50" },
+ {{005,007,000,000,000,077,000,000,000}, 0xfe7d, "uni06400651.medi" },
+ {{005,007,000,000,000,000,000,000,000}, 0xfe7c, "uni00200651.isol" },
+ {{002,005,002,000,000,000,000,000,000}, 0xfe7e, "uni00200652.isol" },
+ {{002,005,002,000,000,077,000,000,000}, 0xfe7f, "uni06400652.medi" },
+ {{016,016,000,000,000,000,000,000,000}, 0xfe70, "uni0020064B.isol" },
+ {{033,011,022,000,000,000,000,000,000}, -1, "asvcodar56" },
+ {{000,000,000,000,000,000,000,016,016}, 0xfe74, "uni0020064D.isol" },
+ {{030,010,025,007,000,077,000,000,000}, -1, "asvcodar58" },
+ {{007,007,005,007,000,000,000,000,000}, -1, "asvcodar59" },
+ {{033,011,022,000,005,007,000,000,000}, -1, "asvcodar60" },
+ {{012,016,000,016,016,000,000,000,000}, -1, "asvcodar61" },
+
+ {{014,010,002,005,003,077,000,000,000}, -1, "asvcodar62" },
+ {{000,000,000,001,001,077,000,012,004}, -1, "asvcodar63" },
+ {{005,012,024,016,001,077,000,000,000}, -1, "asvcodar64" },
 
  /* Arabic-Indic digits from Appendix 9 */
  {{000,000,000,004,000,000,000,000,000}, 0x0660 }, /* zero */