From c799b00eaf0f3c5e17f17171bdc1f8087d90e964 Mon Sep 17 00:00:00 2001 From: Willem Date: Sat, 2 Aug 2025 23:12:52 +0200 Subject: [PATCH] FC18: Replaced APL with BraSCII named as LUE0127 --- .../mais/fc18/print/FCDocPageWriterCandy.java | 14 +- .../org/x4o/fc18/cake2/FourCornerDotCake.java | 12 +- .../cake2/zero33/FCDotAPL0127DashP7B.java | 142 ----------------- .../cake2/zero33/FCDotAPL0127DashP7C.java | 144 ------------------ ...7DashP7A.java => FCDotLUA0127DashP7A.java} | 112 +++++--------- .../cake2/zero33/FCDotLUA0127DashP7B.java | 96 ++++++++++++ .../cake2/zero33/FCDotLUA0127DashP7C.java | 96 ++++++++++++ .../cake2/zero33/dec1/FCDotINC0801DashP8.java | 12 +- .../{FCDotAPLTest.java => FCDotBRETest.java} | 12 +- 9 files changed, 252 insertions(+), 388 deletions(-) delete mode 100644 nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotAPL0127DashP7B.java delete mode 100644 nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotAPL0127DashP7C.java rename nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/{FCDotAPL0127DashP7A.java => FCDotLUA0127DashP7A.java} (56%) create mode 100644 nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotLUA0127DashP7B.java create mode 100644 nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotLUA0127DashP7C.java rename nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/{FCDotAPLTest.java => FCDotBRETest.java} (85%) diff --git a/nx01-mushroom-mais-fc18/src/main/java/love/distributedrebirth/nx01/mushroom/mais/fc18/print/FCDocPageWriterCandy.java b/nx01-mushroom-mais-fc18/src/main/java/love/distributedrebirth/nx01/mushroom/mais/fc18/print/FCDocPageWriterCandy.java index 92f4f02..ab6baed 100644 --- a/nx01-mushroom-mais-fc18/src/main/java/love/distributedrebirth/nx01/mushroom/mais/fc18/print/FCDocPageWriterCandy.java +++ b/nx01-mushroom-mais-fc18/src/main/java/love/distributedrebirth/nx01/mushroom/mais/fc18/print/FCDocPageWriterCandy.java @@ -27,9 +27,9 @@ import java.util.List; import org.x4o.fc18.FourCornerUnicodeDisplay; import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.zero33.FCDotAPL0127DashP7A; -import org.x4o.fc18.cake2.zero33.FCDotAPL0127DashP7B; -import org.x4o.fc18.cake2.zero33.FCDotAPL0127DashP7C; +import org.x4o.fc18.cake2.zero33.FCDotLUA0127DashP7A; +import org.x4o.fc18.cake2.zero33.FCDotLUA0127DashP7B; +import org.x4o.fc18.cake2.zero33.FCDotLUA0127DashP7C; import org.x4o.fc18.cake2.zero33.FCDotBYD0127DashP7D; import org.x4o.fc18.cake2.zero33.FCDotBYD0127DashP7E; import org.x4o.fc18.cake2.zero33.FCDotBYD0127DashP7F; @@ -68,12 +68,12 @@ public class FCDocPageWriterCandy implements MaisDocPageWriter, FCDocSegmentWrit } } try (ContentCloseable content = writer.docPageContent()) { - String xSpec = FourCornerDotCake.FC_APL0127_P7A.nameSpec().replaceAll("P7A", "P7x"); + String xSpec = FourCornerDotCake.FC_LUA0127_P7A.nameSpec().replaceAll("P7A", "P7x"); try (ContentCloseable table = writer.docTable(xSpec, null, MaisDocContentCss.overviewSummary)) { writeTableBoxHeaderNumeric(writer, 28, true); - writeP7x(writer, FourCornerDotCake.FC_APL0127_P7A, v -> FCDotAPL0127DashP7A.valueOf(v).codePointDotIndex()); - writeP7x(writer, FourCornerDotCake.FC_APL0127_P7B, v -> FCDotAPL0127DashP7B.valueOf(v).codePointDotIndex()); - writeP7x(writer, FourCornerDotCake.FC_APL0127_P7C, v -> FCDotAPL0127DashP7C.valueOf(v).codePointDotIndex()); + writeP7x(writer, FourCornerDotCake.FC_LUA0127_P7A, v -> FCDotLUA0127DashP7A.valueOf(v).codePointDotIndex()); + writeP7x(writer, FourCornerDotCake.FC_LUA0127_P7B, v -> FCDotLUA0127DashP7B.valueOf(v).codePointDotIndex()); + writeP7x(writer, FourCornerDotCake.FC_LUA0127_P7C, v -> FCDotLUA0127DashP7C.valueOf(v).codePointDotIndex()); } } try (ContentCloseable content = writer.docPageContent()) { 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 44a9bc5..dcd58bf 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 @@ -130,9 +130,9 @@ import org.x4o.fc18.cake2.pie9d.FCDotPIE9DDash24; import org.x4o.fc18.cake2.pie9d.FCDotPIE9DDash25; import org.x4o.fc18.cake2.pie9d.FCDotPIE9DDash26; import org.x4o.fc18.cake2.pie9d.FCDotPIE9DDash27; -import org.x4o.fc18.cake2.zero33.FCDotAPL0127DashP7A; -import org.x4o.fc18.cake2.zero33.FCDotAPL0127DashP7B; -import org.x4o.fc18.cake2.zero33.FCDotAPL0127DashP7C; +import org.x4o.fc18.cake2.zero33.FCDotLUA0127DashP7A; +import org.x4o.fc18.cake2.zero33.FCDotLUA0127DashP7B; +import org.x4o.fc18.cake2.zero33.FCDotLUA0127DashP7C; import org.x4o.fc18.cake2.zero33.FCDotBYD0127DashP7D; import org.x4o.fc18.cake2.zero33.FCDotBYD0127DashP7E; import org.x4o.fc18.cake2.zero33.FCDotBYD0127DashP7F; @@ -150,9 +150,9 @@ public enum FourCornerDotCake { FC_CDC1604_P6(0, 64, FCDotCDC1604DashP6.values(), "Character Dough Cake"), FC_DEC2701_PX0(64, 27, FCDotDEC2701DashPX0.values(), "Direct or Escaped Control"), - FC_APL0127_P7A(91, 27, FCDotAPL0127DashP7A.values(), "Array Programming Language P7A"), - FC_APL0127_P7B(118, 27, FCDotAPL0127DashP7B.values(), "Array Programming Language P7B"), - FC_APL0127_P7C(145, 27, FCDotAPL0127DashP7C.values(), "Array Programming Language P7C"), + FC_LUA0127_P7A(91, 27, FCDotLUA0127DashP7A.values(), "Local Union Alphabet P7A"), + FC_LUA0127_P7B(118, 27, FCDotLUA0127DashP7B.values(), "Local Union Alphabet P7B"), + FC_LUA0127_P7C(145, 27, FCDotLUA0127DashP7C.values(), "Local Union Alphabet P7C"), FC_BYD0127_P7D(172, 27, FCDotBYD0127DashP7D.values(), "Block Your Display P7D"), FC_BYD0127_P7E(199, 27, FCDotBYD0127DashP7E.values(), "Block Your Display P7E"), diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotAPL0127DashP7B.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotAPL0127DashP7B.java deleted file mode 100644 index d815161..0000000 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotAPL0127DashP7B.java +++ /dev/null @@ -1,142 +0,0 @@ -/* - * 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.fc18.cake2.zero33; - -import java.util.List; - -import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerDotColleZero33; -import org.x4o.fc18.cake2.zero33.dec1.FCDotINC0801DashP8; - -/// "FC.APL0127-P7B" Four Corner A Programming Language symbols cake slice of cake points. -/// -/// @author Willem Cazander -/// @version 1.0 Jan 1, 2025 -/// -public enum FCDotAPL0127DashP7B implements FourCornerDotColleZero33 { - - /// NEW from dynlog APL - __CIRCLE_DOT_XL(' '), - /// NEW from dynlog APL - __CIRLCE_DOT(' '), - /// SL250000 - __JOT(' '), - /// NEW from dynlog APL - __STAR_DOT(' '), - - // === ALGOL_60 ::= + | - | × | / | ÷ | ↑ - - // SL790000 = Plus = FCDotCDC1604DashP6._PLUS - // SL690000 = Bar = FCDotCDC1604DashP6._MINUS - /// SL550000 - __TIMES(' '), - // SL760000 = Slash = FCDotCDC1604DashP6.BAR_V_RIGHT - /// SL540000 - __DIVIDE(' '), - - // === ALGOL_60 ::= <, ≤, =, ≥, >, ≠ - - // SL520000 = Less than = FCDotCDC1604DashP6.TAG_COMPARE_LEFT - /// SL560000 - __NOT_GREATER(' '), - // SL810000 = Equal = FCDotCDC1604DashP6._EQUALS - /// SL570000 - __NOT_LESS(' '), - // SL530000 = Greater than = FCDotCDC1604DashP6.TAG_COMPARE_RIGHT - /// SL820000 - __NOT_EQUAL(' '), - /// SL050000 - __DEL_STILE(' '), // grade down - /// SL070000 - __DELTA_STILE(' '), - - // === ALGOL_60 ::= ≡ | ⊃ | ∧ | ∨ | ¬ - - /// SL300000 - __EQUALS_UNDERBAR(' '), - /// SL430000 - __RIGHT_SHOE(' '), - /// SL510000 - __UP_CARET(' '), - /// SL500000 - __DOWN_CARET(' '), - /// NEW: This comes from ALGOL_60 chars. - __ALGOL_NOT(' '), - /// SL170000 - __UP_CARET_TILDE(' '), // NAND - /// SL180000 - __DOWN_CARET_TILDE(' '), - /// NEW: from Dynalog_APL - __EQUALS_UNDERNOT(' '), - - /// === Left over from modern APL for Zilog Z8000 see https://aplwiki.com/wiki/Dyalog_APL - - /// SL240000 - __IBEAM_TACK(' '), - /// NEW from DYNA - __DOTTED_TILDE(' '), - /// SL450000 - __DIAERESIS(' '), - // SL870000 - __EPSILON_UNDERBAR(' '), - // SL860000 = Iota Underbar - __IOTA_UNDERBAR(' '), - /// SL730000 - __IOTA(' '), - /// SL410000 - __DOWN_SHOE(' '), - /// SL400000 - __UP_SHOE(' '), - - ; - - static final private FCDotAPL0127DashP7B[] VALUES = values(); // values() is slow method - private final int codePoint; - - private FCDotAPL0127DashP7B(int codePoint) { - this.codePoint = codePoint; - } - - @Override - public List baklavaPointSequence() { - return FCDotINC0801DashP8.INC_APL0127_P7B.baklavaPointsE16(ordinal()); - } - - @Override - public int cakePointDotIndex() { - return FourCornerDotCake.FC_APL0127_P7B.getStart() + ordinal(); - } - - @Override - public int codePointDotIndex() { - return codePoint; - } - - static public int valuesLength() { - return VALUES.length; - } - - static public FCDotAPL0127DashP7B valueOf(int idx) { - return VALUES[idx]; - } -} diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotAPL0127DashP7C.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotAPL0127DashP7C.java deleted file mode 100644 index 9d7e2d4..0000000 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotAPL0127DashP7C.java +++ /dev/null @@ -1,144 +0,0 @@ -/* - * 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.fc18.cake2.zero33; - -import java.util.List; - -import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerDotColleZero33; -import org.x4o.fc18.cake2.zero33.dec1.FCDotINC0801DashP8; - -/// "FC.APL0127-P7C" Four Corner A Programming Language symbols cake slice of cake points. -/// -/// @author Willem Cazander -/// @version 1.0 Jan 1, 2025 -/// -public enum FCDotAPL0127DashP7C implements FourCornerDotColleZero33 { - - /// SL720000 - __EPSILON(' '), - /// NEW from dynslog APL - __LEFT_SHOE_UNDERBAR(' '), - /// SL420000 - __LEFT_SHOE(' '), - /// SL740000 - __RHO(' '), - /// NEW from dynlog APL - __MINUS_COMMA(' '), - - /// --------- Left over from IBM APL - - /// SL210000 - __UP_SHOE_NULL(' '), - /// SL630000 - __OVERBAR(' '), - /// SL710000 - __ALPHA(' '), - /// SL750000 - __OMEGA(' '), - - - /// SL040000 - __DEL_TILDE(' '), /// === ⎕LOCK - /// SL130000 - __QUAD_QUOTE(' '), // GNU APL: stdin and debug out - /// SL270000 - __QUAD_JOT(' '), // file meta info - /// SL280000 - __QUAD_SLOPE(' '), // was expand - /// SL320000 - __DIAERESIS_DOT(' '), // each item - // SL330000 - __DELTA_UNDERBAR(' '), // GNU APL: user var: starts (A-Z) or one of the 3 characters _, ∆ , or ⍙ - /// SL370000 - __LESS_GREATER(' '), // each stmt - /// SL480000 - __CIRCLE_PLUS(' '), // group - /// SL490000 - __CIRCLE_TIMES(' '), // index of - - OPEN_19(' '), - OPEN_20(' '), - OPEN_21(' '), - OPEN_22(' '), - OPEN_23(' '), - OPEN_24(' '), - OPEN_25(' '), - OPEN_26(' '), - OPEN_27(' '), - - - - // SL290000 = Unsupported = Ampersand Underbar - // SL310000 = Unsupported = OUT Symbol = Not used by IBM ? - // SL380000 = Stile = FCDotCDC1604DashP6.BAR_VERTICAL - // SL390000 = undefined - // SL440000 = Underbar = FCDotCDC1604DashP6.BAR_UNDER - // SL460000 = Tilde = FCDotCDC1604DashP6._TILDE - // SL470000 = undefined - // SL580000 = Quote Dot = FCDotCDC1604DashP6._EXCLAMATION - // SL640000 = Slope = FCDotCDC1604DashP6.BAR_V_LEFT - // SL650000 = Star = FCDotCDC1604DashP6._ASTRIKS - // SL660000 = Quota = FCDotCDC1604DashP6._APOSTROPHE - // SL670000 = Left Parenthesis = FCDotCDC1604DashP6.TAG_ROUND_LEFT - // SL680000 = Right Parenthesis = FCDotCDC1604DashP6.TAG_ROUND_RIGHT - // SL700000 = Query = FCDotCDC1604DashP6._QUESTION - // SL770000 = Left Bracket = FCDotCDC1604DashP6.TAG_SQUARE_LEFT - // SL780000 = Right Bracket = FCDotCDC1604DashP6.TAG_SQUARE_RIGHT - // SL800000 = Semicolon = FCDotCDC1604DashP6._SEMICOLON - // SL830000 = Colon = FCDotCDC1604DashP6._COLON - // SL840000 = Dot = FCDotCDC1604DashP6._DOT - // SL850000 = Comma = FCDotCDC1604DashP6._COMMA - - ; - - static final private FCDotAPL0127DashP7C[] VALUES = values(); // values() is slow method - private final int codePoint; - - private FCDotAPL0127DashP7C(int codePoint) { - this.codePoint = codePoint; - } - - @Override - public List baklavaPointSequence() { - return FCDotINC0801DashP8.INC_APL0127_P7A.baklavaPointsE16(ordinal()); - } - - @Override - public int cakePointDotIndex() { - return FourCornerDotCake.FC_APL0127_P7C.getStart() + ordinal(); - } - - @Override - public int codePointDotIndex() { - return codePoint; - } - - static public int valuesLength() { - return VALUES.length; - } - - static public FCDotAPL0127DashP7C valueOf(int idx) { - return VALUES[idx]; - } -} diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotAPL0127DashP7A.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotLUA0127DashP7A.java similarity index 56% rename from nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotAPL0127DashP7A.java rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotLUA0127DashP7A.java index 8748f15..bf3a903 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotAPL0127DashP7A.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotLUA0127DashP7A.java @@ -28,99 +28,57 @@ import org.x4o.fc18.cake2.FourCornerDotCake; import org.x4o.fc18.cake2.FourCornerDotColleZero33; import org.x4o.fc18.cake2.zero33.dec1.FCDotINC0801DashP8; -/// "FC.APL0127-P7A" Four Corner A Programming Language symbols cake slice of cake points. +/// "FC.LUA0127-P7A" Four Corner Local Union Alphabet symbols cake slice of cake points. /// /// @author Willem Cazander -/// @version 1.0 Jan 1, 2025 +/// @version 1.0 Aug 2, 2025 /// -public enum FCDotAPL0127DashP7A implements FourCornerDotColleZero33 { - - /// SL080000 One is pi - __CIRCLE(' '), - - // === 2 + 6 boxes - - /// SL360000 - __QUAD(' '), - /// SL260000 - __SQUISH_QUAD(' '), - /// SL140000 - __QUAD_DIVIDE(' '), - /// NEW from Dynlog APL - __QUAD_DOT2(' '), - /// NEW from Dynlog APL - __QUAD_BOX3(' '), - /// NEW from Dynlog APl - __QUAD_QUAD(' '), - - // === 8 directions T arrows - - /// SL610000 - __UP_ARROW(' '), - /// SL600000 - __RIGHT_ARROW(' '), - /// SL620000 - __DOWN_ARROW(' '), - /// SL590000 - __LEFT_ARROW(' '), - /// SL220000 - __UP_TACK(' '), - /// SL350000 - __RIGHT_TACK(' '), - /// SL230000 - __DOWN_TACK(' '), - /// SL340000 - __LEFT_TACK(' '), - - // === 8 mirrors - - /// SL190000 - __DOWN_TACK_JOT(' '), - /// SL200000 - __UP_TACK_JOT(' '), - /// SL150000 - __SLASH_BAR(' '), - /// SL160000 - __SLOPE_BAR(' '), - /// SL010000 - __UP_STILE(' '), - /// SL020000 - __DOWN_STILE(' '), - /// SL030000 (used in GNU GPL) - __DEL(' '), - /// SL060000 (used in GNU GPL) - __DELTA(' '), - - - // === 8 Oooohhhs - - /// SL110000 - __CIRCLE_STAR(' '), - /// SL090000 - __CIRCLE_STILE(' '), - /// SL120000 - __CIRCLE_BAR(' '), - /// SL100000 - __CIRCLE_SLOPE(' '), - +public enum FCDotLUA0127DashP7A implements FourCornerDotColleZero33 { + NXX_01('À'), + NXX_02('Á'), + NXX_03('Â'), + NXX_04('Ã'), + NXX_05('Ä'), + NXX_06('Å'), + NXX_07('Æ'), + NXX_08('Ç'), + NXX_09('È'), + NXX_10('É'), + NXX_11('Ê'), + NXX_12('Ë'), + NXX_13('Ì'), + NXX_14('Í'), + NXX_15('Î'), + NXX_16('Ï'), + NXX_17('Ð'), + NXX_18('Ñ'), + NXX_19('Ò'), + NXX_20('Ó'), + NXX_21('Ô'), + NXX_22('Õ'), + NXX_23('Ö'), + NXX_24('Œ'), + NXX_25('Ø'), + NXX_26('Ù'), + NXX_27('Ú'), ; - static final private FCDotAPL0127DashP7A[] VALUES = values(); // values() is slow method + static final private FCDotLUA0127DashP7A[] VALUES = values(); // values() is slow method private final int codePoint; - private FCDotAPL0127DashP7A(int codePoint) { + private FCDotLUA0127DashP7A(int codePoint) { this.codePoint = codePoint; } @Override public List baklavaPointSequence() { - return FCDotINC0801DashP8.INC_APL0127_P7A.baklavaPointsE16(ordinal()); + return FCDotINC0801DashP8.INC_LUA0127_P7A.baklavaPointsE16(ordinal()); } @Override public int cakePointDotIndex() { - return FourCornerDotCake.FC_APL0127_P7A.getStart() + ordinal(); + return FourCornerDotCake.FC_LUA0127_P7A.getStart() + ordinal(); } @Override @@ -132,7 +90,7 @@ public enum FCDotAPL0127DashP7A implements FourCornerDotColleZero33 { return VALUES.length; } - static public FCDotAPL0127DashP7A valueOf(int idx) { + static public FCDotLUA0127DashP7A valueOf(int idx) { return VALUES[idx]; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotLUA0127DashP7B.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotLUA0127DashP7B.java new file mode 100644 index 0000000..88807bf --- /dev/null +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotLUA0127DashP7B.java @@ -0,0 +1,96 @@ +/* + * 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.fc18.cake2.zero33; + +import java.util.List; + +import org.x4o.fc18.cake2.FourCornerDotCake; +import org.x4o.fc18.cake2.FourCornerDotColleZero33; +import org.x4o.fc18.cake2.zero33.dec1.FCDotINC0801DashP8; + +/// "FC.LUA0127-P7B" Four Corner Local Union Alphabet symbols cake slice of cake points. +/// +/// @author Willem Cazander +/// @version 1.0 Aug 2, 2025 +/// +public enum FCDotLUA0127DashP7B implements FourCornerDotColleZero33 { + + NXX_01('Û'), + NXX_02('Ü'), + NXX_03('Ý'), + NXX_04('Þ'), + NXX_05('ß'), + NXX_06('à'), + NXX_07('á'), + NXX_08('â'), + NXX_09('ã'), + NXX_10('ä'), + NXX_11('å'), + NXX_12('æ'), + NXX_13('ç'), + NXX_14('è'), + NXX_15('é'), + NXX_16('ê'), + NXX_17('ë'), + NXX_18('ì'), + NXX_19('í'), + NXX_20('î'), + NXX_21('ï'), + NXX_22('ð'), + NXX_23('ñ'), + NXX_24('ò'), + NXX_25('ó'), + NXX_26('ô'), + NXX_27('õ'), + ; + + static final private FCDotLUA0127DashP7B[] VALUES = values(); // values() is slow method + private final int codePoint; + + private FCDotLUA0127DashP7B(int codePoint) { + this.codePoint = codePoint; + } + + @Override + public List baklavaPointSequence() { + return FCDotINC0801DashP8.INC_LUA0127_P7B.baklavaPointsE16(ordinal()); + } + + @Override + public int cakePointDotIndex() { + return FourCornerDotCake.FC_LUA0127_P7B.getStart() + ordinal(); + } + + @Override + public int codePointDotIndex() { + return codePoint; + } + + static public int valuesLength() { + return VALUES.length; + } + + static public FCDotLUA0127DashP7B valueOf(int idx) { + return VALUES[idx]; + } +} diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotLUA0127DashP7C.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotLUA0127DashP7C.java new file mode 100644 index 0000000..eb074df --- /dev/null +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotLUA0127DashP7C.java @@ -0,0 +1,96 @@ +/* + * 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.fc18.cake2.zero33; + +import java.util.List; + +import org.x4o.fc18.cake2.FourCornerDotCake; +import org.x4o.fc18.cake2.FourCornerDotColleZero33; +import org.x4o.fc18.cake2.zero33.dec1.FCDotINC0801DashP8; + +/// "FC.LUA0127-P7C" Four Corner Local Union Alphabet symbols cake slice of cake points. +/// +/// @author Willem Cazander +/// @version 1.0 Aug 2, 2025 +/// +public enum FCDotLUA0127DashP7C implements FourCornerDotColleZero33 { + + NXX_01('ö'), + NXX_02('œ'), + NXX_03('ø'), + NXX_04('ù'), + NXX_05('ú'), + NXX_06('û'), + NXX_07('ü'), + NXX_08('ý'), + NXX_09('þ'), + NXX_10('ÿ'), + NXX_11(' '), + NXX_12(' '), + NXX_13(' '), + NXX_14(' '), + NXX_15(' '), + NXX_16(' '), + NXX_17(' '), + NXX_18(' '), + NXX_19(' '), + NXX_20(' '), + NXX_21(' '), + NXX_22(' '), + NXX_23(' '), + NXX_24(' '), + NXX_25(' '), + NXX_26(' '), + NXX_27(' '), + ; + + static final private FCDotLUA0127DashP7C[] VALUES = values(); // values() is slow method + private final int codePoint; + + private FCDotLUA0127DashP7C(int codePoint) { + this.codePoint = codePoint; + } + + @Override + public List baklavaPointSequence() { + return FCDotINC0801DashP8.INC_LUA0127_P7A.baklavaPointsE16(ordinal()); + } + + @Override + public int cakePointDotIndex() { + return FourCornerDotCake.FC_LUA0127_P7C.getStart() + ordinal(); + } + + @Override + public int codePointDotIndex() { + return codePoint; + } + + static public int valuesLength() { + return VALUES.length; + } + + static public FCDotLUA0127DashP7C valueOf(int idx) { + return VALUES[idx]; + } +} diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/dec1/FCDotINC0801DashP8.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/dec1/FCDotINC0801DashP8.java index 2712e87..4b6cb72 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/dec1/FCDotINC0801DashP8.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/dec1/FCDotINC0801DashP8.java @@ -42,16 +42,16 @@ import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; public enum FCDotINC0801DashP8 implements FourCornerX06BaklavaPointSequence, FourCornerX08MuffinPointSequence, FourCornerX18CakePointSequence, FourCornerX18CakePointDotName { /// ¡¡¡ - /// Select APL page 7A mode. - INC_APL0127_P7A(FourCornerDotCake.FC_APL0127_P7A), + /// Select LUA page 7A mode. + INC_LUA0127_P7A(FourCornerDotCake.FC_LUA0127_P7A), /// ¡¡¿ - /// Select APL page 7B mode. - INC_APL0127_P7B(FourCornerDotCake.FC_APL0127_P7B), + /// Select LUA page 7B mode. + INC_LUA0127_P7B(FourCornerDotCake.FC_LUA0127_P7B), /// ¡¿¡ - /// Select APL page 7C mode. - INC_APL0127_P7C(FourCornerDotCake.FC_APL0127_P7C), + /// Select LUA page 7C mode. + INC_LUA0127_P7C(FourCornerDotCake.FC_LUA0127_P7C), /// ¡¿¿ /// Select BYD page 7D mode. diff --git a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotAPLTest.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotBRETest.java similarity index 85% rename from nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotAPLTest.java rename to nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotBRETest.java index 92b84f7..95671dc 100644 --- a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotAPLTest.java +++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotBRETest.java @@ -34,20 +34,20 @@ import org.junit.jupiter.api.Test; * @author Willem Cazander * @version 1.0 Jan 1, 2025 */ -public class FCDotAPLTest { +public class FCDotBRETest { @Test public void testValuesLength() throws Exception { - Assertions.assertEquals(27, FCDotAPL0127DashP7A.valuesLength()); - Assertions.assertEquals(27, FCDotAPL0127DashP7B.valuesLength()); - Assertions.assertEquals(27, FCDotAPL0127DashP7C.valuesLength()); + Assertions.assertEquals(27, FCDotLUA0127DashP7A.valuesLength()); + Assertions.assertEquals(27, FCDotLUA0127DashP7B.valuesLength()); + Assertions.assertEquals(27, FCDotLUA0127DashP7C.valuesLength()); } @Test public void testValues() throws Exception { boolean duplicate = false; - Map global = new HashMap<>(); - for (FCDotAPL0127DashP7A v : FCDotAPL0127DashP7A.values()) { + Map global = new HashMap<>(); + for (FCDotLUA0127DashP7A v : FCDotLUA0127DashP7A.values()) { Assertions.assertNotNull(v); if (global.containsKey(v.codePointDotIndex())) { duplicate = true;