diff --git a/nx01-mushroom-mais-fc18/src/main/java/love/distributedrebirth/nx01/mushroom/mais/fc18/FCDocWriter.java b/nx01-mushroom-mais-fc18/src/main/java/love/distributedrebirth/nx01/mushroom/mais/fc18/FCDocWriter.java index e1acab9..6208b38 100644 --- a/nx01-mushroom-mais-fc18/src/main/java/love/distributedrebirth/nx01/mushroom/mais/fc18/FCDocWriter.java +++ b/nx01-mushroom-mais-fc18/src/main/java/love/distributedrebirth/nx01/mushroom/mais/fc18/FCDocWriter.java @@ -215,7 +215,7 @@ public class FCDocWriter { MaisDocNode wordNode = sliceNode.addNode(createNodeCakeWord(dotCake, i)); if (FourCornerDotCake.FC_DEC2701_PX0.equals(dotCake)) { - if ("ESC68_INC0801_P8".equals(wordNode.getName())) { + if ("ESC6_INC0801_P8".equals(wordNode.getName())) { for (FCDotINC0801DashP8 vide : FCDotINC0801DashP8.values()) { wordNode.addNode(createNodeCakeWordEscape(vide, vide.name())); } diff --git a/nx01-mushroom-mais-fc18/src/main/java/love/distributedrebirth/nx01/mushroom/mais/fc18/print/FCDocSegmentWriterCakeWord.java b/nx01-mushroom-mais-fc18/src/main/java/love/distributedrebirth/nx01/mushroom/mais/fc18/print/FCDocSegmentWriterCakeWord.java index d5795a4..3c2d870 100644 --- a/nx01-mushroom-mais-fc18/src/main/java/love/distributedrebirth/nx01/mushroom/mais/fc18/print/FCDocSegmentWriterCakeWord.java +++ b/nx01-mushroom-mais-fc18/src/main/java/love/distributedrebirth/nx01/mushroom/mais/fc18/print/FCDocSegmentWriterCakeWord.java @@ -117,7 +117,10 @@ public class FCDocSegmentWriterCakeWord implements FCDocSegmentWriter { x21CodeDisplay.get().codePointSequence().forEach(v -> buf.appendCodePoint(v)); value = buf.toString(); } - writer.docTableRow(name, value); + boolean empty = name.isEmpty() && value.isEmpty(); + if (!empty) { + writer.docTableRow(name, value); + } if (x06BaklavaSequence.isPresent()) { writeTableRowSequenceHex(writer, "Sequence-X06", 2, x06BaklavaSequence.get().baklavaPointSequence()); diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerDotCake.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerDotCake.java index e0c62d2..7c09855 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerDotCake.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerDotCake.java @@ -363,22 +363,22 @@ public enum FourCornerDotCake { FC_BA2L2048_SEL0(0x0387FE, 256, "Number lego 2048 bit select"), FC_BA2L2048_BANK(0x0388FE, 256, "Number lego 2048 bit bank"), - FC_BA2I0016_SEL0(0x0389FE, 2, "Number integer 16 bit select"), - FC_BA2I0016_BANK(0x038A00, 256, "Number integer 16 bit bank"), - FC_BA2I0032_SEL0(0x038B00, 4, "Number integer 32 bit select"), - FC_BA2I0032_BANK(0x038B04, 256, "Number integer 32 bit bank"), - FC_BA2I0064_SEL0(0x038C04, 8, "Number integer 64 bit select"), - FC_BA2I0064_BANK(0x038C0C, 256, "Number integer 64 bit bank"), - FC_BA2I0128_SEL0(0x038D0C, 16, "Number integer 128 bit select"), - FC_BA2I0128_BANK(0x038D1C, 256, "Number integer 128 bit bank"), - FC_BA2I0256_SEL0(0x038E1C, 32, "Number integer 256 bit select"), - FC_BA2I0256_BANK(0x038E3C, 256, "Number integer 256 bit bank"), - FC_BA2I0512_SEL0(0x038F3C, 64, "Number integer 512 bit select"), - FC_BA2I0512_BANK(0x038F7C, 256, "Number integer 512 bit bank"), - FC_BA2I1024_SEL0(0x03907C, 128, "Number integer 1024 bit select"), - FC_BA2I1024_BANK(0x0390FC, 256, "Number integer 1024 bit bank"), - FC_BA2I2048_SEL0(0x0391FC, 256, "Number integer 2048 bit select"), - FC_BA2I2048_BANK(0x0392FC, 256, "Number integer 2048 bit bank"), + FC_BA2I0016_SEL0(0x0389FE, 2, "Number signed 16 bit select"), + FC_BA2I0016_BANK(0x038A00, 256, "Number signed 16 bit bank"), + FC_BA2I0032_SEL0(0x038B00, 4, "Number signed 32 bit select"), + FC_BA2I0032_BANK(0x038B04, 256, "Number signed 32 bit bank"), + FC_BA2I0064_SEL0(0x038C04, 8, "Number signed 64 bit select"), + FC_BA2I0064_BANK(0x038C0C, 256, "Number signed 64 bit bank"), + FC_BA2I0128_SEL0(0x038D0C, 16, "Number signed 128 bit select"), + FC_BA2I0128_BANK(0x038D1C, 256, "Number signed 128 bit bank"), + FC_BA2I0256_SEL0(0x038E1C, 32, "Number signed 256 bit select"), + FC_BA2I0256_BANK(0x038E3C, 256, "Number signed 256 bit bank"), + FC_BA2I0512_SEL0(0x038F3C, 64, "Number signed 512 bit select"), + FC_BA2I0512_BANK(0x038F7C, 256, "Number signed 512 bit bank"), + FC_BA2I1024_SEL0(0x03907C, 128, "Number signed 1024 bit select"), + FC_BA2I1024_BANK(0x0390FC, 256, "Number signed 1024 bit bank"), + FC_BA2I2048_SEL0(0x0391FC, 256, "Number signed 2048 bit select"), + FC_BA2I2048_BANK(0x0392FC, 256, "Number signed 2048 bit bank"), /// 16x512=8192+1020 cake points to embed base8 number types FC_BA8L0018_SEL0(0x0393FC, 2, "Number lego 18 bit select"), @@ -477,7 +477,7 @@ public enum FourCornerDotCake { int wrapCakePoint = start + i; if (wrapCakePoint >= (1024 - 12) && wrapCakePoint < 0x1400) { // after move use cake - final String wrapName = sliceName + "_" + String.format("0x%06X", wrapCakePoint); + final String wrapName = sliceName + "_" + String.format("%04d", 1 + (wrapCakePoint - start)); result.add(new FourCornerDotColleGram5() { @Override