From 9c1ff8522e865d13d871eae94acb68ad0928db1c Mon Sep 17 00:00:00 2001 From: Willem Date: Sat, 24 May 2025 18:08:56 +0200 Subject: [PATCH] Fixed ESC68_2PIE pie towers with elevator buttons --- .../org/x4o/fc18/FourCornerUnicodeImport.java | 16 +++--- .../org/x4o/fc18/cake2/FourCornerDotCake.java | 8 +-- .../fc18/cake2/pie9c/FCDotPIE9CDash01.java | 2 +- .../fc18/cake2/pie9c/FCDotPIE9CDash02.java | 2 +- .../fc18/cake2/pie9c/FCDotPIE9CDash03.java | 2 +- .../fc18/cake2/pie9c/FCDotPIE9CDash04.java | 2 +- .../fc18/cake2/pie9c/FCDotPIE9CDash05.java | 2 +- .../fc18/cake2/pie9c/FCDotPIE9CDash06.java | 2 +- .../fc18/cake2/pie9c/FCDotPIE9CDash07.java | 2 +- .../fc18/cake2/pie9c/FCDotPIE9CDash08.java | 2 +- .../fc18/cake2/pie9c/FCDotPIE9CDash09.java | 2 +- .../fc18/cake2/pie9c/FCDotPIE9CDash10.java | 2 +- .../fc18/cake2/pie9c/FCDotPIE9CDash11.java | 2 +- .../fc18/cake2/pie9c/FCDotPIE9CDash12.java | 2 +- .../fc18/cake2/pie9c/FCDotPIE9CDash13.java | 2 +- .../fc18/cake2/pie9c/FCDotPIE9CDash14.java | 2 +- .../fc18/cake2/pie9c/FCDotPIE9CDash15.java | 2 +- .../fc18/cake2/pie9c/FCDotPIE9CDash16.java | 2 +- .../fc18/cake2/pie9c/FCDotPIE9CDash17.java | 2 +- .../fc18/cake2/pie9c/FCDotPIE9CDash18.java | 2 +- .../fc18/cake2/pie9c/FCDotPIE9CDash19.java | 2 +- .../fc18/cake2/pie9c/FCDotPIE9CDash20.java | 2 +- .../fc18/cake2/pie9c/FCDotPIE9CDash21.java | 2 +- .../fc18/cake2/pie9c/FCDotPIE9CDash22.java | 2 +- .../fc18/cake2/pie9c/FCDotPIE9CDash23.java | 2 +- .../fc18/cake2/pie9c/FCDotPIE9CDash24.java | 2 +- .../fc18/cake2/pie9c/FCDotPIE9CDash25.java | 2 +- .../fc18/cake2/pie9c/FCDotPIE9CDash26.java | 2 +- .../fc18/cake2/pie9c/FCDotPIE9CDash27.java | 2 +- .../fc18/zion7/FourCornerZionStenoLexer.java | 51 ++++++++++--------- .../fc18/FourCornerUnicodeDisplayTest.java | 16 +++--- .../x4o/fc18/FourCornerUnicodeImportTest.java | 10 ++-- .../x4o/fc18/cake2/zero33/FCDotVT06Test.java | 4 +- 33 files changed, 81 insertions(+), 78 deletions(-) diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeImport.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeImport.java index 752f578..905be84 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeImport.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeImport.java @@ -259,13 +259,13 @@ public class FourCornerUnicodeImport { return false; // 18 direct cake point is found by generic lookup } if (ctx.codePoint >= '0' && ctx.codePoint <= '9') { - if (!FCDotCDC1604DashP6.NX10_J.equals(ctx.cdcNumberTerminator)) { + if (!FCDotCDC1604DashP6.NY10_CARET.equals(ctx.cdcNumberTerminator)) { if (ctx.bits == 6) { - ctx.output.addAll(toX06BaklavaPoints(FCDotCDC1604DashP6.NX10_J)); + ctx.output.addAll(toX06BaklavaPoints(FCDotCDC1604DashP6.NY10_CARET)); } else { - ctx.output.addAll(toX08MuffinPoints(FCDotCDC1604DashP6.NX10_J)); + ctx.output.addAll(toX08MuffinPoints(FCDotCDC1604DashP6.NY10_CARET)); } - ctx.cdcNumberTerminator = FCDotCDC1604DashP6.NX10_J; + ctx.cdcNumberTerminator = FCDotCDC1604DashP6.NY10_CARET; } int cdcNumberOff = ctx.codePoint - '0'; int cdcNumber = FCDotCDC1604DashP6.NX01_A.ordinal() + cdcNumberOff; @@ -288,13 +288,13 @@ public class FourCornerUnicodeImport { return false; // 18 direct cake point is found by generic lookup } if (ctx.codePoint >= 'a' && ctx.codePoint <= 'z') { - if (!FCDotCDC1604DashP6.NX26_Z.equals(ctx.cdcCaseTerminator)) { + if (!FCDotCDC1604DashP6.NY26_SQUARE_RIGHT.equals(ctx.cdcCaseTerminator)) { if (ctx.bits == 6) { - ctx.output.addAll(toX06BaklavaPoints(FCDotCDC1604DashP6.NX26_Z)); + ctx.output.addAll(toX06BaklavaPoints(FCDotCDC1604DashP6.NY26_SQUARE_RIGHT)); } else { - ctx.output.addAll(toX08MuffinPoints(FCDotCDC1604DashP6.NX26_Z)); + ctx.output.addAll(toX08MuffinPoints(FCDotCDC1604DashP6.NY26_SQUARE_RIGHT)); } - ctx.cdcCaseTerminator = FCDotCDC1604DashP6.NX26_Z; + ctx.cdcCaseTerminator = FCDotCDC1604DashP6.NY26_SQUARE_RIGHT; } int cdcNumberOff = ctx.codePoint - 'a'; int cdcNumber = FCDotCDC1604DashP6.NX01_A.ordinal() + cdcNumberOff; diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerDotCake.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerDotCake.java index 30e0ea7..beee5a6 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerDotCake.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerDotCake.java @@ -487,9 +487,9 @@ public enum FourCornerDotCake { } public static Optional valueFromCakePoint(final int cakePoint) { - final int valuesLength = VALUES.length; + final int valuesLength = valuesLength(); for (int i = 0; i < valuesLength; i++) { - FourCornerDotCake cake = VALUES[i]; + FourCornerDotCake cake = valueOf(i); if (cake.contains(cakePoint)) { return Optional.of(cake); } @@ -499,9 +499,9 @@ public enum FourCornerDotCake { static public List valuesByTower(final FourCornerDotCakeTower tower) { final List result = new ArrayList<>(); - final int valuesLength = VALUES.length; + final int valuesLength = valuesLength(); for (int i = 0; i < valuesLength; i++) { - FourCornerDotCake cake = VALUES[i]; + FourCornerDotCake cake = valueOf(i); if (cake.tower().equals(tower)) { result.add(cake); } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash01.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash01.java index e87f9ca..a9bf445 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash01.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash01.java @@ -47,7 +47,7 @@ public enum FCDotPIE9CDash01 implements FourCornerDotCollePie9 { @Override public List baklavaPointSequence() { - return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX01_A, ordinal()); + return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY01_AT, ordinal()); } @Override diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash02.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash02.java index 8ba409b..cfe429e 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash02.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash02.java @@ -48,7 +48,7 @@ public enum FCDotPIE9CDash02 implements FourCornerDotCollePie9 { @Override public List baklavaPointSequence() { - return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX02_B, ordinal()); + return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY02_BAR_V_RIGHT, ordinal()); } @Override diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash03.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash03.java index 103e342..8036180 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash03.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash03.java @@ -49,7 +49,7 @@ public enum FCDotPIE9CDash03 implements FourCornerDotCollePie9 { @Override public List baklavaPointSequence() { - return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX03_C, ordinal()); + return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY03_BAR_V_LEFT, ordinal()); } @Override diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash04.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash04.java index ba23886..fbafbd3 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash04.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash04.java @@ -50,7 +50,7 @@ public enum FCDotPIE9CDash04 implements FourCornerDotCollePie9 { @Override public List baklavaPointSequence() { - return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX04_D, ordinal()); + return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY04_BAR_UNDER, ordinal()); } @Override diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash05.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash05.java index 22239ac..0234bf0 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash05.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash05.java @@ -51,7 +51,7 @@ public enum FCDotPIE9CDash05 implements FourCornerDotCollePie9 { @Override public List baklavaPointSequence() { - return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX05_E, ordinal()); + return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY05_BAR_VERTICAL, ordinal()); } @Override diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash06.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash06.java index 9650d47..2e3100e 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash06.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash06.java @@ -52,7 +52,7 @@ public enum FCDotPIE9CDash06 implements FourCornerDotCollePie9 { @Override public List baklavaPointSequence() { - return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX06_F, ordinal()); + return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY06_PERCENT, ordinal()); } @Override diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash07.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash07.java index 6dbe794..bafed14 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash07.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash07.java @@ -53,7 +53,7 @@ public enum FCDotPIE9CDash07 implements FourCornerDotCollePie9 { @Override public List baklavaPointSequence() { - return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX07_G, ordinal()); + return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY07_DOLLAR, ordinal()); } @Override diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash08.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash08.java index f8a6f7d..21bfd92 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash08.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash08.java @@ -54,7 +54,7 @@ public enum FCDotPIE9CDash08 implements FourCornerDotCollePie9 { @Override public List baklavaPointSequence() { - return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX08_H, ordinal()); + return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY08_HASH, ordinal()); } @Override diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash09.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash09.java index 25f70f9..03bcc93 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash09.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash09.java @@ -55,7 +55,7 @@ public enum FCDotPIE9CDash09 implements FourCornerDotCollePie9 { @Override public List baklavaPointSequence() { - return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX09_I, ordinal()); + return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY09_EQUALS, ordinal()); } @Override diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash10.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash10.java index 001928f..6aec96a 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash10.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash10.java @@ -56,7 +56,7 @@ public enum FCDotPIE9CDash10 implements FourCornerDotCollePie9 { @Override public List baklavaPointSequence() { - return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX10_J, ordinal()); + return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY10_CARET, ordinal()); } @Override diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash11.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash11.java index 3c4bac4..fa84a5b 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash11.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash11.java @@ -57,7 +57,7 @@ public enum FCDotPIE9CDash11 implements FourCornerDotCollePie9 { @Override public List baklavaPointSequence() { - return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX11_K, ordinal()); + return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY11_BACKTICK, ordinal()); } @Override diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash12.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash12.java index f418ba8..d710637 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash12.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash12.java @@ -58,7 +58,7 @@ public enum FCDotPIE9CDash12 implements FourCornerDotCollePie9 { @Override public List baklavaPointSequence() { - return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX12_L, ordinal()); + return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY12_QUOTATION, ordinal()); } @Override diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash13.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash13.java index 0f935f3..c52a111 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash13.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash13.java @@ -59,7 +59,7 @@ public enum FCDotPIE9CDash13 implements FourCornerDotCollePie9 { @Override public List baklavaPointSequence() { - return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX13_M, ordinal()); + return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY13_APOSTROPHE, ordinal()); } @Override diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash14.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash14.java index 28150b0..9331f38 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash14.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash14.java @@ -60,7 +60,7 @@ public enum FCDotPIE9CDash14 implements FourCornerDotCollePie9 { @Override public List baklavaPointSequence() { - return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX14_N, ordinal()); + return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY14_SEMICOLON, ordinal()); } @Override diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash15.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash15.java index 4ae75a5..da6bf89 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash15.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash15.java @@ -61,7 +61,7 @@ public enum FCDotPIE9CDash15 implements FourCornerDotCollePie9 { @Override public List baklavaPointSequence() { - return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX15_O, ordinal()); + return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY15_COLON, ordinal()); } @Override diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash16.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash16.java index 4c0936c..7dfa850 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash16.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash16.java @@ -62,7 +62,7 @@ public enum FCDotPIE9CDash16 implements FourCornerDotCollePie9 { @Override public List baklavaPointSequence() { - return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX16_P, ordinal()); + return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY16_DOT, ordinal()); } @Override diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash17.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash17.java index afa0f56..edb2e34 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash17.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash17.java @@ -63,7 +63,7 @@ public enum FCDotPIE9CDash17 implements FourCornerDotCollePie9 { @Override public List baklavaPointSequence() { - return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX17_Q, ordinal()); + return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY17_COMMA, ordinal()); } @Override diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash18.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash18.java index 94c8959..0951e1d 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash18.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash18.java @@ -65,7 +65,7 @@ public enum FCDotPIE9CDash18 implements FourCornerDotCollePie9 { @Override public List baklavaPointSequence() { - return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX18_R, ordinal()); + return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY18_ASTERISK, ordinal()); } @Override diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash19.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash19.java index aceb3a3..157b972 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash19.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash19.java @@ -65,7 +65,7 @@ public enum FCDotPIE9CDash19 implements FourCornerDotCollePie9 { @Override public List baklavaPointSequence() { - return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX19_S, ordinal()); + return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY19_MINUS, ordinal()); } @Override diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash20.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash20.java index 9c19fc8..911067e 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash20.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash20.java @@ -66,7 +66,7 @@ public enum FCDotPIE9CDash20 implements FourCornerDotCollePie9 { @Override public List baklavaPointSequence() { - return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX20_T, ordinal()); + return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY20_PLUS, ordinal()); } @Override diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash21.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash21.java index 1250f7e..cc7e933 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash21.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash21.java @@ -67,7 +67,7 @@ public enum FCDotPIE9CDash21 implements FourCornerDotCollePie9 { @Override public List baklavaPointSequence() { - return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX21_U, ordinal()); + return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY21_TILDE, ordinal()); } @Override diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash22.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash22.java index c27ab0a..9d101a1 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash22.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash22.java @@ -68,7 +68,7 @@ public enum FCDotPIE9CDash22 implements FourCornerDotCollePie9 { @Override public List baklavaPointSequence() { - return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX22_V, ordinal()); + return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY22_CURLY_RIGHT, ordinal()); } @Override diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash23.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash23.java index 4ba352e..34e5193 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash23.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash23.java @@ -69,7 +69,7 @@ public enum FCDotPIE9CDash23 implements FourCornerDotCollePie9 { @Override public List baklavaPointSequence() { - return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX23_W, ordinal()); + return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY23_CURLY_LEFT, ordinal()); } @Override diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash24.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash24.java index c98a597..36fa41a 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash24.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash24.java @@ -70,7 +70,7 @@ public enum FCDotPIE9CDash24 implements FourCornerDotCollePie9 { @Override public List baklavaPointSequence() { - return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX24_X, ordinal()); + return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY24_ROUND_RIGHT, ordinal()); } @Override diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash25.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash25.java index 213b779..3883dba 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash25.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash25.java @@ -73,7 +73,7 @@ public enum FCDotPIE9CDash25 implements FourCornerDotCollePie9 { @Override public List baklavaPointSequence() { - return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX25_Y, ordinal()); + return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY25_ROUND_LEFT, ordinal()); } @Override diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash26.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash26.java index 152f50c..cd4f8f0 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash26.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash26.java @@ -75,7 +75,7 @@ public enum FCDotPIE9CDash26 implements FourCornerDotCollePie9 { @Override public List baklavaPointSequence() { - return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX26_Z, ordinal()); + return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY26_SQUARE_RIGHT, ordinal()); } @Override diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash27.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash27.java index 4e1493b..1cd2513 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash27.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash27.java @@ -73,7 +73,7 @@ public enum FCDotPIE9CDash27 implements FourCornerDotCollePie9 { @Override public List baklavaPointSequence() { - return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX27_AMP, ordinal()); + return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY27_SQUARE_LEFT, ordinal()); } @Override diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoLexer.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoLexer.java index bf41401..31f3185 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoLexer.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoLexer.java @@ -68,7 +68,8 @@ public class FourCornerZionStenoLexer { private FCDotINC0801DashP8 cdcDECModeInc = null; private FCDotDEC0801DashE10 cdcDECModeE10 = null; private Integer cdcDECModeNcr = null; - private Integer cdcDECModePie = null; + private int cdcDECModePie = 0; + private boolean cdcDECModePieAlt = false; private FourCornerZionStenoLexerSmoke smokeSignals = CLEAN_SMOKE; private FourCornerZionStenoLexerFire fireSignals = CLEAN_FIRE; @@ -255,7 +256,8 @@ public class FourCornerZionStenoLexer { cdcDECModeInc = null; cdcDECModeE10 = null; cdcDECModeNcr = null; - cdcDECModePie = null; + cdcDECModePie = 0; + cdcDECModePieAlt = false; } abstract static private class StenoScanner { @@ -712,30 +714,31 @@ public class FourCornerZionStenoLexer { private boolean handlePIE(FourCornerZionStenoLexer lexer) { int cdcPoint = lexer.input.get(lexer.cdcDECScanIndex); - // TODO: add PIE left/right + elevator button support - - if (lexer.cdcDECModePie == null) { - lexer.cdcDECModePie = cdcPoint; - if (lexer.cdcDECModePie < FCDotCDC1604DashP6.NX01_A.ordinal()) { - lexer.decModeReset(); - return false; // print char - } else { - return true; - } + // elevator button selector + if (cdcPoint >= FCDotCDC1604DashP6.NY27_SQUARE_LEFT.ordinal() && cdcPoint <= FCDotCDC1604DashP6.NY01_AT.ordinal()) { + lexer.cdcDECModePie = FCDotCDC1604DashP6.NY01_AT.ordinal() - cdcPoint; // goto relative + return true; // swallow button + } else if (cdcPoint == FCDotCDC1604DashP6._SALT_COMPARE_LEFT.ordinal()) { + lexer.cdcDECModePieAlt = false; + return true; // eat the left salt + } else if (cdcPoint == FCDotCDC1604DashP6._SALT_COMPARE_RIGHT.ordinal()) { + lexer.cdcDECModePieAlt = true; + return true; // eat the right salt + } else if (cdcPoint <= FCDotCDC1604DashP6._PEPPER_DOWNUP_QUESTION.ordinal()) { + lexer.decModeReset(); + return false; // print char } - if (lexer.cdcDECModePie != null) { - if (cdcPoint < FCDotCDC1604DashP6.NX01_A.ordinal()) { - lexer.decModeReset(); - return false; - } - if (cdcPoint > lexer.cdcDECModePie) { - lexer.decModeReset(); - return false; - } - } - int terminatorOffZero = lexer.cdcDECModePie - FCDotCDC1604DashP6.NX01_A.ordinal(); + int terminatorOffZero = lexer.cdcDECModePie; int numberIdxOffZero = cdcPoint - FCDotCDC1604DashP6.NX01_A.ordinal(); - FourCornerDotCake slice = FourCornerDotCake.valueOf(terminatorOffZero + FourCornerDotCake.FC_PIE9C_01.ordinal()); + if (numberIdxOffZero > terminatorOffZero) { + lexer.decModeReset(); + return false; + } + int sliceBase = FourCornerDotCake.FC_PIE9C_01.ordinal(); + if (lexer.cdcDECModePieAlt) { + sliceBase = FourCornerDotCake.FC_PIE9D_01.ordinal(); + } + FourCornerDotCake slice = FourCornerDotCake.valueOf(terminatorOffZero + sliceBase); lexer.handler.strobeWord(slice, numberIdxOffZero); return true; } diff --git a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/FourCornerUnicodeDisplayTest.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/FourCornerUnicodeDisplayTest.java index 14c3c9c..497216e 100644 --- a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/FourCornerUnicodeDisplayTest.java +++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/FourCornerUnicodeDisplayTest.java @@ -55,16 +55,17 @@ public class FourCornerUnicodeDisplayTest { cdc.add(FCDotCDC1604DashP6.NX04_D); cdc.add(FCDotCDC1604DashP6.NY16_DOT); cdc.add(FCDotDEC2701DashPX0.ESC68_2PIE); - cdc.add(FCDotCDC1604DashP6.NX26_Z); // select lower case + cdc.add(FCDotCDC1604DashP6.NY26_SQUARE_RIGHT); // select lower case cdc.add(FCDotCDC1604DashP6.NX10_J); cdc.add(FCDotCDC1604DashP6.NX11_K); + cdc.add(FCDotCDC1604DashP6._SALT_COMPARE_RIGHT); cdc.add(FCDotCDC1604DashP6.NX12_L); cdc.add(FCDotCDC1604DashP6.NX13_M); cdc.add(FCDotDEC2701DashPX0.ESC_STOP); cdc.add(FCDotCDC1604DashP6.NX15_O); - Assertions.assertEquals("ab BCD.jklmO", FourCornerUnicodeDisplay.text().renderFromX06(cdc)); - Assertions.assertEquals("␇␇␘ZA␇␇␘ZB␘␆␆ABCD.␇␇␘ZJKLM␘␘␘O", FourCornerUnicodeDisplay.raw().renderFromX06(cdc)); + Assertions.assertEquals("ab BCD.jk𝐋𝐌O", FourCornerUnicodeDisplay.text().renderFromX06(cdc)); + Assertions.assertEquals("␇␇␘]A␇␇␘]B␘␆␆ABCD.␇␇␘]JK>LM␘␘␘O", FourCornerUnicodeDisplay.raw().renderFromX06(cdc)); } @Test @@ -72,23 +73,22 @@ public class FourCornerUnicodeDisplayTest { List cdc = new ArrayList<>(); cdc.add(FCDotCDC1604DashP6.NX24_X); // = X cdc.add(FCDotDEC2701DashPX0.ESC68_2PIE); - cdc.add(FCDotCDC1604DashP6.NY10_CARET); // ^ - cdc.add(FCDotCDC1604DashP6.NY06_PERCENT); // = % + cdc.add(FCDotCDC1604DashP6.NY10_CARET); + cdc.add(FCDotCDC1604DashP6.NY06_PERCENT); cdc.add(FCDotDEC2701DashPX0.ESC68_2PIE); cdc.add(FCDotCDC1604DashP6.NY01_AT); cdc.add(FCDotCDC1604DashP6.NX11_K); // = K - Assertions.assertEquals("X^%@K", FourCornerUnicodeDisplay.text().renderFromX06(cdc)); + Assertions.assertEquals("XK", FourCornerUnicodeDisplay.text().renderFromX06(cdc)); } @Test public void testNumberPieOutOfRange() throws Exception { List cdc = new ArrayList<>(); cdc.add(FCDotDEC2701DashPX0.ESC68_2PIE); - cdc.add(FCDotCDC1604DashP6.NX01_A); cdc.add(FCDotCDC1604DashP6.NX02_B); // B cdc.add(FCDotDEC2701DashPX0.ESC68_2PIE); - cdc.add(FCDotCDC1604DashP6.NX10_J); + cdc.add(FCDotCDC1604DashP6.NY10_CARET); cdc.add(FCDotCDC1604DashP6.NX04_D); // 3 cdc.add(FCDotCDC1604DashP6.NX11_K); // K diff --git a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/FourCornerUnicodeImportTest.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/FourCornerUnicodeImportTest.java index c88e483..29842da 100644 --- a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/FourCornerUnicodeImportTest.java +++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/FourCornerUnicodeImportTest.java @@ -69,7 +69,7 @@ public class FourCornerUnicodeImportTest { Assertions.assertFalse(cdc.isEmpty()); Assertions.assertEquals(8, cdc.size()); Assertions.assertEquals(FCDotDEC2701DashPX0.ESC68_2PIE, cdi.next()); - Assertions.assertEquals(FCDotCDC1604DashP6.NX26_Z, cdi.next()); + Assertions.assertEquals(FCDotCDC1604DashP6.NY26_SQUARE_RIGHT, cdi.next()); Assertions.assertEquals(FCDotCDC1604DashP6.NX06_F, cdi.next()); Assertions.assertEquals(FCDotCDC1604DashP6.NX15_O, cdi.next()); Assertions.assertEquals(FCDotCDC1604DashP6.NX15_O, cdi.next()); @@ -89,7 +89,7 @@ public class FourCornerUnicodeImportTest { Assertions.assertFalse(cdc.isEmpty()); Assertions.assertEquals(11, cdc.size()); Assertions.assertEquals(FCDotDEC2701DashPX0.ESC68_2PIE, cdi.next()); - Assertions.assertEquals(FCDotCDC1604DashP6.NX26_Z, cdi.next()); + Assertions.assertEquals(FCDotCDC1604DashP6.NY26_SQUARE_RIGHT, cdi.next()); Assertions.assertEquals(FCDotCDC1604DashP6.NX06_F, cdi.next()); Assertions.assertEquals(FCDotCDC1604DashP6.NX15_O, cdi.next()); Assertions.assertEquals(FCDotCDC1604DashP6.NX15_O, cdi.next()); @@ -112,7 +112,7 @@ public class FourCornerUnicodeImportTest { Assertions.assertFalse(cdc.isEmpty()); Assertions.assertEquals(9, cdc.size()); Assertions.assertEquals(FCDotDEC2701DashPX0.ESC68_2PIE, cdi.next()); - Assertions.assertEquals(FCDotCDC1604DashP6.NX26_Z, cdi.next()); + Assertions.assertEquals(FCDotCDC1604DashP6.NY26_SQUARE_RIGHT, cdi.next()); Assertions.assertEquals(FCDotCDC1604DashP6.NX06_F, cdi.next()); Assertions.assertEquals(FCDotCDC1604DashP6.NX15_O, cdi.next()); Assertions.assertEquals(FCDotCDC1604DashP6.NX15_O, cdi.next()); @@ -175,7 +175,7 @@ public class FourCornerUnicodeImportTest { Assertions.assertFalse(cdc.isEmpty()); Assertions.assertEquals(10, cdc.size()); Assertions.assertEquals(FCDotDEC2701DashPX0.ESC68_2PIE, cdi.next()); - Assertions.assertEquals(FCDotCDC1604DashP6.NX10_J, cdi.next()); + Assertions.assertEquals(FCDotCDC1604DashP6.NY10_CARET, cdi.next()); Assertions.assertEquals(FCDotCDC1604DashP6.NX01_A, cdi.next()); // 0 Assertions.assertEquals(FCDotCDC1604DashP6.NX02_B, cdi.next()); // 1 Assertions.assertEquals(FCDotCDC1604DashP6.NX03_C, cdi.next()); // 2 @@ -197,7 +197,7 @@ public class FourCornerUnicodeImportTest { Assertions.assertFalse(cdc.isEmpty()); Assertions.assertEquals(10, cdc.size()); Assertions.assertEquals(FCDotDEC2701DashPX0.ESC68_2PIE, cdi.next()); - Assertions.assertEquals(FCDotCDC1604DashP6.NX10_J, cdi.next()); + Assertions.assertEquals(FCDotCDC1604DashP6.NY10_CARET, cdi.next()); Assertions.assertEquals(FCDotCDC1604DashP6.NX01_A, cdi.next()); // 0 Assertions.assertEquals(FCDotCDC1604DashP6.NX02_B, cdi.next()); // 1 Assertions.assertEquals(FCDotCDC1604DashP6.NX03_C, cdi.next()); // 2 diff --git a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotVT06Test.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotVT06Test.java index 9a794f5..6e4eebc 100644 --- a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotVT06Test.java +++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotVT06Test.java @@ -50,7 +50,7 @@ public class FCDotVT06Test { cdc.addAll(FourCornerUnicodeMapper.DICTIONARY.toDecimalsX06(456)); cdc.add(FCDotCDC1604DashP6._SALAH_EXCLAMATION); - Assertions.assertEquals("␘␘␇AG␇␇␘JBCD?␇␇␘JEFG!", FourCornerUnicodeDisplay.raw().renderFromX06(cdc)); + Assertions.assertEquals("␘␘␇AG␇␇␘^BCD?␇␇␘^EFG!", FourCornerUnicodeDisplay.raw().renderFromX06(cdc)); // TODO: Fix lexer embedded escapes, and display external with single unicode escape sign //Assertions.assertEquals("?AG?BCD?EFG!", FourCornerUnicodeDisplay.text().renderFromX06(cdc)); } @@ -62,6 +62,6 @@ public class FCDotVT06Test { cdc.addAll(FourCornerUnicodeMapper.DICTIONARY.toDecimalsX06(5)); cdc.add(FCDotCDC1604DashP6._SALAH_EXCLAMATION); - Assertions.assertEquals("␘␘␇CA␇␇␘JF!", FourCornerUnicodeDisplay.raw().renderFromX06(cdc)); + Assertions.assertEquals("␘␘␇CA␇␇␘^F!", FourCornerUnicodeDisplay.raw().renderFromX06(cdc)); } }