From: Ben Harris Date: Sat, 3 Oct 2009 21:28:33 +0000 (+0100) Subject: I've found a more comprehensive version of the SAA5050 datasheet, X-Git-Tag: bedstead-000.900~34 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~bjharris/git?a=commitdiff_plain;h=827ad4cc67122a29a00033f47291eb3e94579d46;p=bedstead.git I've found a more comprehensive version of the SAA5050 datasheet, including various versions intended for western continental Europe, along with Cyrillic and Hebrew ones. This has given me a load more glyphs, including canonical versions of ones I'd previously designed myself. Add them all. Also sort my glyphs better. --- diff --git a/ttxt.c b/ttxt.c index ab97519..5569490 100644 --- a/ttxt.c +++ b/ttxt.c @@ -25,7 +25,7 @@ struct glyph { int unicode; char const *name; } glyphs[] = { - /* US ASCII character set from SAA5050 datasheet */ + /* US ASCII (SAA5055) character set from SAA5050 datasheet */ {{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" }, @@ -123,7 +123,7 @@ struct glyph { {{010,025,002,000,000,000,000,000,000,000}, 0x007e, "asciitilde" }, {{037,037,037,037,037,037,037,000,000,000}, 0x2588, "block" }, - /* Extra characters found in the English character set */ + /* 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" }, @@ -136,23 +136,160 @@ struct glyph { {{030,004,030,004,031,003,005,007,001,000}, 0x00be, "threequarters" }, {{000,004,000,037,000,004,000,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" }, + + /* 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" }, + + /* 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" }, + + /* 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" }, + + /* Extra characters found in the Hebrew (SAA5056) character set */ + {{000,021,011,025,022,021,021,000,000,000}, 0x05d0, "afii57664" }, + {{000,016,002,002,002,002,037,000,000,000}, 0x05d1, "afii57665" }, + {{000,003,001,001,003,005,011,000,000,000}, 0x05d2, "afii57666" }, + {{000,037,002,002,002,002,002,000,000,000}, 0x05d3, "afii57667" }, + {{000,037,001,001,021,021,021,000,000,000}, 0x05d4, "afii57668" }, + {{000,014,004,004,004,004,004,000,000,000}, 0x05d5, "afii57669" }, + {{000,016,004,010,004,004,004,000,000,000}, 0x05d6, "afii57670" }, + {{000,037,021,021,021,021,021,000,000,000}, 0x05d7, "afii57671" }, + {{000,021,023,025,021,021,037,000,000,000}, 0x05d8, "afii57672" }, + {{000,014,004,000,000,000,000,000,000,000}, 0x05d9, "afii57673" }, + {{000,037,001,001,001,001,001,001,000,000}, 0x05da, "afii57674" }, + {{000,037,001,001,001,001,037,000,000,000}, 0x05db, "afii57675" }, + {{020,037,001,001,001,002,014,000,000,000}, 0x05dc, "afii57676" }, + {{000,037,021,021,021,021,037,000,000,000}, 0x05dd, "afii57677" }, + {{000,026,011,021,021,021,027,000,000,000}, 0x05de, "afii57678" }, + {{000,014,004,004,004,004,004,004,004,000}, 0x05df, "afii57679" }, + {{000,006,002,002,002,002,016,000,000,000}, 0x05e0, "afii57680" }, + {{000,037,011,021,021,021,016,000,000,000}, 0x05e1, "afii57681" }, + {{000,011,011,011,011,012,034,000,000,000}, 0x05e2, "afii57682" }, + {{000,037,011,015,001,001,001,001,000,000}, 0x05e3, "afii57683" }, + {{000,037,011,015,001,001,037,000,000,000}, 0x05e4, "afii57684" }, + {{000,031,012,014,010,010,010,010,000,000}, 0x05e5, "afii57685" }, + {{000,021,021,012,004,002,037,000,000,000}, 0x05e6, "afii57686" }, + {{000,037,001,011,011,012,010,010,000,000}, 0x05e7, "afii57687" }, + {{000,037,001,001,001,001,001,000,000,000}, 0x05e8, "afii57688" }, + {{000,025,025,025,031,021,036,000,000,000}, 0x05e9, "afii57689" }, + {{000,017,011,011,011,011,031,000,000,000}, 0x05ea, "afii57690" }, + {{000,000,025,025,016,000,000,000,000,000}, -1, "heb-7.11" }, + + /* Extra characters found in the Cyrillic (SAA5057) character set */ + {{000,000,021,021,035,025,035,000,000,000}, 0x044b, "afii10093" }, + {{022,025,025,035,025,025,022,000,000,000}, 0x042e, "afii10048" }, + {{016,021,021,021,037,021,021,000,000,000}, 0x0410, "afii10017" }, + {{037,020,020,037,021,021,037,000,000,000}, 0x0411, "afii10018" }, + {{022,022,022,022,022,022,037,001,000,000}, 0x0426, "afii10040" }, + {{006,012,012,012,012,012,037,021,000,000}, 0x0414, "afii10021" }, + {{037,020,020,036,020,020,037,000,000,000}, 0x0415, "afii10022" }, + {{004,037,025,025,025,037,004,000,000,000}, 0x0424, "afii10038" }, + {{037,020,020,020,020,020,020,000,000,000}, 0x0413, "afii10020" }, + {{021,021,012,004,012,021,021,000,000,000}, 0x0425, "afii10039" }, + {{021,021,023,025,031,021,021,000,000,000}, 0x0418, "afii10026" }, + {{025,021,023,025,031,021,021,000,000,000}, 0x0419, "afii10027" }, + {{021,022,024,030,024,022,021,000,000,000}, 0x041a, "afii10028" }, + {{007,011,011,011,011,011,031,000,000,000}, 0x041b, "afii10029" }, + {{021,033,025,025,021,021,021,000,000,000}, 0x041c, "afii10030" }, + {{021,021,021,037,021,021,021,000,000,000}, 0x041d, "afii10031" }, + {{016,021,021,021,021,021,016,000,000,000}, 0x041e, "afii10032" }, + {{037,021,021,021,021,021,021,000,000,000}, 0x041f, "afii10033" }, + {{017,021,021,017,005,011,021,000,000,000}, 0x042f, "afii10049" }, + {{036,021,021,036,020,020,020,000,000,000}, 0x0420, "afii10034" }, + {{016,021,020,020,020,021,016,000,000,000}, 0x0421, "afii10035" }, + {{037,004,004,004,004,004,004,000,000,000}, 0x0422, "afii10036" }, + {{021,021,021,037,001,001,037,000,000,000}, 0x0423, "afii10037" }, + {{025,025,025,016,025,025,025,000,000,000}, 0x0416, "afii10024" }, + {{036,021,021,036,021,021,036,000,000,000}, 0x0412, "afii10019" }, + {{020,020,020,037,021,021,037,000,000,000}, 0x042c, "afii10046" }, + {{030,010,010,017,011,011,017,000,000,000}, 0x042a, "afii10044" }, + {{016,021,001,006,001,021,016,000,000,000}, 0x0417, "afii10025" }, + {{025,025,025,025,025,025,037,000,000,000}, 0x0428, "afii10042" }, + {{014,022,001,007,001,022,014,000,000,000}, 0x042d, "afii10047" }, + {{025,025,025,025,025,025,037,001,000,000}, 0x0429, "afii10043" }, + {{021,021,021,037,001,001,001,000,000,000}, 0x0427, "afii10041" }, + {{021,021,021,035,025,025,035,000,000,000}, 0x042b, "afii10045" }, + {{000,000,022,025,035,025,022,000,000,000}, 0x044e, "afii10096" }, + {{000,000,016,001,017,021,017,000,000,000}, 0x0430, "afii10065" }, + {{016,020,036,021,021,021,036,000,000,000}, 0x0431, "afii10066" }, + {{000,000,022,022,022,022,037,001,000,000}, 0x0446, "afii10088" }, + {{000,000,006,012,012,012,037,021,000,000}, 0x0434, "afii10069" }, + {{000,000,016,021,037,020,016,000,000,000}, 0x0435, "afii10070" }, + {{000,004,016,025,025,025,016,004,000,000}, 0x0444, "afii10086" }, + {{000,000,037,020,020,020,020,000,000,000}, 0x0433, "afii10068" }, + {{000,000,021,012,004,012,021,000,000,000}, 0x0445, "afii10087" }, + {{000,000,021,023,025,031,021,000,000,000}, 0x0438, "afii10074" }, + {{000,004,021,023,025,031,021,000,000,000}, 0x0439, "afii10075" }, + {{000,000,021,022,034,022,021,000,000,000}, 0x043a, "afii10076" }, + {{000,000,007,011,011,011,031,000,000,000}, 0x043b, "afii10077" }, + {{000,000,021,033,025,021,021,000,000,000}, 0x043c, "afii10078" }, + {{000,000,021,021,037,021,021,000,000,000}, 0x043d, "afii10079" }, + {{000,000,016,021,021,021,016,000,000,000}, 0x043e, "afii10080" }, + {{000,000,037,021,021,021,021,000,000,000}, 0x043f, "afii10081" }, + {{000,000,017,021,017,005,031,000,000,000}, 0x044f, "afii10097" }, + {{000,000,036,021,021,021,036,020,020,000}, 0x0440, "afii10082" }, + {{000,000,016,021,020,021,016,000,000,000}, 0x0441, "afii10083" }, + {{000,000,037,004,004,004,004,000,000,000}, 0x0442, "afii10084" }, + {{000,000,021,021,021,021,017,001,016,000}, 0x0443, "afii10085" }, + {{000,000,025,025,016,025,025,000,000,000}, 0x0436, "afii10072" }, + {{000,000,036,021,036,021,036,000,000,000}, 0x0432, "afii10067" }, + {{000,000,020,020,036,021,036,000,000,000}, 0x044c, "afii10094" }, + {{000,000,030,010,016,011,016,000,000,000}, 0x044a, "afii10092" }, + {{000,000,016,021,006,021,016,000,000,000}, 0x0437, "afii10073" }, + {{000,000,025,025,025,025,037,000,000,000}, 0x0448, "afii10090" }, + {{000,000,014,022,006,022,014,000,000,000}, 0x044d, "afii10095" }, + {{000,000,025,025,025,025,037,001,000,000}, 0x0449, "afii10091" }, + {{000,000,021,021,021,017,001,000,000,000}, 0x0447, "afii10089" }, + /* 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" }, - {{017,020,016,021,016,001,036,000,000,000}, 0x00a7, "section" }, {{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" }, - {{000,021,012,004,012,021,000,000,000,000}, 0x00d7, "multiply" }, - {{014,022,022,014,000,000,000,000,000,000}, 0x00b0, "degree" }, - {{004,004,037,004,004,000,037,000,000,000}, 0x00b1, "plusminus" }, {{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" },