This commit is contained in:
Willem Cazander 2022-02-11 17:27:44 +01:00
parent 11aafbe651
commit 28be40ef3c
3 changed files with 82 additions and 79 deletions

View file

@ -53,14 +53,14 @@ public interface BãßBȍőnPartʸᴰ<T extends BãßBȍőnPartʸᴰ<T>> extends
} }
default String BȍőnPrintGlyphSetNumber10(BaseGlyphSet glyphSet) { default String BȍőnPrintGlyphSetNumber10(BaseGlyphSet glyphSet) {
return glyphSet.BȍőnPrintGlyphSetNumber10(BȍőnRangTelNul(), BãßInstances().length - 1); return glyphSet.BȍőnPrintNumber10(BȍőnRangTelNul(), BãßInstances().length - 1);
} }
default String BȍőnPrintGlyphSetNumber16(BaseGlyphSet glyphSet) { default String BȍőnPrintGlyphSetNumber16(BaseGlyphSet glyphSet) {
return glyphSet.BȍőnPrintGlyphSetNumber16(BȍőnRangTelNul(), BãßInstances().length - 1); return glyphSet.BȍőnPrintNumber16(BȍőnRangTelNul(), BãßInstances().length - 1);
} }
default String BȍőnPrintGlyphSetNumber27(BaseGlyphSet glyphSet) { default String BȍőnPrintGlyphSetNumber27(BaseGlyphSet glyphSet) {
return glyphSet.BȍőnPrintGlyphSetNumber27(BȍőnRangTelNul(), BãßInstances().length - 1); return glyphSet.BȍőnPrintNumber27(BȍőnRangTelNul(), BãßInstances().length - 1);
} }
} }

View file

