Now that lots of glyphs have "uni*" names, arrange that an unspecified name

defaults to that.  Much more space for flags!

diff --git a/ttxt.c b/ttxt.c
index 88bdcf5f80d3aa7e3c0ba506bca37a130ca864b6..efe7480ecc792ed1c2cc8d08a893a0b66b28efd1 100644 (file)
--- a/ttxt.c
+++ b/ttxt.c
@@ -258,100 +258,100 @@ struct glyph {
  {{000,000,017,020,020,020,017,002,006}, -1, "ccedilla.alt" },
 
  /* Extra characters found in the Hebrew (SAA5056) character set */
- {{000,021,011,025,022,021,021,000,000}, 0x05d0, "uni05D0" }, /* alef */
- {{000,016,002,002,002,002,037,000,000}, 0x05d1, "uni05D1" }, /* bet */
- {{000,003,001,001,003,005,011,000,000}, 0x05d2, "uni05D2" }, /* gimel */
- {{000,037,002,002,002,002,002,000,000}, 0x05d3, "uni05D3" }, /* dalet */
- {{000,037,001,001,021,021,021,000,000}, 0x05d4, "uni05D4" }, /* he */
- {{000,014,004,004,004,004,004,000,000}, 0x05d5, "uni05D5" }, /* vav */
- {{000,016,004,010,004,004,004,000,000}, 0x05d6, "uni05D6" }, /* zayin */
- {{000,037,021,021,021,021,021,000,000}, 0x05d7, "uni05D7" }, /* het */
- {{000,021,023,025,021,021,037,000,000}, 0x05d8, "uni05D8" }, /* tet */
- {{000,014,004,000,000,000,000,000,000}, 0x05d9, "uni05D9" }, /* yod */
- {{000,037,001,001,001,001,001,001,000}, 0x05da, "uni05DA" }, /*kaffinal*/
- {{000,037,001,001,001,001,037,000,000}, 0x05db, "uni05DB" }, /* kaf */
- {{020,037,001,001,001,002,014,000,000}, 0x05dc, "uni05DC" }, /* lamed */
- {{000,037,021,021,021,021,037,000,000}, 0x05dd, "uni05DD" }, /*memfinal*/
- {{000,026,011,021,021,021,027,000,000}, 0x05de, "uni05DE" }, /* mem */
- {{000,014,004,004,004,004,004,004,004}, 0x05df, "uni05DF" }, /*nunfinal*/
- {{000,006,002,002,002,002,016,000,000}, 0x05e0, "uni05E0" }, /* nun */
- {{000,037,011,021,021,021,016,000,000}, 0x05e1, "uni05E1" }, /* samekh */
- {{000,011,011,011,011,012,034,000,000}, 0x05e2, "uni05E2" }, /* ayin */
- {{000,037,011,015,001,001,001,001,000}, 0x05e3, "uni05E3" }, /* pefinal*/
- {{000,037,011,015,001,001,037,000,000}, 0x05e4, "uni05E4" }, /* pe */
- {{000,031,012,014,010,010,010,010,000}, 0x05e5, "uni05E5" }, /*tsadifin*/
- {{000,021,021,012,004,002,037,000,000}, 0x05e6, "uni05E6" }, /* tsadi */
- {{000,037,001,011,011,012,010,010,000}, 0x05e7, "uni05E7" }, /* qof */
- {{000,037,001,001,001,001,001,000,000}, 0x05e8, "uni05E8" }, /* resh */
- {{000,025,025,025,031,021,036,000,000}, 0x05e9, "uni05E9" }, /* shin */
- {{000,017,011,011,011,011,031,000,000}, 0x05ea, "uni05EA" }, /* tav */
+ {{000,021,011,025,022,021,021,000,000}, 0x05d0 }, /* alef */
+ {{000,016,002,002,002,002,037,000,000}, 0x05d1 }, /* bet */
+ {{000,003,001,001,003,005,011,000,000}, 0x05d2 }, /* gimel */
+ {{000,037,002,002,002,002,002,000,000}, 0x05d3 }, /* dalet */
+ {{000,037,001,001,021,021,021,000,000}, 0x05d4 }, /* he */
+ {{000,014,004,004,004,004,004,000,000}, 0x05d5 }, /* vav */
+ {{000,016,004,010,004,004,004,000,000}, 0x05d6 }, /* zayin */
+ {{000,037,021,021,021,021,021,000,000}, 0x05d7 }, /* het */
+ {{000,021,023,025,021,021,037,000,000}, 0x05d8 }, /* tet */
+ {{000,014,004,000,000,000,000,000,000}, 0x05d9 }, /* yod */
+ {{000,037,001,001,001,001,001,001,000}, 0x05da }, /*kaffinal*/
+ {{000,037,001,001,001,001,037,000,000}, 0x05db }, /* kaf */
+ {{020,037,001,001,001,002,014,000,000}, 0x05dc }, /* lamed */
+ {{000,037,021,021,021,021,037,000,000}, 0x05dd }, /*memfinal*/
+ {{000,026,011,021,021,021,027,000,000}, 0x05de }, /* mem */
+ {{000,014,004,004,004,004,004,004,004}, 0x05df }, /*nunfinal*/
+ {{000,006,002,002,002,002,016,000,000}, 0x05e0 }, /* nun */
+ {{000,037,011,021,021,021,016,000,000}, 0x05e1 }, /* samekh */
+ {{000,011,011,011,011,012,034,000,000}, 0x05e2 }, /* ayin */
+ {{000,037,011,015,001,001,001,001,000}, 0x05e3 }, /* pefinal*/
+ {{000,037,011,015,001,001,037,000,000}, 0x05e4 }, /* pe */
+ {{000,031,012,014,010,010,010,010,000}, 0x05e5 }, /*tsadifin*/
+ {{000,021,021,012,004,002,037,000,000}, 0x05e6 }, /* tsadi */
+ {{000,037,001,011,011,012,010,010,000}, 0x05e7 }, /* qof */
+ {{000,037,001,001,001,001,001,000,000}, 0x05e8 }, /* resh */
+ {{000,025,025,025,031,021,036,000,000}, 0x05e9 }, /* shin */
+ {{000,017,011,011,011,011,031,000,000}, 0x05ea }, /* tav */
  {{000,000,025,025,016,000,000,000,000}, -1, "oldsheqel" },
 
  /* Extra characters found in the Cyrillic (SAA5057) character set */
- {{000,000,021,021,035,025,035,000,000}, 0x044b, "uni044B" }, /* yeru */
- {{022,025,025,035,025,025,022,000,000}, 0x042e, "uni042E" }, /* Iu */
- {{016,021,021,021,037,021,021,000,000}, 0x0410, "uni0410" }, /* A */
- {{037,020,020,037,021,021,037,000,000}, 0x0411, "uni0411" }, /* Be */
- {{022,022,022,022,022,022,037,001,000}, 0x0426, "uni0426" }, /* Tse */
- {{006,012,012,012,012,012,037,021,000}, 0x0414, "uni0414" }, /* De */
- {{037,020,020,036,020,020,037,000,000}, 0x0415, "uni0415" }, /* Ie */
- {{004,037,025,025,025,037,004,000,000}, 0x0424, "uni0424" }, /* Ef */
- {{037,020,020,020,020,020,020,000,000}, 0x0413, "uni0413" }, /* Ghe */
- {{021,021,012,004,012,021,021,000,000}, 0x0425, "uni0425" }, /* Ha */
- {{021,021,023,025,031,021,021,000,000}, 0x0418, "uni0418" }, /* I */
- {{025,021,023,025,031,021,021,000,000}, 0x0419, "uni0419" }, /* Ishort */
- {{021,022,024,030,024,022,021,000,000}, 0x041a, "uni041A" }, /* Ka */
- {{007,011,011,011,011,011,031,000,000}, 0x041b, "uni041B" }, /* El */
- {{021,033,025,025,021,021,021,000,000}, 0x041c, "uni041C" }, /* Em */
- {{021,021,021,037,021,021,021,000,000}, 0x041d, "uni041D" }, /* En */
- {{016,021,021,021,021,021,016,000,000}, 0x041e, "uni041E" }, /* O */
- {{037,021,021,021,021,021,021,000,000}, 0x041f, "uni041F" }, /* Pe */
- {{017,021,021,017,005,011,021,000,000}, 0x042f, "uni042F" }, /* Ya */
- {{036,021,021,036,020,020,020,000,000}, 0x0420, "uni0420" }, /* Er */
- {{016,021,020,020,020,021,016,000,000}, 0x0421, "uni0421" }, /* Es */
- {{037,004,004,004,004,004,004,000,000}, 0x0422, "uni0422" }, /* Te */
- {{021,021,021,037,001,001,037,000,000}, 0x0423, "uni0423" }, /* U */
- {{025,025,025,016,025,025,025,000,000}, 0x0416, "uni0416" }, /* Zhe */
- {{036,021,021,036,021,021,036,000,000}, 0x0412, "uni0412" }, /* Ve */
- {{020,020,020,037,021,021,037,000,000}, 0x042c, "uni042C" }, /* Soft */
- {{030,010,010,017,011,011,017,000,000}, 0x042a, "uni042A" }, /* Hard */
- {{016,021,001,006,001,021,016,000,000}, 0x0417, "uni0417" }, /* Ze */
- {{025,025,025,025,025,025,037,000,000}, 0x0428, "uni0428" }, /* Sha */
- {{014,022,001,007,001,022,014,000,000}, 0x042d, "uni042D" }, /* E */
- {{025,025,025,025,025,025,037,001,000}, 0x0429, "uni0429" }, /* Shcha */
- {{021,021,021,037,001,001,001,000,000}, 0x0427, "uni0427" }, /* Che */
- {{021,021,021,035,025,025,035,000,000}, 0x042b, "uni042B" }, /* Yeru */
- {{000,000,022,025,035,025,022,000,000}, 0x044e, "uni044E" }, /* yu */
- {{000,000,016,001,017,021,017,000,000}, 0x0430, "uni0430" }, /* a */
- {{016,020,036,021,021,021,036,000,000}, 0x0431, "uni0431" }, /* be */
- {{000,000,022,022,022,022,037,001,000}, 0x0446, "uni0446" }, /* tse */
- {{000,000,006,012,012,012,037,021,000}, 0x0434, "uni0434" }, /* de */
- {{000,000,016,021,037,020,016,000,000}, 0x0435, "uni0435" }, /* ie */
- {{000,004,016,025,025,025,016,004,000}, 0x0444, "uni0444" }, /* ef */
- {{000,000,037,020,020,020,020,000,000}, 0x0433, "uni0433" }, /* ghe */
- {{000,000,021,012,004,012,021,000,000}, 0x0445, "uni0445" }, /* ha */
- {{000,000,021,023,025,031,021,000,000}, 0x0438, "uni0438" }, /* i */
- {{000,004,021,023,025,031,021,000,000}, 0x0439, "uni0439" }, /* ishort */
- {{000,000,021,022,034,022,021,000,000}, 0x043a, "uni043A" }, /* ka */
- {{000,000,007,011,011,011,031,000,000}, 0x043b, "uni043B" }, /* el */
- {{000,000,021,033,025,021,021,000,000}, 0x043c, "uni043C" }, /* em */
- {{000,000,021,021,037,021,021,000,000}, 0x043d, "uni043D" }, /* en */
- {{000,000,016,021,021,021,016,000,000}, 0x043e, "uni043E" }, /* o */
- {{000,000,037,021,021,021,021,000,000}, 0x043f, "uni043F" }, /* pe */
- {{000,000,017,021,017,005,031,000,000}, 0x044f, "uni044F" }, /* ya */
- {{000,000,036,021,021,021,036,020,020}, 0x0440, "uni0440" }, /* er */
- {{000,000,016,021,020,021,016,000,000}, 0x0441, "uni0441" }, /* es */
- {{000,000,037,004,004,004,004,000,000}, 0x0442, "uni0442" }, /* te */
- {{000,000,021,021,021,021,017,001,016}, 0x0443, "uni0443" }, /* u */
- {{000,000,025,025,016,025,025,000,000}, 0x0436, "uni0436" }, /* zhe */
- {{000,000,036,021,036,021,036,000,000}, 0x0432, "uni0432" }, /* ve */
- {{000,000,020,020,036,021,036,000,000}, 0x044c, "uni044C" }, /* soft */
- {{000,000,030,010,016,011,016,000,000}, 0x044a, "uni044A" }, /* hard */
- {{000,000,016,021,006,021,016,000,000}, 0x0437, "uni0437" }, /* ze */
- {{000,000,025,025,025,025,037,000,000}, 0x0448, "uni0448" }, /* sha */
- {{000,000,014,022,006,022,014,000,000}, 0x044d, "uni044D" }, /* e */
- {{000,000,025,025,025,025,037,001,000}, 0x0449, "uni0449" }, /* shcha */
- {{000,000,021,021,021,017,001,000,000}, 0x0447, "uni0447" }, /* che */
+ {{000,000,021,021,035,025,035,000,000}, 0x044b }, /* yeru */
+ {{022,025,025,035,025,025,022,000,000}, 0x042e }, /* Iu */
+ {{016,021,021,021,037,021,021,000,000}, 0x0410 }, /* A */
+ {{037,020,020,037,021,021,037,000,000}, 0x0411 }, /* Be */
+ {{022,022,022,022,022,022,037,001,000}, 0x0426 }, /* Tse */
+ {{006,012,012,012,012,012,037,021,000}, 0x0414 }, /* De */
+ {{037,020,020,036,020,020,037,000,000}, 0x0415 }, /* Ie */
+ {{004,037,025,025,025,037,004,000,000}, 0x0424 }, /* Ef */
+ {{037,020,020,020,020,020,020,000,000}, 0x0413 }, /* Ghe */
+ {{021,021,012,004,012,021,021,000,000}, 0x0425 }, /* Ha */
+ {{021,021,023,025,031,021,021,000,000}, 0x0418 }, /* I */
+ {{025,021,023,025,031,021,021,000,000}, 0x0419 }, /* Ishort */
+ {{021,022,024,030,024,022,021,000,000}, 0x041a }, /* Ka */
+ {{007,011,011,011,011,011,031,000,000}, 0x041b }, /* El */
+ {{021,033,025,025,021,021,021,000,000}, 0x041c }, /* Em */
+ {{021,021,021,037,021,021,021,000,000}, 0x041d }, /* En */
+ {{016,021,021,021,021,021,016,000,000}, 0x041e }, /* O */
+ {{037,021,021,021,021,021,021,000,000}, 0x041f }, /* Pe */
+ {{017,021,021,017,005,011,021,000,000}, 0x042f }, /* Ya */
+ {{036,021,021,036,020,020,020,000,000}, 0x0420 }, /* Er */
+ {{016,021,020,020,020,021,016,000,000}, 0x0421 }, /* Es */
+ {{037,004,004,004,004,004,004,000,000}, 0x0422 }, /* Te */
+ {{021,021,021,037,001,001,037,000,000}, 0x0423 }, /* U */
+ {{025,025,025,016,025,025,025,000,000}, 0x0416 }, /* Zhe */
+ {{036,021,021,036,021,021,036,000,000}, 0x0412 }, /* Ve */
+ {{020,020,020,037,021,021,037,000,000}, 0x042c }, /* Soft */
+ {{030,010,010,017,011,011,017,000,000}, 0x042a }, /* Hard */
+ {{016,021,001,006,001,021,016,000,000}, 0x0417 }, /* Ze */
+ {{025,025,025,025,025,025,037,000,000}, 0x0428 }, /* Sha */
+ {{014,022,001,007,001,022,014,000,000}, 0x042d }, /* E */
+ {{025,025,025,025,025,025,037,001,000}, 0x0429 }, /* Shcha */
+ {{021,021,021,037,001,001,001,000,000}, 0x0427 }, /* Che */
+ {{021,021,021,035,025,025,035,000,000}, 0x042b }, /* Yeru */
+ {{000,000,022,025,035,025,022,000,000}, 0x044e }, /* yu */
+ {{000,000,016,001,017,021,017,000,000}, 0x0430 }, /* a */
+ {{016,020,036,021,021,021,036,000,000}, 0x0431 }, /* be */
+ {{000,000,022,022,022,022,037,001,000}, 0x0446 }, /* tse */
+ {{000,000,006,012,012,012,037,021,000}, 0x0434 }, /* de */
+ {{000,000,016,021,037,020,016,000,000}, 0x0435 }, /* ie */
+ {{000,004,016,025,025,025,016,004,000}, 0x0444 }, /* ef */
+ {{000,000,037,020,020,020,020,000,000}, 0x0433 }, /* ghe */
+ {{000,000,021,012,004,012,021,000,000}, 0x0445 }, /* ha */
+ {{000,000,021,023,025,031,021,000,000}, 0x0438 }, /* i */
+ {{000,004,021,023,025,031,021,000,000}, 0x0439 }, /* ishort */
+ {{000,000,021,022,034,022,021,000,000}, 0x043a }, /* ka */
+ {{000,000,007,011,011,011,031,000,000}, 0x043b }, /* el */
+ {{000,000,021,033,025,021,021,000,000}, 0x043c }, /* em */
+ {{000,000,021,021,037,021,021,000,000}, 0x043d }, /* en */
+ {{000,000,016,021,021,021,016,000,000}, 0x043e }, /* o */
+ {{000,000,037,021,021,021,021,000,000}, 0x043f }, /* pe */
+ {{000,000,017,021,017,005,031,000,000}, 0x044f }, /* ya */
+ {{000,000,036,021,021,021,036,020,020}, 0x0440 }, /* er */
+ {{000,000,016,021,020,021,016,000,000}, 0x0441 }, /* es */
+ {{000,000,037,004,004,004,004,000,000}, 0x0442 }, /* te */
+ {{000,000,021,021,021,021,017,001,016}, 0x0443 }, /* u */
+ {{000,000,025,025,016,025,025,000,000}, 0x0436 }, /* zhe */
+ {{000,000,036,021,036,021,036,000,000}, 0x0432 }, /* ve */
+ {{000,000,020,020,036,021,036,000,000}, 0x044c }, /* soft */
+ {{000,000,030,010,016,011,016,000,000}, 0x044a }, /* hard */
+ {{000,000,016,021,006,021,016,000,000}, 0x0437 }, /* ze */
+ {{000,000,025,025,025,025,037,000,000}, 0x0448 }, /* sha */
+ {{000,000,014,022,006,022,014,000,000}, 0x044d }, /* e */
+ {{000,000,025,025,025,025,037,001,000}, 0x0449 }, /* shcha */
+ {{000,000,021,021,021,017,001,000,000}, 0x0447 }, /* che */
 
  /*
   * The second batch of glyphs was found in the appendices to
@@ -429,16 +429,16 @@ struct glyph {
  {{005,012,024,016,001,037,000,000,000}, -1, "asvcodar-64" },
 
  /* Arabic-Indic digits from Appendix 9 */
- {{000,000,000,004,000,000,000,000,000}, 0x0660, "uni0660" }, /* zero */
- {{000,004,004,004,004,004,000,000,000}, 0x0661, "uni0661" }, /* one */
- {{000,012,014,010,010,010,000,000,000}, 0x0662, "uni0662" }, /* two */
- {{000,025,032,020,020,020,000,000,000}, 0x0663, "uni0663" }, /* three */
- {{000,006,010,006,010,006,000,000,000}, 0x0664, "uni0664" }, /* four */
- {{000,016,021,021,021,016,000,000,000}, 0x0665, "uni0665" }, /* five */
- {{000,016,002,002,002,002,000,000,000}, 0x0666, "uni0666" }, /* six */
- {{000,021,021,012,012,004,000,000,000}, 0x0667, "uni0667" }, /* seven */
- {{000,004,012,012,021,021,000,000,000}, 0x0668, "uni0668" }, /* eight */
- {{000,014,022,016,002,002,000,000,000}, 0x0669, "uni0669" }, /* nine */
+ {{000,000,000,004,000,000,000,000,000}, 0x0660 }, /* zero */
+ {{000,004,004,004,004,004,000,000,000}, 0x0661 }, /* one */
+ {{000,012,014,010,010,010,000,000,000}, 0x0662 }, /* two */
+ {{000,025,032,020,020,020,000,000,000}, 0x0663 }, /* three */
+ {{000,006,010,006,010,006,000,000,000}, 0x0664 }, /* four */
+ {{000,016,021,021,021,016,000,000,000}, 0x0665 }, /* five */
+ {{000,016,002,002,002,002,000,000,000}, 0x0666 }, /* six */
+ {{000,021,021,012,012,004,000,000,000}, 0x0667 }, /* seven */
+ {{000,004,012,012,021,021,000,000,000}, 0x0668 }, /* eight */
+ {{000,014,022,016,002,002,000,000,000}, 0x0669 }, /* nine */
  /* Appendix 9 also contains a Hebrew alphabet, but we've already got one. */
 
  /*
@@ -454,7 +454,7 @@ struct glyph {
  {{037,000,000,000,000,000,000,000,000}, 0x00af, "macron" },
  {{004,004,037,004,004,000,037,000,000}, 0x00b1, "plusminus" },
  {{002,004,010,000,000,000,000,000,000}, 0x00b4, "acute" },
- {{000,000,022,022,022,022,035,020,020}, 0x00b5, "uni00b5" }, /* micro */
+ {{000,000,022,022,022,022,035,020,020}, 0x00b5 }, /* micro */
  {{015,025,025,015,005,005,005,000,000}, 0x00b6, "paragraph" },
  {{000,000,000,004,000,000,000,000,000}, 0x00b7, "periodcentered" },
  {{004,000,004,004,010,021,016,000,000}, 0x00bf, "questiondown" },
@@ -464,7 +464,7 @@ struct glyph {
  {{011,022,022,000,000,000,000,000,000}, 0x201c, "quotedblleft" },
  {{011,011,022,000,000,000,000,000,000}, 0x201d, "quotedblright" },
  {{000,000,000,000,000,011,011,022,000}, 0x201e, "quotedblbase" },
- {{022,022,011,000,000,000,000,000,000}, 0x201f, "uni201F" },
+ {{022,022,011,000,000,000,000,000,000}, 0x201f }, /* quotedblreversed */
  {{000,004,004,025,016,004,000,000,000}, 0x2193, "arrowdown" },
 
  /* This is getting silly. */
@@ -536,7 +536,11 @@ main(int argc, char **argv)
        printf("BeginChars: %d %d\n", 65536 + extraglyphs, nglyphs);
        extraglyphs = 0;
        for (i = 0; i < nglyphs; i++) {
-               printf("\nStartChar: %s\n", glyphs[i].name);
+               if (glyphs[i].name)
+                       printf("\nStartChar: %s\n", glyphs[i].name);
+               else
+                       printf("\nStartChar: uni%04X\n",
+                           (unsigned)glyphs[i].unicode);
                printf("Encoding: %d %d %d\n",
                    glyphs[i].unicode != -1 ? glyphs[i].unicode :
                    65536 + extraglyphs++, glyphs[i].unicode, i);