From: Ben Harris Date: Fri, 1 Nov 2013 21:02:26 +0000 (+0000) Subject: Merge CP437 changes. X-Git-Tag: bedstead-001.000~67 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~bjharris/git?a=commitdiff_plain;h=5055c00061e56d2374b5d9635aa2632cf5c529af;p=bedstead.git Merge CP437 changes. --- 5055c00061e56d2374b5d9635aa2632cf5c529af diff --cc bedstead.c index c0aa499,4003918..b99e397 --- a/bedstead.c +++ b/bedstead.c @@@ -507,93 -509,28 +507,101 @@@ struct glyph {{016,021,021,021,016,000,037,000,000}, 0x00ba, "ordmasculine" }, {{000,000,000,022,011,022,000,000,000}, 0x00bb, "guillemotright" }, {{000,000,004,000,004,004,010,021,016}, 0x00bf, "questiondown" }, + {{010,004,016,021,037,021,021,000,000}, 0x00c0, "Agrave" }, + {{002,004,016,021,037,021,021,000,000}, 0x00c1, "Aacute" }, + {{004,012,016,021,037,021,021,000,000}, 0x00c2, "Acircumflex" }, + {{005,012,016,021,037,021,021,000,000}, 0x00c3, "Atilde" }, {{017,024,024,036,024,024,027,000,000}, 0x00c6, "AE" }, {{016,021,020,020,020,021,016,004,010}, 0x00c7, "Ccedilla" }, ++<<<<<<< TREE + {{010,004,037,020,036,020,037,000,000}, 0x00c8, "Egrave" }, + {{004,012,037,020,036,020,037,000,000}, 0x00ca, "Ecircumflex" }, + {{012,000,037,020,036,020,037,000,000}, 0x00cb, "Edieresis" }, + {{010,004,000,016,004,004,016,000,000}, 0x00cc, "Igrave" }, + {{002,004,000,016,004,004,016,000,000}, 0x00cd, "Iacute" }, + {{004,012,000,016,004,004,016,000,000}, 0x00ce, "Icircumflex" }, + {{012,000,016,004,004,004,016,000,000}, 0x00cf, "Idieresis" }, + {{016,011,011,035,011,011,016,000,000}, 0x00d0, "Eth" }, + {{005,012,000,031,025,023,021,000,000}, 0x00d1, "Ntilde" }, + {{010,004,016,021,021,021,016,000,000}, 0x00d2, "Ograve" }, + {{002,004,016,021,021,021,016,000,000}, 0x00d3, "Oacute" }, + {{004,012,016,021,021,021,016,000,000}, 0x00d4, "Ocircumflex" }, + {{005,012,016,021,021,021,016,000,000}, 0x00d5, "Otilde" }, {{000,021,012,004,012,021,000,000,000}, 0x00d7, "multiply" }, + {{016,021,023,025,031,021,016,000,000}, 0x00d8, "Oslash" }, + {{010,004,021,021,021,021,016,000,000}, 0x00d9, "Ugrave" }, + {{002,004,021,021,021,021,016,000,000}, 0x00da, "Uacute" }, + {{004,012,000,021,021,021,016,000,000}, 0x00db, "Ucircumflex" }, + {{002,004,021,012,004,004,004,000,000}, 0x00dd, "Yacute" }, + {{020,036,021,021,036,020,020,000,000}, 0x00de, "Thorn" }, {{002,004,016,001,017,021,017,000,000}, 0x00e1, "aacute" }, + {{005,012,016,001,017,021,017,000,000}, 0x00e3, "atilde" }, {{000,000,012,005,017,024,016,000,000}, 0x00e6, "ae" }, {{002,004,000,014,004,004,016,000,000}, 0x00ed, "iacute" }, + {{032,004,012,001,017,021,016,000,000}, 0x00f0, "eth" }, + {{005,012,036,021,021,021,021,000,000}, 0x00f1, "ntilde" }, {{002,004,000,016,021,021,016,000,000}, 0x00f3, "oacute" }, + {{004,012,000,016,021,021,016,000,000}, 0x00f4, "ocircumflex" }, + {{005,012,000,016,021,021,016,000,000}, 0x00f5, "otilde" }, + {{000,000,017,023,025,031,036,000,000}, 0x00f8, "oslash" }, {{002,004,021,021,021,021,017,000,000}, 0x00fa, "uacute" }, + {{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" }, + {{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" }, + {{002,004,017,020,020,020,017,000,000}, 0x0107, "cacute" }, + {{004,012,016,021,020,021,016,000,000}, 0x0108, "Ccircumflex" }, + {{004,012,017,020,020,020,017,000,000}, 0x0109, "ccircumflex" }, + {{004,000,016,021,020,021,016,000,000}, 0x010a, "Cdotaccent" }, + {{004,000,017,020,020,020,017,000,000}, 0x010b, "cdotaccent" }, + {{012,004,016,021,020,021,016,000,000}, 0x010c, "Ccaron" }, + {{012,004,017,020,020,020,017,000,000}, 0x010d, "ccaron" }, + {{016,000,037,020,036,020,037,000,000}, 0x0112, "Emacron" }, + {{016,000,016,021,037,020,016,000,000}, 0x0113, "emacron" }, + {{004,000,037,020,036,020,037,000,000}, 0x0116, "Edotaccent" }, + {{004,000,016,021,037,020,016,000,000}, 0x0117, "edotaccent" }, + {{012,004,037,020,036,020,037,000,000}, 0x011a, "Ecaron" }, + {{012,004,016,021,037,020,016,000,000}, 0x011b, "ecaron" }, + {{004,012,017,020,023,021,017,000,000}, 0x011c, "Gcircumflex" }, + {{004,012,017,021,021,021,017,001,016}, 0x011d, "gcircumflex" }, + {{004,000,017,020,023,021,017,000,000}, 0x0120, "Gdotaccent" }, + {{004,000,017,021,021,021,017,001,016}, 0x0121, "gdotaccent" }, + {{016,000,016,004,004,004,016,000,000}, 0x012a, "Imacron" }, + {{016,000,014,004,004,004,016,000,000}, 0x012b, "imacron" }, + {{004,000,016,004,004,004,016,000,000}, 0x0130, "Idotaccent" }, + {{000,000,014,004,004,004,016,000,000}, 0x0131, "dotlessi" }, + {{021,021,031,025,023,021,021,001,016}, 0x014a, "Eng" }, + {{000,000,036,021,021,021,021,001,016}, 0x014b, "eng" }, + {{016,000,016,021,021,021,016,000,000}, 0x014c, "Omacron" }, + {{000,016,000,016,021,021,016,000,000}, 0x014d, "omacron" }, + {{017,024,024,026,024,024,017,000,000}, 0x0152, "OE" }, + {{000,000,012,025,027,024,013,000,000}, 0x0153, "oe" }, + {{016,000,021,021,021,021,016,000,000}, 0x016a, "Umacron" }, + {{000,016,000,021,021,021,017,000,000}, 0x016b, "umacron" }, + {{004,012,000,021,012,004,004,000,000}, 0x0176, "Ycircumflex" }, + {{004,012,000,021,021,021,017,001,016}, 0x0177, "ycircumflex" }, + {{012,000,021,012,004,004,004,000,000}, 0x0178, "Ydieresis" }, + {{002,004,004,016,004,004,004,004,010}, 0x0192, "florin" }, {{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 }, /* quotedblreversed */ + {{016,021,035,033,033,035,031,021,016}, 0x2117 }, /* phonographic */ + {{020,020,020,020,022,005,002,005,002}, 0x215b, "oneeighth" }, + {{020,010,020,010,022,005,002,005,002}, 0x215c, "threeeighths" }, + {{030,020,030,010,022,005,002,005,002}, 0x215d, "fiveeighths" }, + {{034,004,010,020,022,005,002,005,002}, 0x215e, "seveneighths" }, + {{000,004,004,025,016,004,000,000,000}, 0x2193, "arrowdown" }, + {{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" }, + {{000,004,004,025,016,004,000,000,000}, 0x2193, "arrowdown", SA }, + {{004,016,025,004,025,016,004,000,000}, 0x2195, "arrowupdn" }, + {{004,016,025,004,025,016,037,000,000}, 0x21a8, "arrowupdnbse" }, {{000,004,010,023,010,004,000,000,000}, -1, "arrowleft.alt" }, {{000,004,002,031,002,004,000,000,000}, -1, "arrowright.alt" }, {{000,004,012,021,004,004,000,000,000}, -1, "arrowup.alt" },