From a76762d9f77f0762bab3bdf15adeebf7e160c579 Mon Sep 17 00:00:00 2001 From: Willem Date: Tue, 7 Jan 2025 03:03:14 +0100 Subject: [PATCH] Enlarged kode keywords and reserved unicode one range --- .../org/x4o/o2o/fc18/FourCornerDotCake.java | 83 +++++++++++-------- ...110DashDA.java => FCDotAMD0110DashSA.java} | 6 +- ...102DashD1.java => FCDotBMW0102DashS2.java} | 6 +- .../o2o/fc18/zero33/FCDotDNA0104DashS4.java | 46 ++++++++++ ...616DashD8.java => FCDotIBM1616DashH8.java} | 6 +- .../o2o/fc18/zero33/FCDotNXP0103DashS3.java | 45 ++++++++++ 6 files changed, 147 insertions(+), 45 deletions(-) rename nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/{FCDotAMD0110DashDA.java => FCDotAMD0110DashSA.java} (90%) rename nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/{FCDotBMW0102DashD1.java => FCDotBMW0102DashS2.java} (89%) create mode 100644 nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotDNA0104DashS4.java rename nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/{FCDotIBM1616DashD8.java => FCDotIBM1616DashH8.java} (95%) create mode 100644 nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotNXP0103DashS3.java diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerDotCake.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerDotCake.java index 3bfb563..e40d38d 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerDotCake.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerDotCake.java @@ -107,17 +107,19 @@ public enum FourCornerDotCake { // =========== Allow end-user select rendering of data gram packet per context - /// Interim Byte Mode, embed raw 8 bit Data - FC_IBM1616_D8(1024, 256), + /// Interim Byte Mode, embed raw Hex 8 bit Data + FC_IBM1616_H8(1024, 256), /// Reserved for future data grams use - __RESERVED_DATAGRAMS(1280, 1448-1280), + __RESERVED_DATAGRAMS(1280, 1445-1280), /// Application Methodoums Decimals, normal decimal numbers 0-9 - FC_AMD0110_DA(1448, 10), + FC_AMD0110_SA(1445, 10), /// Direct Nuclear Air strike for quadratonic values - FC_DNA0104_D2(1458, 4), + FC_DNA0104_S4(1455, 4), + /// Natural X-state Phasing for tri-state or high impedance (Hi-Z) signals + FC_NXP0103_S3(1459, 3), /// Binary Model Word encoding for bit 0 and bit 1 notation - FC_BMW0102_D1(1462, 2), + FC_BMW0102_S2(1462, 2), /// Octal Character Encoding in Hinari 3 bit FC_OCE0801_H3(1464, 8), @@ -153,38 +155,47 @@ public enum FourCornerDotCake { /// Code Language Keywords for VHDL/C++ and Java/etc which allows a user to load a custom word dictionary. /// TODO: Add a few more sources and do a few dedup alias rename sessions AND abbr... unpacking + aliasses - FC_CLK9P_A(196608 + (512*0), 512), // start at "2^17+2^16" - FC_CLK9P_B(196608 + (512*1), 512), - FC_CLK9P_C(196608 + (512*2), 512), - FC_CLK9P_D(196608 + (512*3), 512), - FC_CLK9P_E(196608 + (512*4), 512), - FC_CLK9P_F(196608 + (512*5), 512), - FC_CLK9P_G(196608 + (512*6), 512), - FC_CLK9P_H(196608 + (512*7), 512), - FC_CLK9P_I(196608 + (512*8), 512), - FC_CLK9P_J(196608 + (512*9), 512), - FC_CLK9P_K(196608 + (512*10), 512), - FC_CLK9P_L(196608 + (512*11), 512), - FC_CLK9P_M(196608 + (512*12), 512), - FC_CLK9P_N(196608 + (512*13), 512), - FC_CLK9P_O(196608 + (512*14), 512), - FC_CLK9P_P(196608 + (512*15), 512), - FC_CLK9P_Q(196608 + (512*16), 512), - FC_CLK9P_R(196608 + (512*17), 512), - FC_CLK9P_S(196608 + (512*18), 512), - FC_CLK9P_T(196608 + (512*19), 512), - FC_CLK9P_U(196608 + (512*20), 512), - FC_CLK9P_V(196608 + (512*21), 512), - FC_CLK9P_W(196608 + (512*22), 512), - FC_CLK9P_X(196608 + (512*23), 512), - FC_CLK9P_Y(196608 + (512*24), 512), - FC_CLK9P_Z(196608 + (512*25), 512), - __RESERVED_CLK9P_AMP(196608 + (512*26), 512), // end at 210432 + FC_CLK9P_A(196608 + (1024*0), 1024), // start at "2^17+2^16" + FC_CLK9P_B(196608 + (1024*1), 1024), + FC_CLK9P_C(196608 + (1024*2), 1024), + FC_CLK9P_D(196608 + (1024*3), 1024), + FC_CLK9P_E(196608 + (1024*4), 1024), + FC_CLK9P_F(196608 + (1024*5), 1024), + FC_CLK9P_G(196608 + (1024*6), 1024), + FC_CLK9P_H(196608 + (1024*7), 1024), + FC_CLK9P_I(196608 + (1024*8), 1024), + FC_CLK9P_J(196608 + (1024*9), 1024), + FC_CLK9P_K(196608 + (1024*10), 1024), + FC_CLK9P_L(196608 + (1024*11), 1024), + FC_CLK9P_M(196608 + (1024*12), 1024), + FC_CLK9P_N(196608 + (1024*13), 1024), + FC_CLK9P_O(196608 + (1024*14), 1024), + FC_CLK9P_P(196608 + (1024*15), 1024), + FC_CLK9P_Q(196608 + (1024*16), 1024), + FC_CLK9P_R(196608 + (1024*17), 1024), + FC_CLK9P_S(196608 + (1024*18), 1024), + FC_CLK9P_T(196608 + (1024*19), 1024), + FC_CLK9P_U(196608 + (1024*20), 1024), + FC_CLK9P_V(196608 + (1024*21), 1024), + FC_CLK9P_W(196608 + (1024*22), 1024), + FC_CLK9P_X(196608 + (1024*23), 1024), + FC_CLK9P_Y(196608 + (1024*24), 1024), + FC_CLK9P_Z(196608 + (1024*25), 1024), + FC_CLK9P_AMP(196608 + (1024*26), 1024), - // Encode 72 bit Unicode-4, which drawing without color, but can contain the 21 bit unicode1 codePoint data within. - //RC_UNI4072_4D(), // _WORD_ESC + _TEST_UNICODE4 + + manyStrokeBlocks + /// Align unicode + __RESERVED_CLKSP(1 + FC_CLK9P_AMP.getStop(), 0x37000 - FC_CLK9P_AMP.getStop() - 1), - __RESERVED_TO_END(__RESERVED_CLK9P_AMP.getStart()+__RESERVED_CLK9P_AMP.getLength(), 262144 - __RESERVED_CLK9P_AMP.getStart()), + /// Support lower 11 bit of unicode to be encoded with one cake point. + __RESERVED_UNI1102_1C(1 + __RESERVED_CLKSP.getStop(), 2048), + /// Prefix "1C" cake with big indian 11 bit half words to get full 21 bit unicode-one point. + __RESERVED_UNI1102_2C(1 + __RESERVED_UNI1102_1C.getStop(), 2048), + + /// Big indian 9 bit parts of 72 bit Unicode-4, which stroke drawing without color. + /// and can contain the 21 bit unicode1 codePoint data within. + __RESERVED_UNI4072_4D(1 + __RESERVED_UNI1102_2C.getStop(), 512), + + __RESERVED_TAIL(1 + __RESERVED_UNI4072_4D.getStop(), 262144 - __RESERVED_UNI4072_4D.getStop() - 1), ; private final int start; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotAMD0110DashDA.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotAMD0110DashSA.java similarity index 90% rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotAMD0110DashDA.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotAMD0110DashSA.java index 4f08bd7..ef323b3 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotAMD0110DashDA.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotAMD0110DashSA.java @@ -26,13 +26,13 @@ import org.x4o.o2o.fc18.FourCornerDotCake; import org.x4o.o2o.fc18.FourCornerX18CakePoints; /** - * "FC.AMD0110-DA" Four Corner Application Methodoums Decimals + * "FC.AMD0110-SA" Four Corner Application Methodoums Decimals * * * @author Willem Cazander * @version 1.0 Dec 31, 2024 */ -public enum FCDotAMD0110DashDA implements FourCornerX18CakePoints { +public enum FCDotAMD0110DashSA implements FourCornerX18CakePoints { /// End-user defined rendering for zero T010_NXX_001, /// End-user defined rendering for one @@ -49,6 +49,6 @@ public enum FCDotAMD0110DashDA implements FourCornerX18CakePoints { @Override public int[] cakePoints() { - return new int[] {FourCornerDotCake.FC_AMD0110_DA.getStart() + ordinal()}; + return new int[] {FourCornerDotCake.FC_AMD0110_SA.getStart() + ordinal()}; } } diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotBMW0102DashD1.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotBMW0102DashS2.java similarity index 89% rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotBMW0102DashD1.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotBMW0102DashS2.java index 07b1eb2..471e0dc 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotBMW0102DashD1.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotBMW0102DashS2.java @@ -26,18 +26,18 @@ import org.x4o.o2o.fc18.FourCornerDotCake; import org.x4o.o2o.fc18.FourCornerX18CakePoints; /** - * "FC.BMW0102-D1" Four Corner Binary Model Word encoding. + * "FC.BMW0102-S2" Four Corner Binary Model Word encoding. * * @author Willem Cazander * @version 1.0 Dec 31, 2024 */ -public enum FCDotBMW0102DashD1 implements FourCornerX18CakePoints { +public enum FCDotBMW0102DashS2 implements FourCornerX18CakePoints { T002_NXX_001, T002_NXX_002, ; @Override public int[] cakePoints() { - return new int[] {FourCornerDotCake.FC_BMW0102_D1.getStart() + ordinal()}; + return new int[] {FourCornerDotCake.FC_BMW0102_S2.getStart() + ordinal()}; } } diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotDNA0104DashS4.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotDNA0104DashS4.java new file mode 100644 index 0000000..0d91fb2 --- /dev/null +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotDNA0104DashS4.java @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2004-2014, Willem Cazander + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.x4o.o2o.fc18.zero33; + +import org.x4o.o2o.fc18.FourCornerDotCake; +import org.x4o.o2o.fc18.FourCornerX18CakePoints; + +/** + * "FC.DNA0104-S4" Four Corner Application Direct Nuclear Air strike for quadratonic values. + * + * + * @author Willem Cazander + * @version 1.0 Jan 07, 2024 + */ +public enum FCDotDNA0104DashS4 implements FourCornerX18CakePoints { + NXX_001, + NXX_002, + NXX_003, + NXX_004, + ; + + @Override + public int[] cakePoints() { + return new int[] {FourCornerDotCake.FC_DNA0104_S4.getStart() + ordinal()}; + } +} diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotIBM1616DashD8.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotIBM1616DashH8.java similarity index 95% rename from nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotIBM1616DashD8.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotIBM1616DashH8.java index e8c5e3e..9fe43a0 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotIBM1616DashD8.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotIBM1616DashH8.java @@ -26,13 +26,13 @@ import org.x4o.o2o.fc18.FourCornerDotCake; import org.x4o.o2o.fc18.FourCornerX18CakePoints; /** - * "FC.IBM1616-D8" Four Corner Interim Byte Mode, embed raw 8 bit Data + * "FC.IBM1616-H8" Four Corner Interim Byte Mode, embed raw 8 bit Data * * * @author Willem Cazander * @version 1.0 Dec 30, 2024 */ -public enum FCDotIBM1616DashD8 implements FourCornerX18CakePoints { +public enum FCDotIBM1616DashH8 implements FourCornerX18CakePoints { NXX_001, NXX_002, NXX_003, @@ -293,6 +293,6 @@ public enum FCDotIBM1616DashD8 implements FourCornerX18CakePoints { @Override public int[] cakePoints() { - return new int[] {FourCornerDotCake.FC_IBM1616_D8.getStart() + ordinal()}; + return new int[] {FourCornerDotCake.FC_IBM1616_H8.getStart() + ordinal()}; } } diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotNXP0103DashS3.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotNXP0103DashS3.java new file mode 100644 index 0000000..21260f7 --- /dev/null +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotNXP0103DashS3.java @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2004-2014, Willem Cazander + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.x4o.o2o.fc18.zero33; + +import org.x4o.o2o.fc18.FourCornerDotCake; +import org.x4o.o2o.fc18.FourCornerX18CakePoints; + +/** + * "FC.NXP0103-S3" Four Corner Application Natural X-state Phasing for tri-state or high impedance (Hi-Z) signals. + * + * + * @author Willem Cazander + * @version 1.0 Jan 07, 2024 + */ +public enum FCDotNXP0103DashS3 implements FourCornerX18CakePoints { + NXX_001, + NXX_002, + NXX_003, + ; + + @Override + public int[] cakePoints() { + return new int[] {FourCornerDotCake.FC_NXP0103_S3.getStart() + ordinal()}; + } +}