diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerDotCake.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerDotCake.java
index 8bcc516..3bfb563 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerDotCake.java
+++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerDotCake.java
@@ -51,10 +51,10 @@ import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash24;
import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash25;
import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash26;
import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash27;
-import org.x4o.o2o.fc18.zero33.FCDotAPL1604DashS6;
-import org.x4o.o2o.fc18.zero33.FCDotBYD1604DashC6;
+import org.x4o.o2o.fc18.zero33.FCDotAPL1604DashP8L;
+import org.x4o.o2o.fc18.zero33.FCDotBYD1604DashP8H;
import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
-import org.x4o.o2o.fc18.zero33.FCDotDEC1604DashE6;
+import org.x4o.o2o.fc18.zero33.FCDotDEC1604DashP7;
/// The dot cake index of four corner 18 bit words in cake slices which holds the cake points.
///
@@ -67,11 +67,11 @@ public enum FourCornerDotCake {
/// Character Dough Cake
FC_CDC1604_P6(0, 64, FCDotCDC1604DashP6.values()),
/// Direct or Escaped Control
- FC_DEC1604_E6(64, 64, FCDotDEC1604DashE6.values()),
+ FC_DEC1604_P7(64, 64, FCDotDEC1604DashP7.values()),
/// Array Programming Language
- FC_APL1604_S6(128, 64, FCDotAPL1604DashS6.values()),
+ FC_APL1604_P8L(128, 64, FCDotAPL1604DashP8L.values()),
/// Block Your Display
- FC_BYD1604_C6(192, 64, FCDotBYD1604DashC6.values()),
+ FC_BYD1604_P8H(192, 64, FCDotBYD1604DashP8H.values()),
// =========== Allow pie terminators for symbols without escaping
@@ -103,14 +103,14 @@ public enum FourCornerDotCake {
FC_PIE9C_26(1 + FC_PIE9C_25.getStop(), 26, FCDotPIE9CDash26.values()),
FC_PIE9C_27(1 + FC_PIE9C_26.getStop(), 27, FCDotPIE9CDash27.values()),
- __RESERVED_PIE_SYMBOLS(1 + FC_PIE9C_27.getStop(), 768 - 1 - FC_PIE9C_27.getStop()),
+ __RESERVED_PIE_SYMBOLS(1 + FC_PIE9C_27.getStop(), 1024 - 1 - FC_PIE9C_27.getStop()),
// =========== Allow end-user select rendering of data gram packet per context
/// Interim Byte Mode, embed raw 8 bit Data
- FC_IBM1616_D8(768, 256),
+ FC_IBM1616_D8(1024, 256),
/// Reserved for future data grams use
- __RESERVED_DATAGRAMS(1024, 1448-1024),
+ __RESERVED_DATAGRAMS(1280, 1448-1280),
/// Application Methodoums Decimals, normal decimal numbers 0-9
FC_AMD0110_DA(1448, 10),
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 ea1b72b..8f68ba3 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
@@ -57,10 +57,10 @@ import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash24;
import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash25;
import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash26;
import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash27;
-import org.x4o.o2o.fc18.zero33.FCDotAPL1604DashS6;
-import org.x4o.o2o.fc18.zero33.FCDotBYD1604DashC6;
+import org.x4o.o2o.fc18.zero33.FCDotAPL1604DashP8L;
+import org.x4o.o2o.fc18.zero33.FCDotBYD1604DashP8H;
import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
-import org.x4o.o2o.fc18.zero33.FCDotDEC1604DashE6;
+import org.x4o.o2o.fc18.zero33.FCDotDEC1604DashP7;
import org.x4o.o2o.octal.PrimordialOctalOrangeJuiceCord;
/// Renders unicode from four corner 18 bit text.
@@ -216,34 +216,34 @@ public class FourCornerUnicodeDisplay {
if (!cdc.hasNext()) {
return null;
}
- FCDotDEC1604DashE6 decCode = FCDotDEC1604DashE6.indexOf(cdc.next());
- if (FCDotDEC1604DashE6.__NUL_DEC.equals(decCode)) {
+ FCDotDEC1604DashP7 decCode = FCDotDEC1604DashP7.indexOf(cdc.next());
+ if (FCDotDEC1604DashP7.__NUL_DEC.equals(decCode)) {
buf.append(FCDotCDC1604DashP6.escapeSignUnicode(FCDotCDC1604DashP6.__NUL.ordinal()));
return null;
}
- if (FCDotDEC1604DashE6.__ESC6_APL.equals(decCode)) {
+ if (FCDotDEC1604DashP7.__ESC6_APL.equals(decCode)) {
if (!cdc.hasNext()) {
return null;
}
- FCDotAPL1604DashS6 aplCode = FCDotAPL1604DashS6.indexOf(cdc.next());
+ FCDotAPL1604DashP8L aplCode = FCDotAPL1604DashP8L.indexOf(cdc.next());
Arrays.stream(aplCode.codePoints()).forEach(v -> buf.appendCodePoint(v));
return null;
}
- if (FCDotDEC1604DashE6.__ESC6_BYD.equals(decCode)) {
+ if (FCDotDEC1604DashP7.__ESC6_BYD.equals(decCode)) {
if (!cdc.hasNext()) {
return null;
}
- FCDotBYD1604DashC6 bydCode = FCDotBYD1604DashC6.indexOf(cdc.next());
+ FCDotBYD1604DashP8H bydCode = FCDotBYD1604DashP8H.indexOf(cdc.next());
Arrays.stream(bydCode.codePoints()).forEach(v -> buf.appendCodePoint(v));
return null;
}
- if (FCDotDEC1604DashE6.__ESC_STOP.equals(decCode)) {
+ if (FCDotDEC1604DashP7.__ESC_STOP.equals(decCode)) {
return null;
}
- if (FCDotDEC1604DashE6.__ESC68_FC18.equals(decCode)) {
+ if (FCDotDEC1604DashP7.__ESC68_FC18.equals(decCode)) {
return decCode.ordinal(); // todo handle
}
- if (FCDotDEC1604DashE6.__ESC_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/FCDotAPL1604DashS6.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotAPL1604DashP8L.java
similarity index 93%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotAPL1604DashS6.java
rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotAPL1604DashP8L.java
index 96877a1..99879c2 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotAPL1604DashS6.java
+++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotAPL1604DashP8L.java
@@ -33,7 +33,7 @@ import org.x4o.o2o.fc18.FourCornerX21CodePoints;
/// @author Willem Cazander
/// @version 1.0 Jan 1, 2025
///
-public enum FCDotAPL1604DashS6 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints {
+public enum FCDotAPL1604DashP8L implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints {
/// Indicator for termination of pussy strings, which is the compatibility duel octal, with the CDC 1604 computers.
__NUL_APL('\u0000'),
@@ -243,16 +243,16 @@ public enum FCDotAPL1604DashS6 implements FourCornerX06BaklavaPoints, FourCorner
;
- static final private FCDotAPL1604DashS6[] VALUES = values(); // values() is slow method
+ static final private FCDotAPL1604DashP8L[] VALUES = values(); // values() is slow method
private final int codePoint;
- private FCDotAPL1604DashS6(char codePoint) {
+ private FCDotAPL1604DashP8L(char codePoint) {
this.codePoint = codePoint;
}
@Override
public int[] baklavaPoints() {
- return new int[] {FCDotCDC1604DashP6.__ESC6.ordinal(), FCDotDEC1604DashE6.__ESC6_APL.ordinal(), ordinal()};
+ return new int[] {FCDotCDC1604DashP6.__ESC6.ordinal(), FCDotDEC1604DashP7.__ESC6_APL.ordinal(), ordinal()};
}
@Override
@@ -262,7 +262,7 @@ public enum FCDotAPL1604DashS6 implements FourCornerX06BaklavaPoints, FourCorner
@Override
public int[] cakePoints() {
- return new int[] {FourCornerDotCake.FC_APL1604_S6.getStart() + ordinal()};
+ return new int[] {FourCornerDotCake.FC_APL1604_P8L.getStart() + ordinal()};
}
@Override
@@ -274,7 +274,7 @@ public enum FCDotAPL1604DashS6 implements FourCornerX06BaklavaPoints, FourCorner
return VALUES.length;
}
- static public FCDotAPL1604DashS6 indexOf(int idx) {
+ static public FCDotAPL1604DashP8L indexOf(int idx) {
return VALUES[idx];
}
}
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotBYD1604DashC6.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotBYD1604DashP8H.java
similarity index 88%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotBYD1604DashC6.java
rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotBYD1604DashP8H.java
index 5f46392..a1d9ef8 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotBYD1604DashC6.java
+++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotBYD1604DashP8H.java
@@ -33,7 +33,7 @@ import org.x4o.o2o.fc18.FourCornerX21CodePoints;
/// @author Willem Cazander
/// @version 1.0 Jan 1, 2025
///
-public enum FCDotBYD1604DashC6 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints {
+public enum FCDotBYD1604DashP8H implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints {
/// Indicator for termination of pussy strings, which is the compatibility duel octal, with the CDC 1604 computers.
__NUL_BYD('\u0000'),
@@ -111,16 +111,16 @@ public enum FCDotBYD1604DashC6 implements FourCornerX06BaklavaPoints, FourCorner
U259F('▟'),
;
- static final private FCDotBYD1604DashC6[] VALUES = values(); // values() is slow method
+ static final private FCDotBYD1604DashP8H[] VALUES = values(); // values() is slow method
private final int codePoint;
- private FCDotBYD1604DashC6(char codePoint) {
+ private FCDotBYD1604DashP8H(char codePoint) {
this.codePoint = codePoint;
}
@Override
public int[] baklavaPoints() {
- return new int[] {FCDotCDC1604DashP6.__ESC6.ordinal(), FCDotDEC1604DashE6.__ESC6_BYD.ordinal(), ordinal()};
+ return new int[] {FCDotCDC1604DashP6.__ESC6.ordinal(), FCDotDEC1604DashP7.__ESC6_BYD.ordinal(), ordinal()};
}
@Override
@@ -130,7 +130,7 @@ public enum FCDotBYD1604DashC6 implements FourCornerX06BaklavaPoints, FourCorner
@Override
public int[] cakePoints() {
- return new int[] {FourCornerDotCake.FC_BYD1604_C6.getStart() + ordinal()};
+ return new int[] {FourCornerDotCake.FC_BYD1604_P8H.getStart() + ordinal()};
}
@Override
@@ -142,7 +142,7 @@ public enum FCDotBYD1604DashC6 implements FourCornerX06BaklavaPoints, FourCorner
return VALUES.length;
}
- static public FCDotBYD1604DashC6 indexOf(int idx) {
+ static public FCDotBYD1604DashP8H indexOf(int idx) {
return VALUES[idx];
}
}
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotDEC1604DashE6.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotDEC1604DashP7.java
similarity index 95%
rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotDEC1604DashE6.java
rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotDEC1604DashP7.java
index 864ff2e..91d019b 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotDEC1604DashE6.java
+++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotDEC1604DashP7.java
@@ -41,7 +41,7 @@ import org.x4o.o2o.fc18.FourCornerX18CakePoints;
* @author Willem Cazander
* @version 1.0 Dec 24, 2024
*/
-public enum FCDotDEC1604DashE6 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints {
+public enum FCDotDEC1604DashP7 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints {
/// Indicator for termination of pussy strings, which is the compatibility duel octal, with the CDC 1604 computers.
__NUL_DEC,
@@ -163,9 +163,9 @@ public enum FCDotDEC1604DashE6 implements FourCornerX06BaklavaPoints, FourCorner
// TODO: full new impl+cleanup of ANSI-NG for 6 bit real computer terminals !?!
;
- static final private FCDotDEC1604DashE6[] VALUES = values(); // values() is slow method
+ static final private FCDotDEC1604DashP7[] VALUES = values(); // values() is slow method
- private FCDotDEC1604DashE6() {
+ private FCDotDEC1604DashP7() {
}
@Override
@@ -180,14 +180,14 @@ public enum FCDotDEC1604DashE6 implements FourCornerX06BaklavaPoints, FourCorner
@Override
public int[] cakePoints() {
- return new int[] {FourCornerDotCake.FC_DEC1604_E6.getStart() + ordinal()};
+ return new int[] {FourCornerDotCake.FC_DEC1604_P7.getStart() + ordinal()};
}
static public int length() {
return VALUES.length;
}
- static public FCDotDEC1604DashE6 indexOf(int idx) {
+ static public FCDotDEC1604DashP7 indexOf(int idx) {
return VALUES[idx];
}
}
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 561e4bf..a1bf49a 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
@@ -29,7 +29,7 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.x4o.o2o.fc18.pie9c.FCDotPIE9CDash26;
import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
-import org.x4o.o2o.fc18.zero33.FCDotDEC1604DashE6;
+import org.x4o.o2o.fc18.zero33.FCDotDEC1604DashP7;
/**
* Tests four corner displayed as unicode.
@@ -65,7 +65,7 @@ public class FourCornerUnicodeDisplayTest {
cdc.add(FCDotCDC1604DashP6.NX02_B);
//cdc.add(FCDotCDC1604DashP6.__ESC6);
- cdc.add(FCDotDEC1604DashE6.__ESC_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
@@ -78,7 +78,7 @@ public class FourCornerUnicodeDisplayTest {
cdc.add(FCDotCDC1604DashP6.NX13_M);
//cdc.add(FCDotCDC1604DashP6.__ESC6);
- cdc.add(FCDotDEC1604DashE6.__ESC_STOP);
+ cdc.add(FCDotDEC1604DashP7.__ESC_STOP);
cdc.add(FCDotCDC1604DashP6.NX15_O);
Assertions.assertEquals("ab B␃cD.jklmO", FourCornerUnicodeDisplay.simple().renderFromP6(cdc));
diff --git a/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/FourCornerWriteExampleMD.java b/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/FourCornerWriteExampleMD.java
index 4399e18..0d8ded0 100644
--- a/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/FourCornerWriteExampleMD.java
+++ b/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/FourCornerWriteExampleMD.java
@@ -29,8 +29,8 @@ import java.nio.file.StandardOpenOption;
import java.util.ArrayList;
import java.util.List;
-import org.x4o.o2o.fc18.zero33.FCDotAPL1604DashS6;
-import org.x4o.o2o.fc18.zero33.FCDotBYD1604DashC6;
+import org.x4o.o2o.fc18.zero33.FCDotAPL1604DashP8L;
+import org.x4o.o2o.fc18.zero33.FCDotBYD1604DashP8H;
import org.x4o.o2o.fc18.zero33.FCDotCDC1604DashP6;
/**
@@ -192,7 +192,7 @@ public class FourCornerWriteExampleMD {
buf.append(prefixHex.charAt(0));
buf.append("x");
for (int i=off; i<16+off;i++) {
- FCDotAPL1604DashS6 apl = FCDotAPL1604DashS6.indexOf(i);
+ FCDotAPL1604DashP8L apl = FCDotAPL1604DashP8L.indexOf(i);
int codePoint = apl.codePoints()[0];
buf.append("| ");
if (codePoint == '\u0000') {
@@ -212,7 +212,7 @@ public class FourCornerWriteExampleMD {
buf.append(prefixHex.charAt(0));
buf.append("x | ");
for (int i=off; i<16+off;i++) {
- FCDotBYD1604DashC6 byd = FCDotBYD1604DashC6.indexOf(i);
+ FCDotBYD1604DashP8H byd = FCDotBYD1604DashP8H.indexOf(i);
int codePoint = byd.codePoints()[0];
buf.append("");
if (codePoint == '\u0000') {
diff --git a/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/zero33/FCDotAPL1604DashS6Test.java b/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/zero33/FCDotAPL1604DashS6Test.java
index 30542e9..c4cd1cc 100644
--- a/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/zero33/FCDotAPL1604DashS6Test.java
+++ b/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/zero33/FCDotAPL1604DashS6Test.java
@@ -38,10 +38,10 @@ public class FCDotAPL1604DashS6Test {
@Test
public void testValues() throws Exception {
- Assertions.assertEquals(64, FCDotAPL1604DashS6.length());
+ Assertions.assertEquals(64, FCDotAPL1604DashP8L.length());
boolean duplicate = false;
- Map global = new HashMap<>();
- for (FCDotAPL1604DashS6 v : FCDotAPL1604DashS6.values()) {
+ Map global = new HashMap<>();
+ for (FCDotAPL1604DashP8L v : FCDotAPL1604DashP8L.values()) {
Assertions.assertNotNull(v);
if (global.containsKey(v.codePoints()[0])) {
duplicate = true;
diff --git a/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/zero33/FCDotBYD1604DashC6Test.java b/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/zero33/FCDotBYD1604DashC6Test.java
index 40d83ba..33c0ae7 100644
--- a/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/zero33/FCDotBYD1604DashC6Test.java
+++ b/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/zero33/FCDotBYD1604DashC6Test.java
@@ -38,10 +38,10 @@ public class FCDotBYD1604DashC6Test {
@Test
public void testValues() throws Exception {
- Assertions.assertEquals(64, FCDotBYD1604DashC6.length());
+ Assertions.assertEquals(64, FCDotBYD1604DashP8H.length());
boolean duplicate = false;
- Map global = new HashMap<>();
- for (FCDotBYD1604DashC6 v : FCDotBYD1604DashC6.values()) {
+ Map global = new HashMap<>();
+ for (FCDotBYD1604DashP8H v : FCDotBYD1604DashP8H.values()) {
Assertions.assertNotNull(v);
if (global.containsKey(v.codePoints()[0])) {
duplicate = true;
|