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

Fixed ESC68_2PIE pie towers with elevator buttons

Browse source
This commit is contained in:
Willem Cazander 2025-05-24 18:08:56 +02:00
parent a3a3350e08
commit 9c1ff8522e
33 changed files with 81 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

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

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

4
nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotVT06Test.java
View file

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