From: Ben Harris <bjh21@bjh21.me.uk>
Date: Fri, 2 Oct 2009 19:50:47 +0000 (+0100)
Subject: Ooh, the SAA5050 datasheet includes character diagrams, including an ASCII
X-Git-Tag: bedstead-000.900~45
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~bjharris/git?a=commitdiff_plain;h=4cbd7230f8f4ed35b857ea138245be76f5351907;p=bedstead-debian.git

Ooh, the SAA5050 datasheet includes character diagrams, including an ASCII
set, so steal that.  Also add a few quotation mark characters that I think
I've done before but seem to have lost.
---

diff --git a/ttxt.c b/ttxt.c
index c8f89c1..a29c513 100644
--- a/ttxt.c
+++ b/ttxt.c
@@ -25,15 +25,15 @@ struct glyph {
 	int unicode;
 	char const *name;
 } glyphs[] = {
- /* Standard character set -- glyphs from BBC Micro User Guide */
+ /* US ASCII 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" },
- {{006,011,010,010,034,010,010,037,000,000}, 0x00a3, "sterling" },
+ {{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,004,000,000,000,000,000,000,000}, 0x0027, "quotesingle" },
+ {{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" },
@@ -85,12 +85,12 @@ struct glyph {
  {{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" },
- {{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" },
- {{012,012,037,012,037,012,012,000,000,000}, 0x0023, "numbersign" },
+ {{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" },
@@ -117,28 +117,45 @@ struct glyph {
  {{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" },
+
+ /* Extra characters found in the English character set */
+ {{006,011,010,010,034,010,010,037,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" },
- {{037,037,037,037,037,037,037,000,000,000}, 0x2588, "block" },
 
- /* Additional glyphs by bjh21 to give us ASCII at least. */
- {{003,004,004,030,004,004,003,000,000,000}, 0x007b, "braceleft" },
+ /* Additional glyphs by bjh21 */
  {{004,004,004,004,004,004,004,000,000,000}, 0x007c, "bar" },
- {{030,004,004,003,004,004,030,000,000,000}, 0x007d, "braceright" },
- {{010,025,002,000,000,000,000,000,000,000}, 0x007e, "asciitilde" },
- {{016,010,010,010,010,010,016,000,000,000}, 0x005b, "bracketleft" },
- {{000,020,010,004,002,001,000,000,000,000}, 0x005c, "backslash" },
- {{016,002,002,002,002,002,016,000,000,000}, 0x005d, "bracketright" },
- {{004,012,021,000,000,000,000,000,000,000}, 0x005e, "asciicircum" },
- {{000,000,000,000,000,000,000,037,000,000}, 0x005f, "underscore" },
  {{010,004,002,000,000,000,000,000,000,000}, 0x0060, "grave" },
-
- /* Obvious derivatives of above glyphs */
  {{002,004,010,000,000,000,000,000,000,000}, 0x00b4, "acute" },
  {{000,004,004,025,016,004,000,000,000,000}, 0x2193, "arrowdown" },
  {{000,021,012,004,012,021,000,000,000,000}, 0x00d7, "multiply" },
+ {{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,021,012,004,016,004,004,000,000,000}, 0x00a4, "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,012,004,000,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" },
+ {{002,004,004,000,000,000,000,000,000,000}, 0x2019, "quoteright" },
+ {{011,011,022,000,000,000,000,000,000,000}, 0x201d, "quotedblright" },
+ {{011,022,022,000,000,000,000,000,000,000}, 0x201c, "quotedblleft" },
 
  /* This is getting silly. */
  {{000,000,004,012,021,037,021,000,000,000}, -1, "a.sc" },