From: Ben Harris <bjh21@bjh21.me.uk>
Date: Sat, 5 Nov 2016 15:06:32 +0000 (+0000)
Subject: Sort the additional glyphs by Unicode code point.
X-Git-Tag: bedstead-001.002~25
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~bjharris/git?a=commitdiff_plain;h=c432b87f68bdda271fe3417322ce0cbb6efdf424;p=bedstead.git

Sort the additional glyphs by Unicode code point.
---

diff --git a/bedstead.c b/bedstead.c
index 8f184e5..7288960 100644
--- a/bedstead.c
+++ b/bedstead.c
@@ -400,11 +400,14 @@ struct glyph {
  {{000,000,021,021,021,017,001,000,000}, 0x0447 }, /* che */
 
  /*
-  * The third batch of glyphs were specially designed for this font.
+  * The other batch of glyphs were specially designed for this font.
+  * These are kept sorted by Unicode code point.
   */
- /* Additional glyphs by bjh21 */
+
+ /* Basic Latin */
  {{010,004,002,000,000,000,000,000,000}, 0x0060, "grave" },
  {{004,004,004,004,004,004,004,000,000}, 0x007c, "bar" },
+ /* Latin-1 supplement */
  {{000,000,004,000,004,004,004,004,004}, 0x00a1, "exclamdown" },
  {{000,004,017,024,024,024,017,004,000}, 0x00a2, "cent" },
  {{021,012,037,004,037,004,004,000,000}, 0x00a5, "yen" },
@@ -467,6 +470,7 @@ struct glyph {
  {{002,004,021,021,021,021,017,001,016}, 0x00fd, "yacute" },
  {{020,020,036,021,021,021,036,020,020}, 0x00fe, "thorn" },
  {{012,000,021,021,021,021,017,001,016}, 0x00ff, "ydieresis" },
+ /* Latin extended-A */
  {{016,000,016,021,037,021,021,000,000}, 0x0100, "Amacron" },
  {{016,000,016,001,017,021,017,000,000}, 0x0101, "amacron" },
  {{002,004,016,021,020,021,016,000,000}, 0x0106, "Cacute" },
@@ -528,7 +532,144 @@ struct glyph {
  {{004,000,037,002,004,010,037,000,000}, 0x017c, "zdotaccent" },
  {{012,004,037,001,016,020,037,000,000}, 0x017d, "Zcaron" },
  {{012,004,037,002,004,010,037,000,000}, 0x017e, "zcaron" },
+ /* Latin extended-B */
  {{002,004,004,016,004,004,004,004,010}, 0x0192, "florin" },
+
+ /* Greek and Coptic*/
+ {{004,012,021,021,037,021,021,000,000}, 0x0391, "Alpha" },
+ {{036,021,021,036,021,021,036,000,000}, 0x0392, "Beta" },
+ {{037,020,020,020,020,020,020,000,000}, 0x0393, "Gamma" },
+ {{004,004,012,012,021,021,037,000,000}, 0x0394 }, /* Delta */
+ {{037,020,020,036,020,020,037,000,000}, 0x0395, "Epsilon" },
+ {{037,001,002,004,010,020,037,000,000}, 0x0396, "Zeta" },
+ {{021,021,021,037,021,021,021,000,000}, 0x0397, "Eta" },
+ {{016,021,021,037,021,021,016,000,000}, 0x0398, "Theta" },
+ {{016,004,004,004,004,004,016,000,000}, 0x0399, "Iota" },
+ {{021,022,024,030,024,022,021,000,000}, 0x039a, "Kappa" },
+ {{004,004,012,012,021,021,021,000,000}, 0x039b, "Lambda" },
+ {{021,033,025,025,021,021,021,000,000}, 0x039c, "Mu" },
+ {{021,021,031,025,023,021,021,000,000}, 0x039d, "Nu" },
+ {{037,000,000,016,000,000,037,000,000}, 0x039e, "Xi" },
+ {{016,021,021,021,021,021,016,000,000}, 0x039f, "Omicron" },
+ {{037,021,021,021,021,021,021,000,000}, 0x03a0, "Pi" },
+ {{036,021,021,036,020,020,020,000,000}, 0x03a1, "Rho" },
+ {{037,020,010,004,010,020,037,000,000}, 0x03a3, "Sigma" },
+ {{037,004,004,004,004,004,004,000,000}, 0x03a4, "Tau" },
+ {{021,021,012,004,004,004,004,000,000}, 0x03a5, "Upsilon" },
+ {{004,016,025,025,025,016,004,000,000}, 0x03a6, "Phi" },
+ {{021,021,012,004,012,021,021,000,000}, 0x03a7, "Chi" },
+ {{025,025,025,025,025,016,004,000,000}, 0x03a8, "Psi" },
+ {{016,021,021,021,021,012,033,000,000}, 0x03a9 }, /* Omega */
+ {{000,000,015,022,022,022,015,000,000}, 0x03b1, "alpha" },
+ {{016,021,021,036,021,021,036,020,020}, 0x03b2, "beta" },
+ {{000,000,021,021,012,012,004,004,004}, 0x03b3, "gamma" },
+ {{017,020,016,021,021,021,016,000,000}, 0x03b4, "delta" },
+ {{000,000,017,020,016,020,017,000,000}, 0x03b5, "epsilon" },
+ {{036,002,004,010,020,020,014,002,004}, 0x03b6, "zeta" },
+ {{000,000,036,021,021,021,021,001,001}, 0x03b7, "eta" },
+ {{014,022,022,036,022,022,014,000,000}, 0x03b8, "theta" },
+ {{000,000,014,004,004,004,002,000,000}, 0x03b9, "iota" },
+ {{000,000,011,012,014,012,011,000,000}, 0x03ba, "kappa" },
+ {{030,004,004,012,012,021,021,000,000}, 0x03bb, "lambda" },
+ {{000,000,022,022,022,022,035,020,020}, 0x03bc }, /* mu */
+ {{000,000,021,021,011,012,004,000,000}, 0x03bd, "nu" },
+ {{016,020,020,016,020,020,016,001,002}, 0x03be, "xi" },
+ {{000,000,016,021,021,021,016,000,000}, 0x03bf, "omicron" },
+ {{000,000,037,012,012,012,011,000,000}, 0x03c0, "pi" },
+ {{000,000,016,021,021,021,036,020,020}, 0x03c1, "rho" },
+ {{000,000,017,020,020,020,016,001,002}, 0x03c2, "sigma1" },
+ {{000,000,017,022,021,021,016,000,000}, 0x03c3, "sigma" },
+ {{000,000,037,004,004,004,002,000,000}, 0x03c4, "tau" },
+ {{000,000,022,021,021,021,016,000,000}, 0x03c5, "upsilon" },
+ {{000,000,026,025,025,025,016,004,004}, 0x03c6, "phi" },
+ {{000,000,021,011,012,004,012,022,021}, 0x03c7, "chi" },
+ {{000,000,025,025,025,025,016,004,004}, 0x03c8, "psi" },
+ {{000,000,012,021,025,025,012,000,000}, 0x03c9, "omega" },
+ {{004,004,016,025,025,025,016,004,004}, 0x03d5, "phi1" },
+
+#ifdef ARMENIAN
+ /* Armenian */
+ {{021,021,021,021,025,022,015,000,000}, 0x0531 }, /* Ayb */
+ {{016,021,021,020,037,020,020,000,000}, 0x0532 }, /* Ben */
+ {{014,022,022,022,017,002,002,000,000}, 0x0533 }, /* Gim */
+ {{014,022,022,002,003,002,002,000,000}, 0x0534 }, /* Da */
+ {{020,020,037,020,021,021,016,000,000}, 0x0535 }, /* Ech */
+ {{016,021,021,001,001,022,037,000,000}, 0x0536 }, /* Za */
+ {{020,020,020,037,020,020,036,000,000}, 0x0537 }, /* Eh */
+ {{016,021,021,020,020,020,037,000,000}, 0x0538 }, /* Et */
+ {{016,021,021,023,025,025,022,000,000}, 0x0539 }, /* To */
+ {{002,002,017,022,022,022,014,000,000}, 0x053a }, /* Zhe */
+ {{020,020,036,021,021,021,020,000,000}, 0x053b }, /* Ini */
+ {{020,020,020,020,020,020,037,000,000}, 0x053c }, /* Liwn */
+ {{020,020,035,025,025,025,022,000,000}, 0x053d }, /* Xeh */
+ {{037,016,021,021,021,021,016,000,000}, 0x053e }, /* Ca */
+ {{020,021,021,017,001,001,001,000,000}, 0x053f }, /* Ken */
+ {{002,001,003,014,020,014,003,000,000}, 0x0540 }, /* Ho */
+ {{016,021,021,001,015,022,015,000,000}, 0x0541 }, /* Ja */
+ {{014,022,022,002,002,002,003,000,000}, 0x0542 }, /* Ghad */
+ {{001,032,004,012,012,021,037,000,000}, 0x0543 }, /* Cheh */
+ {{023,022,022,022,022,022,014,000,000}, 0x0544 }, /* Men */
+ {{016,021,001,036,001,021,016,000,000}, 0x0545 }, /* Yi */
+ {{030,010,010,010,011,011,006,000,000}, 0x0546 }, /* Now */
+ {{030,007,010,020,021,021,016,000,000}, 0x0547 }, /* Sha */
+ {{016,021,021,021,021,021,021,000,000}, 0x0548 }, /* Vo */
+ {{016,021,021,001,002,034,003,000,000}, 0x0549 }, /* Cha */
+ {{016,025,025,005,005,001,001,000,000}, 0x054a }, /* Peh */
+ {{016,021,021,031,005,026,037,000,000}, 0x054b }, /* Jheh */
+ {{014,022,022,023,022,022,022,000,000}, 0x054c }, /* Ra */
+ {{021,021,021,021,021,021,016,000,000}, 0x054d }, /* Seh */
+ {{002,022,022,022,016,002,003,000,000}, 0x054e }, /* Vew */
+ {{016,021,020,016,001,021,016,000,000}, 0x054f }, /* Tiwn */
+ {{016,021,021,020,020,020,020,000,000}, 0x0550 }, /* Reh */
+ {{016,021,016,021,001,021,016,000,000}, 0x0551 }, /* Co */
+ {{020,020,037,020,020,020,020,000,000}, 0x0552 }, /* Yiwn */
+ {{004,016,025,025,025,016,004,000,000}, 0x0553 }, /* Piwr */
+ {{006,011,011,016,010,037,010,000,000}, 0x0554 }, /* Keh */
+ {{016,021,021,021,021,021,016,000,000}, 0x0555 }, /* Oh */
+ {{014,024,016,005,025,025,016,000,000}, 0x0556 }, /* Feh */
+ {{000,000,025,025,025,025,013,000,000}, 0x0561 }, /* ayb */
+ {{000,000,036,021,021,020,037,020,020}, 0x0562 }, /* ben */
+ {{000,000,016,022,022,022,017,002,002}, 0x0563 }, /* gim */
+ {{000,000,034,022,022,022,023,002,002}, 0x0564 }, /* da */
+ {{020,020,037,020,021,021,017,000,000}, 0x0565 }, /* ech */
+ {{000,000,016,022,022,022,016,002,003}, 0x0566 }, /* za */
+ {{020,020,037,020,020,020,036,000,000}, 0x0567 }, /* eh */
+ {{000,000,036,021,021,021,021,020,037}, 0x0568 }, /* et */
+ {{000,000,036,021,027,031,026,020,020}, 0x0569 }, /* to */
+ {{002,002,017,022,022,022,014,000,000}, 0x056a }, /* zhe */
+ {{020,020,036,021,021,021,021,020,020}, 0x056b }, /* ini */
+ {{000,000,010,010,010,010,010,010,016}, 0x056c }, /* liwn */
+ {{020,020,035,025,025,025,023,020,020}, 0x056d }, /* xeh */
+ {{004,002,017,022,022,022,014,000,000}, 0x056e }, /* ca */
+ {{020,020,021,021,021,021,017,001,001}, 0x056f }, /* ken */
+ {{020,020,036,021,021,021,021,000,000}, 0x0570 }, /* ho */
+ {{004,002,004,012,021,023,015,000,000}, 0x0571 }, /* ja */
+ {{000,000,034,022,022,022,022,002,003}, 0x0572 }, /* ghad */
+ {{007,010,036,011,011,011,007,000,000}, 0x0573 }, /* cheh */
+ {{003,002,022,022,022,022,016,000,000}, 0x0574 }, /* men */
+ {{000,000,004,004,004,004,004,004,010}, 0x0575 }, /* yi */
+ {{030,010,011,011,011,011,007,000,000}, 0x0576 }, /* now */
+ {{000,000,016,021,001,002,014,020,037}, 0x0577 }, /* sha */
+ {{000,000,036,021,021,021,021,000,000}, 0x0578 }, /* vo */
+ {{000,000,004,010,004,002,014,020,037}, 0x0579 }, /* cha */
+ {{000,000,025,025,025,025,013,001,001}, 0x057a }, /* peh */
+ {{000,000,016,021,021,012,014,020,037}, 0x057b }, /* jheh */
+ {{000,000,036,021,021,022,023,000,000}, 0x057c }, /* ra */
+ {{000,000,021,021,021,021,017,000,000}, 0x057d }, /* seh */
+ {{002,002,022,022,022,022,016,002,003}, 0x057e }, /* vew */
+ {{000,000,026,025,025,025,015,000,000}, 0x057f }, /* tiwn */
+ {{000,000,036,021,021,021,021,020,020}, 0x0580 }, /* reh */
+ {{000,000,017,021,021,021,017,001,016}, 0x0581 }, /* co */
+ {{000,000,010,010,010,010,016,000,000}, 0x0582 }, /* yiwn */
+ {{004,004,026,025,025,025,015,004,004}, 0x0583 }, /* piwr */
+ {{000,000,016,011,011,016,010,037,010}, 0x0584 }, /* keh */
+ {{000,000,016,021,021,021,016,000,000}, 0x0585 }, /* oh */
+ {{014,024,016,005,025,025,016,004,004}, 0x0586 }, /* feh */
+ {{020,020,024,024,024,024,017,000,000}, 0x0587 }, /* ech_yiwn */
+ {{014,022,022,007,002,007,002,000,000}, 0x058f }, /* armdram */
+#endif
+
+ /* General punctuation */
  {{000,000,000,000,000,000,037,000,037}, 0x2017, "underscoredbl" },
  {{002,004,004,000,000,000,000,000,000}, 0x2018, "quoteleft" },
  {{000,000,000,000,000,004,004,010,000}, 0x201a, "quotesinglbase" },
@@ -538,9 +679,7 @@ struct glyph {
  {{022,022,011,000,000,000,000,000,000}, 0x201f }, /* quotedblreversed */
  {{000,000,016,016,016,000,000,000,000}, 0x2022, "bullet" },
  {{012,012,012,012,012,000,012,000,000}, 0x203c, "exclamdbl" },
- {{030,024,030,022,027,022,021,000,000}, 0x20a7, "peseta" },
- {{031,025,025,021,025,025,026,000,000}, 0x20aa }, /* newsheqel */
- {{006,011,034,010,034,011,006,000,000}, 0x20ac, "Euro" },
+ /* Subscripts and superscripts */
  {{004,012,012,012,004,000,000,000,000}, 0x2070 }, /* zerosuperior */
  {{004,000,014,004,016,000,000,000,000}, 0x2071 }, /* isuperior */
  {{002,006,012,016,002,000,000,000,000}, 0x2074 }, /* foursuperior */
@@ -555,7 +694,13 @@ struct glyph {
  {{002,004,004,004,002,000,000,000,000}, 0x207d }, /* parenleftsuperior */
  {{010,004,004,004,010,000,000,000,000}, 0x207e }, /* parenrightsuperior */
  {{000,000,014,012,012,000,000,000,000}, 0x207f }, /* nsuperior */
+ /* Currency symbols */
+ {{030,024,030,022,027,022,021,000,000}, 0x20a7, "peseta" },
+ {{031,025,025,021,025,025,026,000,000}, 0x20aa }, /* newsheqel */
+ {{006,011,034,010,034,011,006,000,000}, 0x20ac, "Euro" },
+ /* Letterlike symbols */
  {{016,021,035,033,033,035,031,021,016}, 0x2117 }, /* phonographic */
+ /* Number forms */
  {{020,020,020,020,027,001,002,004,004}, 0x2150 }, /* oneseventh */
  {{020,020,020,020,022,005,003,001,002}, 0x2151 }, /* oneninth */
  {{010,010,010,010,000,022,025,025,022}, 0x2152 }, /* onetenth */
@@ -572,6 +717,7 @@ struct glyph {
  {{030,020,030,010,022,005,002,005,002}, 0x215d, "fiveeighths" },
  {{034,004,010,020,022,005,002,005,002}, 0x215e, "seveneighths" },
  {{010,024,024,010,002,001,002,001,002}, 0x2189 }, /* zerothirds */
+ /* Arrows */
  {{000,004,004,025,016,004,000,000,000}, 0x2193, "arrowdown" },
  {{000,012,021,037,021,012,000,000,000}, 0x2194, "arrowboth" },
  {{004,016,025,004,025,016,004,000,000}, 0x2195, "arrowupdn" },
@@ -602,6 +748,7 @@ struct glyph {
  {{000,004,002,031,002,004,000,000,000}, -1, "arrowright.alt" },
  {{000,004,012,021,004,004,000,000,000}, -1, "arrowup.alt" },
  {{000,004,004,021,012,004,000,000,000}, -1, "arrowdown.alt" },
+ /* Mathematical operators */
  {{000,000,000,037,000,000,000,000,000}, 0x2212, "minus" },
  {{037,000,004,004,037,004,004,000,000}, 0x2213 }, /* minusplus */
  {{000,000,004,016,004,000,000,000,000}, 0x2219 }, /* bulletoperator */
@@ -612,14 +759,28 @@ struct glyph {
  {{000,021,021,021,021,016,000,000,000}, 0x222a, "union" },
  {{000,010,024,025,005,002,000,000,000}, 0x223f }, /* sinewave */
  {{000,010,025,002,010,025,002,000,000}, 0x2248, "approxequal" },
+ {{000,002,037,004,037,010,000,000,000}, 0x2260, "notequal" },
  {{000,037,000,037,000,037,000,000,000}, 0x2261, "equivalence" },
  {{003,014,020,014,003,030,007,000,000}, 0x2264, "lessequal" },
  {{030,006,001,006,030,003,034,000,000}, 0x2265, "greaterequal" },
+ /* Miscellaneous technical */
  {{004,012,021,021,021,021,037,000,000}, 0x2302, "house" },
  {{000,000,037,020,020,000,000,000,000}, 0x2310, "revlogicalnot" },
  {{000,000,002,005,004,004,004,004,004}, 0x2320, "integraltp" },
  {{004,004,004,004,004,024,010,000,000}, 0x2321, "integralbt" },
  {{000,000,037,000,025,000,000,000,000}, 0x2393 }, /* directcurrent */
+ {{037,000,000,000,000,000,000,000,000}, 0x23ba }, /* horizontal scan 1 */
+ {{000,000,037,000,000,000,000,000,000}, 0x23bb }, /* horizontal scan 3 */
+ {{000,000,000,000,000,000,037,000,000}, 0x23bc }, /* horizontal scan 7 */
+ {{000,000,000,000,000,000,000,000,037}, 0x23bd }, /* horizontal scan 9 */
+ /* Control pictures */
+ {{024,034,024,000,007,002,002,000,000}, 0x2409 }, /* DEC graphics HT */
+ {{030,020,030,023,002,003,002,000,000}, 0x240c }, /* DEC graphics FF */
+ {{014,020,020,016,005,006,005,000,000}, 0x240d }, /* DEC graphics CR */
+ {{020,020,020,033,002,003,002,000,000}, 0x240a }, /* DEC graphics LF */
+ {{024,024,010,000,007,002,002,000,000}, 0x240b }, /* DEC graphics VT */
+ {{032,026,022,000,010,010,017,000,000}, 0x2424 }, /* DEC graphics NL */
+ /* Box drawing */
  {{000,000,000,000,037,000,000,000,000}, 0x2500, "SF100000" },
  {{000,000,000,037,037,037,000,000,000}, 0x2501 },
  {{004,004,004,004,004,004,004,004,004}, 0x2502, "SF110000" },
@@ -717,6 +878,7 @@ struct glyph {
  {{004,004,004,037,004,037,004,004,004}, 0x256a, "SF540000" },
  {{012,012,012,012,037,012,012,012,012}, 0x256b, "SF530000" },
  {{012,012,012,033,000,033,012,012,012}, 0x256c, "SF440000" },
+ /* Block elements */
  {{037,037,037,037,037,000,000,000,000}, 0x2580, "upblock" },
  {{000,000,000,000,037,037,037,037,037}, 0x2584, "dnblock" },
  {{037,037,037,037,037,037,037,037,037}, 0x2588, "block" },
@@ -725,6 +887,7 @@ struct glyph {
  {{025,000,012,000,025,000,012,000,025}, 0x2591, "ltshade" },
  {{022,011,004,022,011,004,022,011,004}, 0x2592, "shade" },
  {{025,037,012,037,025,037,012,037,025}, 0x2593, "dkshade" },
+ /* Geometric shapes */
  {{037,021,021,021,021,021,037,000,000}, 0x25a1, "H22073" },
  {{000,000,016,016,016,000,000,000,000}, 0x25aa, "H18543" },
  {{000,000,016,012,016,000,000,000,000}, 0x25ab, "H18551" },
@@ -749,6 +912,7 @@ struct glyph {
  {{000,016,021,035,025,016,000,000,000}, 0x25f5 }, /* circle lower left quad */
  {{000,016,025,027,021,016,000,000,000}, 0x25f6 }, /* circle lower right quad */
  {{000,016,021,027,025,016,000,000,000}, 0x25f7 }, /* circle upper right quad */
+ /* Miscellaneous symbols */
  {{001,002,004,010,005,003,007,000,000}, 0x2607 }, /* lightning */
  {{037,022,024,030,025,023,027,000,000}, 0x2608 }, /* thunderstorm */
  {{000,016,021,025,021,016,000,000,000}, 0x2609 }, /* astrological sun */
@@ -768,7 +932,9 @@ struct glyph {
  {{010,010,013,015,011,012,014,000,000}, 0x266d }, /* flat */
  {{010,013,015,011,013,015,001,000,000}, 0x266e }, /* natural */
  {{002,013,016,033,016,032,010,000,000}, 0x266f }, /* sharp */
+ /* Dingbats */
  {{000,004,022,017,022,004,000,000,000}, 0x2708 }, /* airplane */
+ /* Supplemental arrows-B */
  {{000,037,016,025,004,004,000,000,000}, 0x2912 }, /* arrowupbar */
  {{000,004,004,025,016,037,000,000,000}, 0x2913 }, /* arrowdownbar */
  {{000,004,016,025,004,030,000,000,000}, 0x2934 }, /* arrow right curve up */
@@ -791,28 +957,15 @@ struct glyph {
  {{000,020,020,037,022,024,000,000,000}, 0x295f },
  {{000,004,014,024,004,037,000,000,000}, 0x2960 },
  {{000,037,004,024,014,004,000,000,000}, 0x2961 },
+ /* Miscellaneous symbols and arrows */
  {{000,025,000,021,000,025,000,000,000}, 0x2b1a }, /* dottedsquare */
+ /* Specials */
  {{016,021,025,011,016,012,016,000,000}, 0xfffd }, /* replacement */
  {{037,021,021,021,021,021,037,000,000}, -1, ".notdef" },
-
- /*
-  * Stuff by sgt20
-  */
- /* Characters needed for VT100 line drawing. */
- {{024,034,024,000,007,002,002,000,000}, 0x2409 }, /* DEC graphics HT */
- {{030,020,030,023,002,003,002,000,000}, 0x240c }, /* DEC graphics FF */
- {{014,020,020,016,005,006,005,000,000}, 0x240d }, /* DEC graphics CR */
- {{020,020,020,033,002,003,002,000,000}, 0x240a }, /* DEC graphics LF */
- {{032,026,022,000,010,010,017,000,000}, 0x2424 }, /* DEC graphics NL */
- {{024,024,010,000,007,002,002,000,000}, 0x240b }, /* DEC graphics VT */
- {{037,000,000,000,000,000,000,000,000}, 0x23ba }, /* horizontal scan 1 */
- {{000,000,037,000,000,000,000,000,000}, 0x23bb }, /* horizontal scan 3 */
- {{000,000,000,000,000,000,037,000,000}, 0x23bc }, /* horizontal scan 7 */
- {{000,000,000,000,000,000,000,000,037}, 0x23bd }, /* horizontal scan 9 */
- {{000,002,037,004,037,010,000,000,000}, 0x2260, "notequal" },
+ /* Transport and map symbols */
  {{000,034,010,011,027,010,000,000,000}, 0x1f681 }, /* helicopter */
 
- /* This is getting silly. */
+ /* Latin small caps */
  {{000,000,016,021,037,021,021,000,000}, -1, "a.sc" },
  {{000,000,036,021,036,021,036,000,000}, -1, "b.sc" },
  {{000,000,016,021,020,021,016,000,000}, -1, "c.sc" },
@@ -839,141 +992,6 @@ struct glyph {
  {{000,000,021,012,004,012,021,000,000}, -1, "x.sc" },
  {{000,000,021,012,004,004,004,000,000}, -1, "y.sc" },
  {{000,000,037,001,016,020,037,000,000}, -1, "z.sc" },
-
- /* Greek */
- {{004,012,021,021,037,021,021,000,000}, 0x0391, "Alpha" },
- {{036,021,021,036,021,021,036,000,000}, 0x0392, "Beta" },
- {{037,020,020,020,020,020,020,000,000}, 0x0393, "Gamma" },
- {{004,004,012,012,021,021,037,000,000}, 0x0394 }, /* Delta */
- {{037,020,020,036,020,020,037,000,000}, 0x0395, "Epsilon" },
- {{037,001,002,004,010,020,037,000,000}, 0x0396, "Zeta" },
- {{021,021,021,037,021,021,021,000,000}, 0x0397, "Eta" },
- {{016,021,021,037,021,021,016,000,000}, 0x0398, "Theta" },
- {{016,004,004,004,004,004,016,000,000}, 0x0399, "Iota" },
- {{021,022,024,030,024,022,021,000,000}, 0x039a, "Kappa" },
- {{004,004,012,012,021,021,021,000,000}, 0x039b, "Lambda" },
- {{021,033,025,025,021,021,021,000,000}, 0x039c, "Mu" },
- {{021,021,031,025,023,021,021,000,000}, 0x039d, "Nu" },
- {{037,000,000,016,000,000,037,000,000}, 0x039e, "Xi" },
- {{016,021,021,021,021,021,016,000,000}, 0x039f, "Omicron" },
- {{037,021,021,021,021,021,021,000,000}, 0x03a0, "Pi" },
- {{036,021,021,036,020,020,020,000,000}, 0x03a1, "Rho" },
- {{037,020,010,004,010,020,037,000,000}, 0x03a3, "Sigma" },
- {{037,004,004,004,004,004,004,000,000}, 0x03a4, "Tau" },
- {{021,021,012,004,004,004,004,000,000}, 0x03a5, "Upsilon" },
- {{004,016,025,025,025,016,004,000,000}, 0x03a6, "Phi" },
- {{021,021,012,004,012,021,021,000,000}, 0x03a7, "Chi" },
- {{025,025,025,025,025,016,004,000,000}, 0x03a8, "Psi" },
- {{016,021,021,021,021,012,033,000,000}, 0x03a9 }, /* Omega */
- {{000,000,015,022,022,022,015,000,000}, 0x03b1, "alpha" },
- {{016,021,021,036,021,021,036,020,020}, 0x03b2, "beta" },
- {{000,000,021,021,012,012,004,004,004}, 0x03b3, "gamma" },
- {{017,020,016,021,021,021,016,000,000}, 0x03b4, "delta" },
- {{000,000,017,020,016,020,017,000,000}, 0x03b5, "epsilon" },
- {{036,002,004,010,020,020,014,002,004}, 0x03b6, "zeta" },
- {{000,000,036,021,021,021,021,001,001}, 0x03b7, "eta" },
- {{014,022,022,036,022,022,014,000,000}, 0x03b8, "theta" },
- {{000,000,014,004,004,004,002,000,000}, 0x03b9, "iota" },
- {{000,000,011,012,014,012,011,000,000}, 0x03ba, "kappa" },
- {{030,004,004,012,012,021,021,000,000}, 0x03bb, "lambda" },
- {{000,000,022,022,022,022,035,020,020}, 0x03bc }, /* mu */
- {{000,000,021,021,011,012,004,000,000}, 0x03bd, "nu" },
- {{016,020,020,016,020,020,016,001,002}, 0x03be, "xi" },
- {{000,000,016,021,021,021,016,000,000}, 0x03bf, "omicron" },
- {{000,000,037,012,012,012,011,000,000}, 0x03c0, "pi" },
- {{000,000,016,021,021,021,036,020,020}, 0x03c1, "rho" },
- {{000,000,017,020,020,020,016,001,002}, 0x03c2, "sigma1" },
- {{000,000,017,022,021,021,016,000,000}, 0x03c3, "sigma" },
- {{000,000,037,004,004,004,002,000,000}, 0x03c4, "tau" },
- {{000,000,022,021,021,021,016,000,000}, 0x03c5, "upsilon" },
- {{000,000,026,025,025,025,016,004,004}, 0x03c6, "phi" },
- {{000,000,021,011,012,004,012,022,021}, 0x03c7, "chi" },
- {{000,000,025,025,025,025,016,004,004}, 0x03c8, "psi" },
- {{000,000,012,021,025,025,012,000,000}, 0x03c9, "omega" },
- {{004,004,016,025,025,025,016,004,004}, 0x03d5, "phi1" },
-
-#ifdef ARMENIAN
- /* Armenian */
- {{021,021,021,021,025,022,015,000,000}, 0x0531 }, /* Ayb */
- {{016,021,021,020,037,020,020,000,000}, 0x0532 }, /* Ben */
- {{014,022,022,022,017,002,002,000,000}, 0x0533 }, /* Gim */
- {{014,022,022,002,003,002,002,000,000}, 0x0534 }, /* Da */
- {{020,020,037,020,021,021,016,000,000}, 0x0535 }, /* Ech */
- {{016,021,021,001,001,022,037,000,000}, 0x0536 }, /* Za */
- {{020,020,020,037,020,020,036,000,000}, 0x0537 }, /* Eh */
- {{016,021,021,020,020,020,037,000,000}, 0x0538 }, /* Et */
- {{016,021,021,023,025,025,022,000,000}, 0x0539 }, /* To */
- {{002,002,017,022,022,022,014,000,000}, 0x053a }, /* Zhe */
- {{020,020,036,021,021,021,020,000,000}, 0x053b }, /* Ini */
- {{020,020,020,020,020,020,037,000,000}, 0x053c }, /* Liwn */
- {{020,020,035,025,025,025,022,000,000}, 0x053d }, /* Xeh */
- {{037,016,021,021,021,021,016,000,000}, 0x053e }, /* Ca */
- {{020,021,021,017,001,001,001,000,000}, 0x053f }, /* Ken */
- {{002,001,003,014,020,014,003,000,000}, 0x0540 }, /* Ho */
- {{016,021,021,001,015,022,015,000,000}, 0x0541 }, /* Ja */
- {{014,022,022,002,002,002,003,000,000}, 0x0542 }, /* Ghad */
- {{001,032,004,012,012,021,037,000,000}, 0x0543 }, /* Cheh */
- {{023,022,022,022,022,022,014,000,000}, 0x0544 }, /* Men */
- {{016,021,001,036,001,021,016,000,000}, 0x0545 }, /* Yi */
- {{030,010,010,010,011,011,006,000,000}, 0x0546 }, /* Now */
- {{030,007,010,020,021,021,016,000,000}, 0x0547 }, /* Sha */
- {{016,021,021,021,021,021,021,000,000}, 0x0548 }, /* Vo */
- {{016,021,021,001,002,034,003,000,000}, 0x0549 }, /* Cha */
- {{016,025,025,005,005,001,001,000,000}, 0x054a }, /* Peh */
- {{016,021,021,031,005,026,037,000,000}, 0x054b }, /* Jheh */
- {{014,022,022,023,022,022,022,000,000}, 0x054c }, /* Ra */
- {{021,021,021,021,021,021,016,000,000}, 0x054d }, /* Seh */
- {{002,022,022,022,016,002,003,000,000}, 0x054e }, /* Vew */
- {{016,021,020,016,001,021,016,000,000}, 0x054f }, /* Tiwn */
- {{016,021,021,020,020,020,020,000,000}, 0x0550 }, /* Reh */
- {{016,021,016,021,001,021,016,000,000}, 0x0551 }, /* Co */
- {{020,020,037,020,020,020,020,000,000}, 0x0552 }, /* Yiwn */
- {{004,016,025,025,025,016,004,000,000}, 0x0553 }, /* Piwr */
- {{006,011,011,016,010,037,010,000,000}, 0x0554 }, /* Keh */
- {{016,021,021,021,021,021,016,000,000}, 0x0555 }, /* Oh */
- {{014,024,016,005,025,025,016,000,000}, 0x0556 }, /* Feh */
-
- {{000,000,025,025,025,025,013,000,000}, 0x0561 }, /* ayb */
- {{000,000,036,021,021,020,037,020,020}, 0x0562 }, /* ben */
- {{000,000,016,022,022,022,017,002,002}, 0x0563 }, /* gim */
- {{000,000,034,022,022,022,023,002,002}, 0x0564 }, /* da */
- {{020,020,037,020,021,021,017,000,000}, 0x0565 }, /* ech */
- {{000,000,016,022,022,022,016,002,003}, 0x0566 }, /* za */
- {{020,020,037,020,020,020,036,000,000}, 0x0567 }, /* eh */
- {{000,000,036,021,021,021,021,020,037}, 0x0568 }, /* et */
- {{000,000,036,021,027,031,026,020,020}, 0x0569 }, /* to */
- {{002,002,017,022,022,022,014,000,000}, 0x056a }, /* zhe */
- {{020,020,036,021,021,021,021,020,020}, 0x056b }, /* ini */
- {{000,000,010,010,010,010,010,010,016}, 0x056c }, /* liwn */
- {{020,020,035,025,025,025,023,020,020}, 0x056d }, /* xeh */
- {{004,002,017,022,022,022,014,000,000}, 0x056e }, /* ca */
- {{020,020,021,021,021,021,017,001,001}, 0x056f }, /* ken */
- {{020,020,036,021,021,021,021,000,000}, 0x0570 }, /* ho */
- {{004,002,004,012,021,023,015,000,000}, 0x0571 }, /* ja */
- {{000,000,034,022,022,022,022,002,003}, 0x0572 }, /* ghad */
- {{007,010,036,011,011,011,007,000,000}, 0x0573 }, /* cheh */
- {{003,002,022,022,022,022,016,000,000}, 0x0574 }, /* men */
- {{000,000,004,004,004,004,004,004,010}, 0x0575 }, /* yi */
- {{030,010,011,011,011,011,007,000,000}, 0x0576 }, /* now */
- {{000,000,016,021,001,002,014,020,037}, 0x0577 }, /* sha */
- {{000,000,036,021,021,021,021,000,000}, 0x0578 }, /* vo */
- {{000,000,004,010,004,002,014,020,037}, 0x0579 }, /* cha */
- {{000,000,025,025,025,025,013,001,001}, 0x057a }, /* peh */
- {{000,000,016,021,021,012,014,020,037}, 0x057b }, /* jheh */
- {{000,000,036,021,021,022,023,000,000}, 0x057c }, /* ra */
- {{000,000,021,021,021,021,017,000,000}, 0x057d }, /* seh */
- {{002,002,022,022,022,022,016,002,003}, 0x057e }, /* vew */
- {{000,000,026,025,025,025,015,000,000}, 0x057f }, /* tiwn */
- {{000,000,036,021,021,021,021,020,020}, 0x0580 }, /* reh */
- {{000,000,017,021,021,021,017,001,016}, 0x0581 }, /* co */
- {{000,000,010,010,010,010,016,000,000}, 0x0582 }, /* yiwn */
- {{004,004,026,025,025,025,015,004,004}, 0x0583 }, /* piwr */
- {{000,000,016,011,011,016,010,037,010}, 0x0584 }, /* keh */
- {{000,000,016,021,021,021,016,000,000}, 0x0585 }, /* oh */
- {{014,024,016,005,025,025,016,004,004}, 0x0586 }, /* feh */
- {{020,020,024,024,024,024,017,000,000}, 0x0587 }, /* ech_yiwn */
- {{014,022,022,007,002,007,002,000,000}, 0x058f }, /* armdram */
-#endif
 };
 
 static void dolookups(struct glyph const *);