FC18: CDC1604 specials with group size indicator to prepare suger3
This commit is contained in:
parent
df329704eb
commit
b964f97421
11 changed files with 76 additions and 77 deletions
|
|
@ -133,7 +133,7 @@ final public class FourCornerRecipe {
|
|||
}
|
||||
}
|
||||
if (isSixBit) {
|
||||
out.add(FCDotCDC1604DashP6.NS04_SALAH_INTERROBANG.cakePointDotIndex()); // fixme improve: see FourCornerDotCollePie9.baklavaPointsPIE9C
|
||||
out.add(FCDotCDC1604DashP6.NS04_RAKA1_INTERROBANG.cakePointDotIndex()); // fixme improve: see FourCornerDotCollePie9.baklavaPointsPIE9C
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ public class FourCornerUnicodeImport {
|
|||
}
|
||||
|
||||
static public FourCornerUnicodeImport lossy() {
|
||||
return new FourCornerUnicodeImport(true, true, false, List.of(FCDotCDC1604DashP6.NS05_RAKA_UPNEXT_QUESTION)); // TODO: change
|
||||
return new FourCornerUnicodeImport(true, true, false, List.of(FCDotCDC1604DashP6.NS05_RAKA1_UPQUESTION)); // TODO: change
|
||||
}
|
||||
|
||||
public List<Integer> convertToInt18(String text) {
|
||||
|
|
|
|||
|
|
@ -44,26 +44,25 @@ public enum FCDotCDC1604DashP6 implements FourCornerDotColleZero33 {
|
|||
// LMNO PQRS TUVW XYZ&
|
||||
|
||||
/// This compatibility indicator is not a candy letter but a control data character string termination code.
|
||||
NS00_NUL('\u0000'),
|
||||
NS00_NUL1_TERMINATOR('\u0000'),
|
||||
|
||||
/// Goto direct escaped control with sequence of 3 escapes on 6 bit systems.
|
||||
NS01_ESC6_X1('\u0001'),
|
||||
NS02_ESC6_X2('\u0002'),
|
||||
NS03_ESC6_X3('\u0003'),
|
||||
NS01_ESC3_X1('\u0001'),
|
||||
NS02_ESC3_X2('\u0002'),
|
||||
NS03_ESC3_X3('\u0003'),
|
||||
|
||||
/// End of argumented escape sequence prayer.
|
||||
NS04_SALAH_INTERROBANG('‽'),
|
||||
NS04_RAKA1_INTERROBANG('‽'),
|
||||
/// Next argument separator for escape sequences.
|
||||
NS05_RAKA_UPNEXT_QUESTION('¿'),
|
||||
NS05_RAKA1_UPQUESTION('¿'),
|
||||
|
||||
/// Use 3 pepper marks, to spice up the escape sequences.
|
||||
NS06_PEPPER_EXCLAMATION('!'),
|
||||
NS07_PEPPER_QUESTION('?'),
|
||||
NS06_PEPPER3_EXCLAMATION('!'),
|
||||
NS07_PEPPER3_QUESTION('?'),
|
||||
|
||||
/// Special Argument Lexer Token, to season escape sequences.
|
||||
/// For examples in ESC68_PIE; Move to left pie.
|
||||
NS08_SALT_COMPARE_LEFT('<'),
|
||||
NS09_SALT_COMPARE_RIGHT('>'),
|
||||
/// Suger Argument Lexer Token, to sweat up the escape sequences.
|
||||
NS08_SUGER1_COMPARE_LEFT('<'),
|
||||
NS09_SUGER1_COMPARE_RIGHT('>'), // TODO: make it suger3
|
||||
|
||||
/// Second set of number letters.
|
||||
NY27_SQUARE_LEFT('['),
|
||||
|
|
@ -200,25 +199,25 @@ public enum FCDotCDC1604DashP6 implements FourCornerDotColleZero33 {
|
|||
}
|
||||
|
||||
static public boolean isEscape6(int cakePoint) {
|
||||
return cakePoint == NS01_ESC6_X1.cakePointDotIndex() || cakePoint == NS02_ESC6_X2.cakePointDotIndex() || cakePoint == NS03_ESC6_X3.cakePointDotIndex();
|
||||
return cakePoint == NS01_ESC3_X1.cakePointDotIndex() || cakePoint == NS02_ESC3_X2.cakePointDotIndex() || cakePoint == NS03_ESC3_X3.cakePointDotIndex();
|
||||
}
|
||||
|
||||
static public boolean isEscapeSaltLeft(int cakePoint) {
|
||||
return cakePoint == NS08_SALT_COMPARE_LEFT.cakePointDotIndex();
|
||||
static public boolean isEscapeSugerLeft(int cakePoint) {
|
||||
return cakePoint == NS08_SUGER1_COMPARE_LEFT.cakePointDotIndex();
|
||||
}
|
||||
|
||||
static public boolean isEscapeSaltRight(int cakePoint) {
|
||||
return cakePoint == NS09_SALT_COMPARE_RIGHT.cakePointDotIndex();
|
||||
static public boolean isEscapeSugerRight(int cakePoint) {
|
||||
return cakePoint == NS09_SUGER1_COMPARE_RIGHT.cakePointDotIndex();
|
||||
}
|
||||
|
||||
static public boolean isEscapePepper(int cakePoint) {
|
||||
return cakePoint == NS06_PEPPER_EXCLAMATION.cakePointDotIndex() || cakePoint == NS07_PEPPER_QUESTION.cakePointDotIndex();
|
||||
return cakePoint == NS06_PEPPER3_EXCLAMATION.cakePointDotIndex() || cakePoint == NS07_PEPPER3_QUESTION.cakePointDotIndex();
|
||||
}
|
||||
|
||||
static public int pepper3SequenceRead(FCDotCDC1604DashP6 msb, FCDotCDC1604DashP6 csb, FCDotCDC1604DashP6 lsb) {
|
||||
int c1 = msb == FCDotCDC1604DashP6.NS06_PEPPER_EXCLAMATION?0:1;
|
||||
int c2 = csb == FCDotCDC1604DashP6.NS06_PEPPER_EXCLAMATION?0:1;
|
||||
int c3 = lsb == FCDotCDC1604DashP6.NS06_PEPPER_EXCLAMATION?0:1;
|
||||
int c1 = msb == FCDotCDC1604DashP6.NS06_PEPPER3_EXCLAMATION?0:1;
|
||||
int c2 = csb == FCDotCDC1604DashP6.NS06_PEPPER3_EXCLAMATION?0:1;
|
||||
int c3 = lsb == FCDotCDC1604DashP6.NS06_PEPPER3_EXCLAMATION?0:1;
|
||||
return (c1 << 2) + (c2 << 1) + (c3 << 0);
|
||||
}
|
||||
|
||||
|
|
@ -234,9 +233,9 @@ public enum FCDotCDC1604DashP6 implements FourCornerDotColleZero33 {
|
|||
throw new IllegalArgumentException("Pepper spray is only 3 bit");
|
||||
}
|
||||
return List.of(
|
||||
((mode >> 2) & 0b1)==0?NS06_PEPPER_EXCLAMATION:NS07_PEPPER_QUESTION,
|
||||
((mode >> 1) & 0b1)==0?NS06_PEPPER_EXCLAMATION:NS07_PEPPER_QUESTION,
|
||||
((mode >> 0) & 0b1)==0?NS06_PEPPER_EXCLAMATION:NS07_PEPPER_QUESTION
|
||||
((mode >> 2) & 0b1)==0?NS06_PEPPER3_EXCLAMATION:NS07_PEPPER3_QUESTION,
|
||||
((mode >> 1) & 0b1)==0?NS06_PEPPER3_EXCLAMATION:NS07_PEPPER3_QUESTION,
|
||||
((mode >> 0) & 0b1)==0?NS06_PEPPER3_EXCLAMATION:NS07_PEPPER3_QUESTION
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ public enum FCDotCMD5401Dash2D implements FourCornerX06BaklavaPointSequence, Fou
|
|||
|
||||
private FCDotCMD5401Dash2D(FCDotCDC1604DashP6 selector) {
|
||||
this.selector = Objects.requireNonNull(selector);
|
||||
if (selector.ordinal() <= FCDotCDC1604DashP6.NS09_SALT_COMPARE_RIGHT.ordinal()) {
|
||||
if (selector.ordinal() <= FCDotCDC1604DashP6.NS09_SUGER1_COMPARE_RIGHT.ordinal()) {
|
||||
throw new IllegalArgumentException("Not used here to keep mind space free");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -172,9 +172,9 @@ public enum FCDotDEC2701DashPX0 implements FourCornerX06BaklavaPointSequence, Fo
|
|||
@Override
|
||||
public List<Integer> baklavaPointSequence() {
|
||||
return List.of(
|
||||
FCDotCDC1604DashP6.NS01_ESC6_X1.ordinal() + (ordinal() / 9),
|
||||
FCDotCDC1604DashP6.NS01_ESC6_X1.ordinal() + ((ordinal() / 3) % 3),
|
||||
FCDotCDC1604DashP6.NS01_ESC6_X1.ordinal() + (ordinal() % 3)
|
||||
FCDotCDC1604DashP6.NS01_ESC3_X1.ordinal() + (ordinal() / 9),
|
||||
FCDotCDC1604DashP6.NS01_ESC3_X1.ordinal() + ((ordinal() / 3) % 3),
|
||||
FCDotCDC1604DashP6.NS01_ESC3_X1.ordinal() + (ordinal() % 3)
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -202,9 +202,9 @@ public enum FCDotDEC2701DashPX0 implements FourCornerX06BaklavaPointSequence, Fo
|
|||
|
||||
static public FCDotDEC2701DashPX0 valueOf(FCDotCDC1604DashP6 msb, FCDotCDC1604DashP6 csb, FCDotCDC1604DashP6 lsb) {
|
||||
int idx = 0;
|
||||
idx += (msb.ordinal() - FCDotCDC1604DashP6.NS01_ESC6_X1.ordinal()) * 9;
|
||||
idx += (csb.ordinal() - FCDotCDC1604DashP6.NS01_ESC6_X1.ordinal()) * 3;
|
||||
idx += (lsb.ordinal() - FCDotCDC1604DashP6.NS01_ESC6_X1.ordinal());
|
||||
idx += (msb.ordinal() - FCDotCDC1604DashP6.NS01_ESC3_X1.ordinal()) * 9;
|
||||
idx += (csb.ordinal() - FCDotCDC1604DashP6.NS01_ESC3_X1.ordinal()) * 3;
|
||||
idx += (lsb.ordinal() - FCDotCDC1604DashP6.NS01_ESC3_X1.ordinal());
|
||||
return valueOf(idx);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -287,11 +287,11 @@ public class FourCornerZionStenoGrapher {
|
|||
while (walkItr.hasNext()) {
|
||||
outAdd(FCDotCDC1604DashP6.NX01_A.cakePointDotIndex() + walkItr.next().ordinal());
|
||||
}
|
||||
outAdd(FCDotCDC1604DashP6.NS05_RAKA_UPNEXT_QUESTION.cakePointDotIndex());
|
||||
outAdd(FCDotCDC1604DashP6.NS05_RAKA1_UPQUESTION.cakePointDotIndex());
|
||||
while (spiceItr.hasNext()) {
|
||||
outAdd(FCDotCDC1604DashP6.NX01_A.cakePointDotIndex() + spiceItr.next().ordinal());
|
||||
}
|
||||
outAdd(FCDotCDC1604DashP6.NS04_SALAH_INTERROBANG.cakePointDotIndex());
|
||||
outAdd(FCDotCDC1604DashP6.NS04_RAKA1_INTERROBANG.cakePointDotIndex());
|
||||
} else {
|
||||
while (walkItr.hasNext()) {
|
||||
int bitValue12 = 0;
|
||||
|
|
@ -349,10 +349,10 @@ public class FourCornerZionStenoGrapher {
|
|||
while (argu.hasNext()) {
|
||||
outAddAll(argu.next());
|
||||
if (argu.hasNext()) {
|
||||
outAdd(FCDotCDC1604DashP6.NS05_RAKA_UPNEXT_QUESTION.baklavaPointDotIndex());
|
||||
outAdd(FCDotCDC1604DashP6.NS05_RAKA1_UPQUESTION.baklavaPointDotIndex());
|
||||
}
|
||||
}
|
||||
outAdd(FCDotCDC1604DashP6.NS04_SALAH_INTERROBANG.baklavaPointDotIndex());
|
||||
outAdd(FCDotCDC1604DashP6.NS04_RAKA1_INTERROBANG.baklavaPointDotIndex());
|
||||
outFlush();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -740,7 +740,7 @@ public class FourCornerZionStenoLexer implements FourCornerZionStenoPetroglyphs
|
|||
lexer.cdcDECModeInc = FCDotINC0801DashP8.valueOf(readEscapePepper3(lexer));
|
||||
return true;
|
||||
}
|
||||
if (FCDotCDC1604DashP6.NS04_SALAH_INTERROBANG.baklavaPointDotIndex() == cdcPoint) {
|
||||
if (FCDotCDC1604DashP6.NS04_RAKA1_INTERROBANG.baklavaPointDotIndex() == cdcPoint) {
|
||||
lexer.decModeReset();
|
||||
return true; // end E10 mode, so no print
|
||||
}
|
||||
|
|
@ -792,23 +792,23 @@ public class FourCornerZionStenoLexer implements FourCornerZionStenoPetroglyphs
|
|||
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.NS06_PEPPER_EXCLAMATION.ordinal()) {
|
||||
} else if (cdcPoint == FCDotCDC1604DashP6.NS06_PEPPER3_EXCLAMATION.ordinal()) {
|
||||
if (lexer.cdcDECModePie < 26) {
|
||||
lexer.cdcDECModePie++;
|
||||
}
|
||||
return true; // eat the up pepper
|
||||
} else if (cdcPoint == FCDotCDC1604DashP6.NS07_PEPPER_QUESTION.ordinal()) {
|
||||
} else if (cdcPoint == FCDotCDC1604DashP6.NS07_PEPPER3_QUESTION.ordinal()) {
|
||||
if (lexer.cdcDECModePie > 0) {
|
||||
lexer.cdcDECModePie--;
|
||||
}
|
||||
return true; // eat the down salt
|
||||
} else if (cdcPoint == FCDotCDC1604DashP6.NS08_SALT_COMPARE_LEFT.ordinal()) {
|
||||
return true; // eat the down suger
|
||||
} else if (cdcPoint == FCDotCDC1604DashP6.NS08_SUGER1_COMPARE_LEFT.ordinal()) {
|
||||
lexer.cdcDECModePieAlt = false;
|
||||
return true; // eat the left salt
|
||||
} else if (cdcPoint == FCDotCDC1604DashP6.NS09_SALT_COMPARE_RIGHT.ordinal()) {
|
||||
return true; // eat the left suger
|
||||
} else if (cdcPoint == FCDotCDC1604DashP6.NS09_SUGER1_COMPARE_RIGHT.ordinal()) {
|
||||
lexer.cdcDECModePieAlt = true;
|
||||
return true; // eat the right salt
|
||||
} else if (cdcPoint == FCDotCDC1604DashP6.NS04_SALAH_INTERROBANG.ordinal() || cdcPoint == FCDotCDC1604DashP6.NS05_RAKA_UPNEXT_QUESTION.ordinal()) {
|
||||
return true; // eat the right suger
|
||||
} else if (cdcPoint == FCDotCDC1604DashP6.NS04_RAKA1_INTERROBANG.ordinal() || cdcPoint == FCDotCDC1604DashP6.NS05_RAKA1_UPQUESTION.ordinal()) {
|
||||
lexer.decModeReset();
|
||||
return true; // eat salah and end mode
|
||||
}
|
||||
|
|
@ -832,7 +832,7 @@ public class FourCornerZionStenoLexer implements FourCornerZionStenoPetroglyphs
|
|||
List<Integer> argu = new ArrayList<>();
|
||||
while (lexer.cdcDECScanIndex <= lexer.cdcDECScanIndexEnd) {
|
||||
int cdcPoint = lexer.input.get(lexer.cdcDECScanIndex);
|
||||
if (cdcPoint == FCDotCDC1604DashP6.NS00_NUL.ordinal()) {
|
||||
if (cdcPoint == FCDotCDC1604DashP6.NS00_NUL1_TERMINATOR.ordinal()) {
|
||||
lexer.smokeSignals.burnSalahInvalidCakePoint(lexer.currLine, lexer.currCol, cdcPoint);
|
||||
result.clear();
|
||||
lexer.cdcDECScanIndex--;
|
||||
|
|
@ -843,11 +843,11 @@ public class FourCornerZionStenoLexer implements FourCornerZionStenoPetroglyphs
|
|||
lexer.cdcDECScanIndex--;
|
||||
return true;
|
||||
}
|
||||
if (FCDotCDC1604DashP6.NS04_SALAH_INTERROBANG.ordinal() == cdcPoint) {
|
||||
if (FCDotCDC1604DashP6.NS04_RAKA1_INTERROBANG.ordinal() == cdcPoint) {
|
||||
result.add(argu);
|
||||
return true;
|
||||
}
|
||||
if (FCDotCDC1604DashP6.NS05_RAKA_UPNEXT_QUESTION.ordinal() == cdcPoint) {
|
||||
if (FCDotCDC1604DashP6.NS05_RAKA1_UPQUESTION.ordinal() == cdcPoint) {
|
||||
result.add(argu);
|
||||
argu = new ArrayList<>();
|
||||
lexer.cdcDECScanIndex++;
|
||||
|
|
@ -867,11 +867,11 @@ public class FourCornerZionStenoLexer implements FourCornerZionStenoPetroglyphs
|
|||
boolean sandWalker = true;
|
||||
while (lexer.cdcDECScanIndex <= lexer.cdcDECScanIndexEnd) {
|
||||
int cdcPoint = lexer.input.get(lexer.cdcDECScanIndex);
|
||||
if (cdcPoint == FCDotCDC1604DashP6.NS05_RAKA_UPNEXT_QUESTION.ordinal()) {
|
||||
if (cdcPoint == FCDotCDC1604DashP6.NS05_RAKA1_UPQUESTION.ordinal()) {
|
||||
sandWalker = false;
|
||||
continue;
|
||||
}
|
||||
if (cdcPoint == FCDotCDC1604DashP6.NS04_SALAH_INTERROBANG.ordinal()) {
|
||||
if (cdcPoint == FCDotCDC1604DashP6.NS04_RAKA1_INTERROBANG.ordinal()) {
|
||||
lexer.handler.strobeSandWorm(sandWalk, sandSpice);
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ public class FourCornerUnicodeDisplayTest {
|
|||
cdc.add(FCDotCDC1604DashP6.NY26_SQUARE_RIGHT); // select lower case
|
||||
cdc.add(FCDotCDC1604DashP6.NX10_J);
|
||||
cdc.add(FCDotCDC1604DashP6.NX11_K);
|
||||
cdc.add(FCDotCDC1604DashP6.NS09_SALT_COMPARE_RIGHT);
|
||||
cdc.add(FCDotCDC1604DashP6.NS09_SUGER1_COMPARE_RIGHT);
|
||||
cdc.add(FCDotCDC1604DashP6.NX12_L);
|
||||
cdc.add(FCDotCDC1604DashP6.NX13_M);
|
||||
cdc.add(FCDotDEC2701DashPX0.ESC_STOP);
|
||||
|
|
@ -114,23 +114,23 @@ public class FourCornerUnicodeDisplayTest {
|
|||
cdc.add(FCDotCDC1604DashP6.NX08_H);
|
||||
cdc.add(FCDotCDC1604DashP6.NX15_O);
|
||||
cdc.add(FCDotCDC1604DashP6.NX09_I);
|
||||
cdc.add(FCDotCDC1604DashP6.NS09_SALT_COMPARE_RIGHT); // goto right FC.PIE9D-27
|
||||
cdc.add(FCDotCDC1604DashP6.NS09_SUGER1_COMPARE_RIGHT); // goto right FC.PIE9D-27
|
||||
cdc.add(FCDotCDC1604DashP6.NX08_H);
|
||||
cdc.add(FCDotCDC1604DashP6.NX15_O);
|
||||
cdc.add(FCDotCDC1604DashP6.NX09_I);
|
||||
cdc.add(FCDotCDC1604DashP6.NS07_PEPPER_QUESTION); // goto up FC.PIE9D-26
|
||||
cdc.add(FCDotCDC1604DashP6.NS07_PEPPER3_QUESTION); // goto up FC.PIE9D-26
|
||||
cdc.add(FCDotCDC1604DashP6.NX08_H);
|
||||
cdc.add(FCDotCDC1604DashP6.NX15_O);
|
||||
cdc.add(FCDotCDC1604DashP6.NX09_I);
|
||||
cdc.add(FCDotCDC1604DashP6.NS07_PEPPER_QUESTION); // goto up FC.PIE9D-25
|
||||
cdc.add(FCDotCDC1604DashP6.NS07_PEPPER3_QUESTION); // goto up FC.PIE9D-25
|
||||
cdc.add(FCDotCDC1604DashP6.NX08_H);
|
||||
cdc.add(FCDotCDC1604DashP6.NX15_O);
|
||||
cdc.add(FCDotCDC1604DashP6.NX09_I);
|
||||
cdc.add(FCDotCDC1604DashP6.NS07_PEPPER_QUESTION); // goto up FC.PIE9D-24
|
||||
cdc.add(FCDotCDC1604DashP6.NS07_PEPPER3_QUESTION); // goto up FC.PIE9D-24
|
||||
cdc.add(FCDotCDC1604DashP6.NX08_H);
|
||||
cdc.add(FCDotCDC1604DashP6.NX15_O);
|
||||
cdc.add(FCDotCDC1604DashP6.NX09_I);
|
||||
cdc.add(FCDotCDC1604DashP6.NS04_SALAH_INTERROBANG);
|
||||
cdc.add(FCDotCDC1604DashP6.NS04_RAKA1_INTERROBANG);
|
||||
|
||||
Assertions.assertEquals("θ̲ο̲ι̲θοιhoih̲o̲i̲𝘩𝘰𝘪𝐇𝐎𝐈ΘΟΙ𝚯𝚶𝚰", FourCornerUnicodeDisplay.text().renderFromX06(cdc));
|
||||
}
|
||||
|
|
@ -141,7 +141,7 @@ public class FourCornerUnicodeDisplayTest {
|
|||
cdc.add(FCDotPIE9DDash10.BOLD_DECIMAL_1);
|
||||
cdc.add(FCDotPIE9DDash10.BOLD_DECIMAL_2);
|
||||
cdc.add(FCDotPIE9DDash10.BOLD_DECIMAL_3);
|
||||
cdc.add(FCDotCDC1604DashP6.NS04_SALAH_INTERROBANG);
|
||||
cdc.add(FCDotCDC1604DashP6.NS04_RAKA1_INTERROBANG);
|
||||
|
||||
Assertions.assertEquals("𝟏𝟐𝟑", FourCornerUnicodeDisplay.text().renderFromX06(cdc));
|
||||
}
|
||||
|
|
@ -162,7 +162,7 @@ public class FourCornerUnicodeDisplayTest {
|
|||
cdc.add(FCDotCDC1604DashP6.NX08_H);
|
||||
cdc.add(FCDotCDC1604DashP6.NX15_O);
|
||||
cdc.add(FCDotCDC1604DashP6.NX09_I);
|
||||
cdc.add(FCDotCDC1604DashP6.NS04_SALAH_INTERROBANG);
|
||||
cdc.add(FCDotCDC1604DashP6.NS04_RAKA1_INTERROBANG);
|
||||
|
||||
// Assertions.assertEquals("𝘩𝘰𝘪╗╞╘hoi", FourCornerUnicodeDisplay.text().renderFromX06(cdc));
|
||||
Assertions.assertEquals("╗╞╘hoi", FourCornerUnicodeDisplay.text().renderFromX06(cdc));
|
||||
|
|
|
|||
|
|
@ -45,9 +45,9 @@ public class FCDotVT06Test {
|
|||
List<Integer> cdc = new ArrayList<>();
|
||||
cdc.addAll(VTDash06DotZeroACursor.VT_CURSOR_GOTO.baklavaPointSequence());
|
||||
cdc.addAll(FourCornerRecipe.toDecimalsX06(123)); // TODO: fix these are the wrong, we need to use the txt grams version
|
||||
cdc.add(FCDotCDC1604DashP6.NS05_RAKA_UPNEXT_QUESTION.baklavaPointDotIndex());
|
||||
cdc.add(FCDotCDC1604DashP6.NS05_RAKA1_UPQUESTION.baklavaPointDotIndex());
|
||||
cdc.addAll(FourCornerRecipe.toDecimalsX06(456));
|
||||
cdc.add(FCDotCDC1604DashP6.NS04_SALAH_INTERROBANG.baklavaPointDotIndex());
|
||||
cdc.add(FCDotCDC1604DashP6.NS04_RAKA1_INTERROBANG.baklavaPointDotIndex());
|
||||
|
||||
Assertions.assertEquals("␘␘␇AG␇␇␇^BCD¿␇␇␇^EFG‽", FourCornerUnicodeDisplay.raw().renderFromInt18(cdc));
|
||||
// TODO: Fix lexer embedded escapes, and display external with single unicode escape sign
|
||||
|
|
@ -59,7 +59,7 @@ public class FCDotVT06Test {
|
|||
List<Integer> cdc = new ArrayList<>();
|
||||
cdc.addAll(VTDash06DotZeroCClear.VT_CLEAR_TOP.baklavaPointSequence());
|
||||
cdc.addAll(FourCornerRecipe.toDecimalsX06(5));
|
||||
cdc.add(FCDotCDC1604DashP6.NS04_SALAH_INTERROBANG.baklavaPointDotIndex());
|
||||
cdc.add(FCDotCDC1604DashP6.NS04_RAKA1_INTERROBANG.baklavaPointDotIndex());
|
||||
|
||||
Assertions.assertEquals("␘␘␇CA␇␇␇^F‽", FourCornerUnicodeDisplay.raw().renderFromInt18(cdc));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,19 +46,19 @@ public class FCDotDEC2701DashPX0Test {
|
|||
List<Integer> seq = null;
|
||||
seq = FCDotDEC2701DashPX0.ESC_USER_1.baklavaPointSequence();
|
||||
Assertions.assertEquals(3, seq.size());
|
||||
Assertions.assertEquals(FCDotCDC1604DashP6.NS01_ESC6_X1.ordinal(), seq.get(0));
|
||||
Assertions.assertEquals(FCDotCDC1604DashP6.NS01_ESC6_X1.ordinal(), seq.get(1));
|
||||
Assertions.assertEquals(FCDotCDC1604DashP6.NS01_ESC6_X1.ordinal(), seq.get(2));
|
||||
Assertions.assertEquals(FCDotCDC1604DashP6.NS01_ESC3_X1.ordinal(), seq.get(0));
|
||||
Assertions.assertEquals(FCDotCDC1604DashP6.NS01_ESC3_X1.ordinal(), seq.get(1));
|
||||
Assertions.assertEquals(FCDotCDC1604DashP6.NS01_ESC3_X1.ordinal(), seq.get(2));
|
||||
|
||||
seq = FCDotDEC2701DashPX0.ESC_VT06.baklavaPointSequence();
|
||||
Assertions.assertEquals(3, seq.size());
|
||||
Assertions.assertEquals(FCDotCDC1604DashP6.NS03_ESC6_X3.ordinal(), seq.get(0));
|
||||
Assertions.assertEquals(FCDotCDC1604DashP6.NS03_ESC6_X3.ordinal(), seq.get(1));
|
||||
Assertions.assertEquals(FCDotCDC1604DashP6.NS02_ESC6_X2.ordinal(), seq.get(2));
|
||||
Assertions.assertEquals(FCDotCDC1604DashP6.NS03_ESC3_X3.ordinal(), seq.get(0));
|
||||
Assertions.assertEquals(FCDotCDC1604DashP6.NS03_ESC3_X3.ordinal(), seq.get(1));
|
||||
Assertions.assertEquals(FCDotCDC1604DashP6.NS02_ESC3_X2.ordinal(), seq.get(2));
|
||||
|
||||
seq = FCDotDEC2701DashPX0.ESC_STOP.baklavaPointSequence();
|
||||
Assertions.assertEquals(FCDotCDC1604DashP6.NS03_ESC6_X3.ordinal(), seq.get(0));
|
||||
Assertions.assertEquals(FCDotCDC1604DashP6.NS03_ESC6_X3.ordinal(), seq.get(1));
|
||||
Assertions.assertEquals(FCDotCDC1604DashP6.NS03_ESC6_X3.ordinal(), seq.get(2));
|
||||
Assertions.assertEquals(FCDotCDC1604DashP6.NS03_ESC3_X3.ordinal(), seq.get(0));
|
||||
Assertions.assertEquals(FCDotCDC1604DashP6.NS03_ESC3_X3.ordinal(), seq.get(1));
|
||||
Assertions.assertEquals(FCDotCDC1604DashP6.NS03_ESC3_X3.ordinal(), seq.get(2));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,11 +46,11 @@ public class FCDotINC0801DashP8Test {
|
|||
List<Integer> seq = null;
|
||||
seq = FCDotINC0801DashP8.INC_LUA0127_P7D.baklavaPointSequence();
|
||||
Assertions.assertEquals(6, seq.size());
|
||||
Assertions.assertEquals(FCDotCDC1604DashP6.NS02_ESC6_X2.ordinal(), seq.get(0));
|
||||
Assertions.assertEquals(FCDotCDC1604DashP6.NS03_ESC6_X3.ordinal(), seq.get(1));
|
||||
Assertions.assertEquals(FCDotCDC1604DashP6.NS01_ESC6_X1.ordinal(), seq.get(2));
|
||||
Assertions.assertEquals(FCDotCDC1604DashP6.NS06_PEPPER_EXCLAMATION.ordinal(), seq.get(3));
|
||||
Assertions.assertEquals(FCDotCDC1604DashP6.NS07_PEPPER_QUESTION.ordinal(), seq.get(4));
|
||||
Assertions.assertEquals(FCDotCDC1604DashP6.NS07_PEPPER_QUESTION.ordinal(), seq.get(5));
|
||||
Assertions.assertEquals(FCDotCDC1604DashP6.NS02_ESC3_X2.ordinal(), seq.get(0));
|
||||
Assertions.assertEquals(FCDotCDC1604DashP6.NS03_ESC3_X3.ordinal(), seq.get(1));
|
||||
Assertions.assertEquals(FCDotCDC1604DashP6.NS01_ESC3_X1.ordinal(), seq.get(2));
|
||||
Assertions.assertEquals(FCDotCDC1604DashP6.NS06_PEPPER3_EXCLAMATION.ordinal(), seq.get(3));
|
||||
Assertions.assertEquals(FCDotCDC1604DashP6.NS07_PEPPER3_QUESTION.ordinal(), seq.get(4));
|
||||
Assertions.assertEquals(FCDotCDC1604DashP6.NS07_PEPPER3_QUESTION.ordinal(), seq.get(5));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue