Rename line to newline and doc align

This commit is contained in:
Willem Cazander 2025-01-08 15:23:22 +01:00
parent 0b7f9147ea
commit f79f8ef1d8
4 changed files with 10 additions and 10 deletions

View file

@ -94,7 +94,7 @@ public class FourCornerUnicodeImport {
// Is not mapped, so handle with code // Is not mapped, so handle with code
if ('\r' == codePoint) { if ('\r' == codePoint) {
result.add(FCDotCDC1604DashP6._LINE); result.add(FCDotCDC1604DashP6._NEWLINE);
cdcNumberTerminator = null; cdcNumberTerminator = null;
cdcCaseTerminator = null; cdcCaseTerminator = null;
continue; continue;

View file

@ -41,7 +41,7 @@ import org.x4o.o2o.fc18.FourCornerX21CodePoints;
/// @version 1.0 Dec 22, 2024 /// @version 1.0 Dec 22, 2024
/// ///
public enum FCDotCDC1604DashP6 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { public enum FCDotCDC1604DashP6 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints {
// [__NUL][__PIE][__PIN][__ESC6] [_LINE][_SPACE]?! {}[] ()<> // [__NUL][__PIE68][__NCR68][__ESC6] [_NEWLINE][_SPACE]?! {}[] ()<>
// ~+-* ,.:; '"`^ =#$% // ~+-* ,.:; '"`^ =#$%
// |_\/ @ABC DEFG HIJK // |_\/ @ABC DEFG HIJK
// LMNO PQRS TUVW XYZ& // LMNO PQRS TUVW XYZ&
@ -58,7 +58,7 @@ public enum FCDotCDC1604DashP6 implements FourCornerX06BaklavaPoints, FourCorner
__NCR68('\u0002'), __NCR68('\u0002'),
/// Escape to direct control code for 6 bit systems. /// Escape to direct control code for 6 bit systems.
__ESC6('\u0003'), __ESC6('\u0003'),
_LINE('\n'), _NEWLINE('\n'),
_SPACE(' '), _SPACE(' '),
QUESTION('?'), QUESTION('?'),
EXCLAMATION('!'), EXCLAMATION('!'),

View file

@ -55,7 +55,7 @@ public class FourCornerUnicodeDisplayTest {
cdc.add(FCDotCDC1604DashP6.NX15_O); // NXX_015 cdc.add(FCDotCDC1604DashP6.NX15_O); // NXX_015
cdc.add(FCDotCDC1604DashP6.NX04_D); // NXX_004 cdc.add(FCDotCDC1604DashP6.NX04_D); // NXX_004
cdc.add(FCDotCDC1604DashP6.SEMICOLON); cdc.add(FCDotCDC1604DashP6.SEMICOLON);
cdc.add(FCDotCDC1604DashP6._LINE); cdc.add(FCDotCDC1604DashP6._NEWLINE);
Assertions.assertEquals("X=¹⁴/₁₅⁵/₁₅⁷/₁₅¹⁵/₁₅⁴/₁₅;\n", FourCornerUnicodeDisplay.text().renderFromX06(cdc)); Assertions.assertEquals("X=¹⁴/₁₅⁵/₁₅⁷/₁₅¹⁵/₁₅⁴/₁₅;\n", FourCornerUnicodeDisplay.text().renderFromX06(cdc));
Assertions.assertEquals("X=␂ONEGOD;\n", FourCornerUnicodeDisplay.raw().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_123.cakePoint()); // NXX_123
cdc.add(FCDotNCR1632Dash1V.NXX_004.cakePoint()); // NXX_004 cdc.add(FCDotNCR1632Dash1V.NXX_004.cakePoint()); // NXX_004
cdc.add(FCDotCDC1604DashP6.SEMICOLON.ordinal()); cdc.add(FCDotCDC1604DashP6.SEMICOLON.ordinal());
cdc.add(FCDotCDC1604DashP6._LINE.ordinal()); cdc.add(FCDotCDC1604DashP6._NEWLINE.ordinal());
Assertions.assertEquals("X=¹/₁¹⁴/₁₅¹²³/₄₅₆⁴/₄₅₆;\n", FourCornerUnicodeDisplay.text().renderFromInt18(cdc)); 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_123.cakePoint()); // NXX_123
cdc.add(FCDotNCR1632Dash1V.NXX_004.cakePoint()); // NXX_004 cdc.add(FCDotNCR1632Dash1V.NXX_004.cakePoint()); // NXX_004
cdc.add(FCDotCDC1604DashP6.SEMICOLON.ordinal()); cdc.add(FCDotCDC1604DashP6.SEMICOLON.ordinal());
cdc.add(FCDotCDC1604DashP6._LINE.ordinal()); cdc.add(FCDotCDC1604DashP6._NEWLINE.ordinal());
// TODO: add support // TODO: add support
//Assertions.assertEquals("X=¹²³/₄₅₆⁴/₄₅₆;\n", FourCornerUnicodeDisplay.text().renderFromInt18(cdc)); //Assertions.assertEquals("X=¹²³/₄₅₆⁴/₄₅₆;\n", FourCornerUnicodeDisplay.text().renderFromInt18(cdc));

View file

@ -214,13 +214,13 @@ public class FourCornerUnicodeImportTest {
Assertions.assertFalse(cdc.isEmpty()); Assertions.assertFalse(cdc.isEmpty());
Assertions.assertEquals(8, cdc.size()); Assertions.assertEquals(8, cdc.size());
Assertions.assertEquals(FCDotCDC1604DashP6.NX01_A, cdc.get(0)); 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.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.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.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); String out = FourCornerUnicodeDisplay.text().renderFromX06(cdc);
Assertions.assertEquals("A\nB\nC\nD\n", out); Assertions.assertEquals("A\nB\nC\nD\n", out);