From 0d3323ba829d27666b91828b44704ccd605c3087 Mon Sep 17 00:00:00 2001 From: Willem Date: Thu, 23 Jan 2025 00:05:25 +0100 Subject: [PATCH] Rename the DEC dot cake correctly to the inverse of the others --- .../x4o/fc18/FourCornerUnicodeDisplay.java | 2 +- .../org/x4o/fc18/cake2/FourCornerDotCake.java | 2 +- .../cake2/zero33/FCDotDEC2701DashPX0.java | 4 ++-- .../fc18/zion7/FourCornerZionStenoLexer.java | 19 ++++++++++++++----- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeDisplay.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeDisplay.java index de0bbfb..f9c6c08 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeDisplay.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeDisplay.java @@ -135,7 +135,7 @@ public class FourCornerUnicodeDisplay { return true; } } - if (FourCornerDotCake.FC_DEC0127_PX0.equals(slice)) { + if (FourCornerDotCake.FC_DEC2701_PX0.equals(slice)) { output.appendCodePoint(FCDotPIE9DDash09.IMG_ESC_DEC.codePointDotIndex()); } if (FourCornerDotCake.FC_UWU0101_S1.equals(slice)) { 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 5d460fc..513d295 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 @@ -139,7 +139,7 @@ public enum FourCornerDotCake { // =========== Allow small terminators to take over 6 bit main frame computers FC_CDC1604_P6(0, 64, FCDotCDC1604DashP6.values(), "Character Dough Cake"), - FC_DEC0127_PX0(64, 27, FCDotDEC2701DashPX0.values(), "Direct or Escaped Control"), + FC_DEC2701_PX0(64, 27, FCDotDEC2701DashPX0.values(), "Direct or Escaped Control"), FC_APL0127_P7A(91, 27, FCDotAPL0127DashP7A.values(), "Array Programming Language P7A"), FC_APL0127_P7B(118, 27, FCDotAPL0127DashP7B.values(), "Array Programming Language P7B"), diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotDEC2701DashPX0.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotDEC2701DashPX0.java index c3180a7..4d88df4 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotDEC2701DashPX0.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotDEC2701DashPX0.java @@ -191,7 +191,7 @@ public enum FCDotDEC2701DashPX0 implements FourCornerX06BaklavaPointSequence, Fo @Override public int cakePointDotIndex() { - return FourCornerDotCake.FC_DEC0127_PX0.getStart() + ordinal(); + return FourCornerDotCake.FC_DEC2701_PX0.getStart() + ordinal(); } static public int valuesLength() { @@ -203,7 +203,7 @@ public enum FCDotDEC2701DashPX0 implements FourCornerX06BaklavaPointSequence, Fo } static public FCDotDEC2701DashPX0 valueOfCakePoint(int cakePoint) { - return valueOf(cakePoint - FourCornerDotCake.FC_DEC0127_PX0.getStart()); + return valueOf(cakePoint - FourCornerDotCake.FC_DEC2701_PX0.getStart()); } static public FCDotDEC2701DashPX0 valueOf(FCDotCDC1604DashP6 msb, FCDotCDC1604DashP6 csb, FCDotCDC1604DashP6 lsb) { 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 a19752e..ef1ceb3 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 @@ -88,7 +88,7 @@ public class FourCornerZionStenoLexer { if (FourCornerDotCake.FC_CDC1604_P6.equals(cakeSlice)) { continue; // handle CDC manually } - if (FourCornerDotCake.FC_DEC0127_PX0.equals(cakeSlice)) { + if (FourCornerDotCake.FC_DEC2701_PX0.equals(cakeSlice)) { continue; // handle DEC manually } if (FourCornerDotCake.FC_UNI2K_11.equals(cakeSlice)) { @@ -397,8 +397,17 @@ public class FourCornerZionStenoLexer { private Integer pepperMode = null; public StenoScannerCDCDEC() { - super(FourCornerDotCake.FC_CDC1604_P6.getStart(), FourCornerDotCake.FC_DEC0127_PX0.getStop()); + super(FourCornerDotCake.FC_CDC1604_P6.getStart(), FourCornerDotCake.FC_DEC2701_PX0.getStop()); } + +// TODO +// // Log state changes +// if (FCDotCDC1604DashP6._NEWLINE.ordinal() == cdcDECPoint) { +// lexer.currLine++; +// lexer.currCol = 0; +// lexer.fireSignals.fireStateLine(lexer.currLine); +// lexer.fireSignals.fireStateColumn(lexer.currCol); +// } @Override public void process(FourCornerZionStenoLexer lexer, int idxFirst, int idxLast) { @@ -416,8 +425,8 @@ public class FourCornerZionStenoLexer { continue; } int cdcDECPoint = lexer.input.get(scanIndex); - if (FourCornerDotCake.FC_DEC0127_PX0.contains(cdcDECPoint)) { - lexer.handler.strobeWord(FourCornerDotCake.FC_DEC0127_PX0, cdcDECPoint - FourCornerDotCake.FC_DEC0127_PX0.getStart()); + if (FourCornerDotCake.FC_DEC2701_PX0.contains(cdcDECPoint)) { + lexer.handler.strobeWord(FourCornerDotCake.FC_DEC2701_PX0, cdcDECPoint - FourCornerDotCake.FC_DEC2701_PX0.getStart()); } else { lexer.handler.strobeWord(FourCornerDotCake.FC_CDC1604_P6, cdcDECPoint); } @@ -435,7 +444,7 @@ public class FourCornerZionStenoLexer { return false; // disable escape handing } int cdcDECPoint = lexer.input.get(scanIndex); - if (FourCornerDotCake.FC_DEC0127_PX0.contains(cdcDECPoint)) { + if (FourCornerDotCake.FC_DEC2701_PX0.contains(cdcDECPoint)) { decMode = FCDotDEC2701DashPX0.valueOfCakePoint(cdcDECPoint); cleanOldDECMode(); return true;