From 3a8fa721ac49c995b1c23b07dd01b2ee55fe93bb Mon Sep 17 00:00:00 2001
From: MysterD <myster@d>
Date: Tue, 28 Mar 2023 16:14:48 -0700
Subject: [PATCH] Added 15 more characters

---
 bin/segment2.c                                |  76 +++++++++
 src/pc/djui/djui_font.c                       | 154 ++++++++++++------
 src/pc/djui/djui_font.h                       |   1 +
 src/pc/djui/djui_inputbox.c                   |   2 +-
 .../custom_font_normal_char_ca_ang.ia4.png    | Bin 0 -> 518 bytes
 .../custom_font_normal_char_cae.ia4.png       | Bin 0 -> 530 bytes
 .../custom_font_normal_char_ceth.ia4.png      | Bin 0 -> 523 bytes
 ...~ => custom_font_normal_char_ci_c.ia4.png} | Bin 512 -> 513 bytes
 .../custom_font_normal_char_coe.ia4.png       | Bin 0 -> 534 bytes
 .../custom_font_normal_char_cos.ia4.png       | Bin 0 -> 522 bytes
 .../custom_font_normal_char_cu_c.ia4.png      | Bin 0 -> 517 bytes
 ...=> custom_font_normal_char_la_ang.ia4.png} | Bin 514 -> 515 bytes
 .../custom_font_normal_char_lae.ia4.png       | Bin 0 -> 513 bytes
 .../custom_font_normal_char_leth.ia4.png      | Bin 0 -> 512 bytes
 ...~ => custom_font_normal_char_li_c.ia4.png} | Bin 501 -> 496 bytes
 .../custom_font_normal_char_loe.ia4.png       | Bin 0 -> 508 bytes
 .../custom_font_normal_char_los.ia4.png       | Bin 0 -> 505 bytes
 ...~ => custom_font_normal_char_lu_c.ia4.png} | Bin 505 -> 512 bytes
 .../custom_font_normal_char_scn.ia4.png~      | Bin 543 -> 0 bytes
 .../custom_font_normal_char_ss.ia4.png        | Bin 0 -> 521 bytes
 20 files changed, 182 insertions(+), 51 deletions(-)
 create mode 100644 textures/segment2/custom_font_normal_char_ca_ang.ia4.png
 create mode 100644 textures/segment2/custom_font_normal_char_cae.ia4.png
 create mode 100644 textures/segment2/custom_font_normal_char_ceth.ia4.png
 rename textures/segment2/{custom_font_normal_char_squ.ia4.png~ => custom_font_normal_char_ci_c.ia4.png} (83%)
 create mode 100644 textures/segment2/custom_font_normal_char_coe.ia4.png
 create mode 100644 textures/segment2/custom_font_normal_char_cos.ia4.png
 create mode 100644 textures/segment2/custom_font_normal_char_cu_c.ia4.png
 rename textures/segment2/{custom_font_normal_char_pcc.ia4.png~ => custom_font_normal_char_la_ang.ia4.png} (83%)
 create mode 100644 textures/segment2/custom_font_normal_char_lae.ia4.png
 create mode 100644 textures/segment2/custom_font_normal_char_leth.ia4.png
 rename textures/segment2/{custom_font_normal_char_sex.ia4.png~ => custom_font_normal_char_li_c.ia4.png} (85%)
 create mode 100644 textures/segment2/custom_font_normal_char_loe.ia4.png
 create mode 100644 textures/segment2/custom_font_normal_char_los.ia4.png
 rename textures/segment2/{custom_font_normal_char_pc.ia4.png~ => custom_font_normal_char_lu_c.ia4.png} (83%)
 delete mode 100644 textures/segment2/custom_font_normal_char_scn.ia4.png~
 create mode 100644 textures/segment2/custom_font_normal_char_ss.ia4.png

diff --git a/bin/segment2.c b/bin/segment2.c
index 3fd187d6..9bc8115a 100644
--- a/bin/segment2.c
+++ b/bin/segment2.c
@@ -3597,6 +3597,10 @@ ALIGNED8 static const u8 texture_font_normal_char_ca_a[] = {
 #include "textures/segment2/custom_font_normal_char_ca_a.ia4.inc.c"
 };
 
+ALIGNED8 static const u8 texture_font_normal_char_ca_ang[] = {
+#include "textures/segment2/custom_font_normal_char_ca_ang.ia4.inc.c"
+};
+
 ALIGNED8 static const u8 texture_font_normal_char_ca_c[] = {
 #include "textures/segment2/custom_font_normal_char_ca_c.ia4.inc.c"
 };
@@ -3637,6 +3641,10 @@ ALIGNED8 static const u8 texture_font_normal_char_ci_a[] = {
 #include "textures/segment2/custom_font_normal_char_ci_a.ia4.inc.c"
 };
 
+ALIGNED8 static const u8 texture_font_normal_char_ci_c[] = {
+#include "textures/segment2/custom_font_normal_char_ci_c.ia4.inc.c"
+};
+
 ALIGNED8 static const u8 texture_font_normal_char_ci_g[] = {
 #include "textures/segment2/custom_font_normal_char_ci_g.ia4.inc.c"
 };
@@ -3673,6 +3681,10 @@ ALIGNED8 static const u8 texture_font_normal_char_cu_a[] = {
 #include "textures/segment2/custom_font_normal_char_cu_a.ia4.inc.c"
 };
 
+ALIGNED8 static const u8 texture_font_normal_char_cu_c[] = {
+#include "textures/segment2/custom_font_normal_char_cu_c.ia4.inc.c"
+};
+
 ALIGNED8 static const u8 texture_font_normal_char_cu_g[] = {
 #include "textures/segment2/custom_font_normal_char_cu_g.ia4.inc.c"
 };
@@ -3693,6 +3705,10 @@ ALIGNED8 static const u8 texture_font_normal_char_la_a[] = {
 #include "textures/segment2/custom_font_normal_char_la_a.ia4.inc.c"
 };
 
+ALIGNED8 static const u8 texture_font_normal_char_la_ang[] = {
+#include "textures/segment2/custom_font_normal_char_la_ang.ia4.inc.c"
+};
+
 ALIGNED8 static const u8 texture_font_normal_char_la_c[] = {
 #include "textures/segment2/custom_font_normal_char_la_c.ia4.inc.c"
 };
@@ -3733,6 +3749,10 @@ ALIGNED8 static const u8 texture_font_normal_char_li_a[] = {
 #include "textures/segment2/custom_font_normal_char_li_a.ia4.inc.c"
 };
 
+ALIGNED8 static const u8 texture_font_normal_char_li_c[] = {
+#include "textures/segment2/custom_font_normal_char_li_c.ia4.inc.c"
+};
+
 ALIGNED8 static const u8 texture_font_normal_char_li_g[] = {
 #include "textures/segment2/custom_font_normal_char_li_g.ia4.inc.c"
 };
@@ -3769,6 +3789,10 @@ ALIGNED8 static const u8 texture_font_normal_char_lu_a[] = {
 #include "textures/segment2/custom_font_normal_char_lu_a.ia4.inc.c"
 };
 
+ALIGNED8 static const u8 texture_font_normal_char_lu_c[] = {
+#include "textures/segment2/custom_font_normal_char_lu_c.ia4.inc.c"
+};
+
 ALIGNED8 static const u8 texture_font_normal_char_lu_g[] = {
 #include "textures/segment2/custom_font_normal_char_lu_g.ia4.inc.c"
 };
@@ -3785,6 +3809,42 @@ ALIGNED8 static const u8 texture_font_normal_char_ly_u[] = {
 #include "textures/segment2/custom_font_normal_char_ly_u.ia4.inc.c"
 };
 
+ALIGNED8 static const u8 texture_font_normal_char_lae[] = {
+#include "textures/segment2/custom_font_normal_char_lae.ia4.inc.c"
+};
+
+ALIGNED8 static const u8 texture_font_normal_char_cae[] = {
+#include "textures/segment2/custom_font_normal_char_cae.ia4.inc.c"
+};
+
+ALIGNED8 static const u8 texture_font_normal_char_loe[] = {
+#include "textures/segment2/custom_font_normal_char_loe.ia4.inc.c"
+};
+
+ALIGNED8 static const u8 texture_font_normal_char_coe[] = {
+#include "textures/segment2/custom_font_normal_char_coe.ia4.inc.c"
+};
+
+ALIGNED8 static const u8 texture_font_normal_char_leth[] = {
+#include "textures/segment2/custom_font_normal_char_leth.ia4.inc.c"
+};
+
+ALIGNED8 static const u8 texture_font_normal_char_ceth[] = {
+#include "textures/segment2/custom_font_normal_char_ceth.ia4.inc.c"
+};
+
+ALIGNED8 static const u8 texture_font_normal_char_los[] = {
+#include "textures/segment2/custom_font_normal_char_los.ia4.inc.c"
+};
+
+ALIGNED8 static const u8 texture_font_normal_char_cos[] = {
+#include "textures/segment2/custom_font_normal_char_cos.ia4.inc.c"
+};
+
+ALIGNED8 static const u8 texture_font_normal_char_ss[] = {
+#include "textures/segment2/custom_font_normal_char_ss.ia4.inc.c"
+};
+
 ALIGNED8 static const u8 texture_font_normal_char_punc_sp_ex[] = {
 #include "textures/segment2/custom_font_normal_char_punc_sp_ex.ia4.inc.c"
 };
@@ -3892,6 +3952,7 @@ const u8* const font_normal_chars[] = {
     texture_font_char_us_star_filled,        // DEL
 
     texture_font_normal_char_ca_a,           // Á
+    texture_font_normal_char_ca_ang,         // Å
     texture_font_normal_char_ca_c,           // Â
     texture_font_normal_char_ca_g,           // À
     texture_font_normal_char_ca_t,           // Ã
@@ -3902,6 +3963,7 @@ const u8* const font_normal_chars[] = {
     texture_font_normal_char_ce_g,           // È
     texture_font_normal_char_ce_u,           // Ë
     texture_font_normal_char_ci_a,           // Í
+    texture_font_normal_char_ci_c,           // Î
     texture_font_normal_char_ci_g,           // Ì
     texture_font_normal_char_ci_u,           // Ï
     texture_font_normal_char_cn_t,           // Ñ
@@ -3911,12 +3973,14 @@ const u8* const font_normal_chars[] = {
     texture_font_normal_char_co_t,           // Õ
     texture_font_normal_char_co_u,           // Ö
     texture_font_normal_char_cu_a,           // Ú
+    texture_font_normal_char_cu_c,           // Û
     texture_font_normal_char_cu_g,           // Ù
     texture_font_normal_char_cu_u,           // Ü
     texture_font_normal_char_cy_a,           // Ý
     texture_font_normal_char_cy_u,           // Ÿ
 
     texture_font_normal_char_la_a,           // á
+    texture_font_normal_char_la_ang,         // å
     texture_font_normal_char_la_c,           // â
     texture_font_normal_char_la_g,           // à
     texture_font_normal_char_la_t,           // ã
@@ -3927,6 +3991,7 @@ const u8* const font_normal_chars[] = {
     texture_font_normal_char_le_g,           // è
     texture_font_normal_char_le_u,           // ë
     texture_font_normal_char_li_a,           // í
+    texture_font_normal_char_li_c,           // î
     texture_font_normal_char_li_g,           // ì
     texture_font_normal_char_li_u,           // ï
     texture_font_normal_char_ln_t,           // ñ
@@ -3936,11 +4001,22 @@ const u8* const font_normal_chars[] = {
     texture_font_normal_char_lo_t,           // õ
     texture_font_normal_char_lo_u,           // ö
     texture_font_normal_char_lu_a,           // ú
+    texture_font_normal_char_lu_c,           // û
     texture_font_normal_char_lu_g,           // ù
     texture_font_normal_char_lu_u,           // ü
     texture_font_normal_char_ly_a,           // ý
     texture_font_normal_char_ly_u,           // ÿ
 
+    texture_font_normal_char_lae,            // æ
+    texture_font_normal_char_cae,            // Æ
+    texture_font_normal_char_loe,            // œ
+    texture_font_normal_char_coe,            // Œ
+    texture_font_normal_char_leth,           // ð
+    texture_font_normal_char_ceth,           // Ð
+    texture_font_normal_char_los,            // ø
+    texture_font_normal_char_cos,            // Ø
+    texture_font_normal_char_ss,             // ß
+
     texture_font_normal_char_punc_sp_ex,     // ¡
     texture_font_normal_char_punc_sp_qu,     // ¿
 
diff --git a/src/pc/djui/djui_font.c b/src/pc/djui/djui_font.c
index c8fb2136..94169323 100644
--- a/src/pc/djui/djui_font.c
+++ b/src/pc/djui/djui_font.c
@@ -4,61 +4,78 @@
 struct SmCodeGlyph {
     char unicode[3];
     char base;
+    f32 width;
 };
 
 struct SmCodeGlyph sSmCodeGlyphs[] = {
-    { "Á", 'A' },
-    { "Â", 'A' },
-    { "À", 'A' },
-    { "Ã", 'A' },
-    { "Ä", 'A' },
-    { "Ç", 'C' },
-    { "É", 'E' },
-    { "Ê", 'E' },
-    { "È", 'E' },
-    { "Ë", 'E' },
-    { "Í", 'I' },
-    { "Ì", 'I' },
-    { "Ï", 'I' },
-    { "Ñ", 'N' },
-    { "Ó", 'O' },
-    { "Ô", 'O' },
-    { "Ò", 'O' },
-    { "Õ", 'O' },
-    { "Ö", 'O' },
-    { "Ú", 'U' },
-    { "Ù", 'U' },
-    { "Ü", 'U' },
-    { "Ý", 'Y' },
-    { "Ÿ", 'Y' },
+    { "Á", 'A', 0 },
+    { "Å", 'A', 0 },
+    { "Â", 'A', 0 },
+    { "À", 'A', 0 },
+    { "Ã", 'A', 0 },
+    { "Ä", 'A', 0 },
+    { "Ç", 'C', 0 },
+    { "É", 'E', 0 },
+    { "Ê", 'E', 0 },
+    { "È", 'E', 0 },
+    { "Ë", 'E', 0 },
+    { "Í", 'I', 0 },
+    { "Î", 'I', 0 },
+    { "Ì", 'I', 0 },
+    { "Ï", 'I', 0 },
+    { "Ñ", 'N', 0 },
+    { "Ó", 'O', 0 },
+    { "Ô", 'O', 0 },
+    { "Ò", 'O', 0 },
+    { "Õ", 'O', 0 },
+    { "Ö", 'O', 0 },
+    { "Ú", 'U', 0 },
+    { "Û", 'U', 0 },
+    { "Ù", 'U', 0 },
+    { "Ü", 'U', 0 },
+    { "Ý", 'Y', 0 },
+    { "Ÿ", 'Y', 0 },
 
-    { "á", 'a' },
-    { "â", 'a' },
-    { "à", 'a' },
-    { "ã", 'a' },
-    { "ä", 'a' },
-    { "ç", 'c' },
-    { "é", 'e' },
-    { "ê", 'e' },
-    { "è", 'e' },
-    { "ë", 'e' },
-    { "í", 'i' },
-    { "ì", 'i' },
-    { "ï", 'i' },
-    { "ñ", 'n' },
-    { "ó", 'o' },
-    { "ô", 'o' },
-    { "ò", 'o' },
-    { "õ", 'o' },
-    { "ö", 'o' },
-    { "ú", 'u' },
-    { "ù", 'u' },
-    { "ü", 'u' },
-    { "ý", 'y' },
-    { "ÿ", 'y' },
+    { "á", 'a', 0 },
+    { "å", 'a', 0 },
+    { "â", 'a', 0 },
+    { "à", 'a', 0 },
+    { "ã", 'a', 0 },
+    { "ä", 'a', 0 },
+    { "ç", 'c', 0 },
+    { "é", 'e', 0 },
+    { "ê", 'e', 0 },
+    { "è", 'e', 0 },
+    { "ë", 'e', 0 },
+    { "í", 'i', 0 },
+    { "î", 'i', 0 },
+    { "ì", 'i', 0 },
+    { "ï", 'i', 0 },
+    { "ñ", 'n', 0 },
+    { "ó", 'o', 0 },
+    { "ô", 'o', 0 },
+    { "ò", 'o', 0 },
+    { "õ", 'o', 0 },
+    { "ö", 'o', 0 },
+    { "ú", 'u', 0 },
+    { "û", 'u', 0 },
+    { "ù", 'u', 0 },
+    { "ü", 'u', 0 },
+    { "ý", 'y', 0 },
+    { "ÿ", 'y', 0 },
 
-    { "¡", '!' },
-    { "¿", '?' },
+    { "æ", 'a', 0.5000f },
+    { "Æ", 'a', 0.6000f },
+    { "œ", 'o', 0.5000f },
+    { "Œ", 'o', 0.5000f },
+    { "ð", 'd', 0 },
+    { "Ð", 'D', 0.4375f },
+    { "ø", 'o', 0 },
+    { "Ø", 'O', 0 },
+    { "ß", 'S', 0 },
+
+    { "¡", '!', 0 },
+    { "¿", '?', 0 },
 };
 
 
@@ -74,6 +91,28 @@ u8 djui_font_convert_smcode_to_base(char c) {
     return sSmCodeGlyphs[((u8)c - 128)].base;
 }
 
+void djui_font_convert_to_unicode(char* from, char* to, int length, int maxlength) {
+    int clen = 0;
+    int count = 0;
+    to[0] = '\0';
+    while (*from != '\0' && count < length) {
+        count++;
+        if ((u8)*from < 128 || !djui_font_valid_smcode(*from)) {
+            clen = strlen(to);
+            snprintf(to + clen, maxlength - clen, "%c", *from);
+            from++;
+            continue;
+        }
+
+        int i = (u8)*from - 128;
+        struct SmCodeGlyph* glyph = &sSmCodeGlyphs[i];
+        clen = strlen(to);
+        snprintf(to + clen, maxlength - clen, "%s", glyph->unicode);
+
+        from++;
+    }
+}
+
 void djui_font_convert_to_smcode(char* text) {
     size_t glyphCount = sizeof(sSmCodeGlyphs) / sizeof(sSmCodeGlyphs[0]);
 
@@ -159,6 +198,21 @@ static void djui_font_normal_render_char(char c) {
 static f32 djui_font_normal_char_width(char c) {
     if (c == ' ') { return 0.30f; }
     extern const f32 font_normal_widths[];
+
+    if ((u8)c < 128) {
+        return font_normal_widths[(u8)c - '!'];
+    }
+
+    size_t glyphCount = sizeof(sSmCodeGlyphs) / sizeof(sSmCodeGlyphs[0]);
+    u8 max = 128 + glyphCount;
+    if ((u8)c > max) {
+        return font_normal_widths[(u8)'?' - '!'];
+    }
+
+    if (sSmCodeGlyphs[(u8)c - 128].width > 0) {
+        return sSmCodeGlyphs[(u8)c - 128].width;
+    }
+
     c = djui_font_convert_smcode_to_base(c);
     return font_normal_widths[(u8)c - '!'];
 }
diff --git a/src/pc/djui/djui_font.h b/src/pc/djui/djui_font.h
index aff57fdb..082e8234 100644
--- a/src/pc/djui/djui_font.h
+++ b/src/pc/djui/djui_font.h
@@ -16,5 +16,6 @@ struct DjuiFont {
 extern const struct DjuiFont* gDjuiFonts[];
 
 u8 djui_font_convert_smcode_to_base(char c);
+void djui_font_convert_to_unicode(char* from, char* to, int length, int maxlength);
 void djui_font_convert_to_smcode(char* text);
 bool djui_font_valid_smcode(char c);
diff --git a/src/pc/djui/djui_inputbox.c b/src/pc/djui/djui_inputbox.c
index c2cbd8b7..977e82d2 100644
--- a/src/pc/djui/djui_inputbox.c
+++ b/src/pc/djui/djui_inputbox.c
@@ -236,7 +236,7 @@ bool djui_inputbox_on_key_down(struct DjuiBase *base, int scancode) {
     if (sHeldControl && (scancode == SCANCODE_C || scancode == SCANCODE_X)) {
         if (sel[0] != sel[1]) {
             char clipboardText[256] = { 0 };
-            snprintf(clipboardText, fmin(256, 1 + s2 - s1), "%s", &msg[s1]);
+            djui_font_convert_to_unicode(&msg[s1], clipboardText, fmin(256, 1 + s2 - s1), 255);
             wm_api->set_clipboard_text(clipboardText);
             if (scancode == SCANCODE_X) {
                 djui_inputbox_delete_selection(inputbox);
diff --git a/textures/segment2/custom_font_normal_char_ca_ang.ia4.png b/textures/segment2/custom_font_normal_char_ca_ang.ia4.png
new file mode 100644
index 0000000000000000000000000000000000000000..8346cd9e3aacbab077b1094c82df2acbab099638
GIT binary patch
literal 518
zcmV+h0{Q)kP)<h;3K|Lk000e1NJLTq000mG000OG1^@s6@OFQf0004QX+uL$X=7sm
z04R}lkvmHRK@^3*Bx-!3poNG<iYOKeq9B$U3!5MkBN(;Gu6YQ%aoOD<!B()b5G+I+
zUxoibTftUA5EMbg&fZreVZCF71W9I@y&q@hTxQOIKWgZvQ#TA|&b4FHk<db7F%*0y
zKran6(UH_0YjSorO3m?gk5ARRA=Rt)zN({TCFSVgYZM;SE!!2I5RR_9mf~&UE<KxE
z5k3+gwB>-p*Gkt){GvEh;t$1kJT?V>)iac-V6B4ntZfPp2!~B0um7D#-J~^@o1c@~
zBeNHW7}G=up^;}51D7GGImxWLZ}`_Y!<u+>`CAmQ#gQQ^-a%3G(lsSDEqY2mgM!Na
zf1XZybfnb1H3Id|p7-7d!Cffsc;5H1=M_&N@C28+vVTo-8vhi1r>un!p?wq1ugaRX
z2Nzq={b(ia<gXNv=})KO?F`xy(0L2ZOQo#-);WEE_=Y^u4eTF4zwB>c{sEQRXW4f_
zJpTXy010qNS#tmY3labT3lag+-G2N4002HoL_t(2Q)6Hl@_-T92Y>$j`A^74EG#Tw
zJs`C(HdZ~@41<ZG(*z9wX+Sp+#z*l2F7M!TD$X##>pvu$00dGmoDeXOdjJ3c07*qo
IM6N<$f&dNOKL7v#

literal 0
HcmV?d00001

diff --git a/textures/segment2/custom_font_normal_char_cae.ia4.png b/textures/segment2/custom_font_normal_char_cae.ia4.png
new file mode 100644
index 0000000000000000000000000000000000000000..f8f89c6970245b7f0210f59b5d1f41b25bbd6a06
GIT binary patch
literal 530
zcmV+t0`2{YP)<h;3K|Lk000e1NJLTq000mG000OG1^@s6@OFQf0004RX+uL$X=7sm
z04R}lkvmHRK@^3*B#PpL6e@_MNTDKPBq)fb#v)A+i3&z-HtQx4Hp#M^AYv=nSO^xP
zjjzIgpsir5AP9;eVrTEG5n1nK0};_#X79(DIhUC;;7^!(-l>a1zEHB0@mP2+H6Lzx
zCP0V|2I<#y#~PoSO7QRaxW%XHO+@wjf8U>@dC72e@HGmL=$2g)9urQilq|)Y!tHua
zTM|AH9<b$r!k0=<d;Fw0>+zdndnP#ne$_La{lV!Utmo{!aG!8@-Yo0Y^QfD&7=_ts
zsa-NdI3$S^BTSky%b1jiNG(WafBT{p-y}ux=<>H%#TG}FoOlOBElXEJYDRQJK9g0I
z`|muR%<z!cy(I?qkFNXL0}b2owdJ~>hpzi|1c3)QFVy@+$!YXm^sSoKy$`{4IK8N8
z=^Z%RfX;hMv$cv8km=84;N=8bQ_yw|O$%OD)pd^VU}jC8=n8iCpjY+>7ry~M?Pw=2
zu)(<i000SaNLh0L01FZT01FZU(%pXi0000<Nkl<ZC{tr#KmvdM{P~Z}2eHw`(D_X0
z8c5|+Yycx6FJN;K3kwU1KCG_B79QBbgoRi?!wf{X9j8;!U4YBkIKzM_e*&Ek01aa!
U%X^8?pa1{>07*qoM6N<$f&d`tYXATM

literal 0
HcmV?d00001

diff --git a/textures/segment2/custom_font_normal_char_ceth.ia4.png b/textures/segment2/custom_font_normal_char_ceth.ia4.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a0de4be0b38f432d648ed3a95a27369b0f74f3c
GIT binary patch
literal 523
zcmV+m0`&cfP)<h;3K|Lk000e1NJLTq000mG000OG1^@s6@OFQf0004RX+uL$X=7sm
z04R}lkvmHRK@^3*B#PpL6e@_MNTDKPBq)fb#v)A+i3&z-HtQx4Hp#M^AYv=nSO^xP
zjjzIgpsir5AP9;eVrTEG5n1nK0};_#X79(DIhUC;;7^!(-l>a1zEHB0@mP2+H6Lzx
zCP0V|2I<#y#~PoSO7QRaxW%XHO+@wjf8U>@dC72e@HGmL=$2g)9urQilq|)Y!tHua
zTM|AH9<b$r!k0=<d;Fw0>+zdndnP#ne$_La{lV!Utmo{!aG!8@-Yo0Y^QfD&7=_ts
zsa-NdI3$S^BTSky%b1jiNG(WafBT{p-y}ux=<>H%#TG}FoOlOBElXEJYDRQJK9g0I
z`|muR%<z!cy(I?qkFNXL0}b2owdJ~>hpzi|1c3)QFVy@+$!YXm^sSoKy$`{4IK8N8
z=^Z%RfX;hMv$cv8km=84;N=8bQ_yw|O$%OD)pd^VU}jC8=n8iCpjY+>7ry~M?Pw=2
zu)(<i000SaNLh0L01FZT01FZU(%pXi0000&Nkl<ZC{tr#7-+zV%K?A>{P~YA$HKyb
zQ$31WY??s|aETM88Kwx`5Ef+JAW39r!ua@XM)4Cag+%)uJ<y2pGXTUBC%M_@?*{+?
N002ovPDHLkV1mTa=tKYj

literal 0
HcmV?d00001

diff --git a/textures/segment2/custom_font_normal_char_squ.ia4.png~ b/textures/segment2/custom_font_normal_char_ci_c.ia4.png
similarity index 83%
rename from textures/segment2/custom_font_normal_char_squ.ia4.png~
rename to textures/segment2/custom_font_normal_char_ci_c.ia4.png
index 183ba19f1cd1244e3f323834c9f322a7762fdbdc..e63d85476d5776ef25fc8aa49dbf2dba933398f6 100644
GIT binary patch
delta 86
zcmZo*X=K^3nbFVE)5S4FBRDxhf>ovUz<m4qf6XQbGI-AJP;q!<z;l@;_;gbqmzi@!
qM1;h|T(*^soeN(ae`#VP$I6g3Uwgt~v&UKtK;Y@>=d#Wzp$PzUt{?9J

delta 85
zcmZo<X<*r~nbFt6)5S4FBRDxhBILpO`S$-EXXv;;yxeg<L2W{=0;`UWPR|Lm$xoz8
pZhL-YyAzh;`(mA<wok`Z7KZIr+Wq<73rrY*z|+;wWt~$(69Bv!AyohX

diff --git a/textures/segment2/custom_font_normal_char_coe.ia4.png b/textures/segment2/custom_font_normal_char_coe.ia4.png
new file mode 100644
index 0000000000000000000000000000000000000000..9fe1b666303b2874231aa8e5ae1396e07262c03b
GIT binary patch
literal 534
zcmV+x0_pvUP)<h;3K|Lk000e1NJLTq000mG000OG1^@s6@OFQf0004RX+uL$X=7sm
z04R}lkvmHRK@^3*B#PpL6e@_MNTDKPBq)fb#v)A+i3&z-HtQx4Hp#M^AYv=nSO^xP
zjjzIgpsir5AP9;eVrTEG5n1nK0};_#X79(DIhUC;;7^!(-l>a1zEHB0@mP2+H6Lzx
zCP0V|2I<#y#~PoSO7QRaxW%XHO+@wjf8U>@dC72e@HGmL=$2g)9urQilq|)Y!tHua
zTM|AH9<b$r!k0=<d;Fw0>+zdndnP#ne$_La{lV!Utmo{!aG!8@-Yo0Y^QfD&7=_ts
zsa-NdI3$S^BTSky%b1jiNG(WafBT{p-y}ux=<>H%#TG}FoOlOBElXEJYDRQJK9g0I
z`|muR%<z!cy(I?qkFNXL0}b2owdJ~>hpzi|1c3)QFVy@+$!YXm^sSoKy$`{4IK8N8
z=^Z%RfX;hMv$cv8km=84;N=8bQ_yw|O$%OD)pd^VU}jC8=n8iCpjY+>7ry~M?Pw=2
zu)(<i000SaNLh0L01FZT01FZU(%pXi0000@Nkl<ZC{tr#AQAle^XEUZ7A9m4x+F*r
zn;1?5NOTOQa&+5}`5-nn*D#_RgUiV*EG%HPAbA)Y!wH1^i!Dr8i1jzjaCF;A_5!+v
Y0JeWKmLddz9{>OV07*qoM6N<$f)O+5@&Et;

literal 0
HcmV?d00001

diff --git a/textures/segment2/custom_font_normal_char_cos.ia4.png b/textures/segment2/custom_font_normal_char_cos.ia4.png
new file mode 100644
index 0000000000000000000000000000000000000000..190cab735e27b73e88883135f5ffed52bac9d60f
GIT binary patch
literal 522
zcmV+l0`>igP)<h;3K|Lk000e1NJLTq000mG000OG1^@s6@OFQf0004RX+uL$X=7sm
z04R}lkvmHRK@^3*B#PpL6e@_MNTDKPBq)fb#v)A+i3&z-HtQx4Hp#M^AYv=nSO^xP
zjjzIgpsir5AP9;eVrTEG5n1nK0};_#X79(DIhUC;;7^!(-l>a1zEHB0@mP2+H6Lzx
zCP0V|2I<#y#~PoSO7QRaxW%XHO+@wjf8U>@dC72e@HGmL=$2g)9urQilq|)Y!tHua
zTM|AH9<b$r!k0=<d;Fw0>+zdndnP#ne$_La{lV!Utmo{!aG!8@-Yo0Y^QfD&7=_ts
zsa-NdI3$S^BTSky%b1jiNG(WafBT{p-y}ux=<>H%#TG}FoOlOBElXEJYDRQJK9g0I
z`|muR%<z!cy(I?qkFNXL0}b2owdJ~>hpzi|1c3)QFVy@+$!YXm^sSoKy$`{4IK8N8
z=^Z%RfX;hMv$cv8km=84;N=8bQ_yw|O$%OD)pd^VU}jC8=n8iCpjY+>7ry~M?Pw=2
zu)(<i000SaNLh0L01FZT01FZU(%pXi0000%Nkl<ZC{tr#81jG-n-Bi{`STx_&sbPk
zu<C)U$EF!11{23;I0L#QvPPH<=xSK-c>&qEFpcP5!0-<)C*txu07a@VpTtWs5dZ)H
M07*qoM6N<$g7JIjU;qFB

literal 0
HcmV?d00001

diff --git a/textures/segment2/custom_font_normal_char_cu_c.ia4.png b/textures/segment2/custom_font_normal_char_cu_c.ia4.png
new file mode 100644
index 0000000000000000000000000000000000000000..79ed515c1f173702021217e07d40cdee8a03130b
GIT binary patch
literal 517
zcmV+g0{Z=lP)<h;3K|Lk000e1NJLTq000mG000OG1^@s6@OFQf0004QX+uL$X=7sm
z04R}lkvmHRK@^3*Bx-!3poNG<iYOKeq9B$U3!5MkBN(;Gu6YQ%aoOD<!B()b5G+I+
zUxoibTftUA5EMbg&fZreVZCF71W9I@y&q@hTxQOIKWgZvQ#TA|&b4FHk<db7F%*0y
zKran6(UH_0YjSorO3m?gk5ARRA=Rt)zN({TCFSVgYZM;SE!!2I5RR_9mf~&UE<KxE
z5k3+gwB>-p*Gkt){GvEh;t$1kJT?V>)iac-V6B4ntZfPp2!~B0um7D#-J~^@o1c@~
zBeNHW7}G=up^;}51D7GGImxWLZ}`_Y!<u+>`CAmQ#gQQ^-a%3G(lsSDEqY2mgM!Na
zf1XZybfnb1H3Id|p7-7d!Cffsc;5H1=M_&N@C28+vVTo-8vhi1r>un!p?wq1ugaRX
z2Nzq={b(ia<gXNv=})KO?F`xy(0L2ZOQo#-);WEE_=Y^u4eTF4zwB>c{sEQRXW4f_
zJpTXy010qNS#tmY3labT3lag+-G2N4002EnL_t(2Q)6Hl@_-SW5B~i5^B<SbSXfvX
zLGmCPs~UWoku_jdM~-F|Vj=<AV35<1osZ!UY_7oRU!d&(?3^Fq!q5+B00000NkvXX
Hu0mjfy2#<<

literal 0
HcmV?d00001

diff --git a/textures/segment2/custom_font_normal_char_pcc.ia4.png~ b/textures/segment2/custom_font_normal_char_la_ang.ia4.png
similarity index 83%
rename from textures/segment2/custom_font_normal_char_pcc.ia4.png~
rename to textures/segment2/custom_font_normal_char_la_ang.ia4.png
index e82ff4232a4651ddde99d44e43021bd15099baf7..450ee9099c7afce746968dd2c3e4ea7590172fa7 100644
GIT binary patch
delta 88
zcmV-e0H^<g1cL;yvjI>$Nkl<ZC{tr#7+&DdpFjUe^${bo25bhfu&}_@faH<+SS>?0
u1ja|FNzx2cjLn58UH~aXRz%RbK=l9>%PX5+SinL60000<MNUMnLSTYS^CLI_

delta 87
zcmZo>X=2&1nbF_M)5S4FBRDxhV%~%E^X>mTO582Kam2u>VS>`0Pc0_RInLpSnTnYd
r&l*&UiHW(Tq%SV`AlbA|FpYzu_oe#0kMGJ)F#v(5tDnm{r-UW|3uhv=

diff --git a/textures/segment2/custom_font_normal_char_lae.ia4.png b/textures/segment2/custom_font_normal_char_lae.ia4.png
new file mode 100644
index 0000000000000000000000000000000000000000..991770e44f8e5d76505bc7cc4f5c70788aa4795f
GIT binary patch
literal 513
zcmV+c0{;DpP)<h;3K|Lk000e1NJLTq000mG000OG1^@s6@OFQf0004RX+uL$X=7sm
z04R}lkvmHRK@^3*B#PpL6e@_MNTDKPBq)fb#v)A+i3&z-HtQx4Hp#M^AYv=nSO^xP
zjjzIgpsir5AP9;eVrTEG5n1nK0};_#X79(DIhUC;;7^!(-l>a1zEHB0@mP2+H6Lzx
zCP0V|2I<#y#~PoSO7QRaxW%XHO+@wjf8U>@dC72e@HGmL=$2g)9urQilq|)Y!tHua
zTM|AH9<b$r!k0=<d;Fw0>+zdndnP#ne$_La{lV!Utmo{!aG!8@-Yo0Y^QfD&7=_ts
zsa-NdI3$S^BTSky%b1jiNG(WafBT{p-y}ux=<>H%#TG}FoOlOBElXEJYDRQJK9g0I
z`|muR%<z!cy(I?qkFNXL0}b2owdJ~>hpzi|1c3)QFVy@+$!YXm^sSoKy$`{4IK8N8
z=^Z%RfX;hMv$cv8km=84;N=8bQ_yw|O$%OD)pd^VU}jC8=n8iCpjY+>7ry~M?Pw=2
zu)(<i000SaNLh0L01FZT01FZU(%pXi0000uNkl<ZC{tr#pcVM@=g)r-Cdqu524szd
z3}GV41}ush(Z$ehWMN^!P=nJ_Y)+@S7cg8yYUl$1B%~{Zxa+fT00000NkvXXu0mjf
De_rA%

literal 0
HcmV?d00001

diff --git a/textures/segment2/custom_font_normal_char_leth.ia4.png b/textures/segment2/custom_font_normal_char_leth.ia4.png
new file mode 100644
index 0000000000000000000000000000000000000000..08c7c1b28593c54c6f0e0e1992777799a04f7991
GIT binary patch
literal 512
zcmV+b0{{JqP)<h;3K|Lk000e1NJLTq000mG000OG1^@s6@OFQf0004RX+uL$X=7sm
z04R}lkvmHRK@^3*B#PpL6e@_MNTDKPBq)fb#v)A+i3&z-HtQx4Hp#M^AYv=nSO^xP
zjjzIgpsir5AP9;eVrTEG5n1nK0};_#X79(DIhUC;;7^!(-l>a1zEHB0@mP2+H6Lzx
zCP0V|2I<#y#~PoSO7QRaxW%XHO+@wjf8U>@dC72e@HGmL=$2g)9urQilq|)Y!tHua
zTM|AH9<b$r!k0=<d;Fw0>+zdndnP#ne$_La{lV!Utmo{!aG!8@-Yo0Y^QfD&7=_ts
zsa-NdI3$S^BTSky%b1jiNG(WafBT{p-y}ux=<>H%#TG}FoOlOBElXEJYDRQJK9g0I
z`|muR%<z!cy(I?qkFNXL0}b2owdJ~>hpzi|1c3)QFVy@+$!YXm^sSoKy$`{4IK8N8
z=^Z%RfX;hMv$cv8km=84;N=8bQ_yw|O$%OD)pd^VU}jC8=n8iCpjY+>7ry~M?Pw=2
zu)(<i000SaNLh0L01FZT01FZU(%pXi0000tNkl<ZC{tr#7zK>TLGb6#pZ~amgoT9#
zMJ>*tLpKD*N2jqGfJ-w>F+LZ<4FoBIVQk(*Hv|C0;WK87kqJ!z0000<MNUMnLSTYg
CN8cU*

literal 0
HcmV?d00001

diff --git a/textures/segment2/custom_font_normal_char_sex.ia4.png~ b/textures/segment2/custom_font_normal_char_li_c.ia4.png
similarity index 85%
rename from textures/segment2/custom_font_normal_char_sex.ia4.png~
rename to textures/segment2/custom_font_normal_char_li_c.ia4.png
index 0df0de6278a11430ae59189ad64359432e267f28..de594a946bc20e21603bf716ad5f29b24a5533ba 100644
GIT binary patch
delta 69
zcmey${DFDHW=2~LPZ!4!jo{=23Dzt8jrR5b{v1!!(km3%`l8FBCdF_Ouj6%&O{~+?
Y7^*zg>v>JuS1<s9r>mdKI;Vst0HGim9smFU

delta 74
zcmeys{FQmbW=1DnPZ!4!jo{=2309ZZ1M}_c|1}$!9o2c!^nxogB0}QhO{Qrs*IYc9
d1O3!o1sSTU`QL2e%4lH#0#8>zmvv4FO#m`V8z}$)

diff --git a/textures/segment2/custom_font_normal_char_loe.ia4.png b/textures/segment2/custom_font_normal_char_loe.ia4.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b5b38d330f6bc4f667637d2d3692cb3294bd9d4
GIT binary patch
literal 508
zcmV<Y0R#StP)<h;3K|Lk000e1NJLTq000mG000OG1^@s6@OFQf0004RX+uL$X=7sm
z04R}lkvmHRK@^3*B#PpL6e@_MNTDKPBq)fb#v)A+i3&z-HtQx4Hp#M^AYv=nSO^xP
zjjzIgpsir5AP9;eVrTEG5n1nK0};_#X79(DIhUC;;7^!(-l>a1zEHB0@mP2+H6Lzx
zCP0V|2I<#y#~PoSO7QRaxW%XHO+@wjf8U>@dC72e@HGmL=$2g)9urQilq|)Y!tHua
zTM|AH9<b$r!k0=<d;Fw0>+zdndnP#ne$_La{lV!Utmo{!aG!8@-Yo0Y^QfD&7=_ts
zsa-NdI3$S^BTSky%b1jiNG(WafBT{p-y}ux=<>H%#TG}FoOlOBElXEJYDRQJK9g0I
z`|muR%<z!cy(I?qkFNXL0}b2owdJ~>hpzi|1c3)QFVy@+$!YXm^sSoKy$`{4IK8N8
z=^Z%RfX;hMv$cv8km=84;N=8bQ_yw|O$%OD)pd^VU}jC8=n8iCpjY+>7ry~M?Pw=2
zu)(<i000SaNLh0L01FZT01FZU(%pXi0000pNkl<ZC{tr#pcVM@=g)r-Cdqu524szd
y3}GV41}ush(Z$ehWMN^!P=nJ_Y|b70UH|~(`Xj9I2q@D40000<MNUMnLSTX<=HTZ5

literal 0
HcmV?d00001

diff --git a/textures/segment2/custom_font_normal_char_los.ia4.png b/textures/segment2/custom_font_normal_char_los.ia4.png
new file mode 100644
index 0000000000000000000000000000000000000000..6be1acc860b8328cbf1c7643de62212a5142b35b
GIT binary patch
literal 505
zcmV<V0S5kwP)<h;3K|Lk000e1NJLTq000mG000OG1^@s6@OFQf0004RX+uL$X=7sm
z04R}lkvmHRK@^3*B#PpL6e@_MNTDKPBq)fb#v)A+i3&z-HtQx4Hp#M^AYv=nSO^xP
zjjzIgpsir5AP9;eVrTEG5n1nK0};_#X79(DIhUC;;7^!(-l>a1zEHB0@mP2+H6Lzx
zCP0V|2I<#y#~PoSO7QRaxW%XHO+@wjf8U>@dC72e@HGmL=$2g)9urQilq|)Y!tHua
zTM|AH9<b$r!k0=<d;Fw0>+zdndnP#ne$_La{lV!Utmo{!aG!8@-Yo0Y^QfD&7=_ts
zsa-NdI3$S^BTSky%b1jiNG(WafBT{p-y}ux=<>H%#TG}FoOlOBElXEJYDRQJK9g0I
z`|muR%<z!cy(I?qkFNXL0}b2owdJ~>hpzi|1c3)QFVy@+$!YXm^sSoKy$`{4IK8N8
z=^Z%RfX;hMv$cv8km=84;N=8bQ_yw|O$%OD)pd^VU}jC8=n8iCpjY+>7ry~M?Pw=2
zu)(<i000SaNLh0L01FZT01FZU(%pXi0000mNkl<ZC{tr#7zK>zLGb6#pZ~~WEG#S-
vYH$V{vSt_?-9U8BOxR2VX(HBUioE~;4PqDGa(f);00000NkvXXu0mjfC4$_h

literal 0
HcmV?d00001

diff --git a/textures/segment2/custom_font_normal_char_pc.ia4.png~ b/textures/segment2/custom_font_normal_char_lu_c.ia4.png
similarity index 83%
rename from textures/segment2/custom_font_normal_char_pc.ia4.png~
rename to textures/segment2/custom_font_normal_char_lu_c.ia4.png
index 9b5b6e4af000fb4cb0933686fb5d2bc399ea648c..94b79177bbaebee310f57450eae6d8c98de73511 100644
GIT binary patch
delta 85
zcmey#+`zJ7Go!DCr;B5VMsRY11Z&R;#}CiX&;Ng;sin2GRZxX}5ht6Zp0k70$CHh`
pZs81%4j(DVJXRpI$th_L4}<&!<*mQCb;TKgz|+;wWt~$(69Bd~AT0m@

delta 78
zcmZo*`N_OtGozcKr;B5VMsRY11gnJNhv(<#|2J?<F$;8T^<}=;)*!M-Tg}Z_dDG<!
hrW-bFSa2fwGaEyVzWj2o%*hNO;OXk;vd$@?2>_S99SHyc

diff --git a/textures/segment2/custom_font_normal_char_scn.ia4.png~ b/textures/segment2/custom_font_normal_char_scn.ia4.png~
deleted file mode 100644
index 8c1804c426e80ed380eeb5d9971cbcd6fa62679f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 543
zcmV+)0^t3LP)<h;3K|Lk000e1NJLTq000mG000OG1^@s6@OFQf0004QX+uL$X=7sm
z04R}lkvmHRK@^2Q6GhQT3I#<i0zR-%5CyT+SfmLOVg#c$yK5doc3pN8L~I2ci-3h_
z<E!u=Xe-z%2!bMr*xCDPMAkcr5Rqh-+52&3&SmBd_@X((bn8dJwDL|o5)REL7eb9M
z`01vDL3%aAwWngSC^g6D9d)YS4y#_Z_f;J&%PH4@x+dXq!*=q*lfu!pysda!xZTKV
z%fg4kLyjC!_)6(|nV%JB%KWa_NyMkYr+S7me^~#+M%FQf2Zj60T*3G~kGe@9WzEe>
z?ULDpOPmN{Lg*A&AxEBJsg`6`-8WM5&9EvSL;g1FIO52V74ML!1?ifSnif4JUygN^
z`~N)M^w?;*dms!APoDSI4~;wUUG%)KBhULj2LB^mSQY=O<TUXida<JQ9YAms&MqsO
zz6<AD(D`6%j#iTVGJWYZyq-d9654K{d9j?;?>Z;<kl2tXx`w@d7?AzJr5_~sXd6Gk
zHC+Gz010qNS#tmY3labT3lag+-G2N40037>L_t(2Q>Br?3IHGoLks->FBS?TV`}E1
zPD0P=W^13X`+jB~nI;h}UKp(n`)XFuGlUAFiokV>TQ69^|1hnxQ00k&S{n<Qz=8J$
h$QcV+h&~Iv!UU3mFXf^z-7)|G002ovPDHLkV1l2K@KgW*

diff --git a/textures/segment2/custom_font_normal_char_ss.ia4.png b/textures/segment2/custom_font_normal_char_ss.ia4.png
new file mode 100644
index 0000000000000000000000000000000000000000..f942adc13781563f13cce8771416ace5574f4212
GIT binary patch
literal 521
zcmV+k0`~ohP)<h;3K|Lk000e1NJLTq000mG000OG1^@s6@OFQf0004RX+uL$X=7sm
z04R}lkvmHRK@^3*B#PpL6e@_MNTDKPBq)fb#v)A+i3&z-HtQx4Hp#M^AYv=nSO^xP
zjjzIgpsir5AP9;eVrTEG5n1nK0};_#X79(DIhUC;;7^!(-l>a1zEHB0@mP2+H6Lzx
zCP0V|2I<#y#~PoSO7QRaxW%XHO+@wjf8U>@dC72e@HGmL=$2g)9urQilq|)Y!tHua
zTM|AH9<b$r!k0=<d;Fw0>+zdndnP#ne$_La{lV!Utmo{!aG!8@-Yo0Y^QfD&7=_ts
zsa-NdI3$S^BTSky%b1jiNG(WafBT{p-y}ux=<>H%#TG}FoOlOBElXEJYDRQJK9g0I
z`|muR%<z!cy(I?qkFNXL0}b2owdJ~>hpzi|1c3)QFVy@+$!YXm^sSoKy$`{4IK8N8
z=^Z%RfX;hMv$cv8km=84;N=8bQ_yw|O$%OD)pd^VU}jC8=n8iCpjY+>7ry~M?Pw=2
zu)(<i000SaNLh0L01FZT01FZU(%pXi0000$Nkl<ZC{tr#81jG--3NdE{P_<PV_{(d
z%frNAe4M^U)(q2#EQT(RVGuS0@VO8qhv5ZW&co(43<K~v5tsh~6^<*ZlRl)400000
LNkvXXu0mjfufpYM

literal 0
HcmV?d00001