diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash02.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash02.java index 248f15e..cfe429e 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash02.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash02.java @@ -37,8 +37,8 @@ import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; */ public enum FCDotPIE9CDash02 implements FourCornerDotCollePie9 { - NXX_01('○'), // from APL - NXX_02('⍥'), // from APL + MULTIPLY('×'), + DIVIDE('÷'), ; private final List codePointDisplay; diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash04.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash04.java index f973550..3050290 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash04.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash04.java @@ -37,7 +37,7 @@ import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; */ public enum FCDotPIE9CDash04 implements FourCornerDotCollePie9 { - NXX_01(' '), + NXX_01('∓'), NXX_02(' '), NXX_03('∎'), NXX_04(' '), diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash03.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash03.java index 65cf477..7252896 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash03.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash03.java @@ -37,9 +37,9 @@ import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; */ public enum FCDotPIE9DDash03 implements FourCornerDotCollePie9 { - NXX_01('×'), - NXX_02('÷'), - NXX_03('∓'), + NXX_1('⊶'), + NXX_2('⊷'), + NXX_3('⊸'), ; private final List codePointDisplay; diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash06.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash06.java index 2bc5710..c62b740 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash06.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash06.java @@ -37,12 +37,12 @@ import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; */ public enum FCDotPIE9DDash06 implements FourCornerDotCollePie9 { - NXX_01('∴'), - NXX_02('∵'), // from APL - NXX_03('⋰'), - NXX_04('⋱'), - NXX_05('⋮'), - NXX_06('⋯'), + NXX_01(' '), + NXX_02(' '), + NXX_03(' '), + NXX_04(' '), + NXX_05(' '), + NXX_06(' '), ; private final List codePointDisplay; diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash08.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash08.java index 192c7ec..dcfe4d9 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash08.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash08.java @@ -37,14 +37,14 @@ import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; */ public enum FCDotPIE9DDash08 implements FourCornerDotCollePie9 { - NXX_01('⋈'), - NXX_02('⋉'), - NXX_03('⋊'), - NXX_04('⋋'), - NXX_05('⋌'), - NXX_06('⊶'), - NXX_07('⊷'), - NXX_08('⊸'), + NXX_01(' '), + NXX_02(' '), + NXX_03(' '), + NXX_04(' '), + NXX_05(' '), + NXX_06(' '), + NXX_07(' '), + NXX_08(' '), ; private final List codePointDisplay; diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash11.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash11.java index f571066..aef36d5 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash11.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash11.java @@ -37,17 +37,17 @@ import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; */ public enum FCDotPIE9DDash11 implements FourCornerDotCollePie9 { - NXX_01('∧'), // from APL - NXX_02('∨'), // from APL - NXX_03('⋀'), - NXX_04('⋁'), - NXX_05('⋏'), - NXX_06('⋎'), - NXX_07('⍲'), // from APL - NXX_08('⍱'), // from APL - NXX_09('⊼'), - NXX_10('⊻'), - NXX_11('⊽'), + NXX_01(' '), + NXX_02(' '), + NXX_03(' '), + NXX_04(' '), + NXX_05(' '), + NXX_06(' '), + NXX_07(' '), + NXX_08(' '), + NXX_09(' '), + NXX_10(' '), + NXX_11(' '), ; private final List codePointDisplay; diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash14.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash14.java index 2287c23..953d610 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash14.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash14.java @@ -37,20 +37,20 @@ import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; */ public enum FCDotPIE9DDash14 implements FourCornerDotCollePie9 { - NXX_01('⊲'), - NXX_02('⊳'), - NXX_03('⋪'), - NXX_04('⋫'), - NXX_05('⊴'), - NXX_06('⊵'), - NXX_07('⋬'), - NXX_08('⋭'), - NXX_09('∆'), // from APL - NXX_10('∇'), // from APL - NXX_11('⍋'), // from APL - NXX_12('⍒'), // from APL - NXX_13('⍙'), // from APL - NXX_14('⍫'), // from APL + 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(' '), ; private final List codePointDisplay; diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash15.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash15.java index db21bd1..f1754d5 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash15.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash15.java @@ -47,11 +47,11 @@ public enum FCDotPIE9DDash15 implements FourCornerDotCollePie9 { NXX_08('⊉'), NXX_09('⊊'), NXX_10('⊋'), - NXX_11('∪'), - NXX_12('∩'), - NXX_13('⋃'), - NXX_14('⋂'), - NXX_15('⍝'), // from APL + NXX_11('⋈'), + NXX_12('⋉'), + NXX_13('⋊'), + NXX_14('⋋'), + NXX_15('⋌'), ; private final List codePointDisplay; diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash21.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash21.java index b013f13..6a9a155 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash21.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash21.java @@ -37,27 +37,27 @@ import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; */ public enum FCDotPIE9DDash21 implements FourCornerDotCollePie9 { - 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_01('⊲'), + NXX_02('⊳'), + NXX_03('⋪'), + NXX_04('⋫'), + NXX_05('⊴'), + NXX_06('⊵'), + NXX_07('⋬'), + NXX_08('⋭'), + NXX_09('∆'), // from APL + NXX_10('∇'), // from APL + NXX_11('⍋'), // from APL + NXX_12('⍒'), // from APL + NXX_13('∧'), // from APL + NXX_14('∨'), // from APL + NXX_15('⊼'), + NXX_16('⊻'), + NXX_17('⍲'), // from APL + NXX_18('⍱'), // from APL + NXX_19('⍙'), // from APL + NXX_20('⍫'), // from APL + NXX_21('⍝'), // from APL ; private final List codePointDisplay; 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/FCDotAPL0127DashP7A.java index f0a0d81..2877fa5 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/FCDotAPL0127DashP7A.java @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.dec1.FCDotINC0801DashP8; public enum FCDotAPL0127DashP7A implements FourCornerDotColleZero33 { /// SL080000 One is pi - __CIRCLE(' '), + CIRCLE('○'), // === 2 + 6 boxes 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 index f38cfb3..863f66f 100644 --- 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 @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.dec1.FCDotINC0801DashP8; public enum FCDotAPL0127DashP7B implements FourCornerDotColleZero33 { /// NEW from dynlog APL - __CIRCLE_DOT_XL(' '), + CIRCLE_DOT_XL('⍥'), /// NEW from dynlog APL CIRLCE_DOT('⍤'), /// SL250000 @@ -104,9 +104,9 @@ public enum FCDotAPL0127DashP7B implements FourCornerDotColleZero33 { /// SL730000 __IOTA(' '), /// SL410000 - __DOWN_SHOE(' '), + DOWN_SHOE('∪'), /// SL400000 - __UP_SHOE(' '), + UP_SHOE('∩'), ; 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 index 01741c4..4e3a42a 100644 --- 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 @@ -67,7 +67,7 @@ public enum FCDotAPL0127DashP7C implements FourCornerDotColleZero33 { /// SL280000 __QUAD_SLOPE(' '), // was expand /// SL320000 - __DIAERESIS_DOT(' '), // each item + DIAERESIS_DOT('∵'), // each item // SL330000 __DELTA_UNDERBAR(' '), // GNU APL: user var: starts (A-Z) or one of the 3 characters _, ∆ , or ⍙ /// SL370000