arch-jedi/nx01
1
0
Fork 0
Code Issues Pull requests Releases Packages Activity Actions

FC16: Renamed all FC6 only escape names

Browse source
This commit is contained in:
Willem Cazander 2025-09-06 14:00:28 +02:00
parent 8a7bfff19b
commit 322d86ad40
9 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeImport.java
View file

@ -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;
}

4
nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerDotCollePie9.java
View file

@ -57,7 +57,7 @@ public interface FourCornerDotCollePie9 extends FourCornerX06BaklavaPointSequenc
default List<Integer> baklavaPointsPIE9C(FCDotCDC1604DashP6 letter, int offset) {
List<Integer> 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<Integer> baklavaPointsPIE9D(FCDotCDC1604DashP6 letter, int offset) {
List<Integer> 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

2
nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/dec1/FCDotCMD5401Dash2D.java
View file

@ -58,7 +58,7 @@ public enum FCDotCMD5401Dash2D implements FourCornerX06BaklavaPointSequence, Fou
@Override
public List<Integer> baklavaPointSequence() {
List<Integer> result = new ArrayList<>();
result.addAll(FCDotDEC2701DashPX0.ESC68_CMD5401_2D.baklavaPointSequence());
result.addAll(FCDotDEC2701DashPX0.ESC6_CMD5401_2D.baklavaPointSequence());
result.add(selector.baklavaPointDotIndex());
return result;
}

12
nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/dec1/FCDotDEC2701DashPX0.java
View file

@ -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.

2
nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/dec1/FCDotINC0801DashP8.java
View file

@ -88,7 +88,7 @@ public enum FCDotINC0801DashP8 implements FourCornerX06BaklavaPointSequence, Fou
@Override
public List<Integer> baklavaPointSequence() {
List<Integer> result = new ArrayList<>();
result.addAll(FCDotDEC2701DashPX0.ESC68_INC0801_P8.baklavaPointSequence());
result.addAll(FCDotDEC2701DashPX0.ESC6_INC0801_P8.baklavaPointSequence());
result.addAll(FCDotCDC1604DashP6.pepper3SequenceWritePoints(ordinal()));
return result;
}

2
nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoGrapher.java
View file

@ -283,7 +283,7 @@ public class FourCornerZionStenoGrapher {
Iterator<PrimordialOctal> walkItr = sandWalk.iterator();
Iterator<PrimordialOctal> 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());
}

10
nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoLexer.java
View file

@ -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;

12
nx01-x4o-fc18/src/test/java/org/x4o/fc18/FourCornerUnicodeDisplayTest.java
View file

@ -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<FourCornerX06BaklavaPointSequence> 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<FourCornerX06BaklavaPointSequence> 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<FourCornerX06BaklavaPointSequence> 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);

6
nx01-x4o-fc18/src/test/java/org/x4o/fc18/FourCornerUnicodeImportTest.java
View file

@ -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