diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeDisplay.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeDisplay.java index 146fbdb..b790311 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeDisplay.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeDisplay.java @@ -33,6 +33,7 @@ import java.util.function.Consumer; import org.x4o.fc18.cake2.FourCornerDotCake; import org.x4o.fc18.cake2.FourCornerX00PetitVide; +import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash11; import org.x4o.fc18.cake2.pie9d.FCDotPIE9DDash09; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.zion7.FourCornerZion7Candlelier; @@ -321,8 +322,14 @@ public class FourCornerUnicodeDisplay { } List numberCandy = new ArrayList<>(); FourCornerRecipe.toScriptSuperX18(numberCandy, numerator); + if (tasteMale.statusCarryOke()) { + numberCandy.add(FCDotPIE9CDash11.NXX_05.cakePointDotIndex()); // temp add bar for carry for now until user template rendering takes over + } numberCandy.add(FCDotCDC1604DashP6.NY02_BAR_V_RIGHT.ordinal()); FourCornerRecipe.toScriptSubX18(numberCandy, denominator); + if (tasteFemale.statusCarryOke()) { + numberCandy.add(FCDotPIE9CDash11.NXX_11.cakePointDotIndex()); + } render(numberCandy, output); } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoGrapher.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoGrapher.java index 938f01e..ef6a7bb 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoGrapher.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoGrapher.java @@ -481,7 +481,7 @@ public class FourCornerZionStenoGrapher { requireBigNoneZero(denominator); BigInteger pig = numerator.shiftLeft(1152).add(denominator).add(BigInteger.valueOf(tasteFemale.ordinal()).shiftLeft(1148)); outAddBankCake12(FourCornerDotCake.FC_RATIONAL2304_SEL0, FourCornerDotCake.FC_RATIONAL2304_BANK, NCR_BANK_IDX_TOPPAGE_2304, pig, v -> { - return (v & 0xFF) + (tasteFemale.ordinal() << 8); + return (v & 0xFF) + (tasteMale.ordinal() << 8); }); } diff --git a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/StenoNumberChocoRationalTest.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/StenoNumberChocoRationalTest.java index 2f1374c..d027259 100644 --- a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/StenoNumberChocoRationalTest.java +++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/StenoNumberChocoRationalTest.java @@ -51,8 +51,10 @@ public class StenoNumberChocoRationalTest { writer.strobeNumberChocoPigRational(FCFlameNumberTaste.NUMBER_POSITIVE, FCFlameNumberTaste.NUMBER_POSITIVE, BigInteger.ONE, v2); BigInteger v3 = BigInteger.valueOf(5432); writer.strobeNumberChocoPigRational(FCFlameNumberTaste.NUMBER_NEGATIVE, FCFlameNumberTaste.NUMBER_NEGATIVE, v3, v3); + BigInteger v4 = BigInteger.valueOf(6543); + writer.strobeNumberChocoPigRational(FCFlameNumberTaste.NUMBER_NEGATIVE, FCFlameNumberTaste.NUMBER_POSITIVE_CARRY, v4, v4); String res = FourCornerUnicodeDisplay.text().render(out); - Assertions.assertEquals("¹/₁₂₃¹/₁₂₃₄₅⁻⁵⁴³²/₋₅₄₃₂", res); + Assertions.assertEquals("¹/₁₂₃¹/₁₂₃₄₅⁻⁵⁴³²/₋₅₄₃₂⁻⁶⁵⁴³/₆₅₄₃₌", res); } @Test