@ -25,7 +25,7 @@ public enum BaseGlyphSet implements DefaultEnumSetᴶᴹˣ<BaseGlyphSet,BãßBȍ
LATIN_DTMF( LATIN_DTMF(
new BaseGlyphSetNumber(v -> T10PartDecimal.PART_1.BãßVoorElk(x -> v.add(x.BȍőnChinaValue()))).withSeperator(BãßBȍőnConstantsʸᴰ.STR_SPACE), new BaseGlyphSetNumber(v -> T10PartDecimal.PART_1.BãßVoorElk(x -> v.add(x.BȍőnChinaValue()))).withSeperator(BãßBȍőnConstantsʸᴰ.STR_SPACE),
new BaseGlyphSetNumber("1","2","3","A","4","5","6","B","7","8","9","C","*","0","#","D"), new BaseGlyphSetNumber("1","2","3","A","4","5","6","B","7","8","9","C","*","0","#","D"),
LATIN_BASIC.BȍőnGlyphSetNumber27()), LATIN_BASIC.BȍőnNumber27()),
LATIN_TOP( LATIN_TOP(
new BaseGlyphSetNumber("","¹","²","³","","","","","",""), new BaseGlyphSetNumber("","¹","²","³","","","","","",""),
new BaseGlyphSetNumber("","¹","²","³","","","","","","","","","","","",""), new BaseGlyphSetNumber("","¹","²","³","","","","","","","","","","","",""),
@ -35,9 +35,9 @@ public enum BaseGlyphSet implements DefaultEnumSetᴶᴹˣ<BaseGlyphSet,BãßBȍ
new BaseGlyphSetNumber("","","","","","","","","","","","","","","","բ"), new BaseGlyphSetNumber("","","","","","","","","","","","","","","","բ"),
new BaseGlyphSetNumber("","","","","","","","","","","","","","","բ","G","","","","","","","","","","Q","")), new BaseGlyphSetNumber("","","","","","","","","","","","","","","բ","G","","","","","","","","","","Q","")),
LATIN_TOPHEX( LATIN_TOPHEX(
LATIN_BASIC.BȍőnGlyphSetNumber10(), LATIN_BASIC.BȍőnNumber10(),
LATIN_BASIC.BȍőnGlyphSetNumber16().withAltGlyphSet(LATIN_TOP), LATIN_BASIC.BȍőnNumber16().withAltGlyphSet(LATIN_TOP),
LATIN_BASIC.BȍőnGlyphSetNumber27()), LATIN_BASIC.BȍőnNumber27()),
TONE_SCRIPT( TONE_SCRIPT(
new BaseGlyphSetNumber(v -> T10PartDecimal.PART_1.BãßVoorElk(x -> v.add(x.BȍőnDialTone()))), new BaseGlyphSetNumber(v -> T10PartDecimal.PART_1.BãßVoorElk(x -> v.add(x.BȍőnDialTone()))),
@ -46,19 +46,19 @@ public enum BaseGlyphSet implements DefaultEnumSetᴶᴹˣ<BaseGlyphSet,BãßBȍ
DIPAVALI_LRPATH_TOPHEX( DIPAVALI_LRPATH_TOPHEX(
new BaseGlyphSetNumber(v -> T10PartDecimal.PART_1.BãßVoorElk(x -> v.add(x.BȍőnAlt1Value()))), new BaseGlyphSetNumber(v -> T10PartDecimal.PART_1.BãßVoorElk(x -> v.add(x.BȍőnAlt1Value()))),
new BaseGlyphSetNumber("˧˥˩","˧˩˥","˧˥˦","˧˩˨","˧˦˦","˧˨˨","˧˥˥","˧˩˩","˥˩˧","˩˥˧","˥˦˧","˩˨˧","˦˦˧","˨˨˧","˥˥˧","˩˩˧").withAltGlyphSet(BaseGlyphSet.LATIN_TOP), new BaseGlyphSetNumber("˧˥˩","˧˩˥","˧˥˦","˧˩˨","˧˦˦","˧˨˨","˧˥˥","˧˩˩","˥˩˧","˩˥˧","˥˦˧","˩˨˧","˦˦˧","˨˨˧","˥˥˧","˩˩˧").withAltGlyphSet(BaseGlyphSet.LATIN_TOP),
TONE_SCRIPT.BȍőnGlyphSetNumber27()), TONE_SCRIPT.BȍőnNumber27()),
DIPAVALI_LRPATH_SUBHEX( DIPAVALI_LRPATH_SUBHEX(
new BaseGlyphSetNumber(v -> T10PartDecimal.PART_1.BãßVoorElk(x -> v.add(x.BȍőnAlt1Value()))), new BaseGlyphSetNumber(v -> T10PartDecimal.PART_1.BãßVoorElk(x -> v.add(x.BȍőnAlt1Value()))),
new BaseGlyphSetNumber("˧˥˩","˧˩˥","˧˥˦","˧˩˨","˧˦˦","˧˨˨","˧˥˥","˧˩˩","˥˩˧","˩˥˧","˥˦˧","˩˨˧","˦˦˧","˨˨˧","˥˥˧","˩˩˧").withAltGlyphSet(BaseGlyphSet.LATIN_SUB), new BaseGlyphSetNumber("˧˥˩","˧˩˥","˧˥˦","˧˩˨","˧˦˦","˧˨˨","˧˥˥","˧˩˩","˥˩˧","˩˥˧","˥˦˧","˩˨˧","˦˦˧","˨˨˧","˥˥˧","˩˩˧").withAltGlyphSet(BaseGlyphSet.LATIN_SUB),
TONE_SCRIPT.BȍőnGlyphSetNumber27()), TONE_SCRIPT.BȍőnNumber27()),
DIPAVALI_RLPATH_TOPHEX( DIPAVALI_RLPATH_TOPHEX(
new BaseGlyphSetNumber(v -> T10PartDecimal.PART_1.BãßVoorElk(x -> v.add(x.BȍőnAlt2Value()))), new BaseGlyphSetNumber(v -> T10PartDecimal.PART_1.BãßVoorElk(x -> v.add(x.BȍőnAlt2Value()))),
new BaseGlyphSetNumber("꜔꜒꜖","꜔꜖꜒","꜔꜒꜓","꜔꜖꜕","꜔꜓꜓","꜔꜕꜕","꜔꜒꜒","꜔꜖꜖","꜒꜖꜔","꜖꜒꜔","꜒꜓꜔","꜖꜕꜔","꜓꜓꜔","꜕꜕꜔","꜒꜒꜔","꜖꜖꜔").withAltGlyphSet(BaseGlyphSet.LATIN_TOP), new BaseGlyphSetNumber("꜔꜒꜖","꜔꜖꜒","꜔꜒꜓","꜔꜖꜕","꜔꜓꜓","꜔꜕꜕","꜔꜒꜒","꜔꜖꜖","꜒꜖꜔","꜖꜒꜔","꜒꜓꜔","꜖꜕꜔","꜓꜓꜔","꜕꜕꜔","꜒꜒꜔","꜖꜖꜔").withAltGlyphSet(BaseGlyphSet.LATIN_TOP),
TONE_SCRIPT.BȍőnGlyphSetNumber27()), TONE_SCRIPT.BȍőnNumber27()),
DIPAVALI_RLPATH_SUBHEX( DIPAVALI_RLPATH_SUBHEX(
new BaseGlyphSetNumber(v -> T10PartDecimal.PART_1.BãßVoorElk(x -> v.add(x.BȍőnAlt2Value()))), new BaseGlyphSetNumber(v -> T10PartDecimal.PART_1.BãßVoorElk(x -> v.add(x.BȍőnAlt2Value()))),
new BaseGlyphSetNumber("꜔꜒꜖","꜔꜖꜒","꜔꜒꜓","꜔꜖꜕","꜔꜓꜓","꜔꜕꜕","꜔꜒꜒","꜔꜖꜖","꜒꜖꜔","꜖꜒꜔","꜒꜓꜔","꜖꜕꜔","꜓꜓꜔","꜕꜕꜔","꜒꜒꜔","꜖꜖꜔").withAltGlyphSet(BaseGlyphSet.LATIN_SUB), new BaseGlyphSetNumber("꜔꜒꜖","꜔꜖꜒","꜔꜒꜓","꜔꜖꜕","꜔꜓꜓","꜔꜕꜕","꜔꜒꜒","꜔꜖꜖","꜒꜖꜔","꜖꜒꜔","꜒꜓꜔","꜖꜕꜔","꜓꜓꜔","꜕꜕꜔","꜒꜒꜔","꜖꜖꜔").withAltGlyphSet(BaseGlyphSet.LATIN_SUB),
TONE_SCRIPT.BȍőnGlyphSetNumber27()), TONE_SCRIPT.BȍőnNumber27()),
GREEK( GREEK(
new BaseGlyphSetNumber("ō","α","β","γ","δ","ε","ϝ","ζ","η","θ"), new BaseGlyphSetNumber("ō","α","β","γ","δ","ε","ϝ","ζ","η","θ"),
@ -68,79 +68,82 @@ public enum BaseGlyphSet implements DefaultEnumSetᴶᴹˣ<BaseGlyphSet,BãßBȍ
new BaseGlyphSetNumber("","","","","","","","","",""), new BaseGlyphSetNumber("","","","","","","","","",""),
new BaseGlyphSetNumber("","","","","","","","","","","জ্ঞ","ক্ষ","","","",""), new BaseGlyphSetNumber("","","","","","","","","","","জ্ঞ","ক্ষ","","","",""),
new BaseGlyphSetNumber("","","","","","","","","","","","","","","","","","","","","","","","","","","")), new BaseGlyphSetNumber("","","","","","","","","","","","","","","","","","","","","","","","","","","")),
KANNADA(
new BaseGlyphSetNumber("","","","","","","","","",""),
new BaseGlyphSetNumber("","","","","","","","","","","","","","","",""),
new BaseGlyphSetNumber("","","","","","","","","","","","","","","","","","","","","","","","","","","")),
MALAYALAM(
new BaseGlyphSetNumber("","","","","","","","","",""),
new BaseGlyphSetNumber("","","","","","","","","","","","","","","",""),
new BaseGlyphSetNumber("","","","","","","","","","","","","","","","","","","","","","","","","","","ൿ")),
THAI( THAI(
new BaseGlyphSetNumber("","","","","","","","","",""), new BaseGlyphSetNumber("","","","","","","","","",""),
new BaseGlyphSetNumber("","","","","","","","","","","","","","","",""), new BaseGlyphSetNumber("","","","","","","","","","","","","","","",""),
new BaseGlyphSetNumber("","","","","","","","","","","","","","","","","","","","","","","","","","","")), new BaseGlyphSetNumber("","","","","","","","","","","","","","","","","","","","","","","","","","","")),
/* Brahmi is U+11000U+1107F and thus unsupported by ImGui
BRAHMI(
new BaseGlyphSetNumber("𑁦","𑁧","𑁨","𑁩","𑁪","𑁫","𑁬","𑁭","𑁮","𑁯"),
new BaseGlyphSetNumber("𑀮","𑀯","𑀰","𑀱","𑀮𑀺","𑀯𑀺","𑀰𑀺","𑀱𑀺","𑀮𑀽","𑀯𑀽","𑀰𑀽","𑀱𑀽","𑀮𑁄","𑀯𑁄","𑀰𑁄","𑀱𑁄"),
new BaseGlyphSetNumber("𑀓𑁆","𑀔𑁆","𑀕𑁆","𑀖𑁆","𑀗𑁆","𑀘𑁆","𑀙𑁆","𑀚𑁆","𑀛𑁆","𑀜𑁆","𑀝𑁆","𑀞𑁆","𑀟𑁆","𑀠𑁆","𑀡𑁆","𑀢𑁆","𑀣𑁆","𑀤𑁆","𑀥𑁆","𑀦𑁆","𑀧𑁆","𑀨𑁆","𑀩𑁆","𑀪𑁆","𑀫𑁆","𑀬𑁆","𑀭𑁆")),
*/
RUNIC( RUNIC(
new BaseGlyphSetNumber("","","","","","","","","",""), new BaseGlyphSetNumber("","","","","","","","","",""),
new BaseGlyphSetNumber("","","","","","","","","","","","","","","",""), new BaseGlyphSetNumber("","","","","","","","","","","","","","","",""),
new BaseGlyphSetNumber("","","","","","","","","","","","","","","","","","","","","","","","","","","")), new BaseGlyphSetNumber("","","","","","","","","","","","","","","","","","","","","","","","","","","")),
RUNIC_TOPHEX( RUNIC_TOPHEX(
RUNIC.BȍőnGlyphSetNumber10(), RUNIC.BȍőnNumber10(),
RUNIC.BȍőnGlyphSetNumber16().withAltGlyphSet(LATIN_TOP), RUNIC.BȍőnNumber16().withAltGlyphSet(LATIN_TOP),
RUNIC.BȍőnGlyphSetNumber27()), RUNIC.BȍőnNumber27()),
KOREAN( KOREAN(
new BaseGlyphSetNumber("","","","","","","","","",""), new BaseGlyphSetNumber("","","","","","","","","",""),
new BaseGlyphSetNumber("","","","","","","","","","","","","","","",""), new BaseGlyphSetNumber("","","","","","","","","","","","","","","",""),
new BaseGlyphSetNumber("","","","","","","","","","","","","","","","","","","","","","","","","","","")), new BaseGlyphSetNumber("","","","","","","","","","","","","","","","","","","","","","","","","","","")),
KOREAN_TOPHEX( KOREAN_TOPHEX(
KOREAN.BȍőnGlyphSetNumber10(), KOREAN.BȍőnNumber10(),
KOREAN.BȍőnGlyphSetNumber16().withAltGlyphSet(LATIN_TOP), KOREAN.BȍőnNumber16().withAltGlyphSet(LATIN_TOP),
KOREAN.BȍőnGlyphSetNumber27()), KOREAN.BȍőnNumber27()),
/* Brahmi is U+11000U+1107F and thus unsupported by ImGui
BRAHMI(
new BaseGlyphSetNumber("𑁦","𑁧","𑁨","𑁩","𑁪","𑁫","𑁬","𑁭","𑁮","𑁯"),
new BaseGlyphSetNumber("𑀮","𑀯","𑀰","𑀱","𑀮𑀺","𑀯𑀺","𑀰𑀺","𑀱𑀺","𑀮𑀽","𑀯𑀽","𑀰𑀽","𑀱𑀽","𑀮𑁄","𑀯𑁄","𑀰𑁄","𑀱𑁄"),
new BaseGlyphSetNumber("𑀓𑁆","𑀔𑁆","𑀕𑁆","𑀖𑁆","𑀗𑁆","𑀘𑁆","𑀙𑁆","𑀚𑁆","𑀛𑁆","𑀜𑁆","𑀝𑁆","𑀞𑁆","𑀟𑁆","𑀠𑁆","𑀡𑁆","𑀢𑁆","𑀣𑁆","𑀤𑁆","𑀥𑁆","𑀦𑁆","𑀧𑁆","𑀨𑁆","𑀩𑁆","𑀪𑁆","𑀫𑁆","𑀬𑁆","𑀭𑁆")),
BRAHMI_TOPHEX(
BRAHMI.BȍőnGlyphSetNumber10(),
BRAHMI.BȍőnGlyphSetNumber16().withAltGlyphSet(LATIN_TOP),
BRAHMI.BȍőnGlyphSetNumber27()),
*/
CHINA( CHINA(
new BaseGlyphSetNumber("","","","","","","","","",""), new BaseGlyphSetNumber("","","","","","","","","",""),
LATIN_BASIC.BȍőnGlyphSetNumber16(), LATIN_BASIC.BȍőnNumber16(),
null), null),
CHINA_FORMAL( CHINA_FORMAL(
new BaseGlyphSetNumber(v -> T10PartDecimal.PART_1.BãßVoorElk(x -> v.add(x.BȍőnChinaKey()))), new BaseGlyphSetNumber(v -> T10PartDecimal.PART_1.BãßVoorElk(x -> v.add(x.BȍőnChinaKey()))),
LATIN_BASIC.BȍőnGlyphSetNumber16(), LATIN_BASIC.BȍőnNumber16(),
null), null),
CHINA_FORMAL_OLD( CHINA_FORMAL_OLD(
new BaseGlyphSetNumber("","","","","","","","","",""), new BaseGlyphSetNumber("","","","","","","","","",""),
LATIN_BASIC.BȍőnGlyphSetNumber16(), LATIN_BASIC.BȍőnNumber16(),
null), null),
JAPAN( JAPAN(
CHINA.BȍőnGlyphSetNumber10(), CHINA.BȍőnNumber10(),
LATIN_BASIC.BȍőnGlyphSetNumber16(), LATIN_BASIC.BȍőnNumber16(),
null), null),
JAPAN_FORMAL( JAPAN_FORMAL(
new BaseGlyphSetNumber("","","","","","","","","",""), new BaseGlyphSetNumber("","","","","","","","","",""),
LATIN_BASIC.BȍőnGlyphSetNumber16(), LATIN_BASIC.BȍőnNumber16(),
null), null),
CYRILLIC( CYRILLIC(
new BaseGlyphSetNumber("Ф","А","В","Г","Д","Є","Ѕ","З","И","Ѳ"), new BaseGlyphSetNumber("Ф","А","В","Г","Д","Є","Ѕ","З","И","Ѳ"),
LATIN_BASIC.BȍőnGlyphSetNumber16(), LATIN_BASIC.BȍőnNumber16(),
new BaseGlyphSetNumber("А","В","Г","Д","Є","Ѕ","З","И","Ѳ","І","К","Л","М","Н","Ѯ","Ѻ","П","Ч","Р","С","Т","Ѵ","Ф","Х","Ѱ","Ѿ","Ц")), new BaseGlyphSetNumber("А","В","Г","Д","Є","Ѕ","З","И","Ѳ","І","К","Л","М","Н","Ѯ","Ѻ","П","Ч","Р","С","Т","Ѵ","Ф","Х","Ѱ","Ѿ","Ц")),
ARABIC( ARABIC(
new BaseGlyphSetNumber("٠","١","٢","٣","٤","٥","٦","٧","٨","٩"), new BaseGlyphSetNumber("٠","١","٢","٣","٤","٥","٦","٧","٨","٩"),
LATIN_BASIC.BȍőnGlyphSetNumber16(), LATIN_BASIC.BȍőnNumber16(),
new BaseGlyphSetNumber("ا","ب","ج","د","ه","و","ز","ح","ط","ي","ك","ل","م","ن","س","ع","ف","ص","ق","ر","ش","ت","ث","خ","ذ","ض","ظ"), new BaseGlyphSetNumber("ا","ب","ج","د","ه","و","ز","ح","ط","ي","ك","ل","م","ن","س","ع","ف","ص","ق","ر","ش","ت","ث","خ","ذ","ض","ظ"),
true), true),
HEBREW( HEBREW(
new BaseGlyphSetNumber("אֶפֶס","אֶחָד","שְׁתַּיִם","שְׁלֹשָׁה","אַרְבַּע‎","חֲמִשָּׁה‎","שֵׁשׁ‎","שִׁבְעָה","שְׁמוֹנֶה","תִּשְׁעָה‎").withSeperator(BãßBȍőnConstantsʸᴰ.STR_SPACE), new BaseGlyphSetNumber("אֶפֶס","אֶחָד","שְׁתַּיִם","שְׁלֹשָׁה","אַרְבַּע‎","חֲמִשָּׁה‎","שֵׁשׁ‎","שִׁבְעָה","שְׁמוֹנֶה","תִּשְׁעָה‎").withSeperator(BãßBȍőnConstantsʸᴰ.STR_SPACE),
LATIN_BASIC.BȍőnGlyphSetNumber16(), LATIN_BASIC.BȍőnNumber16(),
new BaseGlyphSetNumber("א","ב","ג","ד","ה","ו","ז","ח","ט","י","כ","ל","מ","נ","ס","ע","פ","צ","ק","ר","ש","ת","ך","ם","ן","ף","ץ"), new BaseGlyphSetNumber("א","ב","ג","ד","ה","ו","ז","ח","ט","י","כ","ל","מ","נ","ס","ע","פ","צ","ק","ר","ש","ת","ך","ם","ן","ף","ץ"),
true), true),
; ;
private final GuageCounterᴶᴹˣ printsGlyphSetNumber10; private final GuageCounterᴶᴹˣ printNumber10Count;
private final GuageCounterᴶᴹˣ printsGlyphSetNumber16; private final GuageCounterᴶᴹˣ printNumber16Count;
private final GuageCounterᴶᴹˣ printsGlyphSetNumber27; private final GuageCounterᴶᴹˣ printNumber27Count;
private final BãßBȍőnCoffinOpenʸᴰ<BãßBȍőnGlyphSetKeyʸᴰ> BBC = BãßBȍőnCoffinOpenʸᴰ.newInstance(); private final BãßBȍőnCoffinOpenʸᴰ<BãßBȍőnGlyphSetKeyʸᴰ> BBC = BãßBȍőnCoffinOpenʸᴰ.newInstance();
public BãßBȍőnCoffinʸᴰ<BãßBȍőnGlyphSetKeyʸᴰ> GET_BBC() { return BBC; } public BãßBȍőnCoffinʸᴰ<BãßBȍőnGlyphSetKeyʸᴰ> GET_BBC() { return BBC; }
public static int LENGTH() { return values().length; }; public static int LENGTH() { return values().length; };
@ -160,24 +163,24 @@ public enum BaseGlyphSet implements DefaultEnumSetᴶᴹˣ<BaseGlyphSet,BãßBȍ
BBC.PUT_OBJ(BãßBȍőnGlyphSetKeyʸᴰ.REVERSE_SCRIPT, reverseScript); // TODO: ImGui workaround BBC.PUT_OBJ(BãßBȍőnGlyphSetKeyʸᴰ.REVERSE_SCRIPT, reverseScript); // TODO: ImGui workaround
BBC.BOON_INIT(this); BBC.BOON_INIT(this);
this.BȍőnJmxInit(BãßBȍőnGlyphSetKeyʸᴰ.JMX); this.BȍőnJmxInit(BãßBȍőnGlyphSetKeyʸᴰ.JMX);
printsGlyphSetNumber10 = BȍőnJmxInitGuageCounter(BãßBȍőnGlyphSetKeyʸᴰ.JMX, "printsGlyphSetNumber10"); printNumber10Count = BȍőnJmxInitGuageCounter(BãßBȍőnGlyphSetKeyʸᴰ.JMX, "printNumber10Count");
printsGlyphSetNumber16 = BȍőnJmxInitGuageCounter(BãßBȍőnGlyphSetKeyʸᴰ.JMX, "printsGlyphSetNumber16"); printNumber16Count = BȍőnJmxInitGuageCounter(BãßBȍőnGlyphSetKeyʸᴰ.JMX, "printNumber16Count");
printsGlyphSetNumber27 = BȍőnJmxInitGuageCounter(BãßBȍőnGlyphSetKeyʸᴰ.JMX, "printsGlyphSetNumber27"); printNumber27Count = BȍőnJmxInitGuageCounter(BãßBȍőnGlyphSetKeyʸᴰ.JMX, "printNumber27Count");
} }
public BaseGlyphSetNumber BȍőnGlyphSetNumber10() { public BaseGlyphSetNumber BȍőnNumber10() {
return GET_BBC().GET_OBJ(BãßBȍőnGlyphSetKeyʸᴰ.NUMBERS, BaseGlyphSetNumber.class); return GET_BBC().GET_OBJ(BãßBȍőnGlyphSetKeyʸᴰ.NUMBERS, BaseGlyphSetNumber.class);
} }
public BaseGlyphSetNumber BȍőnGlyphSetNumber16() { public BaseGlyphSetNumber BȍőnNumber16() {
return GET_BBC().GET_OBJ(BãßBȍőnGlyphSetKeyʸᴰ.HEXIMALS, BaseGlyphSetNumber.class); return GET_BBC().GET_OBJ(BãßBȍőnGlyphSetKeyʸᴰ.HEXIMALS, BaseGlyphSetNumber.class);
} }
public BaseGlyphSetNumber BȍőnGlyphSetNumber27() { public BaseGlyphSetNumber BȍőnNumber27() {
return GET_BBC().GET_OBJ(BãßBȍőnGlyphSetKeyʸᴰ.GEMATRIA, BaseGlyphSetNumber.class); return GET_BBC().GET_OBJ(BãßBȍőnGlyphSetKeyʸᴰ.GEMATRIA, BaseGlyphSetNumber.class);
} }
public Boolean BȍőnGlyphSetReverseScript() { public Boolean BȍőnReverseScript() {
return GET_BBC().GET_BOOL(BãßBȍőnGlyphSetKeyʸᴰ.REVERSE_SCRIPT); return GET_BBC().GET_BOOL(BãßBȍőnGlyphSetKeyʸᴰ.REVERSE_SCRIPT);
} }
@ -185,17 +188,17 @@ public enum BaseGlyphSet implements DefaultEnumSetᴶᴹˣ<BaseGlyphSet,BãßBȍ
StringBuilder buf = new StringBuilder(); StringBuilder buf = new StringBuilder();
for (char c:numbers.toCharArray()) { for (char c:numbers.toCharArray()) {
for (BaseGlyphSet set:values()) { for (BaseGlyphSet set:values()) {
int loc = set.BȍőnGlyphSetNumber10().BȍőnIndexOf(""+c); int loc = set.BȍőnNumber10().BȍőnIndexOf(""+c);
if (loc != -1) { if (loc != -1) {
buf.append(set.BȍőnGlyphSetNumber10().BȍőnCharFor(loc)); buf.append(set.BȍőnNumber10().BȍőnCharFor(loc));
} }
} }
} }
return buf.toString(); return buf.toString();
} }
public String BȍőnPrintGlyphSetNumber10(int number, int numberMax) { public String BȍőnPrintNumber10(int number, int numberMax) {
printsGlyphSetNumber10.increment(); printNumber10Count.increment();
String maxDigitNumber = Integer.toString(numberMax); String maxDigitNumber = Integer.toString(numberMax);
StringBuilder maxDigitFormat = new StringBuilder(); StringBuilder maxDigitFormat = new StringBuilder();
for (int i=0;i<maxDigitNumber.length();i++) { for (int i=0;i<maxDigitNumber.length();i++) {
@ -206,27 +209,27 @@ public enum BaseGlyphSet implements DefaultEnumSetᴶᴹˣ<BaseGlyphSet,BãßBȍ
for (int i=0;i<numberStr.length();i++) { for (int i=0;i<numberStr.length();i++) {
char c = numberStr.charAt(i); char c = numberStr.charAt(i);
int numberDigit = c - '0'; int numberDigit = c - '0';
buf.append(BȍőnGlyphSetNumber10().BȍőnCharFor(numberDigit)); buf.append(BȍőnNumber10().BȍőnCharFor(numberDigit));
if (i<numberStr.length() - 1) { if (i<numberStr.length() - 1) {
buf.append(BȍőnGlyphSetNumber10().BȍőnCharSeperator()); buf.append(BȍőnNumber10().BȍőnCharSeperator());
} }
} }
if (BȍőnGlyphSetReverseScript()) { if (BȍőnReverseScript()) {
return buf.reverse().toString(); return buf.reverse().toString();
} }
return buf.toString(); return buf.toString();
} }
public String BȍőnPrintGlyphSetNumber16(int number, int numberMax) { public String BȍőnPrintNumber16(int number, int numberMax) {
printsGlyphSetNumber16.increment(); printNumber16Count.increment();
String maxDigitNumber = Integer.toHexString(numberMax); String maxDigitNumber = Integer.toHexString(numberMax);
String numberStr = Integer.toHexString(number); String numberStr = Integer.toHexString(number);
StringBuilder buf = new StringBuilder(); StringBuilder buf = new StringBuilder();
BaseGlyphSet printSet = this; BaseGlyphSet printSet = this;
for (int i=numberStr.length();i<maxDigitNumber.length();i++) { for (int i=numberStr.length();i<maxDigitNumber.length();i++) {
buf.append(printSet.BȍőnGlyphSetNumber16().BȍőnCharFor(0)); buf.append(printSet.BȍőnNumber16().BȍőnCharFor(0));
if (i==numberStr.length() && BȍőnGlyphSetNumber16().BȍőnAltGlyphSet() != null) { if (i==numberStr.length() && BȍőnNumber16().BȍőnAltGlyphSet() != null) {
printSet = BȍőnGlyphSetNumber16().BȍőnAltGlyphSet(); printSet = BȍőnNumber16().BȍőnAltGlyphSet();
} }
} }
for (int i=0;i<numberStr.length();i++) { for (int i=0;i<numberStr.length();i++) {
@ -237,30 +240,30 @@ public enum BaseGlyphSet implements DefaultEnumSetᴶᴹˣ<BaseGlyphSet,BãßBȍ
} else { } else {
numberDigit = c - '0'; numberDigit = c - '0';
} }
buf.append(printSet.BȍőnGlyphSetNumber16().BȍőnCharFor(numberDigit)); buf.append(printSet.BȍőnNumber16().BȍőnCharFor(numberDigit));
if (i<numberStr.length() - 1) { if (i<numberStr.length() - 1) {
buf.append(printSet.BȍőnGlyphSetNumber16().BȍőnCharSeperator()); buf.append(printSet.BȍőnNumber16().BȍőnCharSeperator());
} }
if (i==0 && BȍőnGlyphSetNumber16().BȍőnAltGlyphSet() != null) { if (i==0 && BȍőnNumber16().BȍőnAltGlyphSet() != null) {
printSet = BȍőnGlyphSetNumber16().BȍőnAltGlyphSet(); printSet = BȍőnNumber16().BȍőnAltGlyphSet();
} }
} }
if (BȍőnGlyphSetReverseScript()) { if (BȍőnReverseScript()) {
return buf.reverse().toString(); return buf.reverse().toString();
} }
return buf.toString(); return buf.toString();
} }
public String BȍőnPrintGlyphSetNumber27(int number, int numberMax) { public String BȍőnPrintNumber27(int number, int numberMax) {
printsGlyphSetNumber27.increment(); printNumber27Count.increment();
String maxDigitNumber = Integer.toString(numberMax, 27); String maxDigitNumber = Integer.toString(numberMax, 27);
String numberStr = Integer.toString(number, 27); String numberStr = Integer.toString(number, 27);
StringBuilder buf = new StringBuilder(); StringBuilder buf = new StringBuilder();
BaseGlyphSet printSet = this; BaseGlyphSet printSet = this;
for (int i=numberStr.length();i<maxDigitNumber.length();i++) { for (int i=numberStr.length();i<maxDigitNumber.length();i++) {
buf.append(printSet.BȍőnGlyphSetNumber27().BȍőnCharFor(0)); buf.append(printSet.BȍőnNumber27().BȍőnCharFor(0));
if (i==numberStr.length() && BȍőnGlyphSetNumber27().BȍőnAltGlyphSet() != null) { if (i==numberStr.length() && BȍőnNumber27().BȍőnAltGlyphSet() != null) {
printSet = BȍőnGlyphSetNumber27().BȍőnAltGlyphSet(); printSet = BȍőnNumber27().BȍőnAltGlyphSet();
} }
} }
for (int i=0;i<numberStr.length();i++) { for (int i=0;i<numberStr.length();i++) {
@ -271,16 +274,16 @@ public enum BaseGlyphSet implements DefaultEnumSetᴶᴹˣ<BaseGlyphSet,BãßBȍ
} else { } else {
numberDigit = c - '0'; numberDigit = c - '0';
} }
buf.append(printSet.BȍőnGlyphSetNumber27().BȍőnCharFor(numberDigit)); buf.append(printSet.BȍőnNumber27().BȍőnCharFor(numberDigit));
if (i<numberStr.length() - 1) { if (i<numberStr.length() - 1) {
buf.append(printSet.BȍőnGlyphSetNumber27().BȍőnCharSeperator()); buf.append(printSet.BȍőnNumber27().BȍőnCharSeperator());
} }
if (i==0 && BȍőnGlyphSetNumber27().BȍőnAltGlyphSet() != null) { if (i==0 && BȍőnNumber27().BȍőnAltGlyphSet() != null) {
printSet = BȍőnGlyphSetNumber27().BȍőnAltGlyphSet(); printSet = BȍőnNumber27().BȍőnAltGlyphSet();
} }
} }
if (BȍőnGlyphSetReverseScript()) { if (BȍőnReverseScript()) {
return buf.reverse().toString(); // TODO: ImGui workaround return buf.reverse().toString();
} }
return buf.toString(); return buf.toString();
} }

View file

@ -47,8 +47,8 @@ public class SystemBaseGlyphRenderer extends ImGuiRendererMain {
private String print10Numbers(BaseGlyphSet set) { private String print10Numbers(BaseGlyphSet set) {
StringBuilder buf = new StringBuilder(); StringBuilder buf = new StringBuilder();
for (int i=0;i<10;i++) { for (int i=0;i<10;i++) {
buf.append(set.BȍőnGlyphSetNumber10().BȍőnCharFor(i)); buf.append(set.BȍőnNumber10().BȍőnCharFor(i));
buf.append(set.BȍőnGlyphSetNumber10().BȍőnCharSeperator()); buf.append(set.BȍőnNumber10().BȍőnCharSeperator());
} }
return buf.toString(); return buf.toString();
} }
@ -57,7 +57,7 @@ public class SystemBaseGlyphRenderer extends ImGuiRendererMain {
StringBuilder buf = new StringBuilder(); StringBuilder buf = new StringBuilder();
int x=240; int x=240;
for (int i=0;i<16;i++) { for (int i=0;i<16;i++) {
buf.append(set.BȍőnPrintGlyphSetNumber16(i + x, 99)); buf.append(set.BȍőnPrintNumber16(i + x, 99));
buf.append(" "); buf.append(" ");
x = x - 16; x = x - 16;
} }