diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotBYD0127DashP7D.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotBYD0127DashP7D.java index faf3dac..949cfd9 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotBYD0127DashP7D.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotBYD0127DashP7D.java @@ -27,44 +27,40 @@ import java.util.List; import org.x4o.fc18.cake2.FourCornerDotCake; import org.x4o.fc18.cake2.FourCornerDotColleZero33; -/// "FC.BYD0127-P8D" Four Corner Block Your Display terminal application. +/// "FC.BYD0127-P7D" Four Corner Block Your Display terminal application. /// /// @author Willem Cazander /// @version 1.0 Jan 1, 2025 /// public enum FCDotBYD0127DashP7D implements FourCornerDotColleZero33 { - // 32 chars are CP/M Plus aligned - - BOX2_1('╧'), - BOX2_2('╟'), - BOX2_3('╚'), - BOX2_4('╤'), - BOX2_5('║'), - BOX2_6('╔'), - BOX2_7('╠'), - BOX2_8('╢'), - BOX2_9('╝'), - BOX2_A('═'), - BOX2_B('╩'), - BOX2_C('╗'), - BOX2_D('╣'), - BOX2_E('╦'), - BOX2_F('╬'), - - /// this index is free in CP/M+, but here is the bi-cross glue from unicode "Box Drawing" char: 0x256A - BOX1_0('╪'), - BOX1_1('╵'), - BOX1_2('╶'), - BOX1_3('└'), - BOX1_4('╷'), - BOX1_5('│'), - BOX1_6('┌'), - BOX1_7('├'), - BOX1_8('╴'), - BOX1_9('┘'), - BOX1_A('─'), - BOX1_B('┴'), + BOX2_01('═'), + BOX2_02('║'), + BOX2_03('╒'), + BOX2_04('╓'), + BOX2_05('╔'), + BOX2_06('╕'), + BOX2_07('╖'), + BOX2_08('╗'), + BOX2_09('╘'), + BOX2_10('╙'), + BOX2_11('╚'), + BOX2_12('╛'), + BOX2_13('╜'), + BOX2_14('╝'), + BOX2_15('╞'), + BOX2_16('╟'), + BOX2_17('╠'), + BOX2_18('╡'), + BOX2_19('╢'), + BOX2_20('╣'), + BOX2_21('╤'), + BOX2_22('╥'), + BOX2_23('╦'), + BOX2_24('╧'), + BOX2_25('╨'), + BOX2_26('╩'), + BOX2_27('▀'), ; static final private FCDotBYD0127DashP7D[] VALUES = values(); // values() is slow method diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotBYD0127DashP7E.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotBYD0127DashP7E.java index 0ef8a9d..ec5b12c 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotBYD0127DashP7E.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotBYD0127DashP7E.java @@ -27,44 +27,42 @@ import java.util.List; import org.x4o.fc18.cake2.FourCornerDotCake; import org.x4o.fc18.cake2.FourCornerDotColleZero33; -/// "FC.BYD0127-P8E" Four Corner Block Your Display terminal application. +/// "FC.BYD0127-P7E" Four Corner Block Your Display terminal application. /// /// @author Willem Cazander /// @version 1.0 Jan 1, 2025 /// public enum FCDotBYD0127DashP7E implements FourCornerDotColleZero33 { - BOX1_C('┐'), - BOX1_D('┤'), - BOX1_E('┬'), - BOX1_F('┼'), + BOX1_01('─'), + BOX1_02('│'), + BOX1_03('┄'), + BOX1_04('┆'), + BOX1_05('┈'), + BOX1_06('┊'), + BOX1_07('┌'), + BOX1_08('┐'), + BOX1_09('└'), + BOX1_10('┘'), + BOX1_11('├'), + BOX1_12('┤'), + BOX1_13('┬'), + BOX1_14('┴'), + BOX1_15('┼'), + BOX1_16('╌'), + BOX1_17('╎'), + BOX1_18('╴'), + BOX1_19('╵'), + BOX1_20('╶'), + BOX1_21('╷'), - // 32 chars aligned with unicode "Block Elements" + BOX2_22('╪'), + BOX2_23('╫'), + BOX2_24('╬'), - U2580('▀'), - U2581('▁'), - U2582('▂'), - U2583('▃'), - U2584('▄'), - U2585('▅'), - U2586('▆'), - U2587('▇'), - U2588('█'), - U2589('▉'), - U258A('▊'), - U258B('▋'), - U258C('▌'), - U258D('▍'), - U258E('▎'), - U258F('▏'), - - U2590('▐'), - U2591('░'), - U2592('▒'), - U2593('▓'), - U2594('▔'), - U2595('▕'), - U2596('▖'), + BLK3_25('░'), + BLK3_26('▒'), + BLK3_27('▓'), ; static final private FCDotBYD0127DashP7E[] VALUES = values(); // values() is slow method diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotBYD0127DashP7F.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotBYD0127DashP7F.java index 9d981ce..eaf7ff9 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotBYD0127DashP7F.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotBYD0127DashP7F.java @@ -27,43 +27,40 @@ import java.util.List; import org.x4o.fc18.cake2.FourCornerDotCake; import org.x4o.fc18.cake2.FourCornerDotColleZero33; -/// "FC.BYD0127-P8F" Four Corner Block Your Display terminal application. +/// "FC.BYD0127-P7F" Four Corner Block Your Display terminal application. /// /// @author Willem Cazander /// @version 1.0 Jan 1, 2025 /// public enum FCDotBYD0127DashP7F implements FourCornerDotColleZero33 { - U2597('▗'), - U2598('▘'), - U2599('▙'), - U259A('▚'), - U259B('▛'), - U259C('▜'), - U259D('▝'), - U259E('▞'), - U259F('▟'), - - OPEN_10('?'), - OPEN_11('?'), - OPEN_12('?'), - OPEN_13('?'), - OPEN_14('?'), - OPEN_15('?'), - OPEN_16('?'), - OPEN_17('?'), - - OPEN_18('?'), - OPEN_19('?'), - OPEN_20('?'), - OPEN_21('?'), - OPEN_22('?'), - OPEN_23('?'), - OPEN_24('?'), - OPEN_25('?'), - OPEN_26('?'), - OPEN_27('?'), - + BLK1_01('▁'), + BLK1_02('▂'), + BLK1_03('▃'), + BLK1_04('▄'), + BLK1_05('▅'), + BLK1_06('▆'), + BLK1_07('▇'), + BLK1_08('█'), + BLK1_09('▉'), + BLK1_10('▊'), + BLK1_11('▋'), + BLK1_12('▌'), + BLK1_13('▍'), + BLK1_14('▎'), + BLK1_15('▏'), + BLK1_16('▐'), + BLK1_17('▕'), + BLK2_18('▔'), + BLK2_19('▀'), + BLK2_20('▛'), + BLK2_21('▜'), + BLK2_22('▟'), + BLK2_23('▙'), + BOX1_24('╭'), + BOX1_25('╮'), + BOX1_26('╯'), + BOX1_27('╰'), ; static final private FCDotBYD0127DashP7F[] VALUES = values(); // values() is slow method diff --git a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotBYDTest.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotBYDTest.java index 6d7bfd9..3cdc1dd 100644 --- a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotBYDTest.java +++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotBYDTest.java @@ -66,16 +66,15 @@ public class FCDotBYDTest { @Test public void testDisplay() throws Exception { List cdc = new ArrayList<>(); - cdc.add(FCDotBYD0127DashP7D.BOX2_A); - cdc.add(FCDotBYD0127DashP7D.BOX2_B); - cdc.add(FCDotBYD0127DashP7D.BOX2_B); - cdc.add(FCDotBYD0127DashP7D.BOX2_A); - cdc.add(FCDotBYD0127DashP7D.BOX1_1); - cdc.add(FCDotBYD0127DashP7D.BOX1_3); - cdc.add(FCDotBYD0127DashP7D.BOX1_3); - cdc.add(FCDotBYD0127DashP7D.BOX1_7); + cdc.add(FCDotBYD0127DashP7D.BOX2_01); + cdc.add(FCDotBYD0127DashP7D.BOX2_02); + cdc.add(FCDotBYD0127DashP7D.BOX2_02); + cdc.add(FCDotBYD0127DashP7D.BOX2_01); + cdc.add(FCDotBYD0127DashP7E.BOX1_01); + cdc.add(FCDotBYD0127DashP7E.BOX1_03); + cdc.add(FCDotBYD0127DashP7E.BOX1_03); + cdc.add(FCDotBYD0127DashP7E.BOX1_07); - Assertions.assertEquals("═╩╩═╵└└├", FourCornerUnicodeDisplay.text().renderFromX06(cdc)); + Assertions.assertEquals("═║║═─┄┄┌", FourCornerUnicodeDisplay.text().renderFromX06(cdc)); } } -