FC18: Made XML4 space larger and improved some cake slice names
This commit is contained in:
parent
d176710f16
commit
cac536251d
10 changed files with 149 additions and 1278 deletions
|
|
@ -24,6 +24,7 @@ package org.x4o.fc18.cake2.pie9;
|
|||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.PrimitiveIterator;
|
||||
|
||||
import org.junit.jupiter.api.Assertions;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
|
@ -33,6 +34,7 @@ import org.x4o.fc18.cake2.FourCornerDotCake;
|
|||
public class FCDotPIE9Test {
|
||||
|
||||
String pieChars;
|
||||
String cakeChars;
|
||||
|
||||
public FCDotPIE9Test() {
|
||||
int pieStart = FourCornerDotCake.FC_PIE9C_01.getStart();
|
||||
|
|
@ -42,21 +44,88 @@ public class FCDotPIE9Test {
|
|||
cakePoints.add(i);
|
||||
}
|
||||
FourCornerUnicodeDisplay disp = FourCornerUnicodeDisplay.text();
|
||||
StringBuilder buf = new StringBuilder();
|
||||
buf.append(disp.renderFromInt18(cakePoints));
|
||||
pieChars = buf.toString();
|
||||
pieChars = disp.renderFromInt18(cakePoints);
|
||||
int cakeStart = FourCornerDotCake.FC_CDC1604_P6.getStart();
|
||||
int cakeStop = FourCornerDotCake.FC_BYD0127_P7F.getStop();
|
||||
for (int i = cakeStart; i <= cakeStop; i++) {
|
||||
cakePoints.add(i);
|
||||
}
|
||||
cakeChars = disp.renderFromInt18(cakePoints);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testUnusedMath() throws Exception {
|
||||
public void testUnusedUnicodeMath() throws Exception {
|
||||
int totalMissing = 0;
|
||||
for (int i = 0x2200; i <= 0x22FF; i++) {
|
||||
String mathChar = new StringBuilder().appendCodePoint(i).toString();
|
||||
if (!pieChars.contains(mathChar)) {
|
||||
String testChar = new StringBuilder().appendCodePoint(i).toString();
|
||||
if (!pieChars.contains(testChar)) {
|
||||
totalMissing++;
|
||||
//System.out.println(totalMissing + ":missing-math-chr: " + mathChar);
|
||||
//System.out.println(totalMissing + ":missing-test-chr: " + testChar);
|
||||
}
|
||||
}
|
||||
Assertions.assertTrue(totalMissing < 128, "To many math chars missing....");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testUnusedKuTen1And2() throws Exception {
|
||||
// see: https://www.msx.org/wiki/KuTen_-_JIS_-_SJIS_Code_Conversion_Tables
|
||||
String kuTenPage1 = "、 。 ， ． ・ ： ； ？ ！ ゛ ゜ ´ ｀ ¨"+
|
||||
"＾ ￣ ＿ ヽ ヾ ゝ ゞ 〃 仝 々 〆 〇 ー ― ‐ ／ " +
|
||||
"＼ ～ ∥ ｜ … ‥ ‘ ’ “ ” （ ） 〔 〕 ［ ］" +
|
||||
" ｝ 〈 〉 《 》 「 」 『 』 【 】 ＋ － ± ×" +
|
||||
"÷ ＝ ≠ ＜ ＞ ≦ ≧ ∞ ∴ ♂ ♀ ° ′ ″ ℃ ￥" +
|
||||
"＄ ￠ ￡ ％ ＃ ＆ ＊ ＠ § ☆ ★ ○ ● ◎ ◇ ";
|
||||
String kuTenPage2 = "◆ □ ■ △ ▲ ▽ ▼ ※ 〒 → ← ↑ ↓ 〓" +
|
||||
"∈ ∋ ⊆ ⊇ ⊂ ⊃" +
|
||||
"∪ ∩ ∧ ∨ ￢ ⇒ ⇔ ∀ " +
|
||||
"∃ ∠ ⊥ ⌒ ∂ " +
|
||||
"∇ ≡ ≒ ≪ ≫ √ ∽ ∝ ∵ ∫ ∬" +
|
||||
"Å ‰ ♯ ♭ ♪ † ‡ ¶ ◯";
|
||||
String kuTen = (kuTenPage1 + kuTenPage2).replaceAll("\t", "").replaceAll(" ", "");
|
||||
int totalMissing = 0;
|
||||
PrimitiveIterator.OfInt charCheck = kuTen.codePoints().iterator();
|
||||
while (charCheck.hasNext()) {
|
||||
String testChar = new StringBuilder().appendCodePoint(charCheck.next()).toString();
|
||||
if (!cakeChars.contains(testChar)) {
|
||||
totalMissing++;
|
||||
//System.out.println(totalMissing + ":missing-test-chr: " + testChar);
|
||||
}
|
||||
}
|
||||
Assertions.assertTrue(totalMissing < 128, "To many kuten chars missing....");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testUnusedVGATempleOS() throws Exception {
|
||||
// see: https://github.com/rendello/templeos_font/blob/master/Convert/chars.txt
|
||||
String vgaTOSChars = " !\"#$%&'()*+,-./"+
|
||||
"0123456789:;<=>?" +
|
||||
"@ABCDEFGHIJKLMNO" +
|
||||
"PQRSTUVWXYZ[\\]^_" +
|
||||
"`abcdefghijklmno" +
|
||||
"pqrstuvwxyz{|}~ " +
|
||||
"çüéâäàȧ êëèïîìÄȦ" +
|
||||
"ÉæÆôöòûùÿÖÜ¢£¥ 𝑓" +
|
||||
"áíóú ¿ ½¼¡«»" +
|
||||
"░▒▓│┤╡╢╖╕╣║╗╝╜╛┐" +
|
||||
"└┴┬├─┼╞╟╚╔╩╦╠═╬╧" +
|
||||
"╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀" +
|
||||
"αβΓπΣσμτΦθΩδ∞ ε " +
|
||||
"≡±≤≥ ÷≈ √ⁿ² " +
|
||||
"ВГЁЖЗИЙЛПУФЧШЪЫЭ" +
|
||||
"ЮЯбвгёжзийклмнпт" +
|
||||
"чшъыьэюя „”№ " +
|
||||
" ⅠⅡ↑↓⭰⭲ " +
|
||||
"ДЦЩдф щ ij🔔 " +
|
||||
" ⅓ ¾ §¶ ";
|
||||
int totalMissing = 0;
|
||||
PrimitiveIterator.OfInt charCheck = vgaTOSChars.codePoints().iterator();
|
||||
while (charCheck.hasNext()) {
|
||||
String testChar = new StringBuilder().appendCodePoint(charCheck.next()).toString();
|
||||
if (!cakeChars.contains(testChar)) {
|
||||
totalMissing++;
|
||||
//System.out.println(totalMissing + ":missing-test-chr: " + testChar);
|
||||
}
|
||||
}
|
||||
Assertions.assertTrue(totalMissing < 128, "To many temple os chars missing....");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -50,28 +50,28 @@ public class LexerNCRTest {
|
|||
lexer.withFireSignals(fireWalker);
|
||||
|
||||
List<Integer> cdc = new ArrayList<>();
|
||||
cdc.add(FourCornerDotCake.FC_NCR1632_XD.getStart() + (512*3) + 1); /// auto NXX_001
|
||||
cdc.add(FourCornerDotCake.FC_NCR1632_DEN.getStart() + (512*3) + 1); /// auto NXX_001
|
||||
Assertions.assertEquals(0, fireWalker.ncr1632BankSparkler);
|
||||
lexer.read(cdc);
|
||||
Assertions.assertEquals(1, fireWalker.ncr1632BankSparkler);
|
||||
|
||||
cdc.addAll(FCDotDEC2701DashPX0.ESC_STOP.baklavaPointSequence()); // the print above auto value + next test
|
||||
cdc.add(FourCornerDotCake.FC_NCR1632_XN.getStart() - 1 + 123); // normal NXX_123
|
||||
cdc.add(FourCornerDotCake.FC_NCR1632_XN.getStart() + (512*4) + 2); /// auto NXX_123 + this
|
||||
cdc.add(FourCornerDotCake.FC_NCR1632_NUM.getStart() - 1 + 123); // normal NXX_123
|
||||
cdc.add(FourCornerDotCake.FC_NCR1632_NUM.getStart() + (512*4) + 2); /// auto NXX_123 + this
|
||||
fireWalker.reset();
|
||||
lexer.read(cdc);
|
||||
Assertions.assertEquals(2, fireWalker.ncr1632BankSparkler);
|
||||
|
||||
Assertions.assertEquals(0, fireWalker.ncr1632BankReset);
|
||||
cdc.addAll(FCDotDEC2701DashPX0.ESC_STOP.cakePointSequence()); // the print above auto value + next test (normal bank reset)
|
||||
cdc.add(FourCornerDotCake.FC_NCR1632_XD.getStart() - 1 + 11);
|
||||
cdc.add(FourCornerDotCake.FC_NCR1632_XD.getStart() + (512*3) + 12);
|
||||
cdc.add(FourCornerDotCake.FC_NCR1632_XN.getStart() + (512*4) + 13);
|
||||
cdc.add(FourCornerDotCake.FC_NCR1632_XN.getStart() + (512*5) + 14);
|
||||
cdc.add(FourCornerDotCake.FC_NCR1632_XN.getStart()); // and one which prints
|
||||
cdc.add(FourCornerDotCake.FC_NCR1632_XN.getStop());
|
||||
cdc.add(FourCornerDotCake.FC_NCR1632_XN.getStop()); // embedded bank reset
|
||||
cdc.add(FourCornerDotCake.FC_NCR1632_XN.getStart() - 1 + 123); // normal NXX_123
|
||||
cdc.add(FourCornerDotCake.FC_NCR1632_DEN.getStart() - 1 + 11);
|
||||
cdc.add(FourCornerDotCake.FC_NCR1632_DEN.getStart() + (512*3) + 12);
|
||||
cdc.add(FourCornerDotCake.FC_NCR1632_NUM.getStart() + (512*4) + 13);
|
||||
cdc.add(FourCornerDotCake.FC_NCR1632_NUM.getStart() + (512*5) + 14);
|
||||
cdc.add(FourCornerDotCake.FC_NCR1632_NUM.getStart()); // and one which prints
|
||||
cdc.add(FourCornerDotCake.FC_NCR1632_NUM.getStop());
|
||||
cdc.add(FourCornerDotCake.FC_NCR1632_NUM.getStop()); // embedded bank reset
|
||||
cdc.add(FourCornerDotCake.FC_NCR1632_NUM.getStart() - 1 + 123); // normal NXX_123
|
||||
fireWalker.reset();
|
||||
lexer.read(cdc);
|
||||
Assertions.assertEquals(1, fireWalker.ncr1632BankReset);
|
||||
|
|
@ -105,15 +105,15 @@ public class LexerNCRTest {
|
|||
List<Integer> cdc = new ArrayList<>();
|
||||
cdc.add(FCDotCDC1604DashP6.NX24_X.ordinal()); // = X
|
||||
cdc.add(FCDotCDC1604DashP6.NY09_EQUALS.ordinal());
|
||||
cdc.add(FourCornerDotCake.FC_NCR1632_XN.getStart() - 1 + 11); // NXX_011
|
||||
cdc.add(FourCornerDotCake.FC_NCR1632_XD.getStart()); // T001
|
||||
cdc.add(FourCornerDotCake.FC_NCR1632_XN.getStart()); // NXX_001
|
||||
cdc.add(FourCornerDotCake.FC_NCR1632_XD.getStart() - 1 + 15); // T015
|
||||
cdc.add(FourCornerDotCake.FC_NCR1632_XN.getStart() - 1 + 14); // NXX_014
|
||||
cdc.add(FourCornerDotCake.FC_NCR1632_XD.getStart() - 1 + 1); // one
|
||||
cdc.add(FourCornerDotCake.FC_NCR1632_XD.getStart() + 512 + 2); // T1024 + one
|
||||
cdc.add(FourCornerDotCake.FC_NCR1632_XN.getStart() - 1 + 123); // NXX_123
|
||||
cdc.add(FourCornerDotCake.FC_NCR1632_XN.getStart() - 1 + 4); // NXX_004
|
||||
cdc.add(FourCornerDotCake.FC_NCR1632_NUM.getStart() - 1 + 11); // NXX_011
|
||||
cdc.add(FourCornerDotCake.FC_NCR1632_DEN.getStart()); // T001
|
||||
cdc.add(FourCornerDotCake.FC_NCR1632_NUM.getStart()); // NXX_001
|
||||
cdc.add(FourCornerDotCake.FC_NCR1632_DEN.getStart() - 1 + 15); // T015
|
||||
cdc.add(FourCornerDotCake.FC_NCR1632_NUM.getStart() - 1 + 14); // NXX_014
|
||||
cdc.add(FourCornerDotCake.FC_NCR1632_DEN.getStart() - 1 + 1); // one
|
||||
cdc.add(FourCornerDotCake.FC_NCR1632_DEN.getStart() + 512 + 2); // T1024 + one
|
||||
cdc.add(FourCornerDotCake.FC_NCR1632_NUM.getStart() - 1 + 123); // NXX_123
|
||||
cdc.add(FourCornerDotCake.FC_NCR1632_NUM.getStart() - 1 + 4); // NXX_004
|
||||
cdc.add(FCDotCDC1604DashP6.NY14_SEMICOLON.ordinal());
|
||||
//cdc.add(FCDotCDC1604DashP6._NEWLINE.ordinal());
|
||||
|
||||
|
|
@ -123,10 +123,10 @@ public class LexerNCRTest {
|
|||
@Test
|
||||
public void testNCRLargestF576() throws Exception {
|
||||
List<Integer> cdc = new ArrayList<>();
|
||||
for (int i = FourCornerDotCake.FC_NCR1632_XD.getStop(); i >= FourCornerDotCake.FC_NCR1632_XD.getStart(); i = i - 512) {
|
||||
for (int i = FourCornerDotCake.FC_NCR1632_DEN.getStop(); i >= FourCornerDotCake.FC_NCR1632_DEN.getStart(); i = i - 512) {
|
||||
cdc.add(i);
|
||||
}
|
||||
for (int i = FourCornerDotCake.FC_NCR1632_XN.getStop(); i >= FourCornerDotCake.FC_NCR1632_XN.getStart(); i = i - 512) {
|
||||
for (int i = FourCornerDotCake.FC_NCR1632_NUM.getStop(); i >= FourCornerDotCake.FC_NCR1632_NUM.getStart(); i = i - 512) {
|
||||
cdc.add(i);
|
||||
}
|
||||
String resSuper = "²⁴⁷³³⁰⁴⁰¹⁴⁷³¹⁰⁴⁵³⁴⁰⁶⁰⁵⁰²⁵²¹⁰¹⁹⁶⁴⁷¹⁹⁰⁰³⁵¹³¹³⁴⁹¹⁰¹²¹¹⁸³⁹⁹¹⁴⁰⁶³⁰⁵⁶⁰⁹²⁸⁹⁷²²⁵¹⁰⁶⁵³¹⁸⁶⁷¹⁷⁰³¹⁶⁴⁰¹⁰⁶¹²⁴³⁰⁴⁴⁹⁸⁹⁵⁹⁷⁶⁷¹⁴²⁶⁰¹⁶¹³⁹³³⁹³⁵¹³⁶⁵⁰³⁴³⁰⁶⁷⁵¹²⁰⁹⁹⁶⁷⁵⁴⁶¹⁵⁵¹⁰¹⁸⁹³¹⁶⁷⁹¹⁶⁶⁰⁶⁷⁷²¹⁴⁸⁶⁹⁹¹³⁶";
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue