FC18: Renamed steno grapher to use steno tongue names

This commit is contained in:
Willem Cazander 2025-09-08 17:25:43 +02:00
parent b289a8c9bf
commit 63f4691e70
10 changed files with 54 additions and 61 deletions

View file

@ -57,47 +57,35 @@ import org.x4o.fc18.zion7.flame4.FCFlameNumberGram;
/// @version 1.0 Jan 11, 2025
public class FourCornerZionStenoGrapher {
static public FourCornerZion7Bereshit writerX06(List<Integer> out) {
return new FourCornerWriterBereshit(v -> out.add(v), () -> {}, FCFlameStenoTongue.FC6_PLUS);
}
static public FourCornerZion7Candlelier writerX18(List<Integer> out) {
return new FourCornerWriterCandlelier(v -> out.add(v), () -> {}, FCFlameStenoTongue.FC18);
}
static public FourCornerZion7TempleScrolls writerXDBX18(List<Integer> out) {
return new FourCornerWriterTempleScrolls(v -> out.add(v), () -> {}, FCFlameStenoTongue.FC18);
}
/*
static public FourCornerZion7Bereshit writerFC6(List<Integer> out) {
return new FourCornerWriter(v -> out.add(v), () -> {}, true);
return new FourCornerWriterBereshit(v -> out.add(v), () -> {}, FCFlameStenoTongue.FC6);
}
static public FourCornerZion7Bereshit writerFC6Plus(List<Integer> out) {
return new FourCornerWriter(v -> out.add(v), () -> {}, true);
return new FourCornerWriterBereshit(v -> out.add(v), () -> {}, FCFlameStenoTongue.FC6_PLUS);
}
static public FourCornerZion7Candlelier writerFC18(List<Integer> out) {
return new FourCornerWriter(v -> out.add(v), () -> {}, false);
return new FourCornerWriterCandlelier(v -> out.add(v), () -> {}, FCFlameStenoTongue.FC18);
}
static public FourCornerZion7Candlelier writerFC18Adult(List<Integer> out) {
return new FourCornerWriter(v -> out.add(v), () -> {}, false);
return new FourCornerWriterCandlelier(v -> out.add(v), () -> {}, FCFlameStenoTongue.FC18_ADULT);
}
static public FourCornerZion7BaseVoid writerFC18Worms(List<Integer> out) {
return new FourCornerWriter(v -> out.add(v), () -> {}, false);
return new FourCornerWriterBaseVoid(v -> out.add(v), () -> {}, FCFlameStenoTongue.FC18_WORMS);
}
static public FourCornerZion7TempleScrolls writerTongue(FCFlameStenoTongue outTongue, List<Integer> out) {
return new FourCornerWriter(v -> out.add(v), () -> {}, false);
}
static public FourCornerZion7TempleScrolls writerTongue(FCFlameStenoTongue outTongue,List<Integer> out) {
return new FourCornerWriter(v -> out.add(v), () -> {}, false);
}s
*/
// static public FourCornerZion7TempleScrolls writerStenoTongue(List<Integer> out, FCFlameStenoTongue outTongue) {
// return new FourCornerWriterTempleScrolls(v -> out.add(v), () -> {}, outTongue);
// }
// static public FourCornerZion7TempleScrolls writerXDBX18(List<Integer> out) {
// return new FourCornerWriterTempleScrolls(v -> out.add(v), () -> {}, FCFlameStenoTongue.FC18);
// }
// static public FourCornerZion7TempleScrolls writerXDBX18Adult(List<Integer> out) {
// return new FourCornerWriterTempleScrolls(v -> out.add(v), () -> {}, FCFlameStenoTongue.FC18_ADULT);
// }
/*
static public FourCornerZion7TempleScrolls writerX18PackedX8(OutputStream out) {
class FourCornerPackedX8Encoder implements IntConsumer, Runnable {
@ -127,13 +115,13 @@ public class FourCornerZionStenoGrapher {
}
*/
static abstract private class FourCornerWriterBaseVoid implements FourCornerZionStenoPetroglyphs, FourCornerZion7BaseVoid {
static abstract private class FourCornerWriterBase implements FourCornerZionStenoPetroglyphs, FourCornerZion7AlphaOmega {
protected final IntConsumer out;
private final Runnable outFlush;
protected final FCFlameStenoTongue outTongue;
public FourCornerWriterBaseVoid(IntConsumer out, Runnable outFlush, FCFlameStenoTongue outTongue) {
public FourCornerWriterBase(IntConsumer out, Runnable outFlush, FCFlameStenoTongue outTongue) {
this.out = Objects.requireNonNull(out);
this.outFlush = Objects.requireNonNull(outFlush);
this.outTongue = Objects.requireNonNull(outTongue);
@ -242,8 +230,6 @@ public class FourCornerZionStenoGrapher {
}
}
// --------------------------------------- BEGIN BASE VOID
@Override
public void strobeDocumentAlpha() {
}
@ -252,6 +238,13 @@ public class FourCornerZionStenoGrapher {
public void strobeDocumentOmega() {
outFlush();
}
}
static private class FourCornerWriterBaseVoid extends FourCornerWriterBase implements FourCornerZion7BaseVoid {
public FourCornerWriterBaseVoid(IntConsumer out, Runnable outFlush, FCFlameStenoTongue outTongue) {
super(out, outFlush, outTongue);
}
@Override
public void strobeSandWorm(List<PrimordialOctal> sandWalk, List<PrimordialOctal> sandSpice) {

View file

@ -36,14 +36,14 @@ public enum FCFlameStenoTongue {
FC6_PLUS (FourCornerDotCake.FC_CDC1604_P6.getStart(), FourCornerDotCake.FC_PIE9D_27.getStop()),
/// Full range with all features
FC18 (FourCornerDotCake.FC_CDC1604_P6.getStart(), FourCornerDotCake.FC_CDC1604_P6.getStop()),
/// No candy for adults.
/// An adult man does not use candy.
FC18_ADULT (FourCornerDotCake.FC_CLK1K_Z.getStop() + 1, FourCornerDotCake.FC_CDC1604_P6.getStop()),
/// Only adult worms are allowed in the desert of the real.
FC18_WORMS (FourCornerDotCake.FC_SANDWALK_12.getStart(), FourCornerDotCake.FC_SANDWORM_15.getStop()),
/// An sand man rides adult worms, in the desert of the real.
FC18_WORMS (0, -1), // allow zero letters in strobeTheWord range
;
private static final FCFlameStenoTongue[] VALUES = values();
private final int cakePointMin;
private final int cakePointMin;
private final int cakePointMax;
private FCFlameStenoTongue(int cakePointMin, int cakePointMax) {