From f9d4980b0cd890dcb9cccec3a2e961abbab46592 Mon Sep 17 00:00:00 2001 From: Willem Date: Fri, 24 Jan 2025 19:53:48 +0100 Subject: [PATCH] Fixed INC pie cake select typos and added unit test for italic text --- .../fc18/zion7/FourCornerZionStenoLexer.java | 6 +++++- .../fc18/FourCornerUnicodeDisplayTest.java | 21 +++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoLexer.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoLexer.java index 24c8bd8..aa752bd 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoLexer.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoLexer.java @@ -629,6 +629,10 @@ public class FourCornerZionStenoLexer { decModeReset(); return false; } + if (FCDotCDC1604DashP6._SALAH_EXCLAMATION.baklavaPointDotIndex() == cdcPoint) { + decModeReset(); + return true; // end E10 mode, so no print + } // if (cdcPoint < FCDotCDC1604DashP6.NX01_A.ordinal()) { // decModeReset(); // return false; @@ -686,7 +690,7 @@ public class FourCornerZionStenoLexer { decModeReset(); return false; } - lexer.handler.strobeWord(FourCornerDotCake.FC_PIE9C_27, cdcPoint - FCDotCDC1604DashP6.NX01_A.ordinal()); + lexer.handler.strobeWord(FourCornerDotCake.FC_PIE9D_27, cdcPoint - FCDotCDC1604DashP6.NX01_A.ordinal()); return true; } if (FCDotINC0801DashP8.INC_PIE9C_26.equals(cdcDECModeInc)) { diff --git a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/FourCornerUnicodeDisplayTest.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/FourCornerUnicodeDisplayTest.java index 23bf0ff..4c80561 100644 --- a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/FourCornerUnicodeDisplayTest.java +++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/FourCornerUnicodeDisplayTest.java @@ -122,4 +122,25 @@ public class FourCornerUnicodeDisplayTest { System.out.println("size FCx6="+cdc6.size()); System.out.println("raw FCx6="+FourCornerUnicodeDisplay.raw().renderFromInt18(cdc6)); } + + @Test + public void testItianalText() throws Exception { + List cdc = new ArrayList<>(); + cdc.add(FCDotDEC2701DashPX0.ESC68_INC0801_P8); + cdc.add(FCDotINC0801DashP8.INC_PIE9D_27); + cdc.add(FCDotCDC1604DashP6.NX08_H); + cdc.add(FCDotCDC1604DashP6.NX15_O); + cdc.add(FCDotCDC1604DashP6.NX09_I); + cdc.add(FCDotINC0801DashP8.INC_BYD0127_P7D); + cdc.add(FCDotCDC1604DashP6.NX08_H); + cdc.add(FCDotCDC1604DashP6.NX15_O); + cdc.add(FCDotCDC1604DashP6.NX09_I); + cdc.add(FCDotINC0801DashP8.INC_PIE9C_26); + cdc.add(FCDotCDC1604DashP6.NX08_H); + cdc.add(FCDotCDC1604DashP6.NX15_O); + cdc.add(FCDotCDC1604DashP6.NX09_I); + cdc.add(FCDotCDC1604DashP6._SALAH_EXCLAMATION); + + Assertions.assertEquals("𝘩𝘰𝘪╗╞╘hoi", FourCornerUnicodeDisplay.text().renderFromX06(cdc)); + } }