From f79f8ef1d8dad60d266b39ee8e45e5264434bfa2 Mon Sep 17 00:00:00 2001 From: Willem Date: Wed, 8 Jan 2025 15:23:22 +0100 Subject: [PATCH] Rename line to newline and doc align --- .../java/org/x4o/o2o/fc18/FourCornerUnicodeImport.java | 2 +- .../java/org/x4o/o2o/fc18/zero33/FCDotCDC1604DashP6.java | 4 ++-- .../org/x4o/o2o/fc18/FourCornerUnicodeDisplayTest.java | 6 +++--- .../org/x4o/o2o/fc18/FourCornerUnicodeImportTest.java | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerUnicodeImport.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerUnicodeImport.java index a04cf95..90f39ef 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerUnicodeImport.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerUnicodeImport.java @@ -94,7 +94,7 @@ public class FourCornerUnicodeImport { // Is not mapped, so handle with code if ('\r' == codePoint) { - result.add(FCDotCDC1604DashP6._LINE); + result.add(FCDotCDC1604DashP6._NEWLINE); cdcNumberTerminator = null; cdcCaseTerminator = null; continue; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotCDC1604DashP6.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotCDC1604DashP6.java index 738d8cb..261f7ff 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotCDC1604DashP6.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotCDC1604DashP6.java @@ -41,7 +41,7 @@ import org.x4o.o2o.fc18.FourCornerX21CodePoints; /// @version 1.0 Dec 22, 2024 /// public enum FCDotCDC1604DashP6 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { - // [__NUL][__PIE][__PIN][__ESC6] [_LINE][_SPACE]?! {}[] ()<> + // [__NUL][__PIE68][__NCR68][__ESC6] [_NEWLINE][_SPACE]?! {}[] ()<> // ~+-* ,.:; '"`^ =#$% // |_\/ @ABC DEFG HIJK // LMNO PQRS TUVW XYZ& @@ -58,7 +58,7 @@ public enum FCDotCDC1604DashP6 implements FourCornerX06BaklavaPoints, FourCorner __NCR68('\u0002'), /// Escape to direct control code for 6 bit systems. __ESC6('\u0003'), - _LINE('\n'), + _NEWLINE('\n'), _SPACE(' '), QUESTION('?'), EXCLAMATION('!'), diff --git a/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/FourCornerUnicodeDisplayTest.java b/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/FourCornerUnicodeDisplayTest.java index 7cb6e5b..92d1e0e 100644 --- a/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/FourCornerUnicodeDisplayTest.java +++ b/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/FourCornerUnicodeDisplayTest.java @@ -55,7 +55,7 @@ public class FourCornerUnicodeDisplayTest { cdc.add(FCDotCDC1604DashP6.NX15_O); // NXX_015 cdc.add(FCDotCDC1604DashP6.NX04_D); // NXX_004 cdc.add(FCDotCDC1604DashP6.SEMICOLON); - cdc.add(FCDotCDC1604DashP6._LINE); + cdc.add(FCDotCDC1604DashP6._NEWLINE); Assertions.assertEquals("X=¹⁴/₁₅⁵/₁₅⁷/₁₅¹⁵/₁₅⁴/₁₅;\n", FourCornerUnicodeDisplay.text().renderFromX06(cdc)); Assertions.assertEquals("X=␂ONEGOD;\n", FourCornerUnicodeDisplay.raw().renderFromX06(cdc)); @@ -74,7 +74,7 @@ public class FourCornerUnicodeDisplayTest { cdc.add(FCDotNCR1632Dash1V.NXX_123.cakePoint()); // NXX_123 cdc.add(FCDotNCR1632Dash1V.NXX_004.cakePoint()); // NXX_004 cdc.add(FCDotCDC1604DashP6.SEMICOLON.ordinal()); - cdc.add(FCDotCDC1604DashP6._LINE.ordinal()); + cdc.add(FCDotCDC1604DashP6._NEWLINE.ordinal()); Assertions.assertEquals("X=¹/₁¹⁴/₁₅¹²³/₄₅₆⁴/₄₅₆;\n", FourCornerUnicodeDisplay.text().renderFromInt18(cdc)); } @@ -89,7 +89,7 @@ public class FourCornerUnicodeDisplayTest { cdc.add(FCDotNCR1632Dash1V.NXX_123.cakePoint()); // NXX_123 cdc.add(FCDotNCR1632Dash1V.NXX_004.cakePoint()); // NXX_004 cdc.add(FCDotCDC1604DashP6.SEMICOLON.ordinal()); - cdc.add(FCDotCDC1604DashP6._LINE.ordinal()); + cdc.add(FCDotCDC1604DashP6._NEWLINE.ordinal()); // TODO: add support //Assertions.assertEquals("X=¹²³/₄₅₆⁴/₄₅₆;\n", FourCornerUnicodeDisplay.text().renderFromInt18(cdc)); diff --git a/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/FourCornerUnicodeImportTest.java b/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/FourCornerUnicodeImportTest.java index a63f9b0..50c7612 100644 --- a/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/FourCornerUnicodeImportTest.java +++ b/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/FourCornerUnicodeImportTest.java @@ -214,13 +214,13 @@ public class FourCornerUnicodeImportTest { Assertions.assertFalse(cdc.isEmpty()); Assertions.assertEquals(8, cdc.size()); Assertions.assertEquals(FCDotCDC1604DashP6.NX01_A, cdc.get(0)); - Assertions.assertEquals(FCDotCDC1604DashP6._LINE, cdc.get(1)); + Assertions.assertEquals(FCDotCDC1604DashP6._NEWLINE, cdc.get(1)); Assertions.assertEquals(FCDotCDC1604DashP6.NX02_B, cdc.get(2)); - Assertions.assertEquals(FCDotCDC1604DashP6._LINE, cdc.get(3)); + Assertions.assertEquals(FCDotCDC1604DashP6._NEWLINE, cdc.get(3)); Assertions.assertEquals(FCDotCDC1604DashP6.NX03_C, cdc.get(4)); - Assertions.assertEquals(FCDotCDC1604DashP6._LINE, cdc.get(5)); + Assertions.assertEquals(FCDotCDC1604DashP6._NEWLINE, cdc.get(5)); Assertions.assertEquals(FCDotCDC1604DashP6.NX04_D, cdc.get(6)); - Assertions.assertEquals(FCDotCDC1604DashP6._LINE, cdc.get(7)); + Assertions.assertEquals(FCDotCDC1604DashP6._NEWLINE, cdc.get(7)); String out = FourCornerUnicodeDisplay.text().renderFromX06(cdc); Assertions.assertEquals("A\nB\nC\nD\n", out);