From 322d86ad4026ca7450cabc79f3310ff8f7f9962b Mon Sep 17 00:00:00 2001 From: Willem Date: Sat, 6 Sep 2025 14:00:28 +0200 Subject: [PATCH] FC16: Renamed all FC6 only escape names --- .../java/org/x4o/fc18/FourCornerUnicodeImport.java | 4 ++-- .../org/x4o/fc18/cake2/FourCornerDotCollePie9.java | 4 ++-- .../fc18/cake2/zero33/dec1/FCDotCMD5401Dash2D.java | 2 +- .../fc18/cake2/zero33/dec1/FCDotDEC2701DashPX0.java | 12 ++++++------ .../fc18/cake2/zero33/dec1/FCDotINC0801DashP8.java | 2 +- .../x4o/fc18/zion7/FourCornerZionStenoGrapher.java | 2 +- .../org/x4o/fc18/zion7/FourCornerZionStenoLexer.java | 10 +++++----- .../org/x4o/fc18/FourCornerUnicodeDisplayTest.java | 12 ++++++------ .../org/x4o/fc18/FourCornerUnicodeImportTest.java | 6 +++--- 9 files changed, 27 insertions(+), 27 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 49a67c2..e6b774b 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 @@ -276,7 +276,7 @@ public class FourCornerUnicodeImport { } if (ctx.codePoint >= '0' && ctx.codePoint <= '9') { if (!FCDotCDC1604DashP6.NY10_CARET.equals(ctx.cdcNumberTerminator)) { - ctx.output.add(FCDotDEC2701DashPX0.ESC68_2PIE9C); + ctx.output.add(FCDotDEC2701DashPX0.ESC6_2PIE9C); ctx.output.add(FCDotCDC1604DashP6.NY10_CARET); ctx.cdcNumberTerminator = FCDotCDC1604DashP6.NY10_CARET; } @@ -298,7 +298,7 @@ public class FourCornerUnicodeImport { } if (ctx.codePoint >= 'a' && ctx.codePoint <= 'z') { if (!FCDotCDC1604DashP6.NY26_SQUARE_RIGHT.equals(ctx.cdcCaseTerminator)) { - ctx.output.add(FCDotDEC2701DashPX0.ESC68_2PIE9C); + ctx.output.add(FCDotDEC2701DashPX0.ESC6_2PIE9C); ctx.output.add(FCDotCDC1604DashP6.NY26_SQUARE_RIGHT); ctx.cdcCaseTerminator = FCDotCDC1604DashP6.NY26_SQUARE_RIGHT; } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerDotCollePie9.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerDotCollePie9.java index 76c1fe6..fc58d02 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerDotCollePie9.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerDotCollePie9.java @@ -57,7 +57,7 @@ public interface FourCornerDotCollePie9 extends FourCornerX06BaklavaPointSequenc default List baklavaPointsPIE9C(FCDotCDC1604DashP6 letter, int offset) { List result = new ArrayList<>(); - result.addAll(FCDotDEC2701DashPX0.ESC68_2PIE9C.baklavaPointSequence()); + result.addAll(FCDotDEC2701DashPX0.ESC6_2PIE9C.baklavaPointSequence()); result.add(letter.baklavaPointDotIndex()); result.add(FCDotCDC1604DashP6.NX01_A.ordinal() + offset); //result.add(FCDotCDC1604DashP6.SEQ_SALAH__EXCLAMATION.cakePointDotIndex()); // TODO: add api layer snake for head @@ -66,7 +66,7 @@ public interface FourCornerDotCollePie9 extends FourCornerX06BaklavaPointSequenc default List baklavaPointsPIE9D(FCDotCDC1604DashP6 letter, int offset) { List result = new ArrayList<>(); - result.addAll(FCDotDEC2701DashPX0.ESC68_2PIE9D.baklavaPointSequence()); + result.addAll(FCDotDEC2701DashPX0.ESC6_2PIE9D.baklavaPointSequence()); result.add(letter.baklavaPointDotIndex()); result.add(FCDotCDC1604DashP6.NX01_A.ordinal() + offset); //result.add(FCDotCDC1604DashP6.SEQ_SALAH__EXCLAMATION.cakePointDotIndex()); // TODO: add api layer snake for head diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/dec1/FCDotCMD5401Dash2D.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/dec1/FCDotCMD5401Dash2D.java index b56746c..55d7648 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/dec1/FCDotCMD5401Dash2D.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/dec1/FCDotCMD5401Dash2D.java @@ -58,7 +58,7 @@ public enum FCDotCMD5401Dash2D implements FourCornerX06BaklavaPointSequence, Fou @Override public List baklavaPointSequence() { List result = new ArrayList<>(); - result.addAll(FCDotDEC2701DashPX0.ESC68_CMD5401_2D.baklavaPointSequence()); + result.addAll(FCDotDEC2701DashPX0.ESC6_CMD5401_2D.baklavaPointSequence()); result.add(selector.baklavaPointDotIndex()); return result; } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/dec1/FCDotDEC2701DashPX0.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/dec1/FCDotDEC2701DashPX0.java index a1993f5..d16cc34 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/dec1/FCDotDEC2701DashPX0.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/dec1/FCDotDEC2701DashPX0.java @@ -101,7 +101,7 @@ public enum FCDotDEC2701DashPX0 implements FourCornerX06BaklavaPointSequence, Fo /// < = goto 9C left cake /// > = goto 9D right cake /// out of range or ‽ or ¿ = end mode - ESC68_2PIE9C, + ESC6_2PIE9C, /// _ESC6_X2 _ESC6_X2 _ESC6_X3 = 15 /// Select packed pie 9D terminator symbol on 6 and 8 bit systems. @@ -112,24 +112,24 @@ public enum FCDotDEC2701DashPX0 implements FourCornerX06BaklavaPointSequence, Fo /// < = goto 9C left cake /// > = goto 9D right cake /// out of range or ‽ or ¿ = end mode - ESC68_2PIE9D, + ESC6_2PIE9D, /// _ESC6_X2 _ESC6_X3 _ESC6_X1 = 16 /// Embed symbol mode starts in CDC, use sequence of 3 UPDOWN letters to select mode and end with ‽ - ESC68_INC0801_P8, + ESC6_INC0801_P8, /// _ESC6_X2 _ESC6_X3 _ESC6_X2 = 17 __ESC_RESERVED_B8, /// _ESC6_X2 _ESC6_X3 _ESC6_X3 = 18 /// Command for embedded octal sand worm for 6 or 8 bit systems. - ESC68_SAND_WORM, + ESC6_SAND_WORM, // =========== Internal control sequences /// _ESC6_X3 _ESC6_X1 _ESC6_X1 = 19 /// Command for type writer signals shortcuts. - ESC68_CMD5401_2D, + ESC6_CMD5401_2D, /// _ESC6_X3 _ESC6_X1 _ESC6_X2 = 20 __ESC_RESERVED_C2, @@ -151,7 +151,7 @@ public enum FCDotDEC2701DashPX0 implements FourCornerX06BaklavaPointSequence, Fo /// _ESC6_X3 _ESC6_X3 _ESC6_X2 = 26 /// Virtual Typewriter 0ctal Six bit control sequences with argumented commands which MUST end with ‽ - ESC_VT06, + ESC_VT06, // TODO: add VT_18 /// _ESC6_X3 _ESC6_X3 _ESC6_X3 = 27 /// An optional triple escape stops the open ended escape sequence. diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/dec1/FCDotINC0801DashP8.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/dec1/FCDotINC0801DashP8.java index 35dd025..da54013 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/dec1/FCDotINC0801DashP8.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/dec1/FCDotINC0801DashP8.java @@ -88,7 +88,7 @@ public enum FCDotINC0801DashP8 implements FourCornerX06BaklavaPointSequence, Fou @Override public List baklavaPointSequence() { List result = new ArrayList<>(); - result.addAll(FCDotDEC2701DashPX0.ESC68_INC0801_P8.baklavaPointSequence()); + result.addAll(FCDotDEC2701DashPX0.ESC6_INC0801_P8.baklavaPointSequence()); result.addAll(FCDotCDC1604DashP6.pepper3SequenceWritePoints(ordinal())); return result; } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoGrapher.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoGrapher.java index 510ad98..fb31b68 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoGrapher.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoGrapher.java @@ -283,7 +283,7 @@ public class FourCornerZionStenoGrapher { Iterator walkItr = sandWalk.iterator(); Iterator spiceItr = sandSpice.iterator(); if (isSixBit) { - outAdd(FCDotDEC2701DashPX0.ESC68_SAND_WORM.cakePointDotIndex()); + outAdd(FCDotDEC2701DashPX0.ESC6_SAND_WORM.cakePointDotIndex()); while (walkItr.hasNext()) { outAdd(FCDotCDC1604DashP6.NX01_A.cakePointDotIndex() + walkItr.next().ordinal()); } 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 281c7e9..87e79ad 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 @@ -710,25 +710,25 @@ public class FourCornerZionStenoLexer implements FourCornerZionStenoPetroglyphs } return true; } - if (FCDotDEC2701DashPX0.ESC68_2PIE9C.equals(cdcDECMode)) { + if (FCDotDEC2701DashPX0.ESC6_2PIE9C.equals(cdcDECMode)) { if (lexer.cdcDECModePieAlt == null) { lexer.cdcDECModePieAlt = false; } return handlePIE(lexer); } - if (FCDotDEC2701DashPX0.ESC68_2PIE9D.equals(cdcDECMode)) { + if (FCDotDEC2701DashPX0.ESC6_2PIE9D.equals(cdcDECMode)) { if (lexer.cdcDECModePieAlt == null) { lexer.cdcDECModePieAlt = true; } return handlePIE(lexer); } - if (FCDotDEC2701DashPX0.ESC68_CMD5401_2D.equals(cdcDECMode)) { + if (FCDotDEC2701DashPX0.ESC6_CMD5401_2D.equals(cdcDECMode)) { return handleCMD(lexer); } - if (FCDotDEC2701DashPX0.ESC68_INC0801_P8.equals(cdcDECMode)) { + if (FCDotDEC2701DashPX0.ESC6_INC0801_P8.equals(cdcDECMode)) { return handleINC(lexer); } - if (FCDotDEC2701DashPX0.ESC68_SAND_WORM.equals(cdcDECMode)) { + if (FCDotDEC2701DashPX0.ESC6_SAND_WORM.equals(cdcDECMode)) { return handleSandWorm68(lexer); } return false; 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 201ec2e..27a85b1 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 @@ -53,7 +53,7 @@ public class FourCornerUnicodeDisplayTest { cdc.add(FCDotCDC1604DashP6.NX03_C); cdc.add(FCDotCDC1604DashP6.NX04_D); cdc.add(FCDotCDC1604DashP6.NY16_DOT); - cdc.add(FCDotDEC2701DashPX0.ESC68_2PIE9C); + cdc.add(FCDotDEC2701DashPX0.ESC6_2PIE9C); cdc.add(FCDotCDC1604DashP6.NY26_SQUARE_RIGHT); // select lower case cdc.add(FCDotCDC1604DashP6.NX10_J); cdc.add(FCDotCDC1604DashP6.NX11_K); @@ -71,10 +71,10 @@ public class FourCornerUnicodeDisplayTest { public void testNumberTerminatorOutOfRange() throws Exception { List cdc = new ArrayList<>(); cdc.add(FCDotCDC1604DashP6.NX24_X); // = X - cdc.add(FCDotDEC2701DashPX0.ESC68_2PIE9C); + cdc.add(FCDotDEC2701DashPX0.ESC6_2PIE9C); cdc.add(FCDotCDC1604DashP6.NY10_CARET); cdc.add(FCDotCDC1604DashP6.NY06_PERCENT); - cdc.add(FCDotDEC2701DashPX0.ESC68_2PIE9C); + cdc.add(FCDotDEC2701DashPX0.ESC6_2PIE9C); cdc.add(FCDotCDC1604DashP6.NY01_AT); cdc.add(FCDotCDC1604DashP6.NX11_K); // = K @@ -84,9 +84,9 @@ public class FourCornerUnicodeDisplayTest { @Test public void testNumberPieOutOfRange() throws Exception { List cdc = new ArrayList<>(); - cdc.add(FCDotDEC2701DashPX0.ESC68_2PIE9C); + cdc.add(FCDotDEC2701DashPX0.ESC6_2PIE9C); cdc.add(FCDotCDC1604DashP6.NX02_B); // B - cdc.add(FCDotDEC2701DashPX0.ESC68_2PIE9C); + cdc.add(FCDotDEC2701DashPX0.ESC6_2PIE9C); cdc.add(FCDotCDC1604DashP6.NY10_CARET); cdc.add(FCDotCDC1604DashP6.NX04_D); // 3 cdc.add(FCDotCDC1604DashP6.NX11_K); // K @@ -97,7 +97,7 @@ public class FourCornerUnicodeDisplayTest { @Test public void testDec2PieText() throws Exception { List cdc = new ArrayList<>(); - cdc.add(FCDotDEC2701DashPX0.ESC68_2PIE9C); + cdc.add(FCDotDEC2701DashPX0.ESC6_2PIE9C); cdc.add(FCDotCDC1604DashP6.NY24_ROUND_RIGHT); cdc.add(FCDotCDC1604DashP6.NX08_H); cdc.add(FCDotCDC1604DashP6.NX15_O); 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 f0ce51f..b7df0eb 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 @@ -67,7 +67,7 @@ public class FourCornerUnicodeImportTest { Assertions.assertNotNull(cdc); Assertions.assertFalse(cdc.isEmpty()); Assertions.assertEquals(8, cdc.size()); - Assertions.assertEquals(FCDotDEC2701DashPX0.ESC68_2PIE9C, cdi.next()); + Assertions.assertEquals(FCDotDEC2701DashPX0.ESC6_2PIE9C, cdi.next()); Assertions.assertEquals(FCDotCDC1604DashP6.NY26_SQUARE_RIGHT, cdi.next()); Assertions.assertEquals(FCDotCDC1604DashP6.NX06_F, cdi.next()); Assertions.assertEquals(FCDotCDC1604DashP6.NX15_O, cdi.next()); @@ -87,7 +87,7 @@ public class FourCornerUnicodeImportTest { Assertions.assertNotNull(cdc); Assertions.assertFalse(cdc.isEmpty()); Assertions.assertEquals(9, cdc.size()); - Assertions.assertEquals(FCDotDEC2701DashPX0.ESC68_2PIE9C, cdi.next()); + Assertions.assertEquals(FCDotDEC2701DashPX0.ESC6_2PIE9C, cdi.next()); Assertions.assertEquals(FCDotCDC1604DashP6.NY26_SQUARE_RIGHT, cdi.next()); Assertions.assertEquals(FCDotCDC1604DashP6.NX06_F, cdi.next()); Assertions.assertEquals(FCDotCDC1604DashP6.NX15_O, cdi.next()); @@ -151,7 +151,7 @@ public class FourCornerUnicodeImportTest { Assertions.assertNotNull(cdc); Assertions.assertFalse(cdc.isEmpty()); Assertions.assertEquals(10, cdc.size()); - Assertions.assertEquals(FCDotDEC2701DashPX0.ESC68_2PIE9C, cdi.next()); + Assertions.assertEquals(FCDotDEC2701DashPX0.ESC6_2PIE9C, 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