From df935bd247d909847947b3dcc6d6adf501a70ff4 Mon Sep 17 00:00:00 2001
From: Willem <willemtsade.git.5785@distributedrebirth.love>
Date: Sun, 26 Jan 2025 03:45:00 +0100
Subject: [PATCH] Fixed TTY CMD to support 8 and 18 bit escape sequence.
---
.../x4o/fc18/cake2/zero33/dec1/FCDotCMD5401Dash2D.java | 7 +++++--
.../org/x4o/fc18/cake2/fcdoc/kanji/KanjiDictTest.java | 10 ++++++----
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/dec1/FCDotCMD5401Dash2D.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/dec1/FCDotCMD5401Dash2D.java
index f5d17dc..8dcf4c7 100644
--- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/dec1/FCDotCMD5401Dash2D.java
+++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/dec1/FCDotCMD5401Dash2D.java
@@ -66,12 +66,15 @@ public enum FCDotCMD5401Dash2D implements FourCornerX06BaklavaPointSequence, Fou
@Override
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
public List<Integer> cakePointSequence() {
- return baklavaPointSequence();
+ return muffinPointSequence();
}
static public Optional<FCDotCMD5401Dash2D> valueOfCDC(int cdcPoint) {
diff --git a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/fcdoc/kanji/KanjiDictTest.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/fcdoc/kanji/KanjiDictTest.java
index 344fe3f..7bb64b1 100644
--- a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/fcdoc/kanji/KanjiDictTest.java
+++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/fcdoc/kanji/KanjiDictTest.java
@@ -84,18 +84,20 @@ public class KanjiDictTest {
KanjiDictLiteral lit = dict.mapKuTen208.get(key);
String valueUnicode = new StringBuilder().appendCodePoint(lit.getCodePoint()).toString();
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(FCDotCMD5401Dash2D.CMD_F4TTY0001_NL.baklavaPointSequence());
+ kuTen2UNI2K.addAll(FCDotCMD5401Dash2D.CMD_F4TTY0001_NL.cakePointSequence());
}
for (String key : dict.mapKuTen213.keySet()) {
KanjiDictLiteral lit = dict.mapKuTen213.get(key);
String valueUnicode = new StringBuilder().appendCodePoint(lit.getCodePoint()).toString();
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(FCDotCMD5401Dash2D.CMD_F4TTY0001_NL.baklavaPointSequence());
+ kuTen2UNI2K.addAll(FCDotCMD5401Dash2D.CMD_F4TTY0001_NL.cakePointSequence());
}
+ // size 316575 (baklave TTY)
+ // size 271350 (cake/muffin TTY)
PrimordialOctalOrangeString mappingFileStr;
File outputFile = new File("target/Q10_UNI2K.FC18");