From 2c59ad16db9c61edbf447b786b5f0be0c1ec808a Mon Sep 17 00:00:00 2001 From: Willem Date: Wed, 8 Jan 2025 14:11:57 +0100 Subject: [PATCH] Keep escape code equal for all systems --- .../org/x4o/o2o/fc18/FourCornerUnicodeDisplay.java | 2 +- .../org/x4o/o2o/fc18/zero33/FCDotDEC1604DashP7.java | 12 +++++------- .../x4o/o2o/fc18/FourCornerUnicodeDisplayTest.java | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerUnicodeDisplay.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerUnicodeDisplay.java index 1d9397a..9f96ac0 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerUnicodeDisplay.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerUnicodeDisplay.java @@ -344,7 +344,7 @@ public class FourCornerUnicodeDisplay { if (FCDotDEC1604DashP7.__ESC68_FC18.equals(decCode)) { return decCode.ordinal(); // todo handle } - if (FCDotDEC1604DashP7.__ESC68_BELOW.equals(decCode)) { + if (FCDotDEC1604DashP7.__ESC_BELOW.equals(decCode)) { if (!cdc.hasNext()) { return null; } diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotDEC1604DashP7.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotDEC1604DashP7.java index 12a2b67..425e1df 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotDEC1604DashP7.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotDEC1604DashP7.java @@ -30,13 +30,11 @@ import org.x4o.o2o.fc18.FourCornerX18CakePoints; /** * "FC.DEC1604-E2" Four Corner dot Direct or Escaped Control in grid of 16 by 04 of dashed Escape codes V2. * - * This block defines "start" points of different escape sequence data-gram encoding within the 6 bit space. + * A 6 bit computer use the __ESC6 to use these 64 control codes. * - * A 6 or 8 bit computer use the __ESC to use these 64 control codes. + * A 8 or 18 or 144 bit computer uses this direct as the second 64 part page. (thus number 64 to 127) * - * A 18 or 144 bit computer uses this direct as the second 64 part page. (thus number 64 to 127) - * - * NOTE: TODO: Currently still all but one, others are undefined. + * NOTE: MSX is VT-52 see https://www.msx.org/wiki/MSX_Characters_and_Control_Codes#Escape_codes * * @author Willem Cazander * @version 1.0 Dec 24, 2024 @@ -55,8 +53,8 @@ public enum FCDotDEC1604DashP7 implements FourCornerX06BaklavaPoints, FourCorner /// On 6/8 bit escape to 18 bit four corner. /// Stream six octals as CDC chars in NX01_A to NX08_H, until any out of range P6. __ESC68_FC18, - /// Lower case escape code for only ONE next char is NX01_A to NX06_Z for 6 and 8 bit systems. - __ESC68_BELOW, + /// Lower case escape code for only ONE next char is NX01_A to NX06_Z for all systems. + __ESC_BELOW, UNDEFINED__QUESTION, UNDEFINED__EXCLAMATION, diff --git a/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/FourCornerUnicodeDisplayTest.java b/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/FourCornerUnicodeDisplayTest.java index e00d072..7cb6e5b 100644 --- a/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/FourCornerUnicodeDisplayTest.java +++ b/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/FourCornerUnicodeDisplayTest.java @@ -102,7 +102,7 @@ public class FourCornerUnicodeDisplayTest { cdc.add(FCDotPIE9CDash26.LOW_B); // if used as this per letter full escaping here.... cdc.add(FCDotCDC1604DashP6._SPACE); // out of range is end lower cdc.add(FCDotCDC1604DashP6.NX02_B); - cdc.add(FCDotDEC1604DashP7.__ESC68_BELOW); // test escape code + cdc.add(FCDotDEC1604DashP7.__ESC_BELOW); // test escape code cdc.add(FCDotCDC1604DashP6.NX03_C); cdc.add(FCDotCDC1604DashP6.NX04_D); // thus this upper case D cdc.add(FCDotCDC1604DashP6.DOT);