From 79c64ca877e9a9898b0c55ff46bbc394eaea3099 Mon Sep 17 00:00:00 2001 From: drkrebs <65777218+drkrebs@users.noreply.github.com> Date: Sat, 15 May 2021 15:46:08 +0200 Subject: [PATCH 1/4] Update chardefs.h --- source/chardefs.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/source/chardefs.h b/source/chardefs.h index d9a276f..2849f92 100644 --- a/source/chardefs.h +++ b/source/chardefs.h @@ -13,6 +13,14 @@ static list missing_glyph = { }; static unordered_map> charmap = { +{L'"', { + 0b010100, + 0b010100, + 0b010100, + 0b000000, + 0b000000, + 0b000000, + 0b000000 }}, {L'\\', { 0b100000, 0b100000, @@ -319,6 +327,14 @@ static unordered_map> charmap = { 0b111110, 0b100010, 0b100010 }}, +{ L'Ä', { + 0b100010, + 0b011100, + 0b100010, + 0b100010, + 0b111110, + 0b100010, + 0b100010 } }, {L'Â', { 0b011100, 0b000000, From e8e86538160cab715ec80a24e947346525012366 Mon Sep 17 00:00:00 2001 From: drkrebs <65777218+drkrebs@users.noreply.github.com> Date: Sat, 15 May 2021 15:49:29 +0200 Subject: [PATCH 2/4] Update cbmtext.cpp print doublequote as symbol, so that it is not confusing the output stream in graphics mode --- source/cbmtext.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/cbmtext.cpp b/source/cbmtext.cpp index a9f2c9c..6242165 100644 --- a/source/cbmtext.cpp +++ b/source/cbmtext.cpp @@ -52,7 +52,7 @@ void printText(ostream& out, istream& in) { char* translate(uint32_t c, char *code) { if (isSpace(c)) c = 32; - if (c >= 32 && c <= 127) { + if (c !=34 && c >= 32 && c <= 127) { // print doublequote as symbol if (c >= 'A' && c <= 'Z') return singleChar(tolower(c), code); if (c >= 'a' && c <= 'z') return singleChar(toupper(c), code); list chardef = charmap[c]; From dc7c5aa7c38936ae046c2529708df25dc499cb01 Mon Sep 17 00:00:00 2001 From: drkrebs <65777218+drkrebs@users.noreply.github.com> Date: Sat, 15 May 2021 16:00:10 +0200 Subject: [PATCH 3/4] Update README.md in synopsis: changed "cdmage" to "cbmtext" --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e96688a..cc02052 100644 --- a/README.md +++ b/README.md @@ -49,8 +49,8 @@ An executable file named **"cbmtext"** will be generated: it's ready to use. Synopsis: ``` -cbmage -cbmage - +cbmtext +cbmtext - ``` This is the basic syntax: it will read the text file (first case), or from standard input (second case, giving "-" as parameter) writing on *standard output* (so, the terminal window) the raw bytes that should be interpreted by the **MPS 803** printer. From a444ab0949aa9c725a062054a71f85b07609ca98 Mon Sep 17 00:00:00 2001 From: drkrebs <65777218+drkrebs@users.noreply.github.com> Date: Sun, 16 May 2021 14:58:05 +0200 Subject: [PATCH 4/4] Update cbmtext.cpp Change undone, as it wasn't necessary. --- source/cbmtext.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/cbmtext.cpp b/source/cbmtext.cpp index 6242165..0270f63 100644 --- a/source/cbmtext.cpp +++ b/source/cbmtext.cpp @@ -52,7 +52,7 @@ void printText(ostream& out, istream& in) { char* translate(uint32_t c, char *code) { if (isSpace(c)) c = 32; - if (c !=34 && c >= 32 && c <= 127) { // print doublequote as symbol + if (c >= 32 && c <= 127) { // print doublequote as symbol if (c >= 'A' && c <= 'Z') return singleChar(tolower(c), code); if (c >= 'a' && c <= 'z') return singleChar(toupper(c), code); list chardef = charmap[c];