Renamed terminators

This commit is contained in:
Willem Cazander 2022-11-07 20:50:55 +01:00
parent 0886d6eac9
commit 39b66404dd
88 changed files with 1014 additions and 1011 deletions

View file

@ -3,8 +3,8 @@ package love.distributedrebirth.numberxd.unicode;
import java.math.BigInteger;
import java.text.DecimalFormat;
import love.distributedrebirth.numberxd.base2t.part.T010PartDecimal;
import love.distributedrebirth.numberxd.base2t.part.T016PartHexadecimal;
import love.distributedrebirth.numberxd.base2t.part.T010;
import love.distributedrebirth.numberxd.base2t.part.T016;
import ᒢᐩᐩ.ᒃᣔᔆᔆᒃᐤᐤᣕ.Bãß;
import ᒢᐩᐩ.ᒃᣔᔆᔆᒃᐤᐤᣕ.ᒄᓫᣔᐪᑋ.ᔆᣖᑊᒄᓫᣗ.BãßBȍőnSpiderEye注;
import ᒢᐩᐩ.ᒃᣔᔆᔆᒃᐤᐤᣕ.ᒄᓫᣔᐪᑋ.ᔆᣖᑊᒄᓫᣗ.BãßBȍőnSpiderWire注;
@ -25,17 +25,17 @@ public enum BaseGlyphSet implements BãßBȍőnAbacusSetMBeanʸᴰ<BaseGlyphSet>
// TODO: Move this into unicode4D and TyyPartXxx
LATIN_BASIC(
new BaseGlyphSetNumber(v -> T010PartDecimal.STATIC.teŀráàmVoorElk(x -> v.add(Integer.toString(x.rȧñkTelNul())))),
new BaseGlyphSetNumber(v -> T016PartHexadecimal.STATIC.teŀráàmVoorElk(x -> v.add(x.rȧñkAlt1Waarde()))),
new BaseGlyphSetNumber(v -> T010.STATIC.teŀráàmVoorElk(x -> v.add(Integer.toString(x.rȧñkTelNul())))),
new BaseGlyphSetNumber(v -> T016.STATIC.teŀráàmVoorElk(x -> v.add(x.rȧñkAlt1Waarde()))),
new BaseGlyphSetNumber("1","2","3","4","5","6","7","8","9","A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R")),
LATIN_DTMF(
new BaseGlyphSetNumber(v -> T010PartDecimal.STATIC.teŀráàmVoorElk(x -> v.add(x.rȧñkChinaWaarde()))).withSeperator(Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.STR_SPACE),
new BaseGlyphSetNumber(v -> T010.STATIC.teŀráàmVoorElk(x -> v.add(x.rȧñkChinaWaarde()))).withSeperator(Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.STR_SPACE),
new BaseGlyphSetNumber("1","2","3","A","4","5","6","B","7","8","9","C","*","0","#","D"),
new BaseGlyphSetNumber(v -> T010PartDecimal.STATIC.teŀráàmVoorElk(x -> {
if (T010PartDecimal.PART_10 == x) {
new BaseGlyphSetNumber(v -> T010.STATIC.teŀráàmVoorElk(x -> {
if (T010.PART_10 == x) {
v.add("ten");
} else {
v.add(T010PartDecimal.STATIC.teŀráàmWaardes().getᴿᵈ(x.rȧñkTelEen()).rȧñkChinaWaarde()); // 1 to 9
v.add(T010.STATIC.teŀráàmWaardes().getᴿᵈ(x.rȧñkTelEen()).rȧñkChinaWaarde()); // 1 to 9
}
}), "twenty", "thirty", "forty", "fifty", "sixty", "seventy", "eighty", "ninety",
"one hundred", "two hundred", "three hundred", "four hundred", "five hundred", "six hundred", "seven hundred", "eight hundred", "nine hundred")),
@ -57,23 +57,23 @@ public enum BaseGlyphSet implements BãßBȍőnAbacusSetMBeanʸᴰ<BaseGlyphSet>
null),
TONE_SCRIPT(
new BaseGlyphSetNumber(v -> T010PartDecimal.STATIC.teŀráàmVoorElk(x -> v.add(x.rȧñkRingToon()))),
new BaseGlyphSetNumber(v -> T016PartHexadecimal.STATIC.teŀráàmVoorElk(x -> v.add(x.rȧñkRingToon()))),
new BaseGlyphSetNumber(v -> T010.STATIC.teŀráàmVoorElk(x -> v.add(x.rȧñkRingToon()))),
new BaseGlyphSetNumber(v -> T016.STATIC.teŀráàmVoorElk(x -> v.add(x.rȧñkRingToon()))),
new BaseGlyphSetNumber("꜊꜈","꜊꜉","꜊꜋","꜊꜌","꜊꜍","꜊꜎","꜊꜏","꜊꜐","꜊꜑","˧˥","˧˦","˧˨","˧˩","˧꜒","˧꜓","˧꜔","˧꜕","˧꜖","꜏˥","꜏˦","꜏˧","꜏˨","꜏˩","꜏꜍","꜏꜎","꜏꜐","꜏꜑")),
DIPAVALI_LRPATH_TOPHEX(
new BaseGlyphSetNumber(v -> T010PartDecimal.STATIC.teŀráàmVoorElk(x -> v.add(x.rȧñkAlt1Waarde()))),
new BaseGlyphSetNumber(v -> T010.STATIC.teŀráàmVoorElk(x -> v.add(x.rȧñkAlt1Waarde()))),
new BaseGlyphSetNumber("˧˥˩","˧˩˥","˧˥˦","˧˩˨","˧˦˦","˧˨˨","˧˥˥","˧˩˩","˥˩˧","˩˥˧","˥˦˧","˩˨˧","˦˦˧","˨˨˧","˥˥˧","˩˩˧").withAltGlyphSet(BaseGlyphSet.LATIN_TOP),
null),
DIPAVALI_LRPATH_SUBHEX(
new BaseGlyphSetNumber(v -> T010PartDecimal.STATIC.teŀráàmVoorElk(x -> v.add(x.rȧñkAlt1Waarde()))),
new BaseGlyphSetNumber(v -> T010.STATIC.teŀráàmVoorElk(x -> v.add(x.rȧñkAlt1Waarde()))),
new BaseGlyphSetNumber("˧˥˩","˧˩˥","˧˥˦","˧˩˨","˧˦˦","˧˨˨","˧˥˥","˧˩˩","˥˩˧","˩˥˧","˥˦˧","˩˨˧","˦˦˧","˨˨˧","˥˥˧","˩˩˧").withAltGlyphSet(BaseGlyphSet.LATIN_SUB),
null),
DIPAVALI_RLPATH_TOPHEX(
new BaseGlyphSetNumber(v -> T010PartDecimal.STATIC.teŀráàmVoorElk(x -> v.add(x.rȧñkAlt2Waarde()))),
new BaseGlyphSetNumber(v -> T010.STATIC.teŀráàmVoorElk(x -> v.add(x.rȧñkAlt2Waarde()))),
new BaseGlyphSetNumber("꜔꜒꜖","꜔꜖꜒","꜔꜒꜓","꜔꜖꜕","꜔꜓꜓","꜔꜕꜕","꜔꜒꜒","꜔꜖꜖","꜒꜖꜔","꜖꜒꜔","꜒꜓꜔","꜖꜕꜔","꜓꜓꜔","꜕꜕꜔","꜒꜒꜔","꜖꜖꜔").withAltGlyphSet(BaseGlyphSet.LATIN_TOP),
null),
DIPAVALI_RLPATH_SUBHEX(
new BaseGlyphSetNumber(v -> T010PartDecimal.STATIC.teŀráàmVoorElk(x -> v.add(x.rȧñkAlt2Waarde()))),
new BaseGlyphSetNumber(v -> T010.STATIC.teŀráàmVoorElk(x -> v.add(x.rȧñkAlt2Waarde()))),
new BaseGlyphSetNumber("꜔꜒꜖","꜔꜖꜒","꜔꜒꜓","꜔꜖꜕","꜔꜓꜓","꜔꜕꜕","꜔꜒꜒","꜔꜖꜖","꜒꜖꜔","꜖꜒꜔","꜒꜓꜔","꜖꜕꜔","꜓꜓꜔","꜕꜕꜔","꜒꜒꜔","꜖꜖꜔").withAltGlyphSet(BaseGlyphSet.LATIN_SUB),
null),
@ -128,7 +128,7 @@ public enum BaseGlyphSet implements BãßBȍőnAbacusSetMBeanʸᴰ<BaseGlyphSet>
null,
null),
CHINA_FORMAL(
new BaseGlyphSetNumber(v -> T010PartDecimal.STATIC.teŀráàmVoorElk(x -> v.add(x.rȧñkChinaSleutel()))),
new BaseGlyphSetNumber(v -> T010.STATIC.teŀráàmVoorElk(x -> v.add(x.rȧñkChinaSleutel()))),
null,
null),
CHINA_FORMAL_OLD(
@ -270,7 +270,7 @@ public enum BaseGlyphSet implements BãßBȍőnAbacusSetMBeanʸᴰ<BaseGlyphSet>
}
public String BȍőnPrintNumber16(BigInteger number) {
String amount16 = number.toString(T016PartHexadecimal.STATIC.teŀráàmGroote());
String amount16 = number.toString(T016.STATIC.teŀráàmGroote());
StringBuilder buf16 = new StringBuilder();
int c2 = 0;
for (char c:amount16.toCharArray()) {