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

Fixed TTY CMD to support 8 and 18 bit escape sequence.

Browse source
This commit is contained in:
Willem Cazander 2025-01-26 03:45:00 +01:00
parent fb0767e272
commit df935bd247
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -66,12 +66,15 @@ public enum FCDotCMD5401Dash2D implements FourCornerX06BaklavaPointSequence, Fou
@Override @Override
public List<Integer> muffinPointSequence() { public List<Integer> muffinPointSequence() {
return baklavaPointSequence(); List<Integer> result = new ArrayList<>();
result.addAll(FCDotDEC2701DashPX0.ESC68_CMD5401_2D.muffinPointSequence());
result.add(selector.muffinPointDotIndex());
return result;
} }
@Override @Override
public List<Integer> cakePointSequence() { public List<Integer> cakePointSequence() {
return baklavaPointSequence(); return muffinPointSequence();
} }
static public Optional<FCDotCMD5401Dash2D> valueOfCDC(int cdcPoint) { static public Optional<FCDotCMD5401Dash2D> valueOfCDC(int cdcPoint) {

10
nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/fcdoc/kanji/KanjiDictTest.java
View file

@ -84,18 +84,20 @@ public class KanjiDictTest {
KanjiDictLiteral lit = dict.mapKuTen208.get(key); KanjiDictLiteral lit = dict.mapKuTen208.get(key);
String valueUnicode = new StringBuilder().appendCodePoint(lit.getCodePoint()).toString(); String valueUnicode = new StringBuilder().appendCodePoint(lit.getCodePoint()).toString();
kuTen2UNI2K.addAll(FourCornerUnicodeImport.strict().convertToInt18(key)); kuTen2UNI2K.addAll(FourCornerUnicodeImport.strict().convertToInt18(key));
kuTen2UNI2K.add(FCDotCDC1604DashP6.NY09_EQUALS.baklavaPointDotIndex()); kuTen2UNI2K.add(FCDotCDC1604DashP6.NY09_EQUALS.cakePointDotIndex());
kuTen2UNI2K.addAll(FourCornerUnicodeMapper.DICTIONARY.embedUNI2K(valueUnicode)); kuTen2UNI2K.addAll(FourCornerUnicodeMapper.DICTIONARY.embedUNI2K(valueUnicode));
kuTen2UNI2K.addAll(FCDotCMD5401Dash2D.CMD_F4TTY0001_NL.baklavaPointSequence()); kuTen2UNI2K.addAll(FCDotCMD5401Dash2D.CMD_F4TTY0001_NL.cakePointSequence());
} }
for (String key : dict.mapKuTen213.keySet()) { for (String key : dict.mapKuTen213.keySet()) {
KanjiDictLiteral lit = dict.mapKuTen213.get(key); KanjiDictLiteral lit = dict.mapKuTen213.get(key);
String valueUnicode = new StringBuilder().appendCodePoint(lit.getCodePoint()).toString(); String valueUnicode = new StringBuilder().appendCodePoint(lit.getCodePoint()).toString();
kuTen2UNI2K.addAll(FourCornerUnicodeImport.strict().convertToInt18(key)); kuTen2UNI2K.addAll(FourCornerUnicodeImport.strict().convertToInt18(key));
kuTen2UNI2K.add(FCDotCDC1604DashP6.NY09_EQUALS.baklavaPointDotIndex()); kuTen2UNI2K.add(FCDotCDC1604DashP6.NY09_EQUALS.cakePointDotIndex());
kuTen2UNI2K.addAll(FourCornerUnicodeMapper.DICTIONARY.embedUNI2K(valueUnicode)); kuTen2UNI2K.addAll(FourCornerUnicodeMapper.DICTIONARY.embedUNI2K(valueUnicode));
kuTen2UNI2K.addAll(FCDotCMD5401Dash2D.CMD_F4TTY0001_NL.baklavaPointSequence()); kuTen2UNI2K.addAll(FCDotCMD5401Dash2D.CMD_F4TTY0001_NL.cakePointSequence());
} }
// size 316575 (baklave TTY)
// size 271350 (cake/muffin TTY)
PrimordialOctalOrangeString mappingFileStr; PrimordialOctalOrangeString mappingFileStr;
File outputFile = new File("target/Q10_UNI2K.FC18"); File outputFile = new File("target/Q10_UNI2K.FC18");