Don't bother mentioning the bottom row of each character cell in the

initialiser for glyphs, since it's always empty.  This should give space in
the source to add extra character metadata.

diff --git a/ttxt.c b/ttxt.c
index 270f87d4371ecd7895d7fe39b9229280a914de26..f9676cf235d47d64b1d87386cb831a151354c526 100644 (file)
--- a/ttxt.c
+++ b/ttxt.c
@@ -101,254 +101,254 @@ struct glyph {
   * the Mullard SAA5050 series datasheet, dated July 1982.
   */
  /* US ASCII (SAA5055) character set */
- {{000,000,000,000,000,000,000,000,000,000}, 0x0020, "space" },
- {{004,004,004,004,004,000,004,000,000,000}, 0x0021, "exclam" },
- {{012,012,012,000,000,000,000,000,000,000}, 0x0022, "quotedbl" },
- {{012,012,037,012,037,012,012,000,000,000}, 0x0023, "numbersign" },
- {{016,025,024,016,005,025,016,000,000,000}, 0x0024, "dollar" },
- {{030,031,002,004,010,023,003,000,000,000}, 0x0025, "percent" },
- {{010,024,024,010,025,022,015,000,000,000}, 0x0026, "ampersand" },
- {{004,004,010,000,000,000,000,000,000,000}, 0x2019, "quoteright" },
- {{002,004,010,010,010,004,002,000,000,000}, 0x0028, "parenleft" },
- {{010,004,002,002,002,004,010,000,000,000}, 0x0029, "parenright" },
- {{004,025,016,004,016,025,004,000,000,000}, 0x002a, "asterisk" },
- {{000,004,004,037,004,004,000,000,000,000}, 0x002b, "plus" },
- {{000,000,000,000,000,004,004,010,000,000}, 0x002c, "comma" },
- {{000,000,000,016,000,000,000,000,000,000}, 0x002d, "hyphen" },
- {{000,000,000,000,000,000,004,000,000,000}, 0x002e, "period" },
- {{000,001,002,004,010,020,000,000,000,000}, 0x002f, "slash" },
- {{004,012,021,021,021,012,004,000,000,000}, 0x0030, "zero" },
- {{004,014,004,004,004,004,016,000,000,000}, 0x0031, "one" },
- {{016,021,001,006,010,020,037,000,000,000}, 0x0032, "two" },
- {{037,001,002,006,001,021,016,000,000,000}, 0x0033, "three" },
- {{002,006,012,022,037,002,002,000,000,000}, 0x0034, "four" },
- {{037,020,036,001,001,021,016,000,000,000}, 0x0035, "five" },
- {{006,010,020,036,021,021,016,000,000,000}, 0x0036, "six" },
- {{037,001,002,004,010,010,010,000,000,000}, 0x0037, "seven" },
- {{016,021,021,016,021,021,016,000,000,000}, 0x0038, "eight" },
- {{016,021,021,017,001,002,014,000,000,000}, 0x0039, "nine" },
- {{000,000,004,000,000,000,004,000,000,000}, 0x003a, "colon" },
- {{000,000,004,000,000,004,004,010,000,000}, 0x003b, "semicolon" },
- {{002,004,010,020,010,004,002,000,000,000}, 0x003c, "less" },
- {{000,000,037,000,037,000,000,000,000,000}, 0x003d, "equal" },
- {{010,004,002,001,002,004,010,000,000,000}, 0x003e, "greater" },
- {{016,021,002,004,004,000,004,000,000,000}, 0x003f, "question" },
- {{016,021,027,025,027,020,016,000,000,000}, 0x0040, "at" },
- {{004,012,021,021,037,021,021,000,000,000}, 0x0041, "A" },
- {{036,021,021,036,021,021,036,000,000,000}, 0x0042, "B" },
- {{016,021,020,020,020,021,016,000,000,000}, 0x0043, "C" },
- {{036,021,021,021,021,021,036,000,000,000}, 0x0044, "D" },
- {{037,020,020,036,020,020,037,000,000,000}, 0x0045, "E" },
- {{037,020,020,036,020,020,020,000,000,000}, 0x0046, "F" },
- {{016,021,020,020,023,021,017,000,000,000}, 0x0047, "G" },
- {{021,021,021,037,021,021,021,000,000,000}, 0x0048, "H" },
- {{016,004,004,004,004,004,016,000,000,000}, 0x0049, "I" },
- {{001,001,001,001,001,021,016,000,000,000}, 0x004a, "J" },
- {{021,022,024,030,024,022,021,000,000,000}, 0x004b, "K" },
- {{020,020,020,020,020,020,037,000,000,000}, 0x004c, "L" },
- {{021,033,025,025,021,021,021,000,000,000}, 0x004d, "M" },
- {{021,021,031,025,023,021,021,000,000,000}, 0x004e, "N" },
- {{016,021,021,021,021,021,016,000,000,000}, 0x004f, "O" },
- {{036,021,021,036,020,020,020,000,000,000}, 0x0050, "P" },
- {{016,021,021,021,025,022,015,000,000,000}, 0x0051, "Q" },
- {{036,021,021,036,024,022,021,000,000,000}, 0x0052, "R" },
- {{016,021,020,016,001,021,016,000,000,000}, 0x0053, "S" },
- {{037,004,004,004,004,004,004,000,000,000}, 0x0054, "T" },
- {{021,021,021,021,021,021,016,000,000,000}, 0x0055, "U" },
- {{021,021,021,012,012,004,004,000,000,000}, 0x0056, "V" },
- {{021,021,021,025,025,025,012,000,000,000}, 0x0057, "W" },
- {{021,021,012,004,012,021,021,000,000,000}, 0x0058, "X" },
- {{021,021,012,004,004,004,004,000,000,000}, 0x0059, "Y" },
- {{037,001,002,004,010,020,037,000,000,000}, 0x005a, "Z" },
- {{017,010,010,010,010,010,017,000,000,000}, 0x005b, "bracketleft" },
- {{000,020,010,004,002,001,000,000,000,000}, 0x005c, "backslash" },
- {{036,002,002,002,002,002,036,000,000,000}, 0x005d, "bracketright" },
- {{004,012,021,000,000,000,000,000,000,000}, 0x005e, "asciicircum" },
- {{000,000,000,000,000,000,037,000,000,000}, 0x005f, "underscore" },
- {{004,004,002,000,000,000,000,000,000,000}, 0x201b, "quotereversed" },
- {{000,000,016,001,017,021,017,000,000,000}, 0x0061, "a" },
- {{020,020,036,021,021,021,036,000,000,000}, 0x0062, "b" },
- {{000,000,017,020,020,020,017,000,000,000}, 0x0063, "c" },
- {{001,001,017,021,021,021,017,000,000,000}, 0x0064, "d" },
- {{000,000,016,021,037,020,016,000,000,000}, 0x0065, "e" },
- {{002,004,004,016,004,004,004,000,000,000}, 0x0066, "f" },
- {{000,000,017,021,021,021,017,001,016,000}, 0x0067, "g" },
- {{020,020,036,021,021,021,021,000,000,000}, 0x0068, "h" },
- {{004,000,014,004,004,004,016,000,000,000}, 0x0069, "i" },
- {{004,000,004,004,004,004,004,004,010,000}, 0x006a, "j" },
- {{010,010,011,012,014,012,011,000,000,000}, 0x006b, "k" },
- {{014,004,004,004,004,004,016,000,000,000}, 0x006c, "l" },
- {{000,000,032,025,025,025,025,000,000,000}, 0x006d, "m" },
- {{000,000,036,021,021,021,021,000,000,000}, 0x006e, "n" },
- {{000,000,016,021,021,021,016,000,000,000}, 0x006f, "o" },
- {{000,000,036,021,021,021,036,020,020,000}, 0x0070, "p" },
- {{000,000,017,021,021,021,017,001,001,000}, 0x0071, "q" },
- {{000,000,013,014,010,010,010,000,000,000}, 0x0072, "r" },
- {{000,000,017,020,016,001,036,000,000,000}, 0x0073, "s" },
- {{004,004,016,004,004,004,002,000,000,000}, 0x0074, "t" },
- {{000,000,021,021,021,021,017,000,000,000}, 0x0075, "u" },
- {{000,000,021,021,012,012,004,000,000,000}, 0x0076, "v" },
- {{000,000,021,021,025,025,012,000,000,000}, 0x0077, "w" },
- {{000,000,021,012,004,012,021,000,000,000}, 0x0078, "x" },
- {{000,000,021,021,021,021,017,001,016,000}, 0x0079, "y" },
- {{000,000,037,002,004,010,037,000,000,000}, 0x007a, "z" },
- {{003,004,004,010,004,004,003,000,000,000}, 0x007b, "braceleft" },
- {{004,004,004,000,004,004,004,000,000,000}, 0x00a6, "brokenbar" },
- {{030,004,004,002,004,004,030,000,000,000}, 0x007d, "braceright" },
- {{010,025,002,000,000,000,000,000,000,000}, 0x007e, "asciitilde" },
- {{037,037,037,037,037,037,037,000,000,000}, 0x2588, "block" },
+ {{000,000,000,000,000,000,000,000,000}, 0x0020, "space" },
+ {{004,004,004,004,004,000,004,000,000}, 0x0021, "exclam" },
+ {{012,012,012,000,000,000,000,000,000}, 0x0022, "quotedbl" },
+ {{012,012,037,012,037,012,012,000,000}, 0x0023, "numbersign" },
+ {{016,025,024,016,005,025,016,000,000}, 0x0024, "dollar" },
+ {{030,031,002,004,010,023,003,000,000}, 0x0025, "percent" },
+ {{010,024,024,010,025,022,015,000,000}, 0x0026, "ampersand" },
+ {{004,004,010,000,000,000,000,000,000}, 0x2019, "quoteright" },
+ {{002,004,010,010,010,004,002,000,000}, 0x0028, "parenleft" },
+ {{010,004,002,002,002,004,010,000,000}, 0x0029, "parenright" },
+ {{004,025,016,004,016,025,004,000,000}, 0x002a, "asterisk" },
+ {{000,004,004,037,004,004,000,000,000}, 0x002b, "plus" },
+ {{000,000,000,000,000,004,004,010,000}, 0x002c, "comma" },
+ {{000,000,000,016,000,000,000,000,000}, 0x002d, "hyphen" },
+ {{000,000,000,000,000,000,004,000,000}, 0x002e, "period" },
+ {{000,001,002,004,010,020,000,000,000}, 0x002f, "slash" },
+ {{004,012,021,021,021,012,004,000,000}, 0x0030, "zero" },
+ {{004,014,004,004,004,004,016,000,000}, 0x0031, "one" },
+ {{016,021,001,006,010,020,037,000,000}, 0x0032, "two" },
+ {{037,001,002,006,001,021,016,000,000}, 0x0033, "three" },
+ {{002,006,012,022,037,002,002,000,000}, 0x0034, "four" },
+ {{037,020,036,001,001,021,016,000,000}, 0x0035, "five" },
+ {{006,010,020,036,021,021,016,000,000}, 0x0036, "six" },
+ {{037,001,002,004,010,010,010,000,000}, 0x0037, "seven" },
+ {{016,021,021,016,021,021,016,000,000}, 0x0038, "eight" },
+ {{016,021,021,017,001,002,014,000,000}, 0x0039, "nine" },
+ {{000,000,004,000,000,000,004,000,000}, 0x003a, "colon" },
+ {{000,000,004,000,000,004,004,010,000}, 0x003b, "semicolon" },
+ {{002,004,010,020,010,004,002,000,000}, 0x003c, "less" },
+ {{000,000,037,000,037,000,000,000,000}, 0x003d, "equal" },
+ {{010,004,002,001,002,004,010,000,000}, 0x003e, "greater" },
+ {{016,021,002,004,004,000,004,000,000}, 0x003f, "question" },
+ {{016,021,027,025,027,020,016,000,000}, 0x0040, "at" },
+ {{004,012,021,021,037,021,021,000,000}, 0x0041, "A" },
+ {{036,021,021,036,021,021,036,000,000}, 0x0042, "B" },
+ {{016,021,020,020,020,021,016,000,000}, 0x0043, "C" },
+ {{036,021,021,021,021,021,036,000,000}, 0x0044, "D" },
+ {{037,020,020,036,020,020,037,000,000}, 0x0045, "E" },
+ {{037,020,020,036,020,020,020,000,000}, 0x0046, "F" },
+ {{016,021,020,020,023,021,017,000,000}, 0x0047, "G" },
+ {{021,021,021,037,021,021,021,000,000}, 0x0048, "H" },
+ {{016,004,004,004,004,004,016,000,000}, 0x0049, "I" },
+ {{001,001,001,001,001,021,016,000,000}, 0x004a, "J" },
+ {{021,022,024,030,024,022,021,000,000}, 0x004b, "K" },
+ {{020,020,020,020,020,020,037,000,000}, 0x004c, "L" },
+ {{021,033,025,025,021,021,021,000,000}, 0x004d, "M" },
+ {{021,021,031,025,023,021,021,000,000}, 0x004e, "N" },
+ {{016,021,021,021,021,021,016,000,000}, 0x004f, "O" },
+ {{036,021,021,036,020,020,020,000,000}, 0x0050, "P" },
+ {{016,021,021,021,025,022,015,000,000}, 0x0051, "Q" },
+ {{036,021,021,036,024,022,021,000,000}, 0x0052, "R" },
+ {{016,021,020,016,001,021,016,000,000}, 0x0053, "S" },
+ {{037,004,004,004,004,004,004,000,000}, 0x0054, "T" },
+ {{021,021,021,021,021,021,016,000,000}, 0x0055, "U" },
+ {{021,021,021,012,012,004,004,000,000}, 0x0056, "V" },
+ {{021,021,021,025,025,025,012,000,000}, 0x0057, "W" },
+ {{021,021,012,004,012,021,021,000,000}, 0x0058, "X" },
+ {{021,021,012,004,004,004,004,000,000}, 0x0059, "Y" },
+ {{037,001,002,004,010,020,037,000,000}, 0x005a, "Z" },
+ {{017,010,010,010,010,010,017,000,000}, 0x005b, "bracketleft" },
+ {{000,020,010,004,002,001,000,000,000}, 0x005c, "backslash" },
+ {{036,002,002,002,002,002,036,000,000}, 0x005d, "bracketright" },
+ {{004,012,021,000,000,000,000,000,000}, 0x005e, "asciicircum" },
+ {{000,000,000,000,000,000,037,000,000}, 0x005f, "underscore" },
+ {{004,004,002,000,000,000,000,000,000}, 0x201b, "quotereversed" },
+ {{000,000,016,001,017,021,017,000,000}, 0x0061, "a" },
+ {{020,020,036,021,021,021,036,000,000}, 0x0062, "b" },
+ {{000,000,017,020,020,020,017,000,000}, 0x0063, "c" },
+ {{001,001,017,021,021,021,017,000,000}, 0x0064, "d" },
+ {{000,000,016,021,037,020,016,000,000}, 0x0065, "e" },
+ {{002,004,004,016,004,004,004,000,000}, 0x0066, "f" },
+ {{000,000,017,021,021,021,017,001,016}, 0x0067, "g" },
+ {{020,020,036,021,021,021,021,000,000}, 0x0068, "h" },
+ {{004,000,014,004,004,004,016,000,000}, 0x0069, "i" },
+ {{004,000,004,004,004,004,004,004,010}, 0x006a, "j" },
+ {{010,010,011,012,014,012,011,000,000}, 0x006b, "k" },
+ {{014,004,004,004,004,004,016,000,000}, 0x006c, "l" },
+ {{000,000,032,025,025,025,025,000,000}, 0x006d, "m" },
+ {{000,000,036,021,021,021,021,000,000}, 0x006e, "n" },
+ {{000,000,016,021,021,021,016,000,000}, 0x006f, "o" },
+ {{000,000,036,021,021,021,036,020,020}, 0x0070, "p" },
+ {{000,000,017,021,021,021,017,001,001}, 0x0071, "q" },
+ {{000,000,013,014,010,010,010,000,000}, 0x0072, "r" },
+ {{000,000,017,020,016,001,036,000,000}, 0x0073, "s" },
+ {{004,004,016,004,004,004,002,000,000}, 0x0074, "t" },
+ {{000,000,021,021,021,021,017,000,000}, 0x0075, "u" },
+ {{000,000,021,021,012,012,004,000,000}, 0x0076, "v" },
+ {{000,000,021,021,025,025,012,000,000}, 0x0077, "w" },
+ {{000,000,021,012,004,012,021,000,000}, 0x0078, "x" },
+ {{000,000,021,021,021,021,017,001,016}, 0x0079, "y" },
+ {{000,000,037,002,004,010,037,000,000}, 0x007a, "z" },
+ {{003,004,004,010,004,004,003,000,000}, 0x007b, "braceleft" },
+ {{004,004,004,000,004,004,004,000,000}, 0x00a6, "brokenbar" },
+ {{030,004,004,002,004,004,030,000,000}, 0x007d, "braceright" },
+ {{010,025,002,000,000,000,000,000,000}, 0x007e, "asciitilde" },
+ {{037,037,037,037,037,037,037,000,000}, 0x2588, "block" },
 
  /* Extra characters found in the English (SAA5050) character set */
- {{006,011,010,034,010,010,037,000,000,000}, 0x00a3, "sterling" },
- {{004,004,004,000,000,000,000,000,000,000}, 0x0027, "quotesingle" },
- {{000,004,010,037,010,004,000,000,000,000}, 0x2190, "arrowleft" },
- {{020,020,020,020,026,001,002,004,007,000}, 0x00bd, "onehalf" },
- {{000,004,002,037,002,004,000,000,000,000}, 0x2192, "arrowright" },
- {{000,004,016,025,004,004,000,000,000,000}, 0x2191, "arrowup" },
- {{000,000,000,037,000,000,000,000,000,000}, 0x2013, "endash" },
- {{010,010,010,010,011,003,005,007,001,000}, 0x00bc, "onequarter" },
- {{012,012,012,012,012,012,012,000,000,000}, 0x2016, "dblverticalbar" },
- {{030,004,030,004,031,003,005,007,001,000}, 0x00be, "threequarters" },
- {{000,004,000,037,000,004,000,000,000,000}, 0x00f7, "divide" },
+ {{006,011,010,034,010,010,037,000,000}, 0x00a3, "sterling" },
+ {{004,004,004,000,000,000,000,000,000}, 0x0027, "quotesingle" },
+ {{000,004,010,037,010,004,000,000,000}, 0x2190, "arrowleft" },
+ {{020,020,020,020,026,001,002,004,007}, 0x00bd, "onehalf" },
+ {{000,004,002,037,002,004,000,000,000}, 0x2192, "arrowright" },
+ {{000,004,016,025,004,004,000,000,000}, 0x2191, "arrowup" },
+ {{000,000,000,037,000,000,000,000,000}, 0x2013, "endash" },
+ {{010,010,010,010,011,003,005,007,001}, 0x00bc, "onequarter" },
+ {{012,012,012,012,012,012,012,000,000}, 0x2016, "dblverticalbar" },
+ {{030,004,030,004,031,003,005,007,001}, 0x00be, "threequarters" },
+ {{000,004,000,037,000,004,000,000,000}, 0x00f7, "divide" },
 
  /* Extra characters found in the German (SAA5051) character set */
- {{000,000,000,000,000,010,010,020,000,000}, -1, "comma.alt" },
- {{000,000,000,000,000,014,014,000,000,000}, -1, "period.alt" },
- {{000,000,000,010,000,000,010,000,000,000}, -1, "colon.alt" },
- {{000,000,010,000,000,010,010,020,000,000}, -1, "semicolon.alt" },
- {{016,021,020,016,021,016,001,021,016,000}, 0x00a7, "section" },
- {{012,000,016,021,037,021,021,000,000,000}, 0x00c4, "Adieresis" },
- {{012,000,016,021,021,021,016,000,000,000}, 0x00d6, "Odieresis" },
- {{012,000,021,021,021,021,016,000,000,000}, 0x00dc, "Udieresis" },
- {{006,011,006,000,000,000,000,000,000,000}, 0x00b0, "degree" },
- {{012,000,016,001,017,021,017,000,000,000}, 0x00e4, "adieresis" },
- {{000,012,000,016,021,021,016,000,000,000}, 0x00f6, "odieresis" },
- {{000,012,000,021,021,021,017,000,000,000}, 0x00fc, "udieresis" },
- {{014,022,022,026,021,021,026,020,020,000}, 0x00df, "germandbls" },
+ {{000,000,000,000,000,010,010,020,000}, -1, "comma.alt" },
+ {{000,000,000,000,000,014,014,000,000}, -1, "period.alt" },
+ {{000,000,000,010,000,000,010,000,000}, -1, "colon.alt" },
+ {{000,000,010,000,000,010,010,020,000}, -1, "semicolon.alt" },
+ {{016,021,020,016,021,016,001,021,016}, 0x00a7, "section" },
+ {{012,000,016,021,037,021,021,000,000}, 0x00c4, "Adieresis" },
+ {{012,000,016,021,021,021,016,000,000}, 0x00d6, "Odieresis" },
+ {{012,000,021,021,021,021,016,000,000}, 0x00dc, "Udieresis" },
+ {{006,011,006,000,000,000,000,000,000}, 0x00b0, "degree" },
+ {{012,000,016,001,017,021,017,000,000}, 0x00e4, "adieresis" },
+ {{000,012,000,016,021,021,016,000,000}, 0x00f6, "odieresis" },
+ {{000,012,000,021,021,021,017,000,000}, 0x00fc, "udieresis" },
+ {{014,022,022,026,021,021,026,020,020}, 0x00df, "germandbls" },
 
  /* Extra characters found in the Swedish (SAA5052) character set */
- {{000,000,021,016,012,016,021,000,000,000}, 0x00a4, "currency" },
- {{002,004,037,020,036,020,037,000,000,000}, 0x00c9, "Eacute" },
- {{016,011,011,011,011,011,016,000,000,000}, -1, "D.alt" },
- {{010,010,010,010,010,010,017,000,000,000}, -1, "L.alt" },
- {{004,000,016,021,037,021,021,000,000,000}, 0x00c5, "Aring" },
- {{002,004,016,021,037,020,016,000,000,000}, 0x00e9, "eacute" },
- {{004,000,016,001,017,021,017,000,000,000}, 0x00e5, "aring" },
+ {{000,000,021,016,012,016,021,000,000}, 0x00a4, "currency" },
+ {{002,004,037,020,036,020,037,000,000}, 0x00c9, "Eacute" },
+ {{016,011,011,011,011,011,016,000,000}, -1, "D.alt" },
+ {{010,010,010,010,010,010,017,000,000}, -1, "L.alt" },
+ {{004,000,016,021,037,021,021,000,000}, 0x00c5, "Aring" },
+ {{002,004,016,021,037,020,016,000,000}, 0x00e9, "eacute" },
+ {{004,000,016,001,017,021,017,000,000}, 0x00e5, "aring" },
 
  /* Extra characters found in the Italian (SAA5053) character set */
- {{000,000,017,020,020,020,017,002,004,000}, 0x00e7, "ccedilla" },
- {{010,004,021,021,021,021,017,000,000,000}, 0x00f9, "ugrave" },
- {{010,004,016,001,017,021,017,000,000,000}, 0x00e0, "agrave" },
- {{010,004,000,016,021,021,016,000,000,000}, 0x00f2, "ograve" },
- {{010,004,016,021,037,020,016,000,000,000}, 0x00e8, "egrave" },
- {{010,004,000,014,004,004,016,000,000,000}, 0x00ec, "igrave" },
+ {{000,000,017,020,020,020,017,002,004}, 0x00e7, "ccedilla" },
+ {{010,004,021,021,021,021,017,000,000}, 0x00f9, "ugrave" },
+ {{010,004,016,001,017,021,017,000,000}, 0x00e0, "agrave" },
+ {{010,004,000,016,021,021,016,000,000}, 0x00f2, "ograve" },
+ {{010,004,016,021,037,020,016,000,000}, 0x00e8, "egrave" },
+ {{010,004,000,014,004,004,016,000,000}, 0x00ec, "igrave" },
 
  /* Extra characters found in the Belgian (SAA5054) character set */
- {{012,000,014,004,004,004,016,000,000,000}, 0x00ef, "idieresis" },
- {{012,000,016,021,037,020,016,000,000,000}, 0x00eb, "edieresis" },
- {{004,012,016,021,037,020,016,000,000,000}, 0x00ea, "ecircumflex" },
- {{004,002,021,021,021,021,017,000,000,000}, -1, "ugrave.alt" },
- {{004,012,000,014,004,004,016,000,000,000}, 0x00ee, "icircumflex" },
- {{004,012,016,001,017,021,017,000,000,000}, 0x00e2, "acircumflex" },
- {{004,012,016,021,021,021,016,000,000,000}, 0x00f4, "ocircumflex" },
- {{004,012,000,021,021,021,017,000,000,000}, 0x00fb, "ucircumflex" },
- {{000,000,017,020,020,020,017,002,006,000}, -1, "ccedilla.alt" },
+ {{012,000,014,004,004,004,016,000,000}, 0x00ef, "idieresis" },
+ {{012,000,016,021,037,020,016,000,000}, 0x00eb, "edieresis" },
+ {{004,012,016,021,037,020,016,000,000}, 0x00ea, "ecircumflex" },
+ {{004,002,021,021,021,021,017,000,000}, -1, "ugrave.alt" },
+ {{004,012,000,014,004,004,016,000,000}, 0x00ee, "icircumflex" },
+ {{004,012,016,001,017,021,017,000,000}, 0x00e2, "acircumflex" },
+ {{004,012,016,021,021,021,016,000,000}, 0x00f4, "ocircumflex" },
+ {{004,012,000,021,021,021,017,000,000}, 0x00fb, "ucircumflex" },
+ {{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,000}, 0x05d0, "afii57664" }, /* alef */
- {{000,016,002,002,002,002,037,000,000,000}, 0x05d1, "afii57665" }, /* bet */
- {{000,003,001,001,003,005,011,000,000,000}, 0x05d2, "afii57666" }, /* gimel */
- {{000,037,002,002,002,002,002,000,000,000}, 0x05d3, "afii57667" }, /* dalet */
- {{000,037,001,001,021,021,021,000,000,000}, 0x05d4, "afii57668" }, /* he */
- {{000,014,004,004,004,004,004,000,000,000}, 0x05d5, "afii57669" }, /* vav */
- {{000,016,004,010,004,004,004,000,000,000}, 0x05d6, "afii57670" }, /* zayin */
- {{000,037,021,021,021,021,021,000,000,000}, 0x05d7, "afii57671" }, /* het */
- {{000,021,023,025,021,021,037,000,000,000}, 0x05d8, "afii57672" }, /* tet */
- {{000,014,004,000,000,000,000,000,000,000}, 0x05d9, "afii57673" }, /* yod */
- {{000,037,001,001,001,001,001,001,000,000}, 0x05da, "afii57674" }, /*kaffinal*/
- {{000,037,001,001,001,001,037,000,000,000}, 0x05db, "afii57675" }, /* kaf */
- {{020,037,001,001,001,002,014,000,000,000}, 0x05dc, "afii57676" }, /* lamed */
- {{000,037,021,021,021,021,037,000,000,000}, 0x05dd, "afii57677" }, /*memfinal*/
- {{000,026,011,021,021,021,027,000,000,000}, 0x05de, "afii57678" }, /* mem */
- {{000,014,004,004,004,004,004,004,004,000}, 0x05df, "afii57679" }, /*nunfinal*/
- {{000,006,002,002,002,002,016,000,000,000}, 0x05e0, "afii57680" }, /* nun */
- {{000,037,011,021,021,021,016,000,000,000}, 0x05e1, "afii57681" }, /* samekh */
- {{000,011,011,011,011,012,034,000,000,000}, 0x05e2, "afii57682" }, /* ayin */
- {{000,037,011,015,001,001,001,001,000,000}, 0x05e3, "afii57683" }, /* pefinal*/
- {{000,037,011,015,001,001,037,000,000,000}, 0x05e4, "afii57684" }, /* pe */
- {{000,031,012,014,010,010,010,010,000,000}, 0x05e5, "afii57685" }, /*tsadifin*/
- {{000,021,021,012,004,002,037,000,000,000}, 0x05e6, "afii57686" }, /* tsadi */
- {{000,037,001,011,011,012,010,010,000,000}, 0x05e7, "afii57687" }, /* qof */
- {{000,037,001,001,001,001,001,000,000,000}, 0x05e8, "afii57688" }, /* resh */
- {{000,025,025,025,031,021,036,000,000,000}, 0x05e9, "afii57689" }, /* shin */
- {{000,017,011,011,011,011,031,000,000,000}, 0x05ea, "afii57690" }, /* tav */
- {{000,000,025,025,016,000,000,000,000,000}, -1, "oldsheqel" },
+ {{000,021,011,025,022,021,021,000,000}, 0x05d0, "afii57664" }, /* alef */
+ {{000,016,002,002,002,002,037,000,000}, 0x05d1, "afii57665" }, /* bet */
+ {{000,003,001,001,003,005,011,000,000}, 0x05d2, "afii57666" }, /* gimel */
+ {{000,037,002,002,002,002,002,000,000}, 0x05d3, "afii57667" }, /* dalet */
+ {{000,037,001,001,021,021,021,000,000}, 0x05d4, "afii57668" }, /* he */
+ {{000,014,004,004,004,004,004,000,000}, 0x05d5, "afii57669" }, /* vav */
+ {{000,016,004,010,004,004,004,000,000}, 0x05d6, "afii57670" }, /* zayin */
+ {{000,037,021,021,021,021,021,000,000}, 0x05d7, "afii57671" }, /* het */
+ {{000,021,023,025,021,021,037,000,000}, 0x05d8, "afii57672" }, /* tet */
+ {{000,014,004,000,000,000,000,000,000}, 0x05d9, "afii57673" }, /* yod */
+ {{000,037,001,001,001,001,001,001,000}, 0x05da, "afii57674" }, /*kaffinal*/
+ {{000,037,001,001,001,001,037,000,000}, 0x05db, "afii57675" }, /* kaf */
+ {{020,037,001,001,001,002,014,000,000}, 0x05dc, "afii57676" }, /* lamed */
+ {{000,037,021,021,021,021,037,000,000}, 0x05dd, "afii57677" }, /*memfinal*/
+ {{000,026,011,021,021,021,027,000,000}, 0x05de, "afii57678" }, /* mem */
+ {{000,014,004,004,004,004,004,004,004}, 0x05df, "afii57679" }, /*nunfinal*/
+ {{000,006,002,002,002,002,016,000,000}, 0x05e0, "afii57680" }, /* nun */
+ {{000,037,011,021,021,021,016,000,000}, 0x05e1, "afii57681" }, /* samekh */
+ {{000,011,011,011,011,012,034,000,000}, 0x05e2, "afii57682" }, /* ayin */
+ {{000,037,011,015,001,001,001,001,000}, 0x05e3, "afii57683" }, /* pefinal*/
+ {{000,037,011,015,001,001,037,000,000}, 0x05e4, "afii57684" }, /* pe */
+ {{000,031,012,014,010,010,010,010,000}, 0x05e5, "afii57685" }, /*tsadifin*/
+ {{000,021,021,012,004,002,037,000,000}, 0x05e6, "afii57686" }, /* tsadi */
+ {{000,037,001,011,011,012,010,010,000}, 0x05e7, "afii57687" }, /* qof */
+ {{000,037,001,001,001,001,001,000,000}, 0x05e8, "afii57688" }, /* resh */
+ {{000,025,025,025,031,021,036,000,000}, 0x05e9, "afii57689" }, /* shin */
+ {{000,017,011,011,011,011,031,000,000}, 0x05ea, "afii57690" }, /* 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,000}, 0x044b, "afii10093" }, /* yeru */
- {{022,025,025,035,025,025,022,000,000,000}, 0x042e, "afii10048" }, /* Iu */
- {{016,021,021,021,037,021,021,000,000,000}, 0x0410, "afii10017" }, /* A */
- {{037,020,020,037,021,021,037,000,000,000}, 0x0411, "afii10018" }, /* Be */
- {{022,022,022,022,022,022,037,001,000,000}, 0x0426, "afii10040" }, /* Tse */
- {{006,012,012,012,012,012,037,021,000,000}, 0x0414, "afii10021" }, /* De */
- {{037,020,020,036,020,020,037,000,000,000}, 0x0415, "afii10022" }, /* Ie */
- {{004,037,025,025,025,037,004,000,000,000}, 0x0424, "afii10038" }, /* Ef */
- {{037,020,020,020,020,020,020,000,000,000}, 0x0413, "afii10020" }, /* Ghe */
- {{021,021,012,004,012,021,021,000,000,000}, 0x0425, "afii10039" }, /* Ha */
- {{021,021,023,025,031,021,021,000,000,000}, 0x0418, "afii10026" }, /* I */
- {{025,021,023,025,031,021,021,000,000,000}, 0x0419, "afii10027" }, /* Ishort */
- {{021,022,024,030,024,022,021,000,000,000}, 0x041a, "afii10028" }, /* Ka */
- {{007,011,011,011,011,011,031,000,000,000}, 0x041b, "afii10029" }, /* El */
- {{021,033,025,025,021,021,021,000,000,000}, 0x041c, "afii10030" }, /* Em */
- {{021,021,021,037,021,021,021,000,000,000}, 0x041d, "afii10031" }, /* En */
- {{016,021,021,021,021,021,016,000,000,000}, 0x041e, "afii10032" }, /* O */
- {{037,021,021,021,021,021,021,000,000,000}, 0x041f, "afii10033" }, /* Pe */
- {{017,021,021,017,005,011,021,000,000,000}, 0x042f, "afii10049" }, /* Ya */
- {{036,021,021,036,020,020,020,000,000,000}, 0x0420, "afii10034" }, /* Er */
- {{016,021,020,020,020,021,016,000,000,000}, 0x0421, "afii10035" }, /* Es */
- {{037,004,004,004,004,004,004,000,000,000}, 0x0422, "afii10036" }, /* Te */
- {{021,021,021,037,001,001,037,000,000,000}, 0x0423, "afii10037" }, /* U */
- {{025,025,025,016,025,025,025,000,000,000}, 0x0416, "afii10024" }, /* Zhe */
- {{036,021,021,036,021,021,036,000,000,000}, 0x0412, "afii10019" }, /* Ve */
- {{020,020,020,037,021,021,037,000,000,000}, 0x042c, "afii10046" }, /* Soft */
- {{030,010,010,017,011,011,017,000,000,000}, 0x042a, "afii10044" }, /* Hard */
- {{016,021,001,006,001,021,016,000,000,000}, 0x0417, "afii10025" }, /* Ze */
- {{025,025,025,025,025,025,037,000,000,000}, 0x0428, "afii10042" }, /* Sha */
- {{014,022,001,007,001,022,014,000,000,000}, 0x042d, "afii10047" }, /* E */
- {{025,025,025,025,025,025,037,001,000,000}, 0x0429, "afii10043" }, /* Shcha */
- {{021,021,021,037,001,001,001,000,000,000}, 0x0427, "afii10041" }, /* Che */
- {{021,021,021,035,025,025,035,000,000,000}, 0x042b, "afii10045" }, /* Yeru */
- {{000,000,022,025,035,025,022,000,000,000}, 0x044e, "afii10096" }, /* yu */
- {{000,000,016,001,017,021,017,000,000,000}, 0x0430, "afii10065" }, /* a */
- {{016,020,036,021,021,021,036,000,000,000}, 0x0431, "afii10066" }, /* be */
- {{000,000,022,022,022,022,037,001,000,000}, 0x0446, "afii10088" }, /* tse */
- {{000,000,006,012,012,012,037,021,000,000}, 0x0434, "afii10069" }, /* de */
- {{000,000,016,021,037,020,016,000,000,000}, 0x0435, "afii10070" }, /* ie */
- {{000,004,016,025,025,025,016,004,000,000}, 0x0444, "afii10086" }, /* ef */
- {{000,000,037,020,020,020,020,000,000,000}, 0x0433, "afii10068" }, /* ghe */
- {{000,000,021,012,004,012,021,000,000,000}, 0x0445, "afii10087" }, /* ha */
- {{000,000,021,023,025,031,021,000,000,000}, 0x0438, "afii10074" }, /* i */
- {{000,004,021,023,025,031,021,000,000,000}, 0x0439, "afii10075" }, /* ishort */
- {{000,000,021,022,034,022,021,000,000,000}, 0x043a, "afii10076" }, /* ka */
- {{000,000,007,011,011,011,031,000,000,000}, 0x043b, "afii10077" }, /* el */
- {{000,000,021,033,025,021,021,000,000,000}, 0x043c, "afii10078" }, /* em */
- {{000,000,021,021,037,021,021,000,000,000}, 0x043d, "afii10079" }, /* en */
- {{000,000,016,021,021,021,016,000,000,000}, 0x043e, "afii10080" }, /* o */
- {{000,000,037,021,021,021,021,000,000,000}, 0x043f, "afii10081" }, /* pe */
- {{000,000,017,021,017,005,031,000,000,000}, 0x044f, "afii10097" }, /* ya */
- {{000,000,036,021,021,021,036,020,020,000}, 0x0440, "afii10082" }, /* er */
- {{000,000,016,021,020,021,016,000,000,000}, 0x0441, "afii10083" }, /* es */
- {{000,000,037,004,004,004,004,000,000,000}, 0x0442, "afii10084" }, /* te */
- {{000,000,021,021,021,021,017,001,016,000}, 0x0443, "afii10085" }, /* u */
- {{000,000,025,025,016,025,025,000,000,000}, 0x0436, "afii10072" }, /* zhe */
- {{000,000,036,021,036,021,036,000,000,000}, 0x0432, "afii10067" }, /* ve */
- {{000,000,020,020,036,021,036,000,000,000}, 0x044c, "afii10094" }, /* soft */
- {{000,000,030,010,016,011,016,000,000,000}, 0x044a, "afii10092" }, /* hard */
- {{000,000,016,021,006,021,016,000,000,000}, 0x0437, "afii10073" }, /* ze */
- {{000,000,025,025,025,025,037,000,000,000}, 0x0448, "afii10090" }, /* sha */
- {{000,000,014,022,006,022,014,000,000,000}, 0x044d, "afii10095" }, /* e */
- {{000,000,025,025,025,025,037,001,000,000}, 0x0449, "afii10091" }, /* shcha */
- {{000,000,021,021,021,017,001,000,000,000}, 0x0447, "afii10089" }, /* che */
+ {{000,000,021,021,035,025,035,000,000}, 0x044b, "afii10093" }, /* yeru */
+ {{022,025,025,035,025,025,022,000,000}, 0x042e, "afii10048" }, /* Iu */
+ {{016,021,021,021,037,021,021,000,000}, 0x0410, "afii10017" }, /* A */
+ {{037,020,020,037,021,021,037,000,000}, 0x0411, "afii10018" }, /* Be */
+ {{022,022,022,022,022,022,037,001,000}, 0x0426, "afii10040" }, /* Tse */
+ {{006,012,012,012,012,012,037,021,000}, 0x0414, "afii10021" }, /* De */
+ {{037,020,020,036,020,020,037,000,000}, 0x0415, "afii10022" }, /* Ie */
+ {{004,037,025,025,025,037,004,000,000}, 0x0424, "afii10038" }, /* Ef */
+ {{037,020,020,020,020,020,020,000,000}, 0x0413, "afii10020" }, /* Ghe */
+ {{021,021,012,004,012,021,021,000,000}, 0x0425, "afii10039" }, /* Ha */
+ {{021,021,023,025,031,021,021,000,000}, 0x0418, "afii10026" }, /* I */
+ {{025,021,023,025,031,021,021,000,000}, 0x0419, "afii10027" }, /* Ishort */
+ {{021,022,024,030,024,022,021,000,000}, 0x041a, "afii10028" }, /* Ka */
+ {{007,011,011,011,011,011,031,000,000}, 0x041b, "afii10029" }, /* El */
+ {{021,033,025,025,021,021,021,000,000}, 0x041c, "afii10030" }, /* Em */
+ {{021,021,021,037,021,021,021,000,000}, 0x041d, "afii10031" }, /* En */
+ {{016,021,021,021,021,021,016,000,000}, 0x041e, "afii10032" }, /* O */
+ {{037,021,021,021,021,021,021,000,000}, 0x041f, "afii10033" }, /* Pe */
+ {{017,021,021,017,005,011,021,000,000}, 0x042f, "afii10049" }, /* Ya */
+ {{036,021,021,036,020,020,020,000,000}, 0x0420, "afii10034" }, /* Er */
+ {{016,021,020,020,020,021,016,000,000}, 0x0421, "afii10035" }, /* Es */
+ {{037,004,004,004,004,004,004,000,000}, 0x0422, "afii10036" }, /* Te */
+ {{021,021,021,037,001,001,037,000,000}, 0x0423, "afii10037" }, /* U */
+ {{025,025,025,016,025,025,025,000,000}, 0x0416, "afii10024" }, /* Zhe */
+ {{036,021,021,036,021,021,036,000,000}, 0x0412, "afii10019" }, /* Ve */
+ {{020,020,020,037,021,021,037,000,000}, 0x042c, "afii10046" }, /* Soft */
+ {{030,010,010,017,011,011,017,000,000}, 0x042a, "afii10044" }, /* Hard */
+ {{016,021,001,006,001,021,016,000,000}, 0x0417, "afii10025" }, /* Ze */
+ {{025,025,025,025,025,025,037,000,000}, 0x0428, "afii10042" }, /* Sha */
+ {{014,022,001,007,001,022,014,000,000}, 0x042d, "afii10047" }, /* E */
+ {{025,025,025,025,025,025,037,001,000}, 0x0429, "afii10043" }, /* Shcha */
+ {{021,021,021,037,001,001,001,000,000}, 0x0427, "afii10041" }, /* Che */
+ {{021,021,021,035,025,025,035,000,000}, 0x042b, "afii10045" }, /* Yeru */
+ {{000,000,022,025,035,025,022,000,000}, 0x044e, "afii10096" }, /* yu */
+ {{000,000,016,001,017,021,017,000,000}, 0x0430, "afii10065" }, /* a */
+ {{016,020,036,021,021,021,036,000,000}, 0x0431, "afii10066" }, /* be */
+ {{000,000,022,022,022,022,037,001,000}, 0x0446, "afii10088" }, /* tse */
+ {{000,000,006,012,012,012,037,021,000}, 0x0434, "afii10069" }, /* de */
+ {{000,000,016,021,037,020,016,000,000}, 0x0435, "afii10070" }, /* ie */
+ {{000,004,016,025,025,025,016,004,000}, 0x0444, "afii10086" }, /* ef */
+ {{000,000,037,020,020,020,020,000,000}, 0x0433, "afii10068" }, /* ghe */
+ {{000,000,021,012,004,012,021,000,000}, 0x0445, "afii10087" }, /* ha */
+ {{000,000,021,023,025,031,021,000,000}, 0x0438, "afii10074" }, /* i */
+ {{000,004,021,023,025,031,021,000,000}, 0x0439, "afii10075" }, /* ishort */
+ {{000,000,021,022,034,022,021,000,000}, 0x043a, "afii10076" }, /* ka */
+ {{000,000,007,011,011,011,031,000,000}, 0x043b, "afii10077" }, /* el */
+ {{000,000,021,033,025,021,021,000,000}, 0x043c, "afii10078" }, /* em */
+ {{000,000,021,021,037,021,021,000,000}, 0x043d, "afii10079" }, /* en */
+ {{000,000,016,021,021,021,016,000,000}, 0x043e, "afii10080" }, /* o */
+ {{000,000,037,021,021,021,021,000,000}, 0x043f, "afii10081" }, /* pe */
+ {{000,000,017,021,017,005,031,000,000}, 0x044f, "afii10097" }, /* ya */
+ {{000,000,036,021,021,021,036,020,020}, 0x0440, "afii10082" }, /* er */
+ {{000,000,016,021,020,021,016,000,000}, 0x0441, "afii10083" }, /* es */
+ {{000,000,037,004,004,004,004,000,000}, 0x0442, "afii10084" }, /* te */
+ {{000,000,021,021,021,021,017,001,016}, 0x0443, "afii10085" }, /* u */
+ {{000,000,025,025,016,025,025,000,000}, 0x0436, "afii10072" }, /* zhe */
+ {{000,000,036,021,036,021,036,000,000}, 0x0432, "afii10067" }, /* ve */
+ {{000,000,020,020,036,021,036,000,000}, 0x044c, "afii10094" }, /* soft */
+ {{000,000,030,010,016,011,016,000,000}, 0x044a, "afii10092" }, /* hard */
+ {{000,000,016,021,006,021,016,000,000}, 0x0437, "afii10073" }, /* ze */
+ {{000,000,025,025,025,025,037,000,000}, 0x0448, "afii10090" }, /* sha */
+ {{000,000,014,022,006,022,014,000,000}, 0x044d, "afii10095" }, /* e */
+ {{000,000,025,025,025,025,037,001,000}, 0x0449, "afii10091" }, /* shcha */
+ {{000,000,021,021,021,017,001,000,000}, 0x0447, "afii10089" }, /* che */
 
  /*
   * The second batch of glyphs was found in the appendices to
@@ -357,140 +357,140 @@ struct glyph {
   * characters in a 5x9 matrix
   */
  /* ASV-CODAR glyphs from Appendix 3 */
- {{001,001,001,001,001,001,000,000,000,000}, 0x0627, "asvcodar-alef" },
- {{000,000,000,001,001,037,000,004,000,000}, 0x0628, "asvcodar-beh" },
- {{000,012,000,001,001,037,000,000,000,000}, 0x062a, "asvcodar-teh" },
- {{004,012,000,001,001,037,000,000,000,000}, 0x062b, "asvcodar-theh" },
- {{000,000,010,024,002,037,000,004,000,000}, 0x062c, "asvcodar-jeem" },
- {{000,000,010,024,002,037,000,000,000,000}, 0x062d, "asvcodar-hah" },
- {{004,000,010,024,002,037,000,000,000,000}, 0x062e, "asvcodar-khah" },
- {{000,004,002,001,001,017,000,000,000,000}, 0x062f, "asvcodar-dal" },
- {{001,004,002,001,001,017,000,000,000,000}, 0x0630, "asvcodar-thal" },
- {{000,000,000,001,001,001,002,004,010,000}, 0x0631, "asvcodar-ra" },
- {{000,004,000,001,001,001,002,004,010,000}, 0x0632, "asvcodar-zain" },
- {{000,000,000,025,025,037,000,000,000,000}, 0x0633, "asvcodar-seen" },
- {{004,012,000,025,025,037,000,000,000,000}, 0x0634, "asvcodar-sheen" },
- {{000,000,000,007,011,037,000,000,000,000}, 0x0635, "asvcodar-sad" },
- {{000,004,000,007,011,037,000,000,000,000}, 0x0636, "asvcodar-dad" },
- {{010,010,010,017,011,037,000,000,000,000}, 0x0637, "asvcodar-tah" },
- {{010,012,010,017,011,037,000,000,000,000}, 0x0638, "asvcodar-zah" },
- {{000,000,006,010,010,037,000,000,000,000}, 0x0639, "asvcodar-ain" },
- {{004,000,006,010,010,037,000,000,000,000}, 0x063a, "asvcodar-ghain" },
- {{002,000,002,005,003,037,000,000,000,000}, 0x0641, "asvcodar-feh" },
- {{012,000,002,005,003,037,000,000,000,000}, 0x0642, "asvcodar-qaf" },
- {{001,002,004,016,001,037,000,000,000,000}, 0x0643, "asvcodar-kaf" },
- {{001,001,001,001,001,037,000,000,000,000}, 0x0644, "asvcodar-lam" },
- {{000,000,000,000,006,031,006,000,000,000}, 0x0645, "asvcodar-meem" },
- {{000,004,000,001,001,037,000,000,000,000}, 0x0646, "asvcodar-noon" },
- {{000,006,001,015,013,037,000,000,000,000}, 0x0647, "asvcodar-heh" },
- {{000,000,000,003,005,007,001,001,016,000}, 0x0648, "asvcodar-waw" },
- {{000,000,000,001,001,037,000,012,000,000}, 0x064a, "asvcodar-yeh" },
- {{000,000,006,010,010,006,010,000,000,000}, 0x0621, "asvcodar-hamza" },
- {{000,000,000,003,025,025,034,000,012,000}, 0xfef2, "asvcodar-yehfinal" },
- {{000,000,000,003,025,025,034,000,000,000}, 0x0649, "asvcodar-alefmaksura" },
- {{000,000,001,003,005,017,000,000,000,000}, -1, "asvcodar-32" },
- {{000,024,001,003,005,017,000,000,000,000}, -1, "asvcodar-tehmarbuta" },
-
- {{015,011,015,001,001,001,000,000,000,000}, 0x0623, "asvcodar-hamzaonalef" },
- {{001,001,001,001,015,011,014,000,000,000}, 0x0625, "asvcodar-hamzaunderalef" },
- {{017,010,001,001,001,001,001,000,000,000}, 0x0622, "asvcodar-maddaonalef" },
- {{014,010,014,001,001,037,000,000,000,000}, -1, "asvcodar-37" },
- {{014,010,014,000,003,005,024,022,036,000}, 0x0626, "asvcodar-hamzaonyeh" },
- {{030,020,030,003,005,007,001,001,016,000}, 0x0624, "asvcodar-hamzaonwaw" },
-
- {{007,000,000,000,000,000,000,000,000,000}, 0xfe76, "asvcodar-fatha" },
- {{007,000,000,000,000,037,000,000,000,000}, 0xfe77, "asvcodar-fathatatweel" },
- {{003,001,002,000,000,000,000,000,000,000}, 0xfe78, "asvcodar-damma" },
- {{003,001,002,000,000,037,000,000,000,000}, 0xfe79, "asvcodar-dammatatweel" },
- {{000,000,000,000,000,000,000,000,007,000}, 0xfe7a, "asvcodar-kasra" },
- {{000,000,000,000,000,037,000,000,007,000}, 0xfe7b, "asvcodar-kasratatweel" },
- {{007,000,005,007,000,000,000,000,000,000}, -1, "asvcodar-46" },
- {{003,001,002,000,005,007,000,000,000,000}, -1, "asvcodar-47" },
- {{005,007,000,007,000,000,000,000,000,000}, -1, "asvcodar-48" },
- {{005,007,000,007,000,037,000,000,000,000}, -1, "asvcodar-49" },
- {{007,000,005,007,000,037,000,000,000,000}, -1, "asvcodar-50" },
- {{005,007,000,000,000,037,000,000,000,000}, 0xfe7d, "asvcodar-shaddatatweel" },
- {{005,007,000,000,000,000,000,000,000,000}, 0xfe7c, "asvcodar-shadda" },
- {{002,005,002,000,000,000,000,000,000,000}, 0xfe7e, "asvcodar-sukun" },
- {{002,005,002,000,000,037,000,000,000,000}, 0xfe7f, "asvcodar-sukuntatweel" },
- {{016,016,000,000,000,000,000,000,000,000}, 0xfe70, "asvcodar-fathatan" },
- {{033,011,022,000,000,000,000,000,000,000}, -1, "asvcodar-56" },
- {{000,000,000,000,000,000,000,016,016,000}, 0xfe74, "asvcodar-kasratan" },
- {{030,010,025,007,000,037,000,000,000,000}, -1, "asvcodar-58" },
- {{007,007,005,007,000,000,000,000,000,000}, -1, "asvcodar-59" },
- {{033,011,022,000,005,007,000,000,000,000}, -1, "asvcodar-60" },
- {{012,016,000,016,016,000,000,000,000,000}, -1, "asvcodar-61" },
-
- {{014,010,002,005,003,037,000,000,000,000}, -1, "asvcodar-62" },
- {{000,000,000,001,001,037,000,012,004,000}, -1, "asvcodar-63" },
- {{005,012,024,016,001,037,000,000,000,000}, -1, "asvcodar-64" },
+ {{001,001,001,001,001,001,000,000,000}, 0x0627, "asvcodar-alef" },
+ {{000,000,000,001,001,037,000,004,000}, 0x0628, "asvcodar-beh" },
+ {{000,012,000,001,001,037,000,000,000}, 0x062a, "asvcodar-teh" },
+ {{004,012,000,001,001,037,000,000,000}, 0x062b, "asvcodar-theh" },
+ {{000,000,010,024,002,037,000,004,000}, 0x062c, "asvcodar-jeem" },
+ {{000,000,010,024,002,037,000,000,000}, 0x062d, "asvcodar-hah" },
+ {{004,000,010,024,002,037,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,037,000,000,000}, 0x0633, "asvcodar-seen" },
+ {{004,012,000,025,025,037,000,000,000}, 0x0634, "asvcodar-sheen" },
+ {{000,000,000,007,011,037,000,000,000}, 0x0635, "asvcodar-sad" },
+ {{000,004,000,007,011,037,000,000,000}, 0x0636, "asvcodar-dad" },
+ {{010,010,010,017,011,037,000,000,000}, 0x0637, "asvcodar-tah" },
+ {{010,012,010,017,011,037,000,000,000}, 0x0638, "asvcodar-zah" },
+ {{000,000,006,010,010,037,000,000,000}, 0x0639, "asvcodar-ain" },
+ {{004,000,006,010,010,037,000,000,000}, 0x063a, "asvcodar-ghain" },
+ {{002,000,002,005,003,037,000,000,000}, 0x0641, "asvcodar-feh" },
+ {{012,000,002,005,003,037,000,000,000}, 0x0642, "asvcodar-qaf" },
+ {{001,002,004,016,001,037,000,000,000}, 0x0643, "asvcodar-kaf" },
+ {{001,001,001,001,001,037,000,000,000}, 0x0644, "asvcodar-lam" },
+ {{000,000,000,000,006,031,006,000,000}, 0x0645, "asvcodar-meem" },
+ {{000,004,000,001,001,037,000,000,000}, 0x0646, "asvcodar-noon" },
+ {{000,006,001,015,013,037,000,000,000}, 0x0647, "asvcodar-heh" },
+ {{000,000,000,003,005,007,001,001,016}, 0x0648, "asvcodar-waw" },
+ {{000,000,000,001,001,037,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}, -1, "asvcodar-32" },
+ {{000,024,001,003,005,017,000,000,000}, -1, "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,037,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,037,000,000,000}, 0xfe77, "asvcodar-fathatatweel" },
+ {{003,001,002,000,000,000,000,000,000}, 0xfe78, "asvcodar-damma" },
+ {{003,001,002,000,000,037,000,000,000}, 0xfe79, "asvcodar-dammatatweel" },
+ {{000,000,000,000,000,000,000,000,007}, 0xfe7a, "asvcodar-kasra" },
+ {{000,000,000,000,000,037,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,037,000,000,000}, -1, "asvcodar-49" },
+ {{007,000,005,007,000,037,000,000,000}, -1, "asvcodar-50" },
+ {{005,007,000,000,000,037,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,037,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,037,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,037,000,000,000}, -1, "asvcodar-62" },
+ {{000,000,000,001,001,037,000,012,004}, -1, "asvcodar-63" },
+ {{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,000}, 0x0660, "afii57392" }, /* zero */
- {{000,004,004,004,004,004,000,000,000,000}, 0x0661, "afii57393" }, /* one */
- {{000,012,014,010,010,010,000,000,000,000}, 0x0662, "afii57394" }, /* two */
- {{000,025,032,020,020,020,000,000,000,000}, 0x0663, "afii57395" }, /* three */
- {{000,006,010,006,010,006,000,000,000,000}, 0x0664, "afii57396" }, /* four */
- {{000,016,021,021,021,016,000,000,000,000}, 0x0665, "afii57397" }, /* five */
- {{000,016,002,002,002,002,000,000,000,000}, 0x0666, "afii57398" }, /* six */
- {{000,021,021,012,012,004,000,000,000,000}, 0x0667, "afii57399" }, /* seven */
- {{000,004,012,012,021,021,000,000,000,000}, 0x0668, "afii57400" }, /* eight */
- {{000,014,022,016,002,002,000,000,000,000}, 0x0669, "afii57401" }, /* nine */
+ {{000,000,000,004,000,000,000,000,000}, 0x0660, "afii57392" }, /* zero */
+ {{000,004,004,004,004,004,000,000,000}, 0x0661, "afii57393" }, /* one */
+ {{000,012,014,010,010,010,000,000,000}, 0x0662, "afii57394" }, /* two */
+ {{000,025,032,020,020,020,000,000,000}, 0x0663, "afii57395" }, /* three */
+ {{000,006,010,006,010,006,000,000,000}, 0x0664, "afii57396" }, /* four */
+ {{000,016,021,021,021,016,000,000,000}, 0x0665, "afii57397" }, /* five */
+ {{000,016,002,002,002,002,000,000,000}, 0x0666, "afii57398" }, /* six */
+ {{000,021,021,012,012,004,000,000,000}, 0x0667, "afii57399" }, /* seven */
+ {{000,004,012,012,021,021,000,000,000}, 0x0668, "afii57400" }, /* eight */
+ {{000,014,022,016,002,002,000,000,000}, 0x0669, "afii57401" }, /* nine */
  /* Appendix 9 also contains a Hebrew alphabet, but we've already got one. */
 
  /*
   * The third batch of glyphs were specially designed for this font.
   */
  /* Additional glyphs by bjh21 */
- {{010,004,002,000,000,000,000,000,000,000}, 0x0060, "grave" },
- {{004,004,004,004,004,004,004,000,000,000}, 0x007c, "bar" },
- {{004,000,004,004,004,004,004,000,000,000}, 0x00a1, "exclamdown" },
- {{000,004,017,024,024,024,017,004,000,000}, 0x00a2, "cent" },
- {{021,012,037,004,037,004,004,000,000,000}, 0x00a5, "yen" },
- {{022,000,000,000,000,000,000,000,000,000}, 0x00a8, "dieresis" },
- {{037,000,000,000,000,000,000,000,000,000}, 0x00af, "macron" },
- {{004,004,037,004,004,000,037,000,000,000}, 0x00b1, "plusminus" },
- {{002,004,010,000,000,000,000,000,000,000}, 0x00b4, "acute" },
- {{000,000,022,022,022,022,035,020,020,000}, 0x00b5, "uni00b5" }, /* micro */
- {{015,025,025,015,005,005,005,000,000,000}, 0x00b6, "paragraph" },
- {{000,000,000,004,000,000,000,000,000,000}, 0x00b7, "periodcentered" },
- {{004,000,004,004,010,021,016,000,000,000}, 0x00bf, "questiondown" },
- {{000,021,012,004,012,021,000,000,000,000}, 0x00d7, "multiply" },
- {{002,004,004,000,000,000,000,000,000,000}, 0x2018, "quoteleft" },
- {{000,000,000,000,000,004,004,010,000,000}, 0x201a, "quotesinglbase" },
- {{011,022,022,000,000,000,000,000,000,000}, 0x201c, "quotedblleft" },
- {{011,011,022,000,000,000,000,000,000,000}, 0x201d, "quotedblright" },
- {{000,000,000,000,000,011,011,022,000,000}, 0x201e, "quotedblbase" },
- {{022,022,011,000,000,000,000,000,000,000}, 0x201f, "uni201F" },
- {{000,004,004,025,016,004,000,000,000,000}, 0x2193, "arrowdown" },
+ {{010,004,002,000,000,000,000,000,000}, 0x0060, "grave" },
+ {{004,004,004,004,004,004,004,000,000}, 0x007c, "bar" },
+ {{004,000,004,004,004,004,004,000,000}, 0x00a1, "exclamdown" },
+ {{000,004,017,024,024,024,017,004,000}, 0x00a2, "cent" },
+ {{021,012,037,004,037,004,004,000,000}, 0x00a5, "yen" },
+ {{022,000,000,000,000,000,000,000,000}, 0x00a8, "dieresis" },
+ {{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 */
+ {{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" },
+ {{000,021,012,004,012,021,000,000,000}, 0x00d7, "multiply" },
+ {{002,004,004,000,000,000,000,000,000}, 0x2018, "quoteleft" },
+ {{000,000,000,000,000,004,004,010,000}, 0x201a, "quotesinglbase" },
+ {{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" },
+ {{000,004,004,025,016,004,000,000,000}, 0x2193, "arrowdown" },
 
  /* This is getting silly. */
- {{000,000,016,021,037,021,021,000,000,000}, -1, "a.sc" },
- {{000,000,036,021,036,021,036,000,000,000}, -1, "b.sc" },
- {{000,000,016,021,020,021,016,000,000,000}, -1, "c.sc" },
- {{000,000,036,021,021,021,036,000,000,000}, -1, "d.sc" },
- {{000,000,037,020,036,020,037,000,000,000}, -1, "e.sc" },
- {{000,000,037,020,036,020,020,000,000,000}, -1, "f.sc" },
- {{000,000,017,020,023,021,017,000,000,000}, -1, "g.sc" },
- {{000,000,021,021,037,021,021,000,000,000}, -1, "h.sc" },
- {{000,000,016,004,004,004,016,000,000,000}, -1, "i.sc" },
- {{000,000,001,001,001,021,016,000,000,000}, -1, "j.sc" },
- {{000,000,021,022,034,022,021,000,000,000}, -1, "k.sc" },
- {{000,000,020,020,020,020,037,000,000,000}, -1, "l.sc" },
- {{000,000,021,033,025,021,021,000,000,000}, -1, "m.sc" },
- {{000,000,021,031,025,023,021,000,000,000}, -1, "n.sc" },
- {{000,000,016,021,021,021,016,000,000,000}, -1, "o.sc" },
- {{000,000,036,021,036,020,020,000,000,000}, -1, "p.sc" },
- {{000,000,016,021,025,022,015,000,000,000}, -1, "q.sc" },
- {{000,000,036,021,036,022,021,000,000,000}, -1, "r.sc" },
- {{000,000,017,020,016,001,036,000,000,000}, -1, "s.sc" },
- {{000,000,037,004,004,004,004,000,000,000}, -1, "t.sc" },
- {{000,000,021,021,021,021,016,000,000,000}, -1, "u.sc" },
- {{000,000,021,021,012,012,004,000,000,000}, -1, "v.sc" },
- {{000,000,021,021,025,025,012,000,000,000}, -1, "w.sc" },
- {{000,000,021,012,004,012,021,000,000,000}, -1, "x.sc" },
- {{000,000,021,012,004,004,004,000,000,000}, -1, "y.sc" },
- {{000,000,037,002,004,010,037,000,000,000}, -1, "z.sc" },
+ {{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" },
+ {{000,000,036,021,021,021,036,000,000}, -1, "d.sc" },
+ {{000,000,037,020,036,020,037,000,000}, -1, "e.sc" },
+ {{000,000,037,020,036,020,020,000,000}, -1, "f.sc" },
+ {{000,000,017,020,023,021,017,000,000}, -1, "g.sc" },
+ {{000,000,021,021,037,021,021,000,000}, -1, "h.sc" },
+ {{000,000,016,004,004,004,016,000,000}, -1, "i.sc" },
+ {{000,000,001,001,001,021,016,000,000}, -1, "j.sc" },
+ {{000,000,021,022,034,022,021,000,000}, -1, "k.sc" },
+ {{000,000,020,020,020,020,037,000,000}, -1, "l.sc" },
+ {{000,000,021,033,025,021,021,000,000}, -1, "m.sc" },
+ {{000,000,021,031,025,023,021,000,000}, -1, "n.sc" },
+ {{000,000,016,021,021,021,016,000,000}, -1, "o.sc" },
+ {{000,000,036,021,036,020,020,000,000}, -1, "p.sc" },
+ {{000,000,016,021,025,022,015,000,000}, -1, "q.sc" },
+ {{000,000,036,021,036,022,021,000,000}, -1, "r.sc" },
+ {{000,000,017,020,016,001,036,000,000}, -1, "s.sc" },
+ {{000,000,037,004,004,004,004,000,000}, -1, "t.sc" },
+ {{000,000,021,021,021,021,016,000,000}, -1, "u.sc" },
+ {{000,000,021,021,012,012,004,000,000}, -1, "v.sc" },
+ {{000,000,021,021,025,025,012,000,000}, -1, "w.sc" },
+ {{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,002,004,010,037,000,000}, -1, "z.sc" },
 };
 
 